normalic 0.1.1 → 0.1.2

data/License.txt

@@ -0,0 +1,8 @@
+Copyright (c) 2011 Eric Tang (eric.x.tang@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Manifest

@@ -1,3 +1,4 @@
+License.txt
 Manifest
 README.rdoc
 Rakefile
@@ -6,4 +7,5 @@ lib/normalic.rb
 lib/normalic/address.rb
 lib/normalic/phone_number.rb
 lib/normalic/uri.rb
+normalic.gemspec
 spec/normalic_spec.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('normalic', '0.1.1') do |p|
+Echoe.new('normalic', '0.1.2') do |p|
   p.description    = "Normalize U.S addresses"
   p.url            = "http://github.com/ericxtang/normalic"
   p.author         = "Eric Tang"

data/lib/normalic/address.rb

@@ -33,10 +33,24 @@ module Normalic
     end
 
     def self.parse(raw)
-      address = raw.to_s
-      clean = self.clean(address)
-      tokens = self.tokenize(clean)
-      normd = self.normalize(tokens)
+      clean = clean(raw)
+      tokens = tokenize(clean)
+      normd = normalize(tokens)
+
+      self.new(normd)
+    end
+
+    def self.normalize_fields(fields)
+      clean_fields = Hash[*fields.collect do |(k, v)|
+        k2 = k.is_a?(Symbol) ? k : clean(k).gsub(/\W+/,'').to_sym
+        [k2, clean(v)]
+      end.flatten(1)]
+      if (address = clean_fields.delete(:address) ||
+                    clean_fields.delete(:address_line1))
+        clean_fields.merge!(Hash[[:type, :street, :direction,
+                                  :number].zip(tokenize_street(address))])
+      end
+      normd = normalize(clean_fields)
 
       self.new(normd)
     end
@@ -100,8 +114,8 @@ module Normalic
       end
     end
 
-    def self.clean(address)
-      address = address.clone
+    def self.clean(raw)
+      address = raw.to_s.dup
 
       address.downcase!
       address.gsub!("\n",', ')
@@ -113,7 +127,7 @@ module Normalic
     end
 
     def self.tokenize(address)
-      address = address.clone
+      address = address.dup
 
       address.detoken!(REGEXES[:country])
       zipcode = address.detoken!(REGEXES[:zipcode])
@@ -134,15 +148,15 @@ module Normalic
 
       if m = address.match(REGEXES[:intersection])
         intersection = true
-        t1, s1, d1 = self.tokenize_street(m[1], false)
-        t2, s2, d2 = self.tokenize_street(m[3], false)
+        t1, s1, d1 = tokenize_street(m[1], false)
+        t2, s2, d2 = tokenize_street(m[3], false)
         type = [t1, t2]
         street = [s1, s2]
         direction = [d1, d2]
         number = nil
       else
         intersection = false
-        type, street, direction, number = self.tokenize_street(address)
+        type, street, direction, number = tokenize_street(address)
       end
 
       {:zipcode => zipcode,
@@ -156,7 +170,7 @@ module Normalic
     end
 
     def self.tokenize_street(address, has_number=true)
-      address = address.clone
+      address = address.dup
 
       number = has_number ? address.detoken_front!(REGEXES[:number]) : nil
       direction = address.detoken_front!(REGEXES[:directional]) ||
@@ -173,18 +187,18 @@ module Normalic
     def self.normalize(tokens)
       tokens = tokens.clone
 
-      tokens[:zipcode] = self.normalize_zipcode(tokens[:zipcode])
-      tokens[:state] = self.normalize_state(tokens[:state], tokens[:zipcode])
-      tokens[:city] = self.normalize_city(tokens[:city], tokens[:zipcode])
+      tokens[:zipcode] = normalize_zipcode(tokens[:zipcode])
+      tokens[:state] = normalize_state(tokens[:state], tokens[:zipcode])
+      tokens[:city] = normalize_city(tokens[:city], tokens[:zipcode])
 
       if tokens[:intersection]
-        tokens[:type].collect! {|t| self.normalize_type(t)}
-        tokens[:street].collect! {|s| self.normalize_street(s)}
-        tokens[:direction].collect! {|d| self.normalize_direction(d)}
+        tokens[:type].collect! {|t| normalize_type(t)}
+        tokens[:street].collect! {|s| normalize_street(s)}
+        tokens[:direction].collect! {|d| normalize_direction(d)}
       else
-        tokens[:type] = self.normalize_type(tokens[:type])
-        tokens[:street] = self.normalize_street(tokens[:street])
-        tokens[:direction] = self.normalize_direction(tokens[:direction])
+        tokens[:type] = normalize_type(tokens[:type])
+        tokens[:street] = normalize_street(tokens[:street])
+        tokens[:direction] = normalize_direction(tokens[:direction])
       end
 
       tokens
@@ -208,20 +222,20 @@ module Normalic
 
     def self.normalize_city(city, zipcode=nil)
       city = ZIP_CITY_MAP[zipcode][:city] if zipcode && ZIP_CITY_MAP[zipcode]
-      city ? self.titlize(city) : nil
+      city ? titlize(city) : nil
     end
 
     def self.normalize_type(type)
       if type
         type = STREET_TYPES[type] || type
-        self.titlize(type) + '.'
+        titlize(type) + '.'
       else
         nil
       end
     end
 
     def self.normalize_street(street)
-      street ? self.titlize(street) : nil
+      street ? titlize(street) : nil
     end
 
     def self.normalize_direction(direction)

data/normalic.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "normalic"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Tang"]
-  s.date = "2011-10-26"
+  s.date = "2011-11-02"
   s.description = "Normalize U.S addresses"
   s.email = "eric.x.tang@gmail.com"
   s.extra_rdoc_files = ["README.rdoc", "lib/constants.rb", "lib/normalic.rb", "lib/normalic/address.rb", "lib/normalic/phone_number.rb", "lib/normalic/uri.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/constants.rb", "lib/normalic.rb", "lib/normalic/address.rb", "lib/normalic/phone_number.rb", "lib/normalic/uri.rb", "spec/normalic_spec.rb", "normalic.gemspec"]
+  s.files = ["License.txt", "Manifest", "README.rdoc", "Rakefile", "lib/constants.rb", "lib/normalic.rb", "lib/normalic/address.rb", "lib/normalic/phone_number.rb", "lib/normalic/uri.rb", "normalic.gemspec", "spec/normalic_spec.rb"]
   s.homepage = "http://github.com/ericxtang/normalic"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Normalic", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/spec/normalic_spec.rb

@@ -275,6 +275,53 @@ describe "Normalic::Address" do
     addr[:intersection].should == false
   end
 
+  it "should parse an address from a hash of fields" do
+    addr = Normalic::Address.normalize_fields(:number => 201,
+                                              :street => "Varick",
+                                              "type" => "St.",
+                                              :city => "New York",
+                                              :state => "NY",
+                                              "zipcode" => 10014)
+    addr[:number].should == "201"
+    addr[:direction].should == nil
+    addr[:street].should == "Varick"
+    addr[:type].should == "St."
+    addr[:city].should == "New York"
+    addr[:state].should == "NY"
+    addr[:zipcode].should == "10014"
+    addr[:intersection].should == false
+  end
+
+  it "should parse an address from a hash of fields including 'address'" do
+    addr = Normalic::Address.normalize_fields("address" => "201 Varick St.",
+                                              :city => "New York",
+                                              :state => "NY",
+                                              :zipcode => 10014)
+    addr[:number].should == "201"
+    addr[:direction].should == nil
+    addr[:street].should == "Varick"
+    addr[:type].should == "St."
+    addr[:city].should == "New York"
+    addr[:state].should == "NY"
+    addr[:zipcode].should == "10014"
+    addr[:intersection].should == false
+  end
+
+  it "should parse an address from a hash of fields including 'address_line1'" do
+    addr = Normalic::Address.normalize_fields("address_line1" => "201 Varick St.",
+                                              :city => "New York",
+                                              :state => "NY",
+                                              :zipcode => 10014)
+    addr[:number].should == "201"
+    addr[:direction].should == nil
+    addr[:street].should == "Varick"
+    addr[:type].should == "St."
+    addr[:city].should == "New York"
+    addr[:state].should == "NY"
+    addr[:zipcode].should == "10014"
+    addr[:intersection].should == false
+  end
+
   it "should use dot notation" do
     addr = Normalic::Address.parse("871 west washington street, new york, ny 10014")
     addr.number.should == "871"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: normalic
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Eric Tang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-02 00:00:00 Z
 dependencies: []
 
 description: Normalize U.S addresses
@@ -32,6 +32,7 @@ extra_rdoc_files:
 - lib/normalic/phone_number.rb
 - lib/normalic/uri.rb
 files: 
+- License.txt
 - Manifest
 - README.rdoc
 - Rakefile
@@ -40,8 +41,8 @@ files:
 - lib/normalic/address.rb
 - lib/normalic/phone_number.rb
 - lib/normalic/uri.rb
-- spec/normalic_spec.rb
 - normalic.gemspec
+- spec/normalic_spec.rb
 homepage: http://github.com/ericxtang/normalic
 licenses: []