i18n_plus 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edbbcf803ea105c7d6b80abe259302432119570f74b5aa689bb63233e7a47fb8
-  data.tar.gz: e1e04de545bbf5d9ceee204f7ad62add5390f3fb44025134936683d5dd19937f
+  metadata.gz: 72cdf760645b9225c7187c939946e577646cdbce67c5fcfe6d34709a48ec5ef9
+  data.tar.gz: fabceece305f25de7bf6aca5b70913e6e1b31f9a376858706ffbd2e45a82043e
 SHA512:
-  metadata.gz: 4e0fb9b348ebd2697e6ce8bc40d5ac3b28df4b1ffde803b4c692a546268dbd535985b08e765a4b2c99f4f7fa00c01a703c7a6b7cc4b97f7f02b911b8f07ae457
-  data.tar.gz: b8319f458904089c48a2ef9a2c0d71e6095153ffc28b116591c8033a0e673460614ed5f022a927d6d97549e278d779d4e8b19be20dd24d14b2426dca73b7337b
+  metadata.gz: 3b9651f0e4ab00e5977fd89abd55be4d0e925b33814d3cb6ce08d28282e9301e678fe353e63d435c8701803026d79ccb256ea1a042cb26bb5809e612162f43b7
+  data.tar.gz: 8a161566cd89fc3a5e88e8dd18953f76e3aa7db519eb846860abd1591d0d51e914e3f8eb683a9b7bdc72dbda5b937931f7675ce860c08959e52d6f5b06f82fdd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.0, release 2019-03-18
+
+* Require Rails 5.2.2.1 at minimum
+
 # 0.3.1, release 2015-07-21
 
 * Require Rails 4.2 at minimum

data/lib/i18n_plus/country.rb

@@ -46,10 +46,12 @@ module ActionView
 
     module ToCountrySelectTag
       def to_country_select_tag(priority_country_codes, options, html_options)
-        html_options = html_options.stringify_keys
+        options.symbolize_keys!
+        html_options.stringify_keys!
         add_default_name_and_id(html_options)
-        value = value(object)
-        opts = add_options(country_options_for_select(value, *priority_country_codes), options, value)
+        _, value = option_text_and_value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        opts = add_options(country_options_for_select(selected_value, *priority_country_codes), options, value)
         content_tag(:select, opts, html_options)
       end
     end

data/lib/i18n_plus/currency.rb

@@ -46,10 +46,12 @@ module ActionView
 
     module ToCurrencySelectTag
       def to_currency_select_tag(priority_currency_codes, options, html_options)
-        html_options = html_options.stringify_keys
+        options.symbolize_keys!
+        html_options.stringify_keys!
         add_default_name_and_id(html_options)
-        value = value(object)
-        opts = add_options(currency_options_for_select(value, *priority_currency_codes), options, value)
+        _, value = option_text_and_value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        opts = add_options(currency_options_for_select(selected_value, *priority_currency_codes), options, value)
         content_tag(:select, opts, html_options)
       end
     end

data/lib/i18n_plus/language.rb

@@ -47,10 +47,12 @@ module ActionView
 
     module ToLanguageSelectTag
       def to_language_select_tag(priority_language_codes, options, html_options)
-        html_options = html_options.stringify_keys
+        options.symbolize_keys!
+        html_options.stringify_keys!
         add_default_name_and_id(html_options)
-        value = value(object)
-        opts = add_options(language_options_for_select(value, *priority_language_codes), options, value)
+        _, value = option_text_and_value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        opts = add_options(language_options_for_select(selected_value, *priority_language_codes), options, value)
         content_tag(:select, opts, html_options)
       end
     end

data/lib/i18n_plus/locale.rb

@@ -46,10 +46,12 @@ module ActionView
 
     module ToLocaleSelectTag
       def to_locale_select_tag(priority_locale_codes, options, html_options)
-        html_options = html_options.stringify_keys
+        options.symbolize_keys!
+        html_options.stringify_keys!
         add_default_name_and_id(html_options)
