decoder 0.5.1 → 0.6.4

data/test/countries/countries_test.rb

@@ -1,31 +1,20 @@
 require 'test_helper'
 
 class CountriesTest < Test::Unit::TestCase
+  should "print '#<#class>" do
+    assert_equal "#<Decoder::Countries>", Decoder::Countries.new.inspect
+  end
+
   context "English" do
     setup do
-      Decoder.i18n = :eng
-    end
-    
-    context "Loading the YAML" do
-      setup do
-        @countries = Decoder::Countries.new
-      end
-
-      should "load yaml/countries/eng.yml" do
-        assert_match /eng.yml/, @countries.yaml_file_name
-      end
-      
-      should "set the #countries with the country data" do
-        YAML.expects(:load_file).returns({:US => "United States"})
-        @countries.load_yaml
-        assert "United States", @countries.countries[:US]
-      end
+      Decoder.i18n = :en
     end
     
     context "a new object" do
       should "load the yaml" do
-        Decoder::Countries.any_instance.expects(:load_yaml)
-        Decoder::Countries.new
+        Decoder.expects(:load_yaml).returns({:en => {"US" => {:name => "United States", :states => {"MA" => "Massachusetts"}}}})
+        countries = Decoder::Countries.new
+        assert_not_nil countries.countries
       end
     end
     

data/test/countries/country_test.rb

@@ -6,32 +6,17 @@ class CountryTest < Test::Unit::TestCase
     assert_contains Decoder::State.included_modules, CommonMethods
   end
 
-  context "English" do
+  context "English for US" do
     setup do
-      Decoder.i18n = :eng
+      Decoder.i18n = :en
     end
     
-    context "Loading the YAML" do
-      setup do
-        @country = Decoder::Country.new(:code => "US", :name => "United States")
-      end
-
-      should "load yaml/states/us/eng.yml" do
-        assert_match /eng.yml/, @country.yaml_file_name
-        assert_match /us/, @country.yaml_file_name
-      end
-      
-      should "set the #states with the US state data" do
-        YAML.expects(:load_file).returns({:MA => "Massachusetts"})
-        @country.load_yaml
-        assert "Massachusetts", @country.states[:MA]
-      end
-    end
-    
-    context "a new object" do
+    context "A new country" do
       should "load the yaml" do
-        Decoder::Country.any_instance.expects(:load_yaml)
-        Decoder::Country.new(:code => "US", :name => "United States")
+        Decoder.expects(:load_yaml).returns({:en => {"US" => {:name => "United States", :states => {"MA" => "Massachusetts"}}}})
+
+        country = Decoder::Country.new(:code => "US", :name => "United States")
+        assert_not_nil country.states
       end
     end
     
@@ -61,21 +46,31 @@ class CountryTest < Test::Unit::TestCase
       end
 
     end
-    
-  end
-  
-  context "#states aliases" do
-    setup do
-      @country = Decoder::Country.new(:code => "US", :name => "United States")
-    end
-    
-    should "be equal for #states and #provinces" do
-      assert_equal @country.states, @country.provinces
+   
+    context "#states" do
+      setup do
+        @country = Decoder::Country.new(:code => "US", :name => "United States")
+      end
+      
+      should "a hash of states" do
+        assert_equal "Massachusetts", @country.states["MA"]
+      end
+      
+      context "aliases" do
+        should "be equal for #states and #counties" do
+          assert_equal @country.states, @country.counties
+        end        
+          
+        should "be equal for #states and #provinces" do
+          assert_equal @country.states, @country.provinces
+        end
+          
+        should "be equal for #states and #territories" do
+          assert_equal @country.states, @country.territories
+        end
+      end
     end
     
-    should "be equal for #states and #territories" do
-      assert_equal @country.states, @country.territories
-    end
   end
   
 end

data/test/decoder_test.rb

@@ -3,12 +3,28 @@ require 'test_helper'
 class DecoderTest < Test::Unit::TestCase
   context "i18n" do
     should "default to :eng" do
-      assert_equal :eng, Decoder.i18n
+      assert_equal :en, Decoder.i18n
     end
     
