coderifous-address_extractor 0.1.2 → 0.1.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('address_extractor', '0.1.2') do |p|
+Echoe.new('address_extractor', '0.1.3') do |p|
   p.description    = "Give it text.  It finds addresses in it."
   p.url            = "http://github.com/coderifous/address_extractor"
   p.author         = "Jim Garvin"

data/address_extractor.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{address_extractor}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Garvin"]
-  s.date = %q{2008-11-16}
+  s.date = %q{2008-11-17}
   s.description = %q{Give it text.  It finds addresses in it.}
   s.email = %q{jim at thegarvin dot com}
   s.extra_rdoc_files = ["lib/address_extractor.rb", "LICENSE.textile", "README.textile"]

data/lib/address_extractor.rb

@@ -154,7 +154,7 @@ class AddressExtractor
       \s+
       (?:[A-Za-z'.-]+\s?){0,2} (?:[A-Za-z'.-]+) # Followed by a street name
     )
-    \s* ,?  \s*                     
+    \s* ,?  \s*                     # a comma, optionally
     (
       (?:\d+\s+)?                   # a secondary unit, optionally
       (?:#{SECONDARY_UNIT_DESIGNATORS_REGEX})
@@ -167,10 +167,10 @@ class AddressExtractor
         \s* ,?  \s*                 # a comma, optionally
         \b(#{STATE_REGEX})\b        # state
         \s* ,? \s*                  # a comma, optionally
-        (\d{6})?                    # a zip code, optionally
+        (\d{5})?                    # a zip code, optionally
       )                            
       |                             # or, instead of city and state
-      (\d{6})?                      # a lone zip code will do
+      (\d{5})?                      # a lone zip code will do
     )
   /xi
 end

data/test/test_address_extractor.rb

@@ -61,20 +61,28 @@ test_input "
     via mail at:
       123 Goob Avenue
       Apt 123
-      Nice Town CA 123456
-  ",
+      Nice Town CA 12345",
   { :street1 => "123 Foo St.", :street2 => nil, :city => "Someplace", :state => "FL", :zip => nil },
-  { :street1 => "123 Goob Avenue", :street2 => "Apt 123", :city => "Nice Town", :state => "CA", :zip => "123456" }
+  { :street1 => "123 Goob Avenue", :street2 => "Apt 123", :city => "Nice Town", :state => "CA", :zip => "12345" }
 
-test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby NY 123456",
-  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "123456" }
+test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby NY 12345",
+  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "12345" }
 
-test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby, NY 123456",
-  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "123456" }
+test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby, NY 12345",
+  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "12345" }
   
-test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby, NY, 123456",
-  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "123456" }
+test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby, NY, 12345",
+  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "12345" }
 
-test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, 123456",
-  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => nil, :state => nil, :zip => "123456" }
+test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, 12345",
+  { :street1 => "123 Foo Bar Street", :street2 => nil, :city => nil, :state => nil, :zip => "12345" }
 
+test_input "
+  Apple Computer, Inc.
+  1 Infinite Loop
+  Cupertino, CA 95014",
+  { :street1 => "1 Infinite Loop", :street2 => nil, :city => "Cupertino", :state => "CA", :zip => "95014" }
+
+test_input "Apple Computer, Inc. 1 Infinite Loop, Cupertino, CA 95014",
+  { :street1 => "1 Infinite Loop", :street2 => nil, :city => "Cupertino", :state => "CA", :zip => "95014" }
+  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coderifous-address_extractor
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jim Garvin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-16 00:00:00 -08:00
+date: 2008-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: []