dburkes-people_places_things 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/people_places_things.rb

@@ -3,6 +3,8 @@ require File.join(File.dirname(__FILE__), 'people_places_things', 'person_name',
 require File.join(File.dirname(__FILE__), 'people_places_things', 'ansi_counties', 'ansi_counties')
 require File.join(File.dirname(__FILE__), 'people_places_things', 'phone_number', 'phone_number')
 require File.join(File.dirname(__FILE__), 'people_places_things', 'zip_code', 'zip_code')
+require File.join(File.dirname(__FILE__), 'people_places_things', 'state', 'state')
+require File.join(File.dirname(__FILE__), 'people_places_things', 'location', 'location')
 
 module PeoplePlacesThings
   VERSION = File.read('VERSION').chomp.strip rescue "Unknown"

data/lib/people_places_things/location/location.rb

@@ -0,0 +1,28 @@
+class Location
+  attr_accessor :city, :state, :zip, :raw
+  
+  def initialize(str)
+    self.raw = str
+    
+    tokens = str.split(/\s|,/).collect {|t| t.strip}
+    
+    # try to parse last token as zip
+    #
+    self.zip = ZipCode.parse(tokens.last) rescue nil
+    tokens = tokens.slice(0..-2) if self.zip
+    
+    # try to parse last token as state
+    #
+    self.state = State.parse(tokens.last) rescue nil
+    tokens = tokens.slice(0..-2) if self.state
+    
+    # remainder must be city
+    #
+    self.city = tokens.join(' ').strip
+    self.city = nil if self.city.empty?
+  end
+  
+  def to_s
+    [[self.city, (self.state.to_s(:abbr) rescue nil)].compact.join(','), self.zip.to_s].compact.join(' ')
+  end
+end

data/lib/people_places_things/state/state.rb

@@ -0,0 +1,95 @@
+class State
+  attr_accessor :raw
+  attr_accessor :sym
+  
+  def initialize(sym)
+    raise "Unsupported state" if !FORWARD.has_key?(sym)
+    self.sym = sym
+  end
+  
+  def self.parse(string)
+    token = string.strip.downcase
+    sym = nil
+    
+    if FORWARD.has_key?(token.to_sym)
+      sym = token.to_sym
+    elsif REVERSE.has_key?(token)
+      sym = REVERSE[token]
+    end
+    
+    raise "Unsupported Format" if !sym
+
+    ret = State.new sym
+    ret.raw = string
+    ret
+  end
+  
+  def self.format(sym, fmt)
+    State.new(sym).to_s(fmt)
+  end
+  
+  def to_s(fmt = :full)
+    raise "Unsupported Format" if !OUTPUT_FORMATS.include?(fmt)
+    fmt == :full ? FORWARD[self.sym].capitalize : self.sym.to_s.upcase
+  end
+  
+  OUTPUT_FORMATS = [:abbr, :full]
+  
+  private
+
+  FORWARD = {
+    :al => "alabama",
+  	:ak => "alaska",
+  	:az => "arizona",
+  	:ar => "arkansas",
+  	:ca => "california",
+  	:co => "colorado",
+  	:ct => "connecticut",
+  	:de => "delaware",
+  	:dc => "district of columbia",
+  	:fl => "florida",
+  	:ga => "georgia",
+  	:hi => "hawaii",
+  	:id => "idaho",
+  	:il => "illinois",
+  	:in => "indiana",
+  	:ia => "iowa",
+  	:ks => "kansas",
+  	:ky => "kentucky",
+  	:la => "louisiana",
+  	:me => "maine",
+  	:md => "maryland",
+  	:ma => "massachusetts",
+  	:mi => "michigan",
+  	:mn => "minnesota",
+  	:ms => "mississippi",
+  	:mo => "missouri",
+  	:mt => "montana",
+  	:ne => "nebraska",
+  	:nv => "nevada",
+  	:nh => "new hampshire",
+  	:nj => "new jersey",
+  	:nm => "new mexico",
+  	:ny => "new york",
+  	:nc => "north carolina",
+  	:nd => "north dakota",
+  	:oh => "ohio",
+  	:ok => "oklahoma",
+  	:or => "oregon",
+  	:pa => "pennsylvania",
+  	:ri => "Rhode island",
+  	:sc => "south carolina",
+  	:sd => "south dakota",
+  	:tn => "tennessee",
+  	:tx => "texas",
+  	:ut => "utah",
+  	:vt => "vermont",
+  	:va => "virginia",
+  	:wa => "washington",
+  	:wv => "west virginia",
+  	:wi => "wisconsin",
+  	:wy => "wyoming",
+	}
+	
+	REVERSE = FORWARD.inject({}) {|r, f| r[f[1]] = f[0]; r}
+end

data/people_places_things.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{people_places_things}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danny Burkes"]
-  s.date = %q{2009-08-28}
+  s.date = %q{2009-08-31}
   s.description = %q{Parsers and formatters for person names, street addresses, city/state/zip, phone numbers, etc.}
   s.email = %q{dburkes@netable.com}
   s.extra_rdoc_files = [
@@ -25,15 +25,19 @@ Gem::Specification.new do |s|
      "lib/people_places_things/ansi_counties/data/data.yml",
      "lib/people_places_things/ansi_counties/data/process_data.rb",
      "lib/people_places_things/ansi_counties/data/raw.txt",
+     "lib/people_places_things/location/location.rb",
      "lib/people_places_things/person_name/person_name.rb",
      "lib/people_places_things/phone_number/phone_number.rb",
+     "lib/people_places_things/state/state.rb",
      "lib/people_places_things/street_address/street_address.rb",
      "lib/people_places_things/zip_code/zip_code.rb",
      "people_places_things.gemspec",
      "spec/ansi_counties_spec.rb",
      "spec/helper.rb",
+     "spec/location_spec.rb",
      "spec/person_name_spec.rb",
      "spec/phone_number_spec.rb",
+     "spec/state_spec.rb",
      "spec/street_address_spec.rb",
      "spec/zip_code_spec.rb"
   ]
@@ -46,8 +50,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/ansi_counties_spec.rb",
      "spec/helper.rb",
+     "spec/location_spec.rb",
      "spec/person_name_spec.rb",
      "spec/phone_number_spec.rb",
+     "spec/state_spec.rb",
      "spec/street_address_spec.rb",
      "spec/zip_code_spec.rb"
   ]

data/spec/location_spec.rb

@@ -0,0 +1,52 @@
+require 'spec/helper'
+
+describe Location do
+  it "should parse city" do
+    test_location("san francisco", "san francisco", nil, nil)
+  end
+
+  it "should parse city state abbreviation" do
+    test_location("san francisco ca", "san francisco", "CA", nil)
+  end
+
+  it "should parse city state full" do
+    test_location("san francisco california", "san francisco", "CA", nil)
+  end
+
+  it "should parse city comma state" do
+    test_location("san francisco, ca", "san francisco", "CA", nil)
+  end
+  
+  it "should parse city state zip" do
+    test_location("san francisco ca 94114-1212", "san francisco", "CA", '94114-1212')
+  end
+
+  it "should parse city comma state zip" do
+    test_location("san francisco, ca 94114-1212", "san francisco", "CA", '94114-1212')
+  end
+  
+  it "should parse city zip" do
+    test_location("san francisco 94114-1212", "san francisco", nil, '94114-1212')
+  end
+  
+  it "should parse state zip" do
+    test_location("ca 94114-1212", nil, "CA", '94114-1212')
+  end
+  
+  it "should parse state" do
+    test_location("california", nil, "CA", nil)
+  end
+  
+  it "should parse zip" do
+    test_location("94114-1212", nil, nil, '94114-1212')
+  end
+  
+  private
+  
+  def test_location(str, city, state, zip)
+    l = Location.new(str)
+    l.city.should == city if l.city
+    l.state.to_s(:abbr).should == state.upcase if l.state
+    l.zip.to_s.should == zip if l.zip
+  end
+end

data/spec/state_spec.rb

@@ -0,0 +1,29 @@
+require 'spec/helper'
+
+describe State do
+  it "should parse abbreviation" do
+    state = State.parse 'ga'
+    state.sym.should == :ga
+  end
+
+  it "should parse full" do
+    state = State.parse 'georgia'
+    state.sym.should == :ga
+  end
+
+  it "should throw exception on unsupported state" do
+    lambda { State.parse('foo') }.should raise_error
+  end
+
+  it "should format :abbr" do 
+    State.parse('ga').to_s(:abbr).should == 'GA'
+  end
+
+  it "should format :full" do 
+    State.parse('ga').to_s(:full).should == 'Georgia'
+  end
+
+  it "should throw exception on unsupported to_s format" do
+    lambda { State.parse('ga').to_s(:bogus) }.should raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dburkes-people_places_things
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Danny Burkes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,19 +31,24 @@ files:
 - lib/people_places_things/ansi_counties/data/data.yml
 - lib/people_places_things/ansi_counties/data/process_data.rb
 - lib/people_places_things/ansi_counties/data/raw.txt
+- lib/people_places_things/location/location.rb
 - lib/people_places_things/person_name/person_name.rb
 - lib/people_places_things/phone_number/phone_number.rb
+- lib/people_places_things/state/state.rb
 - lib/people_places_things/street_address/street_address.rb
 - lib/people_places_things/zip_code/zip_code.rb
 - people_places_things.gemspec
 - spec/ansi_counties_spec.rb
 - spec/helper.rb
+- spec/location_spec.rb
 - spec/person_name_spec.rb
 - spec/phone_number_spec.rb
+- spec/state_spec.rb
 - spec/street_address_spec.rb
 - spec/zip_code_spec.rb
 has_rdoc: true
 homepage: http://github.com/dburkes/people_places_things
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -64,14 +69,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Parsers and formatters for person names, street addresses, city/state/zip, phone numbers, etc.
 test_files: 
 - spec/ansi_counties_spec.rb
 - spec/helper.rb
+- spec/location_spec.rb
 - spec/person_name_spec.rb
 - spec/phone_number_spec.rb
+- spec/state_spec.rb
 - spec/street_address_spec.rb
 - spec/zip_code_spec.rb