decoder 0.7.2 → 0.8.0

data/README.rdoc

@@ -12,6 +12,20 @@
  
  Currently the yaml files are still quite incomplete. Please fork and populate!
  
+= FIPS
+ http://en.wikipedia.org/wiki/Federal_Information_Processing_Standard
+ Certain US States have FIPS codes. You can either get the code for a state
+ or look up a state by its FIPS code:
+ 
+ >> Decoder.i18n = :en
+ >> country = Decoder::Countries[:US]
+ >> state = country[:MA]
+ >> state.fips
+ => 25
+ >> state = country.by_fips(25)
+ >> state.to_s
+ => "Massachusetts"
+ 
 = i18n
  When adding a new language please use the ISO 639-1 Code 2-letter standard.
  You can find the appropriate code for a given language here:

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/decoder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{decoder}
-  s.version = "0.7.2"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Cardarella"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2009-11-22}
   s.description = %q{Decoder}
   s.email = %q{bcardarella@gmail.com}
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bcardarella/decoder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Decoder}
   s.test_files = [
     "test/common_methods_test.rb",
@@ -55,13 +55,12 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end
-

data/lib/decoder/country.rb

@@ -24,7 +24,17 @@ module Decoder
     def [](_code)
       _code = _code.to_s.upcase
       state = states[_code]
-      Decoder::State.new(:code => _code, :name => state)
+      if state.is_a?(Array)
+        fips  = state.last
+        state = state.first
+      end
+      Decoder::State.new(:code => _code, :name => state, :fips => fips)
+    end
+    
+    def by_fips(fips)
+      fips = fips.to_s
+      state = states.detect { |k,v| v.include?(fips) if v.is_a?(Array) }
+      self[state.first]
     end
   end
 end

data/lib/decoder/state.rb

@@ -1,11 +1,12 @@
 module Decoder
   class State
     include ::CommonMethods
-    attr_accessor :code, :name
+    attr_accessor :code, :name, :fips
 
     def initialize(args)
       self.code = args[:code].to_s
       self.name = args[:name]
+      self.fips = args[:fips].to_i if args[:fips]
     end
   end
 end

data/lib/locales/en.yml

@@ -607,66 +607,170 @@
   US:
     :name: United States
     :states:
-      VA: Virginia
-      NY: New York
-      ND: North Dakota
-      AL: Alabama
-      HI: Hawaii
-      MN: Minnesota
-      DE: Delaware
-      RI: Rhode Island
-      MD: Maryland
-      NE: Nebraska
-      CO: Colorado
-      IA: Iowa
-      MO: Missouri
-      PR: Puerto Rico
-      WY: Wyoming
-      ME: Maine
-      KY: Kentucky
-      OR: Oregon
-      IL: Illinois
       MP: Northern Mariana Islands
-      GU: Guam
-      AZ: Arizona
-      OH: Ohio
-      TX: Texas
-      TN: Tennessee
-      GA: Georgia
-      NH: New Hampshire
+      MT: 
+      - Montana
+      - "30"
+      NE: 
+      - Nebraska
+      - "31"
+      VA: 
+      - Virginia
+      - "51"
+      ME: 
+      - Maine
+      - "23"
       MH: Marshall Islands
-      ID: Idaho
-      IN: Indiana
-      SC: South Carolina
-      OK: Oklahoma
-      NJ: New Jersey
-      SD: South Dakota
-      CT: Connecticut
-      MI: Michigan
-      AR: Arkansas
-      FL: Florida
-      MS: Mississippi
-      PA: Pennsylvania
-      FM: Federated States Of Micronesia
-      MT: Montana
-      PW: Palau
-      WI: Wisconsin
+      TN: 
+      - Tennessee
+      - "47"
+      LA: 
+      - Louisiana
+      - "22"
+      MS: 
+      - Mississippi
+      - "28"
+      PA: 
+      - Pennsylvania
+      - "42"
+      ND: 
+      - North Dakota
+      - "38"
       AS: American Samoa
-      VI: Virgin Islands
-      KS: Kansas
-      NV: Nevada
-      CA: California
-      VT: Vermont
-      NM: New Mexico
-      WV: West Virginia
-      MA: Massachusetts
-      DC: District Of Columbia
-      UT: Utah
-      WA: Washington
-      AK: Alaska
-      LA: Louisiana
-      NC: North Carolina
+      SC: 
+      - South Carolina
+      - "45"
+      NC: 
+      - North Carolina
+      - "37"
+      KY: 
+      - Kentucky
+      - "21"
+      MI: 
+      - Michigan
+      - "26"
       AE: Armed Forces
+      DE: 
+      - Delaware
+      - "10"
+      MO: 
+      - Missouri
+      - "29"
+      VT: 
+      - Vermont
+      - "50"
+      WI: 
+      - Wisconsin
+      - "55"
+      OH: 
+      - Ohio
+      - "39"
+      UT: 
+      - Utah
+      - "49"
+      NY: 
+      - New York
+      - "36"
+      SD: 
+      - South Dakota
+      - "46"
+      DC: 
+      - District of Columbia
+      - "11"
+      AL: 
+      - Alabama
+      - "01"
+      VI: Virgin Islands
+      GA: 
+      - Georgia
+      - "13"
+      TX: 
+      - Texas
+      - "48"
+      WY: 
+      - Wyoming
+      - "56"
+      IL: 
+      - Illinois
+      - "17"
+      AR: 
+      - Arkansas
+      - "05"
+      RI: 
+      - Rhode Island
+      - "44"
+      AZ: 
+      - Arizona
+      - "04"
+      OR: 
+      - Oregon
+      - "41"
+      CA: 
+      - California
+      - "06"
+      IN: 
+      - Indiana
+      - "18"
+      CO: 
+      - Colorado
+      - 08
+      PW: Palau
+      MD: 
+      - Maryland
+      - "24"
+      WA: 
+      - Washington
+      - "53"
+      CT: 
+      - Connecticut
+      - 09
+      WV: 
+      - West Virginia
+      - "54"
+      FL: 
+      - Florida
+      - "12"
+      HI: 
+      - Hawaii
+      - "15"
+      ID: 
+      - Idaho
+      - "16"
+      NM: 
+      - New Mexico
+      - "35"
+      MN: 
+      - Minnesota
+      - "27"
+      GU: Guam
+      MA: 
+      - Massachusetts
+      - "25"
+      AK: 
+      - Alaska
+      - "02"
+      NJ: 
+      - New Jersey
+      - "34"
+      PR: 
+      - Puerto Rico
+      - "72"
+      FM: Federated States Of Micronesia
+      NV: 
+      - Nevada
+      - "32"
+      IA: 
+      - Iowa
+      - "19"
+      KS: 
+      - Kansas
+      - "20"
+      OK: 
+      - Oklahoma
+      - "40"
+      NH: 
+      - New Hampshire
+      - "33"
   BV:
     :name: Bouvet Island
     :states: {}

data/test/countries/countries_test.rb

@@ -10,7 +10,7 @@ class CountriesTest < Test::Unit::TestCase
       Decoder.i18n = :en
     end
 
-    context "a new object" do
+    context "A new object" do
       should "load the yaml" do
         Decoder.expects(:load_yaml).returns({:en => {"US" => {:name => "United States", :states => {"MA" => "Massachusetts"}}}})
         countries = Decoder::Countries.new

data/test/countries/country_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class CountryTest < Test::Unit::TestCase
-
   should "include 'Common Methods' module" do
     assert_contains Decoder::State.included_modules, CommonMethods
   end
@@ -24,27 +23,46 @@ class CountryTest < Test::Unit::TestCase
       setup do
         @country = Decoder::Country.new(:code => "US", :name => "United States")
       end
+      
+      context "by code" do
+        should "return a state object of \"Massachusetts\" for :MA" do
+          state = @country[:MA]
+          assert_equal Decoder::State, state.class
+          assert_equal "Massachusetts", state.name
+        end
 
-      should "return a state object of \"Massachusetts\" for :MA" do
-        state = @country[:MA]
-        assert_equal Decoder::State, state.class
-      end
+        should "return a state object of \"Massachusetts\" for :ma" do
+          state = @country[:ma]
+          assert_equal Decoder::State, state.class
+          assert_equal "Massachusetts", state.name
+        end
 
-      should "return a state object of \"Massachusetts\" for :ma" do
-        state = @country[:ma]
-        assert_equal Decoder::State, state.class
-      end
+        should "return a state object of \"Massachusetts\" for \"MA\"" do
+          state = @country["MA"]
+          assert_equal Decoder::State, state.class
+          assert_equal "Massachusetts", state.name
+        end
 
-      should "return a state object of \"Massachusetts\" for \"MA\"" do
-        state = @country["MA"]
-        assert_equal Decoder::State, state.class
+        should "return a state object of \"Massachusetts\" for \"ma\"" do
+          state = @country["ma"]
+          assert_equal Decoder::State, state.class
+          assert_equal "Massachusetts", state.name
+        end
       end
+      
+      context "by FIPS" do
+        should "return a state object of \"Massachusetts\" for 25" do
+          state = @country.by_fips(25)
+          assert_equal Decoder::State, state.class
+          assert_equal "Massachusetts", state.name
+        end
 
-      should "return a state object of \"Massachusetts\" for \"ma\"" do
-        state = @country["ma"]
-        assert_equal Decoder::State, state.class
+        should "return a state object of \"Massachusetts\" for \"25\"" do
+          state = @country.by_fips("25")
+          assert_equal Decoder::State, state.class
+          assert_equal "Massachusetts", state.name
+        end
       end
-
     end
 
     context "#states" do
@@ -52,10 +70,18 @@ class CountryTest < Test::Unit::TestCase
         @country = Decoder::Country.new(:code => "US", :name => "United States")
       end
 
-      should "a hash of states" do
-        assert_equal "Massachusetts", @country.states["MA"]
+      context "For a FIPS state" do
+        should "be a hash of states" do
+          assert_equal ["Massachusetts", "25"], @country.states["MA"]
+        end
       end
-
+      
+      context "For a non-FIPS state" do
+        should "be a hash of states" do
+          assert_equal "Northern Mariana Islands", @country.states["MP"]
+        end
+      end
+      
       context "aliases" do
         should "be equal for #states and #counties" do
           assert_equal @country.states, @country.counties

data/test/states/state_test.rb

@@ -24,6 +24,21 @@ class StateTest < Test::Unit::TestCase
         assert_equal "MA", @state.code
       end
     end
+    
+    context "FIPS states from a country" do
+      setup do 
+        @country = Decoder::Countries["US"]
+        @state   = @country["MA"]
+      end
+      
+      should "properly assign the name" do
+        assert_equal "Massachusetts", @state.name
+      end
+      
+      should "properly assign the fips" do
+        assert_equal 25, @state.fips
+      end
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: decoder
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -04:00
+date: 2010-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +66,8 @@ homepage: http://github.com/bcardarella/decoder
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement