bcardarella-decoder 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/decoder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{decoder}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Cardarella"]
-  s.date = %q{2009-08-31}
+  s.date = %q{2009-09-01}
   s.description = %q{Decoder}
   s.email = %q{bcardarella@gmail.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "decoder.gemspec",
+     "lib/common_methods.rb",
      "lib/countries/countries.rb",
      "lib/countries/country.rb",
      "lib/decoder.rb",
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/i18n/states/ca/eng.yml",
      "lib/i18n/states/us/eng.yml",
      "lib/states/state.rb",
+     "test/common_methods_test.rb",
      "test/countries/countries_test.rb",
      "test/countries/country_test.rb",
      "test/decoder_test.rb",
@@ -45,7 +47,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.2}
   s.summary = %q{Decoder}
   s.test_files = [
-    "test/countries/countries_test.rb",
+    "test/common_methods_test.rb",
+     "test/countries/countries_test.rb",
      "test/countries/country_test.rb",
      "test/decoder_test.rb",
      "test/states/state_test.rb",

data/lib/common_methods.rb

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

data/lib/countries/countries.rb

@@ -15,7 +15,7 @@ module Decoder
     end
     
     def [](_code)
-      _code    = _code.to_s.upcase
+      _code   = _code.to_s.upcase
       country = countries[_code]
       Decoder::Country.new(:code => _code, :name => country)
     end

data/lib/countries/country.rb

@@ -1,5 +1,6 @@
 module Decoder
   class Country
+    include ::CommonMethods
     attr_accessor :states, :code, :name
     alias_method :provinces, :states
     alias_method :territories, :states
@@ -24,9 +25,5 @@ module Decoder
       state = states[_code]
       Decoder::State.new(:code => _code, :name => state)
     end
-    
-    def to_s
-      name
-    end
   end
 end

data/lib/decoder.rb

@@ -1,3 +1,4 @@
+require 'common_methods'
 require 'countries/countries'
 require 'countries/country'
 require 'states/state'

data/lib/states/state.rb

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

data/test/common_methods_test.rb

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

data/test/countries/country_test.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 
 class CountryTest < Test::Unit::TestCase
+
+  should "include 'Common Methods' module" do
+    assert_contains Decoder::State.included_modules, CommonMethods
+  end
+
   context "English" do
     setup do
       Decoder.i18n = :eng
@@ -38,33 +43,25 @@ class CountryTest < Test::Unit::TestCase
       should "return a state object of \"Massachusetts\" for :MA" do
         state = @country[:MA]
         assert_equal Decoder::State, state.class
-        assert_equal "Massachusetts", state.to_s
       end
       
       should "return a state object of \"Massachusetts\" for :ma" do
         state = @country[:ma]
         assert_equal Decoder::State, state.class
-        assert_equal "Massachusetts", state.to_s
       end
 
       should "return a state object of \"Massachusetts\" for \"MA\"" do
         state = @country["MA"]
         assert_equal Decoder::State, state.class
-        assert_equal "Massachusetts", state.to_s
       end
 
       should "return a state object of \"Massachusetts\" for \"ma\"" do
         state = @country["ma"]
         assert_equal Decoder::State, state.class
-        assert_equal "Massachusetts", state.to_s
       end
 
     end
     
-    should "return 'United States' for #to_s" do
-      country = Decoder::Country.new(:code => "US", :name => "United States")
-      assert_equal "United States", country.to_s
-    end
   end
   
   context "#states aliases" do

data/test/states/state_test.rb

@@ -1,6 +1,11 @@
 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 = :eng
@@ -11,10 +16,6 @@ class StateTest < Test::Unit::TestCase
         @state = Decoder::State.new(:code => "MA", :name => "Massachusetts")
       end
 
-      should "return 'Massachusetts' for #to_s" do
-        assert_equal "Massachusetts", @state.to_s
-      end
-
       should "return 'Massachusetts' for #name" do
         assert_equal "Massachusetts", @state.name
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcardarella-decoder
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - Rakefile
 - VERSION
 - decoder.gemspec
+- lib/common_methods.rb
 - lib/countries/countries.rb
 - lib/countries/country.rb
 - lib/decoder.rb
@@ -47,6 +48,7 @@ files:
 - lib/i18n/states/ca/eng.yml
 - lib/i18n/states/us/eng.yml
 - lib/states/state.rb
+- test/common_methods_test.rb
 - test/countries/countries_test.rb
 - test/countries/country_test.rb
 - test/decoder_test.rb
@@ -79,6 +81,7 @@ 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