i18n_country_select 1.0.19 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ecf6fe042b23e81a270af77cc1f5b9ba3cf83f9
-  data.tar.gz: ff617925f6467a7eef8b96b883e47c6df38e24cb
+  metadata.gz: 4e34e99a3b26cc00853cbf5d5dcd5c740c038a0c
+  data.tar.gz: 6612498e32156e8f87c16db1e877a255d1a00fdf
 SHA512:
-  metadata.gz: a8a3468e27669bf02cc847b4ee0cefdde15b45b6fa5447ad9cfa5434245707f84e45608db9a465f5658b77e898e9388167379645dcda34166854d37a6985ad45
-  data.tar.gz: 0b06fe56c1ca328995ad3d70ec4f61503d82cfb31c85314fbecf83529de2389a4a15a278db65df14a07de47809d6828892112d986dd78680fd3d25bcba84d7da
+  metadata.gz: 33c79b176d6ce5f8aca40fc0fcc6b0081abcebbc466e28f45d9b10270cea46824627af1236a5b8ede346e7757bd4130cc7b18403a7e39047482886c2352a5c20
+  data.tar.gz: 19b4aee5c9102c2cb280314e6fc5ab4ca0cc1e6d52e530ff00367288a488eeafbc21782075a260dc96f984b546dbd9eac4b79fc9258fbfe8fd3fb447fb3d0fe5

data/README.rdoc

@@ -36,10 +36,12 @@ Supplying priority countries to be placed at the top of the list:
 * Marten Klitzke (https://github.com/mortik)
 * Victor D. (https://github.com/V1c70r)
 * Alexey Degtyarev (https://github.com/alexhifer)
+* Björn Wilmsmann (https://github.com/BjoernKW)
 
 Based on the deprecated country_code_select by: Russ Smith (russ@bashme.org) and Frank Wambutt (frank@mo-stud.io)
 
 == Version History
+* 1.1.0 - Rails 4 support
 * 1.0.19 - Added Macedonia
 * 1.0.18 - Fixed translated sorting
 * 1.0.17 - Removing duplicate country code IE

data/lib/i18n_country_select.rb

@@ -8,5 +8,9 @@ require "i18n_country_select/form_helpers"
 require "i18n_country_select/instance_tag"
 
 ActionView::Base.send(:include, I18nCountrySelect::FormHelpers)
-ActionView::Helpers::InstanceTag.send(:include, I18nCountrySelect::InstanceTag)
+if Rails::VERSION::MAJOR >= 4
+  ActionView::Helpers::ActiveModelInstanceTag.send(:include, I18nCountrySelect::InstanceTag)
+else
+  ActionView::Helpers::InstanceTag.send(:include, I18nCountrySelect::InstanceTag)
+end
 ActionView::Helpers::FormBuilder.send(:include, I18nCountrySelect::FormBuilder)

data/lib/i18n_country_select/form_helpers.rb

@@ -1,7 +1,13 @@
 module I18nCountrySelect
   module FormHelpers
     def country_code_select(object_name, method, priority_countries = nil, options = {}, html_options = {})
-      ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object)).to_country_code_select_tag(priority_countries, 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
     end
   end
 end

data/lib/i18n_country_select/instance_tag.rb

@@ -19,7 +19,7 @@ module I18nCountrySelect
 
       countries = ""
 
-      if options[:include_blank]
+      if options.present? and options[:include_blank]
         option = options[:include_blank] == true ? "" : options[:include_blank]
         countries += "<option>#{option}</option>\n"
       end

data/lib/i18n_country_select/version.rb

@@ -1,3 +1,3 @@
 module I18nCountrySelect
-  VERSION = "1.0.19"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_country_select
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian McQuay (brian@onomojo.com)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n