air18n 0.1.56 → 0.1.57

data/lib/air18n/class_methods.rb

@@ -60,7 +60,7 @@ module Air18n
     # Returns whether or not imperial lengths are appropriate under
     # I18n.full_locale and I18n.tld_country.
     def uses_imperial_lengths?
-      uses_imperial_lengths_in_locale_and_country(I18n.full_locale, I18n.tld_country)
+      uses_imperial_lengths_in_locale_and_country?(I18n.full_locale, I18n.tld_country)
     end
 
     # Returns whether or not imperial lengths are appropriate for given locale

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.56"
+  VERSION = "0.1.57"
 end

data/spec/lib/air18n/air18n_spec.rb

@@ -45,10 +45,27 @@ describe Air18n do
   end
 
   context 'uses_imperial_lengths?' do
-    I18n.uses_imperial_lengths_in_locale_and_country?(:en, :US).should == true
-    I18n.uses_imperial_lengths_in_locale_and_country?(:en, :GB).should == true
-    I18n.uses_imperial_lengths_in_locale_and_country?(:en, :AU).should == false
-    I18n.uses_imperial_lengths_in_locale_and_country?(:fr, :US).should == false
+    it 'should work with given locale and country' do
+      I18n.uses_imperial_lengths_in_locale_and_country?(:en, :US).should == true
+      I18n.uses_imperial_lengths_in_locale_and_country?(:en, :GB).should == true
+      I18n.uses_imperial_lengths_in_locale_and_country?(:"en-GB", :GB).should == true
+      I18n.uses_imperial_lengths_in_locale_and_country?(:en, :AU).should == false
+      I18n.uses_imperial_lengths_in_locale_and_country?(:fr, :US).should == false
+    end
+
+    it 'should work using I18n.tld_country and I18n.full_locale' do
+      I18n.run_in_locale(:en) do
+        old_country = I18n.tld_country
+        I18n.tld_country = :US
+        I18n.uses_imperial_lengths?.should == true
+        I18n.tld_country = :BE
+        I18n.uses_imperial_lengths?.should == false
+        I18n.tld_country = old_country
+      end
+      I18n.run_in_locale(:fr) do
+        I18n.uses_imperial_lengths?.should == false
+      end
+    end
   end
 
   context 'Keeping track of default routes context' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n