bcardarella-decoder 0.6.1 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.3

data/decoder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{decoder}
-  s.version = "0.6.1"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Cardarella"]

data/lib/countries/countries.rb

@@ -1,19 +1,22 @@
 module Decoder
   class Countries
-    attr_accessor :countries
-    
+
     def initialize
-      self.load_yaml
+      self.countries = Decoder.locale[Decoder.i18n]
     end
     
-    def load_yaml
-      self.countries = YAML.load_file(yaml_file_name)[Decoder.i18n]
+    def inspect
+      %{#<#{self.class}>}
     end
-    
-    def yaml_file_name
-      "#{File.dirname(__FILE__)}/../locales/#{Decoder.i18n}.yml"
+
+    def countries=(_countries)
+      @countries = _countries
     end
     
+    def countries
+      @countries
+    end
+
     def [](_code)
       _code   = _code.to_s.upcase
       country = countries[_code]

data/lib/countries/country.rb

@@ -1,24 +1,25 @@
 module Decoder
   class Country
     include ::CommonMethods
-    attr_accessor :states, :code, :name
-    alias_method :provinces, :states
-    alias_method :territories, :states
+    attr_accessor :code, :name
     
     def initialize(args)
-      self.code = args[:code].to_s
-      self.name = args[:name]
-      
-      self.load_yaml
+      self.code   = args[:code].to_s
+      self.name   = args[:name]
+      self.states = Decoder.locale[Decoder.i18n][self.code][:states]
     end
     
-    def load_yaml
-      self.states = YAML.load_file(yaml_file_name)[Decoder.i18n][self.code][:states]
+    def states
+      @states
     end
     
-    def yaml_file_name
-      "#{File.dirname(__FILE__)}/../locales/#{Decoder.i18n}.yml"
+    def states=(_states)
+      @states = _states
     end
+
+    alias_method :counties, :states        
+    alias_method :provinces, :states
+    alias_method :territories, :states
     
     def [](_code)
       _code = _code.to_s.upcase

data/lib/decoder.rb

@@ -4,11 +4,30 @@ require 'countries/country'
 require 'states/state'
 
 module Decoder
+  
   def self.i18n
     @i18n ||= :en
   end
   
   def self.i18n=(code)
     @i18n = code
+    self.locale = nil
+  end
+  
+  def self.locale
+    @locale || self.locale = self.load_yaml
+  end
+  
+  def self.locale=(_locale)
+    @locale = _locale
   end
+  
+  def self.load_yaml
+    Decoder.locale = YAML.load_file(yaml_file_name)
+  end
+  
+  def self.yaml_file_name
+    "#{File.dirname(__FILE__)}/locales/#{Decoder.i18n}.yml"
+  end
+
 end

data/test/countries/countries_test.rb

@@ -1,32 +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 = :en
     end
     
-    context "Loading the YAML" do
-      setup do
-        @countries = Decoder::Countries.new
-      end
-
-      should "load locales/en.yml" do
-        assert_match /en.yml/, @countries.yaml_file_name
-      end
-      
-      should "set the #countries with the country data" do
-        YAML.expects(:load_file).returns({:en => {"US" => {:name => "United States",
-              :states => {}}}})
-        @countries.load_yaml
-        assert "United States", @countries.countries["US"][:name]
-      end
-    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 = :en
     end
     
-    context "Loading the YAML" do
-      setup do
-        @country = Decoder::Country.new(:code => "US", :name => "United States")
-      end
-
-      should "load yaml/states/us/en.yml" do
-        assert_match /en.yml/, @country.yaml_file_name
-      end
-      
-      should "set the #states with the US state data" do
-        YAML.expects(:load_file).returns({:en => {"US" => {:name => "United States",
-              :states => {"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

@@ -9,6 +9,22 @@ class DecoderTest < Test::Unit::TestCase
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcardarella-decoder
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors: 
 - Brian Cardarella