postal_address 0.9.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 709f977bc0f278516ed857f4180eea486b82f8a2
-  data.tar.gz: bd3e09740ea53e45cfebbecec53dddea5b08a306
+SHA256:
+  metadata.gz: 732395d6e01e69eb058f8040e1e4897b00d5362126261ce8d5519308cf6f83bf
+  data.tar.gz: abf24032951733529ab117b7b985655183a5fb2d127e84c4f4d9cd405b02afb6
 SHA512:
-  metadata.gz: a9584eae3902a14d69ee379d21c32daeae08c31d552ee50f9910aa14b2561652b03504cbf6c9b816d7d0f1dbd406612fa9ac7300040db332bd2ec579e73adb04
-  data.tar.gz: ff909cfda68bf7bafa7486e3ce53b7bf74d8c0422073eaa39fe2da337d21c21f64d52a5d6b972674517cc0ed668855f82b66f49acac0efe97659d8aae5448bb5
+  metadata.gz: 25f0707107ac25f08e63cda2a703b81e06230113eb3e5fb197f4dc6396c24c21efc0fc204aa6a6faf4f5837c865d11efeca059e2c3c77d3daa69835c49774ac7
+  data.tar.gz: 7727b70db57733a9edc17410324278c6457314831b85c445a5cf0377ac89b1d71c51f29dc22c6a759267415ccca4cbfff2a0ec5fc944d5467af74b0845bc122e

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm: 
-  - 2.0.0
-  - 1.9.3
+  - 2.2.0
+  - 2.4.2

data/README.md

@@ -2,7 +2,6 @@
 
 International postal address formatting with HTML Microformats.
 
