decoder 0.8.1 → 0.9.0

data/decoder.gemspec

@@ -1,66 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "decoder/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{decoder}
-  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{2009-11-22}
+  s.name        = "decoder"
+  s.version     = Decoder::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Brian Cardarella"]
+  s.email       = ["bcardarella@gmail.com"]
+  s.homepage    = "https://github.com/bcardarella/decoder"
+  s.summary     = %q{Decoder}
   s.description = %q{Decoder}
-  s.email = %q{bcardarella@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "decoder.gemspec",
-     "lib/common_methods.rb",
-     "lib/decoder.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",
-     "test/decoder_test.rb",
-     "test/states/state_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bcardarella/decoder}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Decoder}
-  s.test_files = [
-    "test/common_methods_test.rb",
-     "test/countries/countries_test.rb",
-     "test/countries/country_test.rb",
-     "test/decoder_test.rb",
-     "test/states/state_test.rb",
-     "test/test_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files -- {lib/*,*.gemspec}`.split("\n")
+  s.test_files    = `git ls-files -- {test}/*`.split("\n")
+  s.require_paths = ["lib"]
 
-    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<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
+  s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'bourne'
 end

data/lib/decoder.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'common_methods'
 require 'decoder/countries'
 require 'decoder/country'
 require 'decoder/state'
@@ -28,7 +27,7 @@ module Decoder
   end
 
   def self.yaml_file_name
-    "#{File.dirname(__FILE__)}/locales/#{Decoder.i18n}.yml"
+    "#{File.dirname(__FILE__)}/decoder/locales/#{Decoder.i18n}.yml"
   end
 
-end
+end

data/lib/decoder/common_methods.rb

@@ -0,0 +1,11 @@
+module Decoder
+  module CommonMethods
+    def to_s
+      name
+    end
+
+    def inspect
+      %{#<#{self.class} code: #{code}, name: #{name}>}
+    end
+  end
+end

data/lib/decoder/countries.rb

@@ -27,4 +27,4 @@ module Decoder
       self.new[_code]
     end
   end
-end
+end

data/lib/decoder/country.rb

@@ -1,6 +1,8 @@
+require 'decoder/common_methods'
+
 module Decoder
   class Country
-    include ::CommonMethods
+    include CommonMethods
     attr_accessor :code, :name
 
     def initialize(args)
@@ -30,11 +32,11 @@ module Decoder
       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
+end

data/lib/{locales → decoder/locales}/en.yml

@@ -649,7 +649,9 @@
       MI: 
       - Michigan
       - "26"
-      AE: Armed Forces
+      AE: Armed Forces Europe
+      AA: Armed Forces Americas
+      AP: Armed Forces Pacific
       DE: 
       - Delaware
       - "10"

data/lib/decoder/state.rb

@@ -1,6 +1,8 @@
+require 'decoder/common_methods'
+
 module Decoder
   class State
-    include ::CommonMethods
+    include CommonMethods
     attr_accessor :code, :name, :fips
 
     def initialize(args)
@@ -9,4 +11,4 @@ module Decoder
       self.fips = args[:fips].to_i if args[:fips]
     end
   end
-end
+end

data/lib/decoder/version.rb

@@ -0,0 +1,3 @@
+module Decoder
+  VERSION = '0.9.0'
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: decoder
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 1
-  version: 0.8.1
+  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -15,54 +10,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -04:00
+date: 2011-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: shoulda-context
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bourne
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Decoder
-email: bcardarella@gmail.com
+email: 
+- bcardarella@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
 - decoder.gemspec
-- lib/common_methods.rb
 - lib/decoder.rb
+- lib/decoder/common_methods.rb
 - lib/decoder/countries.rb
 - lib/decoder/country.rb
+- lib/decoder/locales/en.yml
 - lib/decoder/state.rb
-- lib/locales/en.yml
-- test/common_methods_test.rb
-- test/countries/countries_test.rb
-- test/countries/country_test.rb
-- test/decoder_test.rb
-- test/states/state_test.rb
-- test/test_helper.rb
+- lib/decoder/version.rb
 has_rdoc: true
-homepage: http://github.com/bcardarella/decoder
+homepage: https://github.com/bcardarella/decoder
 licenses: []
 
 post_install_message: 
@@ -75,30 +67,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.9.3
 signing_key: 
 specification_version: 3
 summary: Decoder
-test_files: 
-- test/common_methods_test.rb
-- test/countries/countries_test.rb
-- test/countries/country_test.rb
-- test/decoder_test.rb
-- test/states/state_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Brian Cardarella
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,47 +0,0 @@
-=decoder
-
-= Usage
-
- >> Decoder.i18n = :en
- >> country = Decoder::Countries[:US]
- >> country.to_s
- => "United States"
- >> state = country[:MA]
- >> state.to_s
- => "Massachusetts"
- 
- 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:
- http://www.loc.gov/standards/iso639-2/php/code_list.php
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2009 Brian Cardarella. See LICENSE for details.

data/Rakefile

@@ -1,56 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "decoder"
-    gem.summary = %Q{Decoder}
-    gem.description = %Q{Decoder}
-    gem.email = "bcardarella@gmail.com"
-    gem.homepage = "http://github.com/bcardarella/decoder"
-    gem.authors = ["Brian Cardarella"]
-    gem.add_development_dependency "shoulda"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "decoder #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-0.8.1

data/lib/common_methods.rb

@@ -1,9 +0,0 @@
-module CommonMethods
-  def to_s
-    name
-  end
-
-  def inspect
-    %{#<#{self.class} code: #{code}, name: #{name}>}
-  end
-end

data/test/common_methods_test.rb

@@ -1,24 +0,0 @@
-require 'test_helper'
-
-class CommonMethodsTest < Test::Unit::TestCase
-
-  class EmptyClass
-    include CommonMethods
-    attr_accessor :code, :name
-  end
-
-  context "CommonMethods" do
-    setup do
-      @empty_class = EmptyClass.new
-      @empty_class.code = "TS"
-      @empty_class.name = "TEST"
-    end
-    should "print #name for #to_s" do
-      assert_equal @empty_class.name, @empty_class.to_s
-    end
-
-    should "print '#<#class code: code, #name: #name>" do
-      assert_equal "#<CommonMethodsTest::EmptyClass code: TS, name: TEST>", @empty_class.inspect
-    end
-  end
-end

data/test/countries/countries_test.rb

@@ -1,82 +0,0 @@
-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 = :en
-    end
-
-    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
-        assert_not_nil countries.countries
-      end
-    end
-
-    context "Getting a country" do
-      setup do
-        @countries = Decoder::Countries.new
-      end
-
-      should "return a country object of \"United States\" for :US" do
-        country = @countries[:US]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-      should "return a country object of \"United States\" for :us" do
-        country = @countries[:us]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-      should "return a country object of \"United States\" for \"US\"" do
-        country = @countries["US"]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-      should "return a country object of \"United States\" for \"us\"" do
-        country = @countries["us"]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-    end
-
-    context "Getting a country alternate form" do
-
-      should "return a country object of \"United States\" for :US" do
-        country = Decoder::Countries[:US]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-      should "return a country object of \"United States\" for :us" do
-        country = Decoder::Countries[:us]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-      should "return a country object of \"United States\" for \"US\"" do
-        country = Decoder::Countries["US"]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-      should "return a country object of \"United States\" for \"us\"" do
-        country = Decoder::Countries["us"]
-        assert_equal Decoder::Country, country.class
-        assert_equal "United States", country.to_s
-      end
-
-    end
-
-  end
-
-end

data/test/countries/country_test.rb

@@ -1,102 +0,0 @@
-require 'test_helper'
-
-class CountryTest < Test::Unit::TestCase
-  should "include 'Common Methods' module" do
-    assert_contains Decoder::State.included_modules, CommonMethods
-  end
-
-  context "English for US" do
-    setup do
-      Decoder.i18n = :en
-    end
-
-    context "A new country" do
-      should "load the yaml" do
-        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
-
-    context "Getting a state" do
-      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
-          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
-          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
-          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 \"25\"" do
-          state = @country.by_fips("25")
-          assert_equal Decoder::State, state.class
-          assert_equal "Massachusetts", state.name
-        end
-      end
-    end
-
-    context "#states" do
-      setup do
-        @country = Decoder::Country.new(:code => "US", :name => "United States")
-      end
-
-      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
-        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
-
-  end
-
-end

data/test/decoder_test.rb

@@ -1,30 +0,0 @@
-require 'test_helper'
-
-class DecoderTest < Test::Unit::TestCase
-  context "i18n" do
-    should "default to :eng" do
-      assert_equal :en, Decoder.i18n
-    end
-
-    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

@@ -1,44 +0,0 @@
-require 'test_helper'
-
-class StateTest < Test::Unit::TestCase
-
-  should "include 'Common Methods' module" do
-    assert_contains Decoder::State.included_modules, CommonMethods
-  end
-
-  context "English" do
-    setup do
-      Decoder.i18n = :en
-    end
-
-    context "Getters" do
-      setup do
-        @state = Decoder::State.new(:code => "MA", :name => "Massachusetts")
-      end
-
-      should "return 'Massachusetts' for #name" do
-        assert_equal "Massachusetts", @state.name
-      end
-
-      should "return \"MA\" for #code" do
-        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

data/test/test_helper.rb

@@ -1,12 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'ruby-debug'
-require 'mocha'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'decoder'
-
-class Test::Unit::TestCase
-end