country_select 1.0.1 → 1.1.1

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
+gem 'rake'
+
 # Specify your gem's dependencies in country_select.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-Country-Select
+Country_Select
 
 Provides a simple helper to get an HTML select list of countries.  The list of countries comes
 from the ISO 3166 standard.  While it is a relatively neutral source of country names, it may
@@ -10,11 +10,11 @@ Users are strongly advised to evaluate the suitability of this list given their
 
 Install as a gem using
 
-    gem install country-select
+    gem install country_select
 
 Or put the following in your Gemfile
 
-    gem 'country-select'
+    gem 'country_select'
 
 ## Example
 
@@ -28,13 +28,7 @@ Supplying priority countries to be placed at the top of the list:
 
 Specifying which country to be selected:
 United Kingdom will be selected.
-country_select("user", "country_name", [ "+United Kingdom+", "France", "Germany" ])
-
-Example in a Rails form:
-Full list, with New Zealand Australia and United Kingdom prioritized (New Zealand selected
-by default)
-<%= country_select(:player, :nationality, [ "+New Zealand+", "Australia", "United Kingdom" ])
-%>
 
+    country_select("user", "country_name", [ "+United Kingdom+", "France", "Germany" ])
 
 Copyright (c) 2008 Michael Koziarski, released under the MIT license

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/lib/country_select.rb

@@ -6,7 +6,12 @@ module ActionView
     module FormOptionsHelper
       # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
+        # check if InstanceTag defined and accepts more than zero attributes in new method
+        if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+          InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
+        else
+          CountrySelect.new(object, method, self, options).to_country_select_tag(priority_countries, options, html_options)
+        end
       end
       # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
       # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
@@ -67,7 +72,7 @@ module ActionView
         "Yemen", "Zambia", "Zimbabwe"] unless const_defined?("COUNTRIES")
     end
 
-    class InstanceTag
+    module ToCountrySelectTag
       def to_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
@@ -81,6 +86,16 @@ module ActionView
       end
     end
 
+    if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+      class InstanceTag
+        include ToCountrySelectTag
+      end
+    else
+      class CountrySelect < Tags::Base
+        include ToCountrySelectTag
+      end
+    end
+
     class FormBuilder
       def country_select(method, priority_countries = nil, options = {}, html_options = {})
         @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)

data/lib/country_select/version.rb

@@ -1,3 +1,3 @@
 module CountrySelect
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies: []
 description: Provides a simple helper to get an HTML select list of countries.  The
   list of countries comes from the ISO 3166 standard.  While it is a relatively neutral
@@ -25,6 +25,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- VERSION
 - country_select.gemspec
 - lib/country_select.rb
 - lib/country_select/version.rb
@@ -40,12 +41,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4540347741116960557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4540347741116960557
 requirements: []
 rubyforge_project: country_select
 rubygems_version: 1.8.24