-[![Build Status](https://travis-ci.org/max-power/postal_address.png)](https://travis-ci.org/max-power/postal_address)
 
 ## Installation
 

data/lib/postal_address/address.rb

@@ -1,31 +1,36 @@
 module Postal
   class Address
-    Fields = [:recipient, :street, :zip, :state, :city, :country, :country_code]
+    Fields = %i(recipient street zip state city country country_code).freeze
   
-    attr_accessor *Fields
-        
+    attr_accessor(*Fields)
+
+    def initialize(**attrs, &block)
+      attrs.each { |k,v| public_send("#{k}=", v) if respond_to?("#{k}=") }
+      yield self if block_given?
+    end
+
     def country_code=(code)
       @country_code = Postal.sanitize(code)
     end
     
     def country
-      @country ||= Postal.country_names[country_code]
+      Postal.country_names[country_code]
     end
   
-    def initialize(attrs={})
-      attrs.each { |k,v| public_send(:"#{k}=", v) if respond_to?(:"#{k}=") } if attrs
+    def values
+      Fields.map(&method(:public_send))
     end
     
     def to_h
-      Fields.each_with_object({}) { |field, hash| hash[field] = public_send(field) }
+      Fields.zip(values).to_h
     end
 
-    def to_s
-      AddressFormatter::Text.new(to_h).render
+    def to_s(**)
+      AddressFormatter::Text.new(to_h).render(**)
     end
         
-    def to_html(params={})
-      AddressFormatter::HTML.new(to_h).render(params)
+    def to_html(**)
+      AddressFormatter::HTML.new(to_h).render(**)
     end
   end
 end

data/lib/postal_address/formatters/html.rb

@@ -1,7 +1,7 @@
 module Postal
   module AddressFormatter
     class HTML < Text
-      Schema   = 'http://schema.org/PostalAddress'
+      ItemType = 'http://schema.org/PostalAddress'
       ItemProp = {
         recipient: 'name',
         street:    'streetAddress',
@@ -11,25 +11,31 @@ module Postal
         country:   'addressCountry'
       }
 
-      def render(params={})
-        content_tag((params.delete(:tag) || :p), super.gsub("\n", "<br>"), params.merge(itemscope: nil, itemtype: Schema))
+      def render(**params)
+        tagname = params.delete(:tag) || :p
+        content = super.gsub("\n", "<br>")
+        tag tagname, content, **params.merge(itemscope: nil, itemtype: ItemType)
       end
 
       private
 
       def address_data
-        super.each_with_object({}) do |(field, value), hash|
-          hash[field] = value && content_tag(:span, value, itemprop: ItemProp[field])
-        end
+        super.map do |key, value|
+          [key, tag_for(key, value)]
+        end.to_h
+      end
+      
+      def tag_for(key, value)
+        tag :span, value, itemprop: ItemProp[key] if value
       end
 
-      def content_tag(tag, content='', attrs={})
-        "<#{tag}#{tag_attributes(attrs)}>#{content}</#{tag}>"
+      def tag(name, content='', **attrs)
+        "<#{name}#{tag_attributes(attrs)}>#{content}</#{name}>"
       end
-      
+  
       def tag_attributes(attrs)
-        attrs.map { |k,v| v ? %[#{k}="#{v}"] : k }.unshift('').join(' ')
+        attrs.map { |k,v| v.nil? ? k : %[#{k}="#{v}"] }.unshift('').join(' ')
       end
     end
   end
-end
+end

data/lib/postal_address/formatters/text.rb

@@ -1,6 +1,7 @@
 module Postal
   module AddressFormatter
     class Text
+      attr_reader :address
       # expects any hash with the 7 keys from Postal::Address::Fields
       def initialize(address)
         @address = address
@@ -13,17 +14,21 @@ module Postal
       private
   
       def address_data
-        @address[:country] = nil if Postal.home_country == @address[:country_code]
-        @address
+        address[:country] = nil if home_country?
+        address
       end
 
       def address_format
-        Postal.address_formats[@address[:country_code]] || default_address_format
+        Postal.address_formats.fetch(address[:country_code]) { default_address_format }
       end
       
       def default_address_format
-        Postal.address_formats[@address[:state] ? 'us' : 'de']
+        Postal.address_formats[address[:state] ? 'us' : 'de']
+      end
+      
+      def home_country?
+        Postal.home_country == address[:country_code]
       end
     end
   end
-end
+end

data/lib/postal_address/version.rb

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

data/lib/postal_address.rb

@@ -18,11 +18,11 @@ module Postal
     end
     
     def address_formats
-      @address_formats ||= YAML.load_file(path_for(:address_formats))
+      @address_formats ||= YAML.load_file(path_for(:address_formats), aliases: true)
     end
   
     def country_names
-      @country_names ||= YAML.load_file(path_for(:country_names))
+      @country_names ||= YAML.load_file(path_for(:country_names), aliases: true)
     end
     
     private

data/postal_address.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kevin Melchert"]
   spec.email         = ["kevin.melchert@gmail.com"]
   spec.description   = %q{International postal address formatting}
-  spec.summary       = %q{International postal address formatting}
-  spec.homepage      = ""
+  spec.summary       = %q{International postal address formatting with HTML Microformats}
+  spec.homepage      = "https://github.com/max-power/postal_address"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", '~> 4.7.0'
-  spec.add_development_dependency "turn"
+  spec.add_development_dependency "minitest"
 end

data/spec/postal_address_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 
 describe Postal do
   it "should load the formats" do
-    Postal.address_formats.wont_be :empty?
-    Postal.address_formats.must_be_kind_of Hash
+    _(Postal.address_formats).wont_be :empty?
+    _(Postal.address_formats).must_be_kind_of Hash
   end
   
   it "should load the country_name" do
-    Postal.country_names.wont_be :empty?
-    Postal.country_names.must_be_kind_of Hash
+    _(Postal.country_names).wont_be :empty?
+    _(Postal.country_names).must_be_kind_of Hash
   end
   
   it "should read/write home country" do
-    Postal.home_country = 'de'
-    Postal.home_country.must_equal 'de'    
+    Postal.home_country = :de
+    _(Postal.home_country).must_equal 'de'
   end
   
-  it "should read/write home country and convert to string and lower case" do
-    Postal.home_country = :DE
-    Postal.home_country.must_equal 'de'
+  it "should sanititze home country" do
+    Postal.home_country = 'DE'
+    _(Postal.home_country).must_equal 'de'
   end
 
   describe "Instance" do
@@ -28,83 +28,72 @@ describe Postal do
     }
      
     let(:address) do
-      Postal::Address.new({
+      Postal::Address.new(
         recipient: 'Tobias Füncke', 
         street: '101 Broadway', 
         city: 'New York City', 
         zip: '10002', 
         state: 'NY', 
         country_code: 'us'
-      })
+      )
     end
     
     it "should respond to to_h" do
       r = address.to_h
-      r.must_be_kind_of Hash
-      r.keys.length.must_equal 7
+      _(r).must_be_kind_of Hash
+      _(r.keys.length).must_equal 7
     end
     
     it "should format to US format" do
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002\nUnited States of America"
+      _(address.to_s).must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002\nUnited States of America"
     end
     
     it "should format to FR format" do
       address.country_code = 'fr'
       address.city = 'Paris'
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\n10002 Paris\nFrance"
+      _(address.to_s).must_equal "Tobias Füncke\n101 Broadway\n10002 Paris\nFrance"
     end
     
     it "should format to DE format" do
       address.country_code = 'de'
       address.city = 'Berlin'
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\n10002 Berlin\nGermany"
+      _(address.to_s).must_equal "Tobias Füncke\n101 Broadway\n10002 Berlin\nGermany"
     end
     
     it "should not print the country if in home country" do
       Postal.home_country = 'us'
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002"
+      _(address.to_s).must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002"
     end
     
     it "should print the country if not in home country" do
       Postal.home_country = 'de'
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002\nUnited States of America"
+      _(address.to_s).must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002\nUnited States of America"
     end
     
     it "should use default formatting with state if format for country code is not available" do
       address.country_code = nil
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002"
+      _(address.to_s).must_equal "Tobias Füncke\n101 Broadway\nNew York City NY 10002"
     end
 
     it "should use default formatting without state if format for country code is not available" do
       address.country_code = nil
       address.state = nil
-      address.to_s.must_equal "Tobias Füncke\n101 Broadway\n10002 New York City"
+      _(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 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>"
+      _(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>"
+    end
+    
+    it "should return html with default formatting" do
+      address.country_code = nil
+      address.state = nil
+      _(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=\"postalCode\">10002</span> <span itemprop=\"addressLocality\">New York City</span></p>"
     end
     
     it "should return custom html" do
-      address.to_html(tag: :section, itemprop: 'address').must_equal "<section itemprop=\"address\" 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></section>"
+      _(address.to_html(tag: :section, itemprop: 'address')).must_equal "<section itemprop=\"address\" 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></section>"
     end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'rubygems'
 require 'bundler/setup'
-
 require 'minitest/autorun'
 require 'minitest/spec'
-require 'turn/autorun'
-
-require 'postal_address'
+require 'postal_address'

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: postal_address
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.6
 platform: ruby
 authors:
 - Kevin Melchert
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2025-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -40,20 +39,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.7.0
-- !ruby/object:Gem::Dependency
-  name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -89,11 +74,10 @@ files:
 - postal_address.gemspec
 - spec/postal_address_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/max-power/postal_address
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -108,11 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
-summary: International postal address formatting
+summary: International postal address formatting with HTML Microformats
 test_files:
 - spec/postal_address_spec.rb
 - spec/spec_helper.rb