coderifous-address_extractor 0.1.3 → 0.1.4

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('address_extractor', '0.1.3') do |p|
+Echoe.new('address_extractor', '0.1.4') 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.3"
+  s.version = "0.1.4"
 
   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-17}
+  s.date = %q{2008-11-21}
   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

@@ -12,8 +12,8 @@ class AddressExtractor
     def find_addresses(string)
       string.scan(ADDRESS_PATTERN).collect { |a| hashify_results(a) }.compact
     end
-    
-    # Pass it a block that recieves 2 parameters: 
+
+    # Pass it a block that recieves 2 parameters:
     #   address hash
     #   matched address string ($&)
     # Whatever your block returns will be used for the substition.
@@ -33,9 +33,9 @@ class AddressExtractor
         useful_address?(hash) ? yield(hash, $&) : match
       end
     end
-    
+
   private
-    
+
     def hashify_results(matches)
       return nil if matches.nil?
       result = { }
@@ -46,16 +46,16 @@ class AddressExtractor
       end
       useful_address?(result) ? result : nil
     end
-    
+
     def useful_address?(hash)
-      hash && 
+      hash &&
       hash[:street1] && ( hash[:zip] || hash[:city] && hash[:state] )
     end
-    
+
   end
-  
+
   CAPTURE_MAP = [ :street1, :street2, :city, :state, :zip, :zip ]
-  
+
   STATES = <<-EOF
     ALABAMA  AL
     ALASKA  AK
@@ -117,9 +117,9 @@ class AddressExtractor
     WISCONSIN  WI
     WYOMING  WY
   EOF
-  
+
   STATE_REGEX = STATES.split(/\n/).collect{ |n| n.scan(/(\w.*\w)\s*([A-Z]{2})\s*$/) }.join("|")
-  
+
   SECONDARY_UNIT_DESIGNATORS = <<-EOF
     APARTMENT APT
     BASEMENT BSMT
@@ -145,14 +145,14 @@ class AddressExtractor
     UNIT UNIT
     UPPER UPPR
   EOF
-  
+
   SECONDARY_UNIT_DESIGNATORS_REGEX = SECONDARY_UNIT_DESIGNATORS.split(/\n/).collect{ |n| n.scan(/(\w+)\s*(\w+)\s*$/) }.join("|")
 
   ADDRESS_PATTERN = /
     (
       \d+                           # A few numbers
       \s+
-      (?:[A-Za-z'.-]+\s?){0,2} (?:[A-Za-z'.-]+) # Followed by a street name
+      (?:[A-Za-z'.-]+\s?){1,5}      # Followed by a street name
     )
     \s* ,?  \s*                     # a comma, optionally
     (
@@ -168,9 +168,9 @@ class AddressExtractor
         \b(#{STATE_REGEX})\b        # state
         \s* ,? \s*                  # a comma, optionally
         (\d{5})?                    # a zip code, optionally
-      )                            
+      )
       |                             # or, instead of city and state
       (\d{5})?                      # a lone zip code will do
     )
   /xi
-end
+end

data/test/test_address_extractor.rb

@@ -1,46 +1,41 @@
-$: << File.dirname(__FILE__)+"/../lib"
-
-require 'test/unit'
-require 'address_extractor.rb'
-require 'test_helper.rb'
+require 'address_extractor'
+require 'test_helper'
 include TestDataHelper
 
 class AddressExtractorTest < Test::Unit::TestCase
-  include Helpers
-
   def test_first_address_extraction
     each_test_data do |test_data|
       address = AddressExtractor.first_address(test_data[:input])
       flunk "No address found in:\n#{test_data[:input]}" if address.nil?
-      assert_equal_hashes address, test_data[:expected_output].first
+      assert_equal_hashes test_data[:expected_output].first, address
     end
   end
-  
+
   def test_find_addresses
     each_test_data do |test_data|
       addresses = AddressExtractor.find_addresses(test_data[:input])
       assert_equal addresses.size, test_data[:expected_output].size
       test_data[:expected_output].each do |expected_output|
-        assert_equal_hashes addresses.shift, expected_output
+        assert_equal_hashes expected_output, addresses.shift
       end
     end
   end
-  
+
   def test_replace_first_address
     string = AddressExtractor.replace_first_address(test_data.first[:input]) do |address_hash, address|
-      assert_equal_hashes address_hash, test_data.first[:expected_output].first
-      assert_match /^\s*123 Foo St., Someplace FL\s*/, address 
+      assert_equal_hashes test_data.first[:expected_output].first, address_hash
+      assert_match /^\s*123 Foo St., Someplace FL\s*/, address
       "skidoosh"
     end
-    assert string =~ /Please send the package to skidoosh/
+    assert_match /Please send the package to skidoosh/, string
   end
 
   def test_replace_addresses
     string = AddressExtractor.replace_addresses(test_data.first[:input]) do |address_hash, address|
       "skidoosh"
     end
-    assert string =~ /Please send the package to skidoosh/
-    assert string =~ /via mail at:\s+skidoosh/
+    assert_match /Please send the package to skidoosh/, string
+    assert_match /via mail at:\s+skidoosh/, string
   end
 
   def test_no_addresses_found
@@ -70,7 +65,7 @@ test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby NY 12345",
 
 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, 12345",
   { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "12345" }
 
@@ -85,4 +80,10 @@ test_input "
 
 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 "Ida Lee Park Recreation Center 60 Ida Lee Dr NW, Leesburg, VA",
+  { :street1 => "60 Ida Lee Dr NW", :street2 => nil, :city => "Leesburg", :state => "VA", :zip => nil }
+
+test_input "Ida Lee Park Recreation Center 60 Ida Lee Dr N West, Leesburg, VA",
+  { :street1 => "60 Ida Lee Dr N West", :street2 => nil, :city => "Leesburg", :state => "VA", :zip => nil }
+

data/test/test_helper.rb

@@ -1,7 +1,8 @@
-module TestDataHelper
-
-  TEST_DATA = []
+require 'test/unit'
+require 'rubygems'
+begin require 'redgreen' unless ENV['TM_FILENAME']; rescue LoadError; end
 
+module TestDataHelper
   def test_input(input_string, *expected_outputs)
     test_data << { :input => input_string, :expected_output => expected_outputs }
   end
@@ -9,23 +10,20 @@ module TestDataHelper
   def each_test_data
     test_data.each { |t| yield(t) }
   end
-  
+
   def test_data
-    TEST_DATA
+    @@test_data ||= []
   end
-  
 end
 
 module Helpers
-
-  def assert_equal_hashes(a,b)
-    (a.keys + b.keys).uniq.each do |k|
-      assert_equal a[k], b[k], "a[#{k.inspect}] = #{a[k].inspect} != b[#{k.inspect}] = #{b[k].inspect}"
+  def assert_equal_hashes(expected, hash)
+    (expected.keys + hash.keys).uniq.each do |k|
+      assert_equal expected[k], hash[k], "expected[#{k.inspect}] = #{expected[k].inspect} != hash[#{k.inspect}] = #{hash[k].inspect}"
     end
   end
+end
 
-  def assert_first_address_string(string)
-    assert_match /^123 Foo St\., Someplace FL\s*$/, string
-  end
-  
+class Test::Unit::TestCase
+  include Helpers
 end

metadata

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