Indirizzo 0.1.5 → 0.1.7

data/Indirizzo.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = %q{Indirizzo}
-  s.version = "0.1.5"
+  s.version = "0.1.7"
 
   s.authors = [%q{Dave Worth}]
-  s.date = %q{2012-01-11}
+  s.date = %q{2012-01-29}
   s.description = %q{Indirizzo is simply an extraction of the US Street Address parsing code from Geocoder::US}
   s.email = %q{dave@highgroove.com}
 

data/lib/indirizzo/address.rb

@@ -1,5 +1,4 @@
 require 'indirizzo/constants'
-require 'awesome_print'
 
 module Indirizzo
   # Defines the matching of parsed address tokens.
@@ -88,10 +87,10 @@ module Indirizzo
             # full_state = @state.strip # special case: New York
             @state = State[@state]
           end
-        elsif !text[:country].nil?
-          @state = text[:country]
         elsif !text[:state].nil?
           @state = text[:state]
+        elsif !text[:country].nil?
+          @state = text[:country]
         end
 
         @zip = text[:postal_code]
@@ -263,17 +262,15 @@ module Indirizzo
 
     def city_parts
       strings = []
-      @city.map {|string|
+      @city.map do |string|
         tokens = string.split(" ")
         strings |= (0...tokens.length).to_a.reverse.map {|i|
                    (i...tokens.length).map {|j| tokens[i..j].join(" ")}}.flatten
-      }
+      end
       # Don't return strings that consist solely of abbreviations.
       # NOTE: Is this a micro-optimization that has edge cases that will break?
       # Answer: Yes, it breaks on "Prairie"
-      good_strings = strings.reject {|s| Std_Abbr.key? s}
-      strings = good_strings if !good_strings.empty?
-      strings.uniq
+      strings.reject { |s| Std_Abbr.key?(s) }.uniq
     end
 
     def city= (strings)

data/test/test_address.rb

@@ -42,17 +42,24 @@ class TestAddress < Test::Unit::TestCase
     assert addr_po.po_box?
   end
 
+  def test_intersection
+    addr_intersection = Address.new "Means St. at Optimism Way"
+    assert addr_intersection.intersection?
+  end
+
   def test_skip_parse
     addresses = [
       {:street => "1233 Main St", :city => "Springfield", :region => "VA", :postal_code => "12345", :final_number => "1233", :parsed_street => "main st"},
       {:street => "somewhere Ln", :city => "Somewhere", :region => "WI", :postal_code => "22222", :number => "402", :parsed_street => "somewhere ln", :final_number => "402"},
+      {:street => "somewhere Ln", :city => "Somewhere", :state => "WI", :postal_code => "22222", :number => "402", :parsed_street => "somewhere ln", :final_number => "402"},
       ]
       for preparsed_address in addresses
         address_for_geocode = Address.new preparsed_address
         assert_equal preparsed_address[:parsed_street],address_for_geocode.street[0]
         assert_equal preparsed_address[:final_number],address_for_geocode.number
         assert_equal preparsed_address[:city],address_for_geocode.city[0]
-        assert_equal preparsed_address[:region],address_for_geocode.state
+        assert_equal preparsed_address[:region],address_for_geocode.state if preparsed_address[:region]
+        assert_equal preparsed_address[:state],address_for_geocode.state  if preparsed_address[:state]
         assert_equal preparsed_address[:postal_code],address_for_geocode.zip
       end
   end
@@ -128,7 +135,8 @@ class TestAddress < Test::Unit::TestCase
     [ "19131", "", "", "19131" ],
     [ "19131-9999", "", "", "19131" ],
   ].each do |fixture|
-    define_method "test_city_parse_#{fixture[0].gsub(/(?:\s+|[,])/,'_')}" do
+    fixture_name = fixture[0].gsub(/(?:\s+|[,])/,'_')
+    define_method "test_city_parse_#{fixture_name}" do
       check_city(fixture)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Indirizzo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348554395680 !ruby/object:Gem::Requirement
+  requirement: &70262923397040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348554395680
+  version_requirements: *70262923397040
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70348554395240 !ruby/object:Gem::Requirement
+  requirement: &70262923396600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348554395240
+  version_requirements: *70262923396600
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70348554394820 !ruby/object:Gem::Requirement
+  requirement: &70262923396180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348554394820
+  version_requirements: *70262923396180
 description: Indirizzo is simply an extraction of the US Street Address parsing code
   from Geocoder::US
 email: dave@highgroove.com