-        value = value(object)
-        opts = add_options(locale_options_for_select(value, *priority_locale_codes), options, value)
+        _, value = option_text_and_value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        opts = add_options(locale_options_for_select(selected_value, *priority_locale_codes), options, value)
         content_tag(:select, opts, html_options)
       end
     end

data/lib/i18n_plus/state.rb

@@ -31,17 +31,20 @@ module ActionView
       end
 
       def state_options_for_select(country_code, selected = nil)
-        all_states = I18nPlus.states(country_code).map { |code,name| [name, code] }.sort
-        options_for_select(all_states, selected)
+        collection = I18nPlus.states(country_code)
+        options = collection.map { |code,name| [name, code] }.sort
+        options_for_select(options, selected)
       end
     end
 
     module ToStateSelectTag
       def to_state_select_tag(country_code, options, html_options)
-        html_options = html_options.stringify_keys
+        options.symbolize_keys!
+        html_options.stringify_keys!
         add_default_name_and_id(html_options)
-        value = value(object)
-        opts = add_options(state_options_for_select(country_code, value), options, value)
+        _, value = option_text_and_value(object)
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
+        opts = add_options(state_options_for_select(country_code, selected_value), options, value)
         content_tag(:select, opts, html_options)
       end
     end

data/lib/i18n_plus/version.rb

@@ -1,3 +1,3 @@
 module I18nPlus
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/test/country_test.rb

@@ -41,57 +41,32 @@ class CountryTest < ActiveSupport::TestCase
 
   test "should return country options for German" do
     I18n.locale = :de
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">Deutschland<\/option>/
-    else
-      match = /<option selected="selected" value="DE">Deutschland<\/option>/
-    end
+    match = /<option selected="selected" value="DE">Deutschland<\/option>/
     assert_match match, country_options_for_select('DE').gsub(/\n/, '')
   end
 
   test "should return country options for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">Germany<\/option>/
-    else
-      match = /<option selected="selected" value="DE">Germany<\/option>/
-    end
+    match = /<option selected="selected" value="DE">Germany<\/option>/
     assert_match match, country_options_for_select('DE').gsub(/\n/, '')
   end
 
   test "should return country options with priority countries for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">Germany<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="DE">Germany<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="DE">Germany<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, country_options_for_select('DE', 'DE').gsub(/\n/, '')
   end
 
   test "should return country options with multiple priority countries for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">Germany<\/option><option value=\"GB\">United Kingdom<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="DE">Germany<\/option><option value=\"GB\">United Kingdom<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="DE">Germany<\/option><option value=\"GB\">United Kingdom<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, country_options_for_select('DE', 'DE', 'GB').gsub(/\n/, '')
   end
 
   test "should return country_select" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<select id="account_country" name="account\[country\]"><option value="DE" selected="selected">Germany<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<select name="account\[country\]" id="account_country"><option selected="selected" value="DE">Germany<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
-    assert_match match, country_select(@account, :country, 'DE').gsub(/\n/, '')
+    match = /<select name="account\[country\]" id="account_country"><option selected="selected" value="DE">Germany<\/option><option value="" disabled="disabled">----------<\/option>/
+    assert_match match, country_select(@account, :country, 'DE', {selected: 'DE'}).gsub(/\n/, '')
   end
 
   test "should return norway" do

data/test/currency_test.rb

@@ -16,56 +16,31 @@ class CurrencyTest < ActiveSupport::TestCase
 
   test "should return currency options for German" do
     I18n.locale = :de
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="EUR" selected="selected">EUR \(€\)<\/option>/
-    else
-      match = /<option selected="selected" value="EUR">EUR \(€\)<\/option>/
-    end
+    match = /<option selected="selected" value="EUR">EUR \(€\)<\/option>/
     assert_match match, currency_options_for_select('EUR').gsub(/\n/, '')
   end
 
   test "should return currency options for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="EUR" selected="selected">EUR \(€\)<\/option>/
