country_select 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e785c0581b426a8f17ea5360af83ee345feedcf
-  data.tar.gz: f7694d0c2f41126fb93baa51c6b1d9abaf58ff52
+  metadata.gz: 0f72c7a94484b2fc7e537a8addc1ba2e3593edff
+  data.tar.gz: b88516afc9af4968d9e10f427504f9c92883185d
 SHA512:
-  metadata.gz: eefc971e1428a53d7ceeca2669f9a9f29cc86d4b85c70bdbdb52b9e04ea53ca4de9f15bb5aa7f13260acc7d9e87d49a246fdc4896bb6f23efabf3a74edb38524
-  data.tar.gz: 6483ee7c72a5609b75c02ec5336203feac1b6d26469e7f41e3a530a5c240f41e6e2ed3d4317457b1aa79b9805e20c2e5cb3c9093c8d7cb4efc35b457143df064
+  metadata.gz: 4ad51cc6825e7da7fcd12db138716df55812850768e1d293b2ad996b8b5f0500a38bed8b1a6c51b0cd6b0bee4c13fe18d1fc658ddfd04488ca247d0334dfde83
+  data.tar.gz: 4d9fa1e8e639330045a77e9b9dc126eecbf72eb0e2487e53715369383c962c5b80d403c9366e14be62f5f8439d8577b402be8be070b664e4eea5a667347c7b62

data/CHANGELOG.md

@@ -1,10 +1,14 @@
-== 2.0.1 2014-09-18
+## 2.1.0 2014-09-29
+
+  * #70 - Allow custom formats for option tag text – See README.md
+
+## 2.0.1 2014-09-18
 
   * #72 - Fixed `include_blank` and `prompt` in Rails 3.2
   * #75 - Raise `CountrySelect::CountryNotFound` error when given a country
     name or code that is not found in https://github.com/hexorx/countries
 
-== 2.0.0 2014-08-10
+## 2.0.0 2014-08-10
 
   * Removed support for Ruby < 1.9.3
   * ISO-3166 alpha-2 codes are now on by default, stored in uppercase
@@ -20,7 +24,7 @@
   * Add best-guess support for country names when codes aren't provided
     in options (e.g., priority_countries)
 
-== 1.2.0 2013-07-06
+## 1.2.0 2013-07-06
 
   * Country names have been synced with UTF-8 encoding to the list of
     countries on [Wikipedia's page for the ISO-3166 standard](https://en.wikipedia.org/wiki/ISO_3166-1).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    country_select (2.0.0)
+    country_select (2.0.1)
       countries (~> 0.9, >= 0.9.3)
 
 GEM

data/README.md

@@ -57,6 +57,21 @@ Supplying additional html options:
 country_select("user", "country", { priority_countries: ["GB", "FR"] }, { selected: "GB", class: 'form-control' })
 ```
 
+Using a custom formatter
+
+You can define a custom formatter which will receive an
+[`ISO3166::Country`](https://github.com/hexorx/countries/blob/master/lib/countries/country.rb)
+```ruby
+# config/initializers/country_select.rb
+CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
+  "#{country.name} (#{country.alpha2})"
+end
+```
+
+```ruby
+country_select("user", "country", format: :with_alpha2)
+```
+
 ### ISO 3166-1 alpha-2 codes
 The `option` tags use ISO 3166-1 alpha-2 codes as values and the country
 names as display strings. For example, the United States would appear as

data/country_select.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'actionpack', '~> 3'
-  s.add_development_dependency 'pry', '~> 0.10'
-  s.add_development_dependency 'rake', '~> 10.3'
-  s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'wwtd', '~> 0.5'
+  s.add_development_dependency 'pry', '~> 0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 3'
+  s.add_development_dependency 'wwtd'
 
   s.add_dependency 'countries', '~> 0.9', '>= 0.9.3'
 end

data/gemfiles/actionpack.edge.gemfile.lock

@@ -25,7 +25,7 @@ GIT
 PATH
   remote: ../
   specs:
-    country_select (2.0.0)
+    country_select (2.0.1)
       countries (~> 0.9, >= 0.9.3)
 
 GEM

data/gemfiles/actionpack3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.0.0)
+    country_select (2.0.1)
       countries (~> 0.9, >= 0.9.3)
 
 GEM

data/gemfiles/actionpack4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.0.0)
+    country_select (2.0.1)
       countries (~> 0.9, >= 0.9.3)
 
 GEM

data/gemfiles/actionpack4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.0.0)
+    country_select (2.0.1)
       countries (~> 0.9, >= 0.9.3)
 
 GEM

data/gemfiles/actionpack4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    country_select (2.0.0)
+    country_select (2.0.1)
       countries (~> 0.9, >= 0.9.3)
 
 GEM

data/lib/country_select.rb

@@ -3,6 +3,7 @@
 require 'iso3166'
 
 require 'country_select/version'
+require 'country_select/formats'
 require 'country_select/tag_helper'
 
 if defined?(ActionView::Helpers::Tags::Base)

data/lib/country_select/formats.rb

@@ -0,0 +1,7 @@
+module CountrySelect
+  FORMATS = {}
+
+  FORMATS[:default] = lambda do |country|
+    country.translations[I18n.locale.to_s] || country.name
+  end
+end

data/lib/country_select/tag_helper.rb

@@ -44,6 +44,10 @@ module CountrySelect
       @options[:except]
     end
 
+    def format
+      @options[:format] || :default
+    end
+
     def country_options
       country_options_for(all_country_codes, true)
     end
@@ -76,10 +80,7 @@ module CountrySelect
             raise CountryNotFoundError.new(msg)
           end
 
-          default_name = country.name
-          localized_name = country.translations[I18n.locale.to_s]
-
-          name = localized_name || default_name
+          name = ::CountrySelect::FORMATS[format].call(country)
 
           [name,code]
         end

data/lib/country_select/version.rb

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

data/spec/country_select_spec.rb

@@ -164,4 +164,18 @@ describe "CountrySelect" do
       expect(t).to include(tag)
     end
   end
+
+  describe "custom formats" do
+    it "accepts a custom formatter" do
+      ::CountrySelect::FORMATS[:with_alpha2] = lambda do |country|
+        "#{country.name} (#{country.alpha2})"
+      end
+
+      tag = options_for_select([['United States (US)', 'US']], 'US')
+
+      walrus.country_code = 'US'
+      t = builder.country_select(:country_code, format: :with_alpha2)
+      expect(t).to include(tag)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: country_select
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Stefan Penner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +122,6 @@ files:
 - 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
@@ -134,6 +132,7 @@ files:
 - gemfiles/actionpack4.2.gemfile.lock
 - lib/country_select.rb
 - lib/country_select/country_select_helper.rb
+- lib/country_select/formats.rb
 - lib/country_select/rails3/country_select_helper.rb
 - lib/country_select/tag_helper.rb
 - lib/country_select/version.rb

data/gemfiles/actionpack3.0.gemfile

@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-gem "actionpack", "~> 3.0.20"
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-end

data/gemfiles/actionpack3.1.gemfile

@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => "../"
-
-gem "actionpack", "~> 3.1.12"
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-end