addressable_record 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.0 2010-09-21
+
+* Make able to parse a string of address elements.
+
+
 == 1.1.0 2010-07-01
 
 * Tweak address formatting to use standard abbreviations and comma placement

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/addressable_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{addressable_record}
-  s.version = "1.1.0"
+  s.version = "1.2.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-07-01}
+  s.date = %q{2010-09-21}
   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 = [
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   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.6}
+  s.rubygems_version = %q{1.3.7}
   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",
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<geographer>, [">= 1.1.1"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/addressable_record.rb

@@ -4,7 +4,7 @@ require 'addressable_record/address'
 require 'addressable_record/active_record_extesions'
 
 module AddressableRecord
-  VERSION = '1.0.4'
+  VERSION = '1.2.0'
 end
 
 ActiveRecord::Base.send( :include, AddressableRecord::ActiveRecordExtensions ) if defined?( ActiveRecord::Base )

data/lib/addressable_record/address.rb

@@ -48,11 +48,13 @@ module AddressableRecord
     end
 
     def street( delimiter=', ' )
-      return @streets.nil? ? '' : @streets.join( delimiter ) 
+      return @streets.nil? ? '' : @streets.join( delimiter )
     end
 
     def self.parse( address )
-      raise "Cannot convert #{address.class.to_s.downcase} to an AddressableRecord::Address" unless [Array, Hash].include?( address.class )
+      unless [Array, Hash, String].include?( address.class )
+        raise "Cannot convert #{address.class.to_s.downcase} to an AddressableRecord::Address"
+      end
       self.send( :"parse_#{address.class.to_s.downcase}", address )
     end
 
@@ -79,7 +81,7 @@ module AddressableRecord
       @pattern_map.each { |pat, replacement| to_return = to_return.gsub( pat, replacement ) }
       to_return.strip
     end
-    
+
     # Outputs the parts of teh address delimited by specified delimiter(s).
     #
     # *parameters*
@@ -99,7 +101,7 @@ module AddressableRecord
         options[:street_delimiter] = options[:delimiter] = opts
         options[:country] = false
       end
-      
+
       to_return = "#{self.street( options[:street_delimiter] )}#{options[:delimiter]}#{self.city}, #{self.state_or_province} #{self.zip_code}"
       return options[:country] ? to_return + "#{options[:delimiter]}#{self.country}" : to_return
     end
@@ -130,11 +132,17 @@ module AddressableRecord
         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
-      
+
       def parse_hash( address )
         return AddressableRecord::Address.new( address )
       end
 
+      def parse_string( address )
+        parts = address.split( ',' )
+        parts = parts.map { |p| p.strip }
+        parse_array( parts )
+      end
+
       def find_state_position( address_elements )
         # Look for state abbreviation
         possible_abbreviation_positions = find_possible_state_abbrev_positions( address_elements )

data/script/environment.rb

@@ -40,4 +40,4 @@ class ContactAddress < ActiveRecord::Base
 end
 
 ADDRESS_ATTRIBUTES = {:raw_street => '123 Jones Street###Suite 540', :city => 'Atlanta', :state_or_province => 'GA',
-  :raw_zip_code => '312347890', :country => 'U.S.A.' }
+  :raw_zip_code => '333331111', :country => 'U.S.A.' }

data/spec/addressable_record/address_spec.rb

@@ -7,51 +7,51 @@ describe "AddressableRecord::Address" do
     @klass = AddressableRecord::Address
     @instance = AddressableRecord::Address.new( @address_attributes )
   end
-  
+
   it "should agree that the raw_street is correct" do
     @instance.send( :raw_street ).should eql( @address_attributes[:raw_street] )
   end
-  
+
   it "should agree that the city is correct" do
     @instance.city.should eql( @address_attributes[:city] )
   end
-  
+
   it "should agree that the state_or_province is correct" do
     @instance.state_or_province.should eql( @address_attributes[:state_or_province] )
   end
-  
+
   it "should agree that the raw_zip_code is correct" do
     @instance.send( :raw_zip_code ).should eql( @address_attributes[:raw_zip_code] )
   end
-  
+
   it "should agree that the country is correct" do
     @instance.country.should eql( @address_attributes[:country] )
   end
-  
+
   it "should agree that the streets array is the correct size" do
     @instance.streets.size.should eql( 2 )
   end
-  
+
   it "should agree that the default call to \#street is correct" do
     @instance.street.should eql( @address_attributes[:raw_street].split( AddressableRecord::Address.street_delimiter ).join( ', ' ) )
   end
-  
+
   it "should agree that the call to \#street with a pattern of '\\n' is correct" do
     @instance.street( '\n' ).should eql( @address_attributes[:raw_street].split( AddressableRecord::Address.street_delimiter ).join( '\n' ) )
   end
-  
+
   it "should agree that the zip code is correct" do
     @instance.zip_code.should eql( "#{@address_attributes[:raw_zip_code][0..4]}-#{@address_attributes[:raw_zip_code][5..9]}")
   end
-  
+
   it "should agree that the state is the state_or_province" do
     @instance.state.should eql( @instance.state_or_province )
   end