-    else
-      match = /<option selected="selected" value="EUR">EUR \(€\)<\/option>/
-    end
+    match = /<option selected="selected" value="EUR">EUR \(€\)<\/option>/
     assert_match match, currency_options_for_select('EUR').gsub(/\n/, '')
   end
 
   test "should return currency options with priority currencies for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="EUR" selected="selected">EUR \(€\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="EUR">EUR \(€\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="EUR">EUR \(€\)<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, currency_options_for_select('EUR', 'EUR').gsub(/\n/, '')
   end
 
   test "should return currency options with multiple priority currencies for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="EUR" selected="selected">EUR \(€\)<\/option><option value=\"USD\">USD \(\$\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="EUR">EUR \(€\)<\/option><option value=\"USD\">USD \(\$\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="EUR">EUR \(€\)<\/option><option value=\"USD\">USD \(\$\)<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, currency_options_for_select('EUR', 'EUR', 'USD').gsub(/\n/, '')
   end
 
   test "should return currency_select" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<select id="account_currency" name="account\[currency\]"><option value="EUR" selected="selected">EUR \(€\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<select name="account\[currency\]" id="account_currency"><option selected="selected" value="EUR">EUR \(€\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
-    assert_match match, currency_select(@account, :currency, 'EUR').gsub(/\n/, '')
+    match = /<select name="account\[currency\]" id="account_currency"><option selected="selected" value="EUR">EUR \(€\)<\/option><option value="" disabled="disabled">----------<\/option>/
+    assert_match match, currency_select(@account, :currency, 'EUR', {selected: 'EUR'}).gsub(/\n/, '')
   end
 end

data/test/language_test.rb

@@ -14,57 +14,32 @@ class LanguageTest < ActiveSupport::TestCase
 
   test "should return language options for German" do
     I18n.locale = :de
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">Deutsch<\/option>/
-    else
-      match = /<option selected="selected" value="DE">Deutsch<\/option>/
-    end
+    match = /<option selected="selected" value="DE">Deutsch<\/option>/
     assert_match match, language_options_for_select('DE').gsub(/\n/, '')
   end
 
   test "should return language options for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">German<\/option>/
-    else
-      match = /<option selected="selected" value="DE">German<\/option>/
-    end
+    match = /<option selected="selected" value="DE">German<\/option>/
     assert_match match, language_options_for_select('DE').gsub(/\n/, '')
   end
 
   test "should return language options with priority languages for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">German<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="DE">German<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="DE">German<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, language_options_for_select('DE', 'DE').gsub(/\n/, '')
   end
 
   test "should return language options with multiple priority languages for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="DE" selected="selected">German<\/option><option value=\"EN\">English<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="DE">German<\/option><option value=\"EN\">English<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="DE">German<\/option><option value=\"EN\">English<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, language_options_for_select('DE', 'DE', 'EN').gsub(/\n/, '')
   end
 
   test "should return language_select" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<select id="account_language" name="account\[language\]"><option value="DE" selected="selected">German<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<select name="account\[language\]" id="account_language"><option selected="selected" value="DE">German<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
-    assert_match match, language_select(@account, :language, 'DE').gsub(/\n/, '')
+    match = /<select name="account\[language\]" id="account_language"><option selected="selected" value="DE">German<\/option><option value="" disabled="disabled">----------<\/option>/
+    assert_match match, language_select(@account, :language, 'DE', {selected: 'DE'}).gsub(/\n/, '')
   end
 
   test "should return Norwegian" do

data/test/locale_test.rb

@@ -14,56 +14,31 @@ class LocaleTest < ActiveSupport::TestCase
 
   test "should return locale options for German" do
     I18n.locale = :de
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="de-DE" selected="selected">Deutsch \(Deutschland\)<\/option>/
-    else
-      match = /<option selected="selected" value="de-DE">Deutsch \(Deutschland\)<\/option>/
-    end
+    match = /<option selected="selected" value="de-DE">Deutsch \(Deutschland\)<\/option>/
     assert_match match, locale_options_for_select('de-DE').gsub(/\n/, '')
   end
 
   test "should return locale options for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="de-DE" selected="selected">German \(Germany\)<\/option>/
-    else
-      match = /<option selected="selected" value="de-DE">German \(Germany\)<\/option>/
-    end
+    match = /<option selected="selected" value="de-DE">German \(Germany\)<\/option>/
     assert_match match, locale_options_for_select('de-DE').gsub(/\n/, '')
   end
 
   test "should return locale options with priority locale for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="de-DE" selected="selected">German \(Germany\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="de-DE">German \(Germany\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="de-DE">German \(Germany\)<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, locale_options_for_select('de-DE', 'de-DE').gsub(/\n/, '')
   end
 
   test "should return locale options with multiple priority locales for English" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="de-DE" selected="selected">German \(Germany\)<\/option><option value=\"en-GB\">English \(United Kingdom\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<option selected="selected" value="de-DE">German \(Germany\)<\/option><option value=\"en-GB\">English \(United Kingdom\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
+    match = /<option selected="selected" value="de-DE">German \(Germany\)<\/option><option value=\"en-GB\">English \(United Kingdom\)<\/option><option value="" disabled="disabled">----------<\/option>/
     assert_match match, locale_options_for_select('de-DE', 'de-DE', 'en-GB').gsub(/\n/, '')
   end
 
   test "should return locale_select" do
     I18n.locale = :en
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<select id="account_locale" name="account\[locale\]"><option value="de-DE" selected="selected">German \(Germany\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    else
-      match = /<select name="account\[locale\]" id="account_locale"><option selected="selected" value="de-DE">German \(Germany\)<\/option><option value="" disabled="disabled">----------<\/option>/
-    end
-    assert_match match, locale_select(@account, :locale, 'de-DE').gsub(/\n/, '')
+    match = /<select name="account\[locale\]" id="account_locale"><option selected="selected" value="de-DE">German \(Germany\)<\/option><option value="" disabled="disabled">----------<\/option>/
+    assert_match match, locale_select(@account, :locale, 'de-DE', {selected: 'de-DE'}).gsub(/\n/, '')
   end
 end

data/test/state_test.rb

@@ -14,35 +14,26 @@ class StateTest < ActiveSupport::TestCase
 
   test "should return states of Germany in German" do
     I18n.locale = :de
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="BY" selected="selected">Bayern<\/option>/
-    else
-      match = /<option selected="selected" value="BY">Bayern<\/option>/
-    end
+    match = /<option selected="selected" value="BY">Bayern<\/option>/
     assert_match match, state_options_for_select('DE', 'BY').gsub(/\n/, '')
   end
 
+  test "should return states of Germany with BE selected" do
+    I18n.locale = :de
+    match = /<option selected="selected" value="BE">Berlin<\/option>/
+    assert_match match, state_options_for_select('DE', 'BE').gsub(/\n/, '')
+  end
+
   test "should return states of Germany in English" do
     I18n.locale = :en
-    if ActiveSupport::VERSION::STRING < '4.0'
-      match = /<option value="BY" selected="selected">Bavaria<\/option>/
-    else
-      match = /<option selected="selected" value="BY">Bavaria<\/option>/
-    end
+    match = /<option selected="selected" value="BY">Bavaria<\/option>/
     assert_match match, state_options_for_select('DE', 'BY').gsub(/\n/, '')
   end
 
   test "should return state_select in English" do
     I18n.locale = :en
-    assert_not_nil results = state_select(@account, :state, 'DE').gsub(/\n/, '')
-
-    if ActiveSupport::VERSION::STRING < '4.0'
-      assert_match(/<select id="account_state" name="account\[state\]">/, results)
-      assert_match(/<option value="BY" selected="selected">Bavaria<\/option>/, results)
-    else
-      assert_match(/<select name="account\[state\]" id="account_state">/, results)
-      assert_match(/<option selected="selected" value="BY">Bavaria<\/option>/, results)
-    end
+    assert_not_nil results = state_select(@account, :state, 'DE', {selected: 'BY'}).gsub(/\n/, '')
+    assert_match(/<select name="account\[state\]" id="account_state">/, results)
+    assert_match(/<option selected="selected" value="BY">Bavaria<\/option>/, results)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_plus
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Oliver Eilhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 5.2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 5.2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 5.2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: 5.2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Internally used for working with countries, currencies, and locales. Only