i18n_country_select 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a630ee211dbe68bfa42524a53fe7ef3e0a956e7d
-  data.tar.gz: a72913c529cabe38e2f5a94abdc8288e3da818e1
+  metadata.gz: 028c8665a7e08597e3ee81e05fdcbe9fd3f3d4ed
+  data.tar.gz: d91a51f16c576ecf4466a97c8a039f49f6623b91
 SHA512:
-  metadata.gz: d3cccfa79e33a85d9f5a4173dce36ea9b911b3be3f13276b84665735c558c21f19e6e5a0f3e20a2a77f14ab8d06ff83e9427a7ef97974405a498efff852d183c
-  data.tar.gz: 7acf949c4970e597a23307bf13a6ed9164e91edd5584165a274b520a72a3b7a8675381536d6ae2a3adf54b461273b8a615e07e683caa226b35838ee29dcb60c5
+  metadata.gz: 396672d7f30555f95e9938e1fe1f57139ed916402f57a0ca97f2c86148f3a6b94d778ddd047c4c82f2ec8613916c3006d8fc04d7a964c8d4a42159590983e5d3
+  data.tar.gz: 9654cc73ada7a5f7f7137284b65eabe568e732157a3984731783fa7783fa00ee997bf5990fe04e935f96db0302615ea18aef295b79d2e956258f7b12553c01cf

data/README.rdoc

@@ -39,10 +39,12 @@ Supplying priority countries to be placed at the top of the list:
 * Björn Wilmsmann (https://github.com/BjoernKW)
 * https://github.com/durandom
 * Stefan Slaveykov (https://github.com/wizardone)
+* Leonardo D. Schlossmacher (https://github.com/leods92)
 
 Based on the deprecated country_code_select by: Russ Smith (russ@bashme.org) and Frank Wambutt (frank@mo-stud.io)
 
 == Version History
+* 1.1.4 - Fixed options being ignored when running Rails 4
 * 1.1.3 - Removed Netherlands Antilles. Added Bonaire, Curacao, Sint Maarten, and South Sudan
 * 1.1.2 - Adding Thread variable to speed up rendering
 * 1.1.1 - Bumping required version of country translations

data/lib/i18n_country_select/form_helpers.rb

@@ -3,11 +3,11 @@ module I18nCountrySelect
     def country_code_select(object_name, method, priority_countries = nil, options = {}, html_options = {})
       if Rails::VERSION::MAJOR >= 4
         instance_tag = ActionView::Helpers::Tags::Select.new(object_name, method, self, [], options, html_options)
-        return instance_tag.to_country_code_select_tag(priority_countries, options.delete(:object), html_options)
-     else
-       instance_tag = ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object))
-       return instance_tag.to_country_code_select_tag(priority_countries, options, html_options)
-     end
+        instance_tag.to_country_code_select_tag(priority_countries, html_options)
+      else
+        instance_tag = ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object))
+        instance_tag.to_country_code_select_tag(priority_countries, html_options, options)
+      end
     end
   end
 end

data/lib/i18n_country_select/instance_tag.rb

@@ -2,7 +2,11 @@ module I18nCountrySelect
   module InstanceTag
     include Countries
 
-    def to_country_code_select_tag(priority_countries, options = {}, html_options = {})
+    def to_country_code_select_tag(priority_countries, html_options = {}, options = {})
+      # Rails 4 stores options sent when creating an InstanceTag.
+      # Let's use them!
+      options = @options if defined?(@options)
+
       country_code_select(priority_countries, options, html_options)
     end
 

data/lib/i18n_country_select/version.rb

@@ -1,3 +1,3 @@
 module I18nCountrySelect
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_country_select
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Brian McQuay (brian@onomojo.com)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -28,6 +28,9 @@ dependencies:
   name: i18n-country-translations
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
@@ -35,6 +38,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
@@ -42,6 +48,9 @@ dependencies:
   name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -49,6 +58,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -56,6 +68,9 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -63,6 +78,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -70,6 +88,9 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
@@ -77,6 +98,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
@@ -101,14 +125,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- lib/i18n_country_select.rb
 - lib/i18n_country_select/countries.rb
 - lib/i18n_country_select/form_builder.rb
 - lib/i18n_country_select/form_helpers.rb
 - lib/i18n_country_select/instance_tag.rb
 - lib/i18n_country_select/version.rb
-- lib/i18n_country_select.rb
-- README.rdoc
-- MIT-LICENSE
 homepage: https://github.com/onomojo/i18n_country_select
 licenses:
 - MIT
@@ -130,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: '[none]'
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: I18n country select helper