-    should "set the Internationalization code to :gla (Gaelic)" do
-      Decoder.i18n = :gla
-      assert_equal :gla, Decoder.i18n
+    should "set the Internationalization code to :de (German)" do
+      Decoder.i18n = :de
+      assert_equal :de, Decoder.i18n
+      assert_nil Decoder.class_eval { @locale }
+    end
+  end
+  
+  context "File loading" do
+    setup do
+      Decoder.locale = nil
+    end
+    
+    should "only load once" do
+      YAML.expects(:load_file).returns({:en => {"US" => {:name => "United States",
+            :states => {"MA" => "Massachusetts"}}}})
+      locale = Decoder.locale
+      Decoder.locale
+      Decoder::Countries.new
+      Decoder::Country.new(:code => "US", :name => "United States")
     end
   end
 end

data/test/states/state_test.rb

@@ -8,7 +8,7 @@ class StateTest < Test::Unit::TestCase
 
   context "English" do
     setup do
-      Decoder.i18n = :eng
+      Decoder.i18n = :en
     end
     
     context "Getters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: decoder
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.4
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -04:00
+date: 2009-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,11 @@ files:
 - VERSION
 - decoder.gemspec
 - lib/common_methods.rb
-- lib/countries/countries.rb
-- lib/countries/country.rb
 - lib/decoder.rb
-- lib/i18n/countries/eng.yml
-- lib/i18n/states/au/eng.yml
-- lib/i18n/states/ca/eng.yml
-- lib/i18n/states/us/eng.yml
-- lib/states/state.rb
+- lib/decoder/countries.rb
+- lib/decoder/country.rb
+- lib/decoder/state.rb
+- lib/locales/en.yml
 - test/common_methods_test.rb
 - test/countries/countries_test.rb
 - test/countries/country_test.rb

data/lib/countries/countries.rb

@@ -1,27 +0,0 @@
-module Decoder
-  class Countries
-    attr_accessor :countries
-    
-    def initialize
-      self.load_yaml
-    end
-    
-    def load_yaml
-      self.countries = YAML.load_file(yaml_file_name)
-    end
-    
-    def yaml_file_name
-      "#{File.dirname(__FILE__)}/../i18n/countries/#{Decoder.i18n}.yml"
-    end
-    
-    def [](_code)
-      _code   = _code.to_s.upcase
-      country = countries[_code]
-      Decoder::Country.new(:code => _code, :name => country)
-    end
-    
-    def self.[](_code)
-      self.new[_code]
-    end
-  end
-end

data/lib/i18n/countries/eng.yml