-  
+
   it "should agree that the province is the state_or_province" do
     @instance.province.should eql( @instance.state_or_province )
   end
-  
+
   it "should be able to find the position of a state abbreviation in an array" do
     @klass.send( :find_state_position, ['123 Jones St.', 'Atlanta', 'GA', '33333', ] ).should eql( 2 )
   end
@@ -64,10 +64,176 @@ describe "AddressableRecord::Address" do
     @klass.send( :find_state_position, ['123 Jones St.', 'Atlanta', '33333' ] ).should be_nil
   end
 
-  describe "when parsing an hash of address elements" do
-    
+  describe "when parsng a string of address elements" do
+     before :each do
+       @address_elements_without_country = ['123 Jones Street', 'Suite 540', 'Atlanta', 'GA', '33333-1111']
+     end
+
+    describe "with a country" do
+      before :each do
+        @address = @klass.parse( (@address_elements_without_country + ['U.S.A.']).join( ', ' ) )
+      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 = @klass.parse( @address_elements_without_country.join( ', ' ) )
+      end
+
+      it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+    end
+
+    describe "with a spelled out state name" do
+      before :each do
+        @address_elements_without_country[@address_elements_without_country.index( 'GA' )] = 'Georgia'
+        @address = @klass.parse( @address_elements_without_country.join( ', ' ) )
+      end
+
+      it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+    end
+
+    describe "when printing out a formatted string" do
+      before :each do
+        @address = @klass.parse( @address_elements_without_country.join( ', ' ) )
+      end
+
+      it "should obey the :us format correctly" do
+        @address.to_s( :us ).should eql( '123 Jones Street, Suite 540, Atlanta, GA 33333-1111' )
+      end
+
+      it "should obey the :us_long format correctly" do
+        @address.to_s( :us_long ).should eql( '123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A.' )
+      end
+
+      it "should obey the %s format correctly" do
+        @address.to_s( '%s' ).should eql( '123 Jones Street, Suite 540' )
+      end
+
+      it "should obey the %1 format correctly" do
+        @address.to_s( '%1' ).should eql( '123 Jones Street' )
+      end
+
+      it "should obey the %2 format correctly" do
+        @address.to_s( '%2' ).should eql( 'Suite 540' )
+      end
+
+      it "should obey the %3 format correctly" do
+        @address.to_s( '%3' ).should eql( '' )
+      end
+
+      it "should obey the %4 format correctly" do
+        @address.to_s( '%4' ).should eql( '' )
+      end
+
+      it "should obey the %5 format correctly" do
+        @address.to_s( '%5' ).should eql( '' )
+      end
+
+      it "should obey the %c format correctly" do
+        @address.to_s( '%c' ).should eql( 'Atlanta' )
+      end
+
+      it "should obey the %S format correctly" do
+        @address.to_s( '%S' ).should eql( 'GA' )
+      end
+
+      it "should obey the %z format correctly" do
+        @address.to_s( '%z' ).should eql( '33333-1111' )
+      end
+
+      it "should obey the %C format correctly" do
+        @address.to_s( '%C' ).should eql( 'U.S.A.' )
+      end
+    end
+  end
+
+  describe "when parsing a hash of address elements" do
+    before :each do
+      @address_elements_without_country = @address_attributes.reject { |k,v| k.to_s.include?( 'country' ) }
+    end
+
+    describe "with a country" do
+      before :each do
+        @address = @klass.parse( @address_attributes )
+      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 = @klass.parse( @address_attributes.reject { |k,v| k.to_s.include?( 'country' ) } )
+    #   end
+    #
+    #   it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+    # end
+
+    # describe "with a spelled out state name" do
+    #   before :each do
+    #     @address_elements_without_country[:state_or_province] = 'Georgia'
+    #     @address = @klass.parse( @address_elements_without_country )
+    #   end
+    #
+    #   it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
+    # end
+
+    describe "when printing out a formatted string" do
+      before :each do
+        @address = @klass.parse( @address_elements_without_country )
+      end
+
+      it "should obey the :us format correctly" do
+        @address.to_s( :us ).should eql( '123 Jones Street, Suite 540, Atlanta, GA 33333-1111' )
+      end
+
+      it "should obey the :us_long format correctly" # do
+       #        @address.to_s( :us_long ).should eql( '123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A.' )
+       #      end
+
+      it "should obey the %s format correctly" do
+        @address.to_s( '%s' ).should eql( '123 Jones Street, Suite 540' )
+      end
+
+      it "should obey the %1 format correctly" do
+        @address.to_s( '%1' ).should eql( '123 Jones Street' )
+      end
+
+      it "should obey the %2 format correctly" do
+        @address.to_s( '%2' ).should eql( 'Suite 540' )
+      end
+
+      it "should obey the %3 format correctly" do
+        @address.to_s( '%3' ).should eql( '' )
+      end
+
+      it "should obey the %4 format correctly" do
+        @address.to_s( '%4' ).should eql( '' )
+      end
+
+      it "should obey the %5 format correctly" do
+        @address.to_s( '%5' ).should eql( '' )
+      end
+
+      it "should obey the %c format correctly" do
+        @address.to_s( '%c' ).should eql( 'Atlanta' )
+      end
+
+      it "should obey the %S format correctly" do
+        @address.to_s( '%S' ).should eql( 'GA' )
+      end
+
+      it "should obey the %z format correctly" do
+        @address.to_s( '%z' ).should eql( '33333-1111' )
+      end
+
+      it "should obey the %C format correctly" # do
+       #        @address.to_s( '%C' ).should eql( 'U.S.A.' )
+       #      end
+    end
   end
