postal_address 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83668dafff4ede2c9d49c1c711cb5867167bd44
-  data.tar.gz: 535bb43703e2f420c0f5177973ae95845d0270dc
+  metadata.gz: 709f977bc0f278516ed857f4180eea486b82f8a2
+  data.tar.gz: bd3e09740ea53e45cfebbecec53dddea5b08a306
 SHA512:
-  metadata.gz: dad66c7a372952a9ba32058e3a9bddbbe1f5c86704fd68d358ea304f3b6ce533025c5b06083f190ab523d6566f235a83f8ffacab5abea4421f2fd20f04ab0352
-  data.tar.gz: dc0a4a98c5b98429e355bbc43c765544f62ddd304ff7d115d2e67fbba19365ae2bab261cc9e50b9227a9f7f4ac51bace01f1f61197d6f5003e12e37eab29d9c5
+  metadata.gz: a9584eae3902a14d69ee379d21c32daeae08c31d552ee50f9910aa14b2561652b03504cbf6c9b816d7d0f1dbd406612fa9ac7300040db332bd2ec579e73adb04
+  data.tar.gz: ff909cfda68bf7bafa7486e3ce53b7bf74d8c0422073eaa39fe2da337d21c21f64d52a5d6b972674517cc0ed668855f82b66f49acac0efe97659d8aae5448bb5

data/lib/postal_address.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "pathname"
 require "postal_address/version"
 require "postal_address/address"
 require "postal_address/formatters/text"
@@ -17,17 +18,17 @@ module Postal
     end
     
     def address_formats
-      @address_formats ||= load_yaml('address_formats')
+      @address_formats ||= YAML.load_file(path_for(:address_formats))
     end
   
     def country_names
-      @country_names ||= load_yaml('country_names')
+      @country_names ||= YAML.load_file(path_for(:country_names))
     end
     
     private
     
-    def load_yaml(filename)
-      YAML.load_file(File.expand_path("../data/#{filename}.yml", File.dirname(__FILE__)))
+    def path_for(filename)
+      Pathname.new(__FILE__).dirname.parent + "data" + "#{filename}.yml"
     end
   end
 end

data/lib/postal_address/address.rb

@@ -3,15 +3,6 @@ module Postal
     Fields = [:recipient, :street, :zip, :state, :city, :country, :country_code]
   
     attr_accessor *Fields
-    
-    alias_method :locality=,    :city=
-    alias_method :zip_code=,    :zip=
-    alias_method :postal_code=, :zip=
-    alias_method :postcode=,    :zip=
-    alias_method :region=,      :state=
-    alias_method :province=,    :state=
-    alias_method :territory=,   :state=
-    alias_method :administrative_area_level_1=, :state=
         
     def country_code=(code)
       @country_code = Postal.sanitize(code)
@@ -22,9 +13,7 @@ module Postal
     end
   
     def initialize(attrs={})
-      attrs.each do |field, value|
-        self.public_send(:"#{field}=", value) if self.respond_to?(:"#{field}=")
-      end if attrs
+      attrs.each { |k,v| public_send(:"#{k}=", v) if respond_to?(:"#{k}=") } if attrs
     end
     
     def to_h

data/lib/postal_address/formatters/text.rb

@@ -1,7 +1,7 @@
 module Postal
   module AddressFormatter
     class Text
-      # expects any hash with the fields names of address
+      # expects any hash with the 7 keys from Postal::Address::Fields
       def initialize(address)
         @address = address
       end

data/lib/postal_address/version.rb

@@ -1,3 +1,3 @@
 module Postal
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/spec/postal_address_spec.rb

@@ -81,23 +81,23 @@ describe Postal do
       address.to_s.must_equal "Tobias Füncke\n101 Broadway\n10002 New York City"
     end
     
-    it "should respond to state aliases" do
-      [:region, :province, :territory, :administrative_area_level_1].each do |alias_name|
-        address.must_respond_to :"#{alias_name}="
-      end
-    end
-    
-    it "should respond to city aliases" do
-      [:locality].each do |alias_name|
-        address.must_respond_to :"#{alias_name}="
-      end
-    end
-    
-    it "should respond to zip aliases" do
-      [:zip_code, :postal_code, :postcode].each do |alias_name|
-        address.must_respond_to :"#{alias_name}="
-      end
-    end
+    # it "should respond to state aliases" do
+    #   [:region, :province, :territory, :administrative_area_level_1].each do |alias_name|
+    #     address.must_respond_to :"#{alias_name}="
+    #   end
+    # end
+    # 
+    # it "should respond to city aliases" do
+    #   [:locality].each do |alias_name|
+    #     address.must_respond_to :"#{alias_name}="
+    #   end
+    # end
+    # 
+    # it "should respond to zip aliases" do
+    #   [:zip_code, :postal_code, :postcode].each do |alias_name|
+    #     address.must_respond_to :"#{alias_name}="
+    #   end
+    # end
     
     it "should return html" do
       address.to_html.must_equal "<p itemscope itemtype=\"http://schema.org/PostalAddress\"><span itemprop=\"name\">Tobias Füncke</span><br><span itemprop=\"streetAddress\">101 Broadway</span><br><span itemprop=\"addressLocality\">New York City</span> <span itemprop=\"addressRegion\">NY</span> <span itemprop=\"postalCode\">10002</span><br><span itemprop=\"addressCountry\">United States of America</span></p>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postal_address
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Kevin Melchert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler