Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow users to pass an abbreviations option to subregion_select to display region abbreviations as the visible element in the option #32

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.bundle/
.idea/
log/*.log
pkg/
Gemfile.lock
Expand Down
28 changes: 16 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
language: ruby
rvm:
- 1.9.2
- 1.9.3
- 2.0.0
env:
- "RAILS_VERSION=3.1.0"
- "RAILS_VERSION=3.2.0"
- "RAILS_VERSION=4.0.0"
- 2.3.8
- 2.4.9
- 2.5
- 2.6
gemfile:
- gemfiles/rails_4.1.gemfile
- gemfiles/rails_4.2.gemfile
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
- gemfiles/rails_5.2.gemfile
- gemfiles/rails_6.0.gemfile
matrix:
exclude:
- rvm: 1.9.2
env: "RAILS_VERSION=4.0.0"
branches:
only:
- master
- rvm: 2.3.8
gemfile: gemfiles/rails_6.0.gemfile
- rvm: 2.4.9
gemfile: gemfiles/rails_6.0.gemfile
36 changes: 32 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,7 +1,35 @@
appraise "rails-3" do
gem "rails", "~> 3.2"
appraise "rails-4.1" do
gem "rails", "~> 4.1.0"
gem 'test-unit', '~> 3.0'
gem 'sprockets', '~> 3.7'
end

appraise "rails-4" do
gem "rails", "~> 4.0"
appraise "rails-4.2" do
gem "rails", "~> 4.2.0"
gem 'test-unit', '~> 3.0'
gem 'sprockets', '~> 3.7'
end

appraise "rails-5.0" do
gem "rails", "~> 5.0.0"
gem 'test-unit', '~> 3.0'
gem 'sprockets', '~> 3.7'
end

appraise "rails-5.1" do
gem "rails", "~> 5.1.0"
gem 'test-unit', '~> 3.0'
gem 'sprockets', '~> 3.7'
end

appraise "rails-5.2" do
gem "rails", "~> 5.2.0"
gem 'test-unit', '~> 3.0'
gem 'sprockets', '~> 3.7'
end

appraise "rails-6.0" do
gem "rails", "~> 6.0.0"
gem 'test-unit', '~> 3.0'
gem 'sprockets', '~> 4.0'
end
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ source "http://rubygems.org"

gemspec

gem 'appraisal', "1.0.0.beta3"
gem "debugger"
gem 'appraisal', "2.2.0"
2 changes: 1 addition & 1 deletion carmen-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["spec/**/*"]

s.add_dependency "rails"
s.add_dependency "carmen", "~> 1.0.0"
s.add_dependency "carmen", "~> 1.0"

s.add_development_dependency "minitest"
end
9 changes: 0 additions & 9 deletions gemfiles/rails_3.gemfile

This file was deleted.

111 changes: 0 additions & 111 deletions gemfiles/rails_3.gemfile.lock

This file was deleted.

10 changes: 10 additions & 0 deletions gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "2.2.0"
gem "rails", "~> 4.1.0"
gem "test-unit", "~> 3.0"
gem "sprockets", "~> 3.7"

gemspec path: "../"
100 changes: 100 additions & 0 deletions gemfiles/rails_4.1.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
PATH
remote: ..
specs:
carmen-rails (1.0.1)
carmen (~> 1.0)
rails

GEM
remote: http://rubygems.org/
specs:
actionmailer (4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.16)
actionview (= 4.1.16)
activesupport (= 4.1.16)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
activerecord (4.1.16)
activemodel (= 4.1.16)
activesupport (= 4.1.16)
arel (~> 5.0.0)
activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
appraisal (2.2.0)
bundler
rake
thor (>= 0.14.0)
arel (5.0.1.20140414130214)
builder (3.2.3)
carmen (1.1.3)
activesupport (>= 3.0.0)
concurrent-ruby (1.1.5)
erubis (2.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (1.8.6)
mail (2.7.1)
mini_mime (>= 0.1.1)
mini_mime (1.0.2)
minitest (5.13.0)
power_assert (1.1.5)
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.16)
actionmailer (= 4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
activemodel (= 4.1.16)
activerecord (= 4.1.16)
activesupport (= 4.1.16)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.16)
sprockets-rails (~> 2.0)
railties (4.1.16)
actionpack (= 4.1.16)
activesupport (= 4.1.16)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (13.0.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
test-unit (3.3.4)
power_assert
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
appraisal (= 2.2.0)
carmen-rails!
minitest
rails (~> 4.1.0)
sprockets (~> 3.7)
test-unit (~> 3.0)

BUNDLED WITH
1.17.2
10 changes: 10 additions & 0 deletions gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal", "2.2.0"
gem "rails", "~> 4.2.0"
gem "test-unit", "~> 3.0"
gem "sprockets", "~> 3.7"

gemspec path: "../"
Loading