addressable_record 1.2.0 → 1.3.0

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm use ruby-1.8.7-p334@addressable_record
+rvm info

data/History.txt

@@ -1,3 +1,8 @@
+== 1.3.0 2010-09-22
+
+* Made string parsing of addresses more adaptable.
+
+
 == 1.2.0 2010-09-21
 
 * Make able to parse a string of address elements.

data/VERSION

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

data/addressable_record.gemspec

@@ -1,60 +1,52 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{addressable_record}
-  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 = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2011-11-17}
   s.description = %q{Encapsulates the composed of pattern for addresses into any easy to use library.  Provides convenience methods for formatting, parsing, etc.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "addressable_record.gemspec",
-     "lib/addressable_record.rb",
-     "lib/addressable_record/active_record_extesions.rb",
-     "lib/addressable_record/address.rb",
-     "lib/addressable_record/states.rb",
-     "rails_generators/addressable_record_migration_generator/addressable_record_migration_generator.rb",
-     "rails_generators/addressable_record_migration_generator/templates/migration.rb",
-     "script/console",
-     "script/environment.rb",
-     "script/seed.rb",
-     "spec/addressable_record/address_parsing_shared_spec.rb",
-     "spec/addressable_record/address_spec.rb",
-     "spec/addressable_record_spec.rb",
-     "spec/database.yml",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".rvmrc",
+    "History.txt",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "addressable_record.gemspec",
+    "lib/addressable_record.rb",
+    "lib/addressable_record/active_record_extesions.rb",
+    "lib/addressable_record/address.rb",
+    "lib/addressable_record/states.rb",
+    "rails_generators/addressable_record_migration_generator/addressable_record_migration_generator.rb",
+    "rails_generators/addressable_record_migration_generator/templates/migration.rb",
+    "script/console",
+    "script/environment.rb",
+    "script/seed.rb",
+    "spec/addressable_record/address_parsing_shared_spec.rb",
+    "spec/addressable_record/address_spec.rb",
+    "spec/addressable_record_spec.rb",
+    "spec/database.yml",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/midas/addressable_record}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Encapsulates the composed of pattern for addresses into any easy to use library.}
-  s.test_files = [
-    "spec/addressable_record/address_parsing_shared_spec.rb",
-     "spec/addressable_record/address_spec.rb",
-     "spec/addressable_record_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/addressable_record/address.rb

@@ -2,6 +2,11 @@ require File.dirname(__FILE__) + '/states'
 
 module AddressableRecord
   class Address
+    NATURAL_OR_CSV_STRING_REGEX = /^\s*?(?:([^,]+?)),\s*?(?:([^,]+?)),\s*?(?:(?:([^,]+?)),\s*?)??([A-Z]{2}),??\s*?(\d{5}(?:-\d{4})?)\s*$/ # /^(.+),\s*(.+),\s*(.+),\s*(.{2}),?\s*(\d{5})-?(\d{4})?\s*$/
+    NATURAL_OR_CSV_STRING_INVALID_MESSAGE = "invalid format, try something like: 123 Some Street, Suite 123, Some City, AL 11111-1111"
+    NATURAL_STRING_REGEX = /^(.+),\s*(.+),\s*(.+),\s*(.{2})\s*(\d{5})-?(\d{4})?\s*$/
+    CSV_STRING_REGEX = /^(.+),\s*(.+),\s*(.+),\s*(.{2}),\s*(\d{5})-?(\d{4})?\s*$/
+
     attr_reader :raw_street, :streets, :city, :state_or_province, :zip_code, :country
 
     @@street_delimiter ||= '###'
@@ -76,12 +81,28 @@ module AddressableRecord
     #   %C - country
     #
     def to_s( pattern=nil )
+      return '' if is_blank?
       to_return = pattern.is_a?( Symbol ) ? @@patterns[pattern] : pattern
       to_return = @@patterns[:us] if to_return.nil? || to_return.empty?
       @pattern_map.each { |pat, replacement| to_return = to_return.gsub( pat, replacement ) }
       to_return.strip
     end
 
+    def is_blank?
+      raw_street.blank? && city.blank? && state_or_province.blank? && raw_zip_code.blank? && country.blank?
+    end
+
+    def ==( other )
+      return false unless other.instance_of?( self.class )
+      return false unless other.raw_street.upcase == raw_street.upcase
+      return false unless other.city.upcase == city.upcase
+      return false unless other.state_or_province.upcase  == state_or_province.upcase
+      return false unless other.raw_zip_code == raw_zip_code
+      return false unless other.country.upcase == country.upcase
+
+      true
+    end
+
     # Outputs the parts of teh address delimited by specified delimiter(s).
     #
     # *parameters*
@@ -121,14 +142,17 @@ module AddressableRecord
 
       def parse_array( address_elements ) #:nodoc:
         state_pos = find_state_position( address_elements )
-        raise 'Cannot parse address array.  Failed to find a state.' if state_pos.nil?
-        raise 'Cannot parse address array.  No zip code found.' unless address_elements.size >= (state_pos + 1)
+        # puts address_elements.class.name, address_elements, state_pos
+        # raise 'Cannot parse address array.  Failed to find a state.' if state_pos.nil?
+        # raise 'Cannot parse address array.  No zip code found.' unless address_elements.size >= (state_pos + 1)
+        return nil if state_pos.nil?
+        return nil unless address_elements.size >= (state_pos + 1)
         state = States.by_abbreviation.has_key?( address_elements[state_pos] ) ? address_elements[state_pos] : States.by_name[address_elements[state_pos]]
         zip_code = address_elements[state_pos+1].gsub( /#{@@zip_code_delimiter}/, '' )
         country = address_elements.size >= (state_pos + 3) ? address_elements[state_pos+2] : 'U.S.A.'
         city = address_elements[state_pos-1]
         streets = []
-        (0..state_pos-2).each { |i| streets << address_elements[i] }
+        (0..state_pos-2).each { |i| streets << address_elements[i].strip }
         street = streets.join( @@street_delimiter )
         return AddressableRecord::Address.new( :raw_street => street, :city => city, :state_or_province => state, :raw_zip_code => zip_code, :country => country )
       end
@@ -138,12 +162,35 @@ module AddressableRecord
       end
 
       def parse_string( address )
-        parts = address.split( ',' )
-        parts = parts.map { |p| p.strip }
+        parts = nil
+        pos = find_state_position_in_string( address )
+        return blank_address if pos.nil?
+
+        if !pos.nil? && address[pos+2,1] == ','
+          parts = address.split( ',' )
+          parts = parts.map { |p| p.strip }
+        else
+          pre_state_string = address[0,pos]
+          parts = pre_state_string.split( ',' ).reject { |p| p.blank? }
+          state_on_string = address[pos,address.size-pos]
+          parts += state_on_string.split( /\s+/ ).reject { |p| p.blank? }
+        end
+
         parse_array( parts )
       end
 
+      def blank_address
+        self.new( {} )
+      end
+
       def find_state_position( address_elements )
+        unless [Array,String].include?( address_elements.class )
+          raise "Cannot search for state position in a #{address_elements.class.name}"
+        end
+        self.send( :"find_state_position_in_#{address_elements.class.to_s.downcase}", address_elements )
+      end
+
+      def find_state_position_in_array( address_elements )
         # Look for state abbreviation
         possible_abbreviation_positions = find_possible_state_abbrev_positions( address_elements )
         state_index = possible_abbreviation_positions.detect { |i| States.by_abbreviation.has_key?( address_elements[i] ) }
@@ -153,6 +200,21 @@ module AddressableRecord
         (0..address_elements.size-1).detect { |i| States.by_name.has_key?( address_elements[i] ) }
       end
 
+      def find_state_position_in_string( address_elements )
+        idx = nil
+        States.abbreviations.each do |abbreviation|
+          idx = address_elements.rindex( abbreviation )
+          return idx unless idx.nil?
+        end
+
+        States.names.each do |name|
+          idx = address_elements.rindex( name )
+          return idx unless idx.nil?
+        end
+
+        nil
+      end
+
       def find_possible_state_abbrev_positions( address_array )
         positions = []
         address_array.each_with_index { |str, i| positions << i if str.size == 2 }
@@ -160,4 +222,4 @@ module AddressableRecord
       end
     end
   end
-end
+end

data/spec/addressable_record/address_spec.rb

@@ -64,7 +64,31 @@ describe "AddressableRecord::Address" do
     @klass.send( :find_state_position, ['123 Jones St.', 'Atlanta', '33333' ] ).should be_nil
   end
 
-  describe "when parsng a string of address elements" do
+  describe "when parsng a naturally puncuated string of address elements" do
+     before :each do
+       @address_elements_without_country = "123 Jones Street, Suite 540, Atlanta, GA 33333-1111"
+       @address_elements = "123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+     end
+
+     # ^(.*),(.*),(.*),(.*),?(\d{5})-?(\d{4})?$
+     # describe "with a country" do
+     #   before :each do
+     #     @address = @address_elements
+     #   end
+     #
+     #   it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+     # end
+
+     # describe "without a country" do
+     #   before :each do
+     #     @address = @address_elements_without_country
+     #   end
+     #
+     #   it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+     # end
+  end
+
+  describe "when parsng a comma separated string of address elements" do
      before :each do
        @address_elements_without_country = ['123 Jones Street', 'Suite 540', 'Atlanta', 'GA', '33333-1111']
      end
@@ -317,5 +341,43 @@ describe "AddressableRecord::Address" do
         @address.to_s( '%C' ).should eql( 'U.S.A.' )
       end
     end
+
+    describe "having a regular expression for a string address" do
+      describe "that is naturally formatted" do
+        describe "without a contry"do
+          it "should match" do
+            # "123 Jones Street, Suite 111, Atlanta, GA 31555"
+          end
+
+          it "should ignore white space" do
+
+          end
+        end
+
+        describe "with a country" do
+          it "should match" do
+            # "123 Jones Street, Suite 111, Atlanta, GA 31555, United States"
+          end
+
+          it "should ignore white space" do
+
+          end
+        end
+      end
+
+      describe "that is comma separated formatted" do
+        it "should match" do
+
+        end
+
+        it "should ignore white space" do
+
+        end
+      end
+
+      describe "similar strings" do
+
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: addressable_record
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -05:00
+date: 2011-11-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rvmrc
 - History.txt
 - LICENSE
 - README.rdoc
@@ -103,8 +103,8 @@ homepage: http://github.com/midas/addressable_record
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -128,12 +128,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Encapsulates the composed of pattern for addresses into any easy to use library.
-test_files: 
-- spec/addressable_record/address_parsing_shared_spec.rb
-- spec/addressable_record/address_spec.rb
-- spec/addressable_record_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.idea/*