addressable_record 1.0.4 → 1.1.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.0 2010-07-01
+
+* Tweak address formatting to use standard abbreviations and comma placement
+
+
 == 1.0.4 2010-03-29
 
 Removed some puts statements that should not have been left in the code.

data/README.rdoc

@@ -34,7 +34,7 @@ Encapsulates the composed of pattern for addresses into any easy to use library.
 
 Add to environment file:
 
-  config.gem "addressable_record", :version => '1.0.0', :source => 'http://gemcutter.org'
+  config.gem "addressable_record", :version => '~>1.0.0', :source => 'http://gemcutter.org'
 
 Run:
 
@@ -77,7 +77,7 @@ Call the macro in an ActiveRecord descendant:
 Set the field equal to something:
 
   @user.home_address = AddressableRecord::Address.new( :raw_street => '123 Jones Street###Suite 540', :city => 'Atlanta',
-                         :state_or_province => 'GA', :raw_zip_code => '333331111', :country => 'United States' )
+                         :state_or_province => 'GA', :raw_zip_code => '333331111', :country => 'U.S.A.' )
 
 or (with identical results):
 
@@ -89,7 +89,7 @@ Reference the raw database fields:
   @user.home_address_city                                   # => Atlanta
   @user.home_address_state_or_province                      # => GA
   @user.home_address_raw_zip_code                           # => 333331111
-  @user.home_address_country                                # => United States
+  @user.home_address_country                                # => U.S.A.
 
 Reference the sub parts of the field:
 
@@ -102,7 +102,7 @@ Reference the sub parts of the field:
   @user.home_address.state                                  # => GA
   @user.home_address.province                               # => GA
   @user.home_address.zip_code                               # => 33333-1111
-  @user.home_address.country                                # => United States
+  @user.home_address.country                                # => U.S.A.
 
 Use formats to control the output:
 
@@ -110,13 +110,13 @@ Use formats to control the output:
   @user.home_address.to_s( '%c' )                           # => Atlanta
   @user.home_address.to_s( '%S' )                           # => GA
   @user.home_address.to_s( '%z' )                           # => 33333-1111
-  @user.home_address.to_s( '%C' )                           # => United States
+  @user.home_address.to_s( '%C' )                           # => U.S.A.
   @user.home_address.to_s( '%c %S' )                        # => Atlanta GA
 
 Use pre-defined named formats to control the output:
 
-  @user.home_address.to_s( :us_long )                       # => 123 Jones Street, Suite 540, Atlanta GA, 33333-1111, United States
-  @user.home_address.to_s( :us )                            # => 123 Jones Street, Suite 540, Atlanta GA, 33333-1111
+  @user.home_address.to_s( :us_long )                       # => 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A.
+  @user.home_address.to_s( :us )                            # => 123 Jones Street, Suite 540, Atlanta, GA 33333-1111
 
 
 == Note on Patches/Pull Requests

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/addressable_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{addressable_record}
-  s.version = "1.0.4"
+  s.version = "1.1.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-03-29}
+  s.date = %q{2010-07-01}
   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.5}
+  s.rubygems_version = %q{1.3.6}
   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",

data/lib/addressable_record/address.rb

@@ -7,8 +7,8 @@ module AddressableRecord
     @@street_delimiter ||= '###'
     @@zip_code_delimiter ||= '-'
     @@patterns ||= {
-            :us_long => "%s, %c %S, %z, %C",
-            :us => "%s, %c %S, %z"
+            :us_long => "%s, %c, %S %z %C",
+            :us => "%s, %c, %S %z"
     }
 
     def initialize( attrs )
@@ -123,7 +123,7 @@ module AddressableRecord
         raise 'Cannot parse address array.  No zip code found.' 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] : 'United States'
+        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] }

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 => 'United States' }
+  :raw_zip_code => '312347890', :country => 'U.S.A.' }

data/spec/addressable_record/address_parsing_shared_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path( File.dirname(__FILE__) + '/../spec_helper' )
 
-shared_examples_for "The address 123 Jones Street, Suite 540, Atlanta, GA, 33333-1111, United States" do
+shared_examples_for "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A." do
   it "should be an AddressableRecord::Address" do
     @address.is_a?( AddressableRecord::Address ).should be_true
   end
@@ -25,8 +25,8 @@ shared_examples_for "The address 123 Jones Street, Suite 540, Atlanta, GA, 33333
     @address.zip_code.should eql( '33333-1111' )
   end
 
-  it "should agree that the country is United States" do
-    @address.country.should eql( 'United States' )
+  it "should agree that the country is U.S.A." do
+    @address.country.should eql( 'U.S.A.' )
   end
   
   it "should join the address correctly given a string delimiter argument" do
@@ -42,10 +42,10 @@ shared_examples_for "The address 123 Jones Street, Suite 540, Atlanta, GA, 33333
   end
   
   it "should join the address correctly given a delimiter and country option" do
-    @address.join( :delimiter => '<br/>', :country => true ).should eql( '123 Jones Street<br/>Suite 540<br/>Atlanta, GA 33333-1111<br/>United States' )
+    @address.join( :delimiter => '<br/>', :country => true ).should eql( '123 Jones Street<br/>Suite 540<br/>Atlanta, GA 33333-1111<br/>U.S.A.' )
   end
   
   it "should join the address correctly given a delimiter and street_delimiter option" do
-    @address.join( :delimiter => '<br/>', :street_delimiter => '###', :country => true ).should eql( '123 Jones Street###Suite 540<br/>Atlanta, GA 33333-1111<br/>United States' )
+    @address.join( :delimiter => '<br/>', :street_delimiter => '###', :country => true ).should eql( '123 Jones Street###Suite 540<br/>Atlanta, GA 33333-1111<br/>U.S.A.' )
   end
 end

data/spec/addressable_record/address_spec.rb

@@ -75,10 +75,10 @@ describe "AddressableRecord::Address" do
 
     describe "with a country" do
       before :each do
-        @address = @klass.parse( @address_elements_without_country + ['United States'] )
+        @address = @klass.parse( @address_elements_without_country + ['U.S.A.'] )
       end
 
-      it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA, 33333-1111, United States"
+      it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA 33333-1111 U.S.A."
     end
 
     describe "without a country" do
@@ -86,7 +86,7 @@ describe "AddressableRecord::Address" do
         @address = @klass.parse( @address_elements_without_country )
       end
 
-      it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA, 33333-1111, United States"
+      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
@@ -95,7 +95,7 @@ describe "AddressableRecord::Address" do
         @address = @klass.parse( @address_elements_without_country )
       end
 
-      it_should_behave_like "The address 123 Jones Street, Suite 540, Atlanta, GA, 33333-1111, United States"
+      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
@@ -104,11 +104,11 @@ describe "AddressableRecord::Address" do
       end
       
       it "should obey the :us format correctly" do
-        @address.to_s( :us ).should eql( '123 Jones Street, Suite 540, Atlanta GA, 33333-1111' )
+        @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, United States' )
+        @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
@@ -148,7 +148,7 @@ describe "AddressableRecord::Address" do
       end
 
       it "should obey the %C format correctly" do
-        @address.to_s( '%C' ).should eql( 'United States' )
+        @address.to_s( '%C' ).should eql( 'U.S.A.' )
       end
     end
   end

data/spec/addressable_record_spec.rb

@@ -46,8 +46,8 @@ describe "AddressableRecord" do
       @user.address.zip_code.should eql( '31234-7890' )
     end
 
-    it "should agree that the country is United States" do
-      @user.address.country.should eql( 'United States' )
+    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 Hash of address elements" do
@@ -84,8 +84,8 @@ describe "AddressableRecord" do
         @user.address.zip_code.should eql( '31234-7890' )
       end
 
-      it "should agree that the country is United States" do
-        @user.address.country.should eql( 'United States' )
+      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
@@ -142,12 +142,12 @@ describe "AddressableRecord" do
         @person.contact_addresses.first.address.zip_code.should eql( '31234-7890' )
       end
 
-      it "should agree that the address country is United States" do
-        @address.country.should eql( 'United States' )
+      it "should agree that the address country is U.S.A." do
+        @address.country.should eql( 'U.S.A.' )
       end
 
-      it "should agree that the associated country is United States" do
-        @person.contact_addresses.first.address.country.should eql( 'United States' )
+      it "should agree that the associated country is U.S.A." do
+        @person.contact_addresses.first.address.country.should eql( 'U.S.A.' )
       end
     end
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: addressable_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -9,39 +14,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -05:00
+date: 2010-07-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: geographer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Encapsulates the composed of pattern for addresses into any easy to use library.  Provides convenience methods for formatting, parsing, etc.
 email: jason@lookforwardenterprises.com
 executables: []
@@ -88,18 +104,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Encapsulates the composed of pattern for addresses into any easy to use library.