country_select 2.0.0 → 2.0.1

data/lib/country_select/rails3/country_select_helper.rb

@@ -31,7 +31,7 @@ module ActionView
         else
           html_options = @html_options.stringify_keys
           add_default_name_and_id(html_options)
-          content_tag(:select, country_option_tags, html_options)
+          content_tag(:select, add_options(country_option_tags, options, value(object)), html_options)
         end
       end
     end

data/lib/country_select/tag_helper.rb

@@ -1,4 +1,5 @@
 module CountrySelect
+  class CountryNotFoundError < StandardError;end
   module TagHelper
     def country_option_tags
       option_tags_options = {
@@ -61,14 +62,20 @@ module CountrySelect
 
     def country_options_for(country_codes, sorted=true)
       I18n.with_locale(locale) do
-        country_list = country_codes.map do |code|
-          code = code.to_s.upcase
+        country_list = country_codes.map do |code_or_name|
+          if country = ISO3166::Country.new(code_or_name)
+            code = country.alpha2
+          elsif country = ISO3166::Country.find_by_name(code_or_name)
+            code = country.first
+          end
+
+          country = ISO3166::Country.new(code)
 
-          unless country = ISO3166::Country.new(code)
-            code = ISO3166::Country.find_by_name(code).first
+          unless country.present?
+            msg = "Could not find Country with string '#{code_or_name}'"
+            raise CountryNotFoundError.new(msg)
           end
 
-          country ||= ISO3166::Country.new(code)
           default_name = country.name
           localized_name = country.translations[I18n.locale.to_s]
 

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/country_select_spec.rb

@@ -135,5 +135,33 @@ describe "CountrySelect" do
       t = builder.country_select(:country_code, country_names)
       expect(t).to include(tag)
     end
+
+    it "raises an error when a country code or name is not found" do
+      country_names = [
+        "United States",
+        "Canada",
+        "United Kingdom",
+        "Mexico",
+        "Australia",
+        "South Korea"
+      ]
+      error_msg = "Could not find Country with string 'South Korea'"
+
+      expect do
+        builder.country_select(:country_code, country_names)
+      end.to raise_error(CountrySelect::CountryNotFoundError, error_msg)
+    end
+
+    it "supports the select prompt" do
+      tag = '<option value="">Select your country</option>'
+      t = builder.country_select(:country_code, prompt: 'Select your country')
+      expect(t).to include(tag)
+    end
+
+    it "supports the include_blank option" do
+      tag = '<option value=""></option>'
+      t = builder.country_select(:country_code, include_blank: true)
+      expect(t).to include(tag)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,20 +1,98 @@
+require 'pry'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-require 'pry'
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
 
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+#=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
   config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  #config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  #config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  #config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+#=end
+
+  # non-default settings
+  config.raise_errors_for_deprecations!
+
+  config.before do
+    I18n.config.enforce_available_locales = false
+  end
 end

metadata

@@ -1,77 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -104,19 +112,26 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
 - UPGRADING.md
 - country_select.gemspec
+- gemfiles/actionpack.edge.gemfile
+- gemfiles/actionpack.edge.gemfile.lock
 - gemfiles/actionpack3.0.gemfile
 - gemfiles/actionpack3.1.gemfile
 - gemfiles/actionpack3.2.gemfile
+- gemfiles/actionpack3.2.gemfile.lock
 - gemfiles/actionpack4.0.gemfile
+- gemfiles/actionpack4.0.gemfile.lock
 - gemfiles/actionpack4.1.gemfile
+- gemfiles/actionpack4.1.gemfile.lock
+- gemfiles/actionpack4.2.gemfile
+- gemfiles/actionpack4.2.gemfile.lock
 - lib/country_select.rb
 - lib/country_select/country_select_helper.rb
 - lib/country_select/rails3/country_select_helper.rb

data/Appraisals

@@ -1,19 +0,0 @@
-appraise 'actionpack3.0' do
-  gem 'actionpack', '~> 3.0.20'
-end
-
-appraise 'actionpack3.1' do
-  gem 'actionpack', '~> 3.1.12'
-end
-
-appraise 'actionpack3.2' do
-  gem 'actionpack', '~> 3.2.17'
-end
-
-appraise 'actionpack4.0' do
-  gem 'actionpack', '~> 4.0.0'
-end
-
-appraise 'actionpack4.1' do
-  gem 'actionpack', '~> 4.1.0'
-end