@@ -1,252 +0,0 @@
---- 
-UY: Uruguay
-NP: Nepal
-BS: Bahamas
-HT: Haiti
-LK: Sri Lanka
-SE: Sweden
-DZ: Algeria
-TW: Taiwan
-GU: Guam
-NC: New Caledonia
-BH: Bahrain
-RS: Serbia
-CY: Cyprus
-KW: Kuwait
-MU: Mauritius
-AZ: Azerbaijan
-TM: Turkmenistan
-GM: Gambia
-ZR: Zaire
-KG: Kyrgyzstan
-PS: Palestinian Territory, Occupied
-CN: China
-TC: Turks and Caicos Islands
-GB: Great Britain (UK)
-MN: Mongolia
-AQ: Antarctica
-WF: Wallis and Futuna Islands
-PG: Papua New Guinea
-CF: Central African Republic
-IS: Iceland
-MD: Moldova
-AF: Afghanistan
-SO: Somalia
-FJ: Fiji
-VA: Vatican City State (Holy See)
-ID: Indonesia
-NT: Neutral Zone
-BV: Bouvet Island
-SH: St. Helena
-EE: Estonia
-LS: Lesotho
-UA: Ukraine
-NF: Norfolk Island
-BJ: Benin
-GY: Guyana
-KZ: Kazakhstan
-RW: Rwanda
-DE: Germany
-GP: Guadeloupe
-MW: Malawi
-BB: Barbados
-TO: Tonga
-CR: Costa Rica
-KI: Kiribati
-PW: Palau
-AS: American Samoa
-TF: French Southern Territories
-GE: Georgia
-IO: British Indian Ocean Territory
-MP: Northern Mariana Islands
-YE: Yemen
-PK: Pakistan
-CH: Switzerland
-JE: Jersey
-MG: Madagascar
-AI: Anguilla
-ST: Sao Tome and Principe
-FM: Micronesia
-VE: Venezuela
-IL: Israel
-NZ: New Zealand (Aotearoa)
-BY: Belarus
-SJ: Svalbard & Jan Mayen Islands
-EH: Western Sahara
-LU: Luxembourg
-UK: United Kingdom
-NI: Nicaragua
-BN: Brunei Darussalam
-HM: Heard and McDonald Islands
-LB: Lebanon
-SB: Solomon Islands
-DK: Denmark
-TR: Turkey
-GR: Greece
-MY: Malaysia
-BE: Belgium
-QA: Qatar
-CU: Cuba
-KN: Saint Kitts and Nevis
-MR: Mauritania
-AU: Australia
-TH: Thailand
-GH: Ghana
-YU: Yugoslavia (former)
-JO: Jordan
-PM: St. Pierre and Miquelon
-CK: Cook Islands
-SV: El Salvador
-FR: France
-MK: F.Y.R.O.M. (Macedonia)
-AM: Armenia
-VI: Virgin Islands (U.S.)
-PA: Panama
-CA: Canada
-IN: India
-LY: Libya
-AC: Ascension Island
-SL: Sierra Leone
-ES: Spain
-US: United States
-HR: Croatia (Hrvatska)
-NO: Norway
-BR: Brazil
-SD: Sudan
-DO: Dominican Republic
-LI: Liechtenstein
-TV: Tuvalu
-NA: Namibia
-BG: Bulgaria
-GT: Guatemala
-KR: Korea (South)
-RO: Romania
-CX: Christmas Island
-TK: Tokelau
-GL: Greenland
-MT: Malta
-AX: Aland Islands
-ZM: Zambia
-PR: Puerto Rico
-CM: Cameroon
-KE: Kenya
-MM: Myanmar
-AO: Angola
-SZ: Swaziland
-GA: Gabon
-VU: Vanuatu
-IR: Iran
-PF: French Polynesia
-CD: Congo, Democratic Republic
-FI: Finland
-MC: Monaco
-AE: United Arab Emirates
-SN: Senegal
-UZ: Uzbekistan
-BT: Bhutan
-HU: Hungary
-NR: Nauru
-SG: Singapore
-EC: Ecuador
-LR: Liberia
-TZ: Tanzania
-NE: Niger
-BI: Burundi
-GW: Guinea-Bissau
-KY: Cayman Islands
-RU: Russian Federation
-CZ: Czech Republic
-TN: Tunisia
-GN: Guinea
-MV: Maldives
-BA: Bosnia and Herzegovina
-ZW: Zimbabwe
-PT: Portugal
-CO: Colombia
-KH: Cambodia
-MO: Macau
-AR: Argentina
-TD: Chad
-GD: Grenada
-WS: Samoa
-IT: Italy
-PH: Philippines
-CG: Congo
-SR: Suriname
-FK: Falkland Islands (Malvinas)
-ME: Montenegro
-AG: Antigua and Barbuda
-VC: Saint Vincent & the Grenadines
-NU: Niue
-BW: Botswana
-IE: Ireland
-LT: Lithuania
-SI: Slovenia
-EG: Egypt
-UG: Uganda
-HK: Hong Kong
-NG: Nigeria
-BM: Bermuda
-SA: Saudi Arabia
-DJ: Djibouti
-LA: Laos
-TP: East Timor
-MX: Mexico
-BD: Bangladesh
-GQ: Equatorial Guinea
-KM: Comoros
-PY: Paraguay
-CS: Czechoslovakia (former)
-TG: Togo
-GF: French Guiana
-MQ: Martinique
-AT: Austria
-YT: Mayotte
-PL: Poland
-CI: Cote D'Ivoire (Ivory Coast)
-JM: Jamaica
-MH: Marshall Islands
-AL: Albania
-SU: USSR (former)
-FO: Faroe Islands
-VG: British Virgin Islands
-IM: Isle of Man
-OM: Oman
-BZ: Belize
-SK: Slovak Republic
-ER: Eritrea
-LV: Latvia
-UM: US Minor Outlying Islands
-NL: Netherlands
-BO: Bolivia
-HN: Honduras
-LC: Saint Lucia
-SC: Seychelles
-DM: Dominica
-TT: Trinidad and Tobago
-GS: S. Georgia and S. Sandwich Isls.
-MZ: Mozambique
-BF: Burkina Faso
-CV: Cape Verde
-KP: Korea (North)
-RE: Reunion
-AW: Aruba
-TJ: Tajikistan
-GI: Gibraltar
-MS: Montserrat
-ZA: South Africa
-PN: Pitcairn
-CL: Chile
-JP: Japan
-ML: Mali
-AN: Netherlands Antilles
-SY: Syria
-FX: France, Metropolitan
-VN: Viet Nam
-IQ: Iraq
-PE: Peru
-CC: Cocos (Keeling) Islands
-SM: San Marino
-ET: Ethiopia
-MA: Morocco
-AD: Andorra