-  
+
   describe "when parsing an array of address elements" do
     before :each do
       @address_elements_without_country = ['123 Jones Street', 'Suite 540', 'Atlanta', 'GA', '33333-1111']
@@ -102,7 +268,7 @@ describe "AddressableRecord::Address" do
       before :each do
         @address = @klass.parse( @address_elements_without_country )
       end
-      
+
       it "should obey the :us format correctly" do
         @address.to_s( :us ).should eql( '123 Jones Street, Suite 540, Atlanta, GA 33333-1111' )
       end

data/spec/addressable_record_spec.rb

@@ -10,18 +10,18 @@ describe "AddressableRecord" do
       ActiveRecord::Base.respond_to?( :addresses ).should be_true
     end
   end
-  
+
   describe "having models descending from ActiveRecord" do
     before :each do
       @address_attributes = ADDRESS_ATTRIBUTES
       @user = User.new( :name => 'John Smith', :address => AddressableRecord::Address.new( @address_attributes ) )
       @user.save!
     end
-    
+
     it "should respond to address" do
       @user.respond_to?( :address ).should be_true
     end
-    
+
     it "should be an AddressableRecord::Address" do
       @user.address.is_a?( AddressableRecord::Address ).should be_true
     end
@@ -42,20 +42,34 @@ describe "AddressableRecord" do
       @user.address.state.should eql( 'GA' )
     end
 
-    it "should agree that the zip_code is 31234-7890" do
-      @user.address.zip_code.should eql( '31234-7890' )
+    it "should agree that the zip_code is 33333-1111" do
+      @user.address.zip_code.should eql( '33333-1111' )
     end
 
     it "should agree that the country is U.S.A." do
       @user.address.country.should eql( 'U.S.A.' )
     end
-    
+
+    # describe "when creating with a string of address elements" do
+    #   before :each do
+    #     attributes = ADDRESS_ATTRIBUTES
+    #     @address_attributes =
+    #       [attributes[:raw_street],attributes[:city],attributes[:state_or_province],attributes[:raw_zip_code],attributes[:country]]
+    #     @klass = AddressableRecord::Address
+    #     @instance = AddressableRecord::Address.new( @address_attributes.join( ', ' ) )
+    #   end
+    #
+    #   it "should create an address record" do
+    #     @instance.is_a?( @klass ).should be_true
+    #   end
+    # end
+
     describe "when creating with a Hash of address elements" do
       before :each do
         @user = User.new( :name => 'John Smith', :address => @address_attributes )
         @user.save!
       end
-      
+
       it "should respond to address" do
         @user.respond_to?( :address ).should be_true
       end
@@ -80,14 +94,14 @@ describe "AddressableRecord" do
         @user.address.state.should eql( 'GA' )
       end
 
-      it "should agree that the zip_code is 31234-7890" do
-        @user.address.zip_code.should eql( '31234-7890' )
+      it "should agree that the zip_code is 33333-1111" do
+        @user.address.zip_code.should eql( '33333-1111' )
       end
 
       it "should agree that the country is U.S.A." do
         @user.address.country.should eql( 'U.S.A.' )
       end
-      
+
       it "should handle a 5 digit zip code" do
         @user = User.new( :name => 'John Smith', :address => @address_attributes.merge( :raw_zip_code => '31234' ) )
         @user.save!
@@ -95,14 +109,14 @@ describe "AddressableRecord" do
       end
     end
   end
-  
+
   describe "when used through an association" do
     before :each do
       @address_attributes = ADDRESS_ATTRIBUTES
       @person = Person.new( :name => 'John Smith' )
       @person.save!
     end
-    
+
     describe "creating through the association" do
       before :each do
         @address = AddressableRecord::Address.new( @address_attributes )
@@ -134,12 +148,12 @@ describe "AddressableRecord" do
         @person.contact_addresses.first.address.state.should eql( 'GA' )
       end
 
-      it "should agree that the address zip code is 31234-7890" do
-        @address.zip_code.should eql( '31234-7890' )
+      it "should agree that the address zip code is 33333-1111" do
+        @address.zip_code.should eql( '33333-1111' )
       end
 
-      it "should agree that the associated zip code is 31234-7890" do
-        @person.contact_addresses.first.address.zip_code.should eql( '31234-7890' )
+      it "should agree that the associated zip code is 33333-1111" do
+        @person.contact_addresses.first.address.zip_code.should eql( '33333-1111' )
       end
 
       it "should agree that the address country is U.S.A." do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: addressable_record
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: geographer
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
@@ -35,9 +38,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 3
@@ -48,9 +53,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -101,23 +108,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Encapsulates the composed of pattern for addresses into any easy to use library.