people_places_things 2.5.0 → 2.5.1

data/lib/people_places_things/location.rb

@@ -5,18 +5,23 @@ module PeoplePlacesThings
     def initialize(str)
       self.raw = str
     
-      tokens = str.split(/\s|,/).collect {|t| t.strip}
+      tokens = str.split(/\s|,/).collect { |t| t.strip }.reject { |t| t.length == 0 }
     
       # try to parse last token as zip
       #
       self.zip = ZipCode.new(tokens.last) rescue nil
       tokens = tokens.slice(0..-2) if self.zip
-    
-      # try to parse last token as state
+      
+      # try to parse out the state (california, new york, district of columbia)
       #
-      self.state = State.new(tokens.last) rescue nil
-      tokens = tokens.slice(0..-2) if self.state
-    
+      3.times do |i|
+        self.state = State.new(tokens.last(i).join(" ")) rescue nil
+        if self.state
+          tokens = tokens.slice(0..(-1 - i))
+          break
+        end
+      end
+      
       # remainder must be city
       #
       self.city = tokens.join(' ').strip

data/lib/people_places_things/version.rb

@@ -1,3 +1,3 @@
 module PeoplePlacesThings
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: people_places_things
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors: 
 - Danny Burkes
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-08 00:00:00 Z
+date: 2012-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Parsers and formatters for person names, street addresses, city/state/zip, phone numbers, etc.