postal_address 0.1.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd9ebb5dbcc6d69377b28f76b56b98d746ecf9a3
-  data.tar.gz: c698853f917f3755ed5afbf6b5fbee155f5b7b09
+  metadata.gz: 6284773a18364d9fe9d92dd813773600962ae91d
+  data.tar.gz: 5d07abcc7f4041971831df9d44d3365670b6fd50
 SHA512:
-  metadata.gz: f466cda1ce5cd6ddb84c58497a308988e8b81e903d419c97992b541891172266ea086f5fc398bf6459f0c1ac96d7e781b3fcfdd2fc4a5516663e4232f2e7447d
-  data.tar.gz: 595ee7159deff55287172552e8eedf055f14e2a17ec0c6ef694f8e553f45624026d6f4ba682fe112c39e7c6c1d46b97ac468630a86db3f6419aef6fb58656b91
+  metadata.gz: 5b3807375fb3e684a72ee605f0836b7f0927faaa04a86918615d619b253059a3d4c81ecdc1246ff4f394d6ec59821de2705a336bf01f278c9956059f37afd0b9
+  data.tar.gz: e2d9a0d08082ef7f994095360ef0c503a0bf2cf636a1e72bd0b9ae587ba21f9a6aa279fc5a4b0492622f08ffab0626a61c8c6a45a03272caa818c2571f8c7037

data/lib/postal_address/address.rb

@@ -12,13 +12,7 @@ module Postal
     alias_method :province=,    :state=
     alias_method :territory=,   :state=
     alias_method :administrative_area_level_1=, :state=
-  
-    def initialize(attrs={})
-      attrs.each do |attr, value|
-        self.public_send(:"#{attr}=", value) if self.respond_to?(:"#{attr}=")
-      end if attrs
-    end
-    
+        
     def country_code=(code)
       @country_code = Postal.sanitize(code)
     end
@@ -26,25 +20,23 @@ module Postal
     def country
       @country ||= Postal.country_names[country_code]
     end
-
-    def to_h
-      attributes
+  
+    def initialize(attrs={})
+      attrs.each do |field, value|
+        self.public_send(:"#{field}=", value) if self.respond_to?(:"#{field}=")
+      end if attrs
     end
     
+    def to_h
+      Fields.each_with_object({}) { |field, hash| hash[field] = public_send(field) }
+    end
+
     def to_s
-      AddressFormatter::Text.new(attributes).render
+      AddressFormatter::Text.new(to_h).render
     end
         
     def to_html(params={})
-      AddressFormatter::HTML.new(attributes).render(params)
-    end
-    
-    private
-    
-    def attributes
-      Fields.each_with_object({}) do |key, hash|
-        hash[key] = public_send(key)
-      end
+      AddressFormatter::HTML.new(to_h).render(params)
     end
   end
 end

data/lib/postal_address/formatters/html.rb

@@ -18,14 +18,17 @@ module Postal
       private
 
       def address_data
-        super.each_with_object({}) do |(key, value), hash|
-          hash[key] = value && content_tag(:span, value, itemprop: ItemProp[key])
+        super.each_with_object({}) do |(field, value), hash|
+          hash[field] = value && content_tag(:span, value, itemprop: ItemProp[field])
         end
       end
 
-      def content_tag(tag, content='', attributes={})
-        attrs = attributes.map {|k,v| k.to_s + (v ? "=\"#{v}\"" : '') }.unshift('').join(' ')
-        "<#{tag}#{attrs}>#{content}</#{tag}>"
+      def content_tag(tag, content='', attrs={})
+        "<#{tag}#{tag_attributes(attrs)}>#{content}</#{tag}>"
+      end
+      
+      def tag_attributes(attrs)
+        attrs.map { |k,v| v ? %[#{k}="#{v}"] : k }.unshift('').join(' ')
       end
     end
   end

data/lib/postal_address/version.rb

@@ -1,3 +1,3 @@
 module Postal
-  VERSION = "0.1.5"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postal_address
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Kevin Melchert