StreetAddress 1.0.2 → 1.0.3

data/README.rdoc

@@ -26,9 +26,10 @@ Parse United States addresses.
   address.state_name # District of columbia
   address.street_type # Ave
   address.intersection? # false
-
+  address.to_s # "1600 Pennsylvania Ave, Washington, DC 20500"
+  address.to_s(:line1) # 1600 Pennsylvania Ave
   StreetAddress::US.parse("1600 Pennsylvania Ave") # nil not a full address
 
 === Gemfile:
 To use from your Gemfile:
-  gem 'StreetAddress', '1.0.2', :require => "street_address
+  gem 'StreetAddress', '1.0.2', :require => "street_address"

data/lib/street_address.rb

@@ -64,7 +64,7 @@
 
 module StreetAddress
   class US
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
     DIRECTIONAL = {
       "north" => "N",
       "northeast" => "NE",
@@ -809,37 +809,47 @@ module StreetAddress
         !street2.nil?
       end
 
-      def to_s
+      def line1(s = "")
+        s += number
+        s += " " + prefix unless prefix.nil?
+        s += " " + street unless street.nil?
+        s += " " + street_type unless street_type.nil?
+        if( !unit_prefix.nil? && !unit.nil? )
+          s += " " + unit_prefix 
+          s += " " + unit
+        elsif( unit_prefix.nil? && !unit.nil? )
+          s += " #" + unit
+        end
+        s += " " + suffix unless suffix.nil?
+        return s
+      end
+
+      def to_s(format = :default)
         s = ""
-        if intersection?
-          s += prefix + " " unless prefix.nil?
-          s += street 
-          s += " " + street_type unless street_type.nil?
-          s += " " + suffix unless suffix.nil?
-          s += " and"
-          s += " " + prefix2 unless prefix2.nil?
-          s += " " + street2
-          s += " " + street_type2 unless street_type2.nil?
-          s += " " + suffix2 unless suffix2.nil?
-          s += ", " + city unless city.nil?
-          s += ", " + state unless state.nil?
-          s += " " + postal_code unless postal_code.nil?
+        case format
+        when :line1
+          s += line1(s)
         else
-          s += number
-          s += " " + prefix unless prefix.nil?
-          s += " " + street unless street.nil?
-          s += " " + street_type unless street_type.nil?
-          if( !unit_prefix.nil? && !unit.nil? )
-            s += " " + unit_prefix 
-            s += " " + unit
-          elsif( unit_prefix.nil? && !unit.nil? )
-            s += " #" + unit
+          if intersection?
+            s += prefix + " " unless prefix.nil?
+            s += street 
+            s += " " + street_type unless street_type.nil?
+            s += " " + suffix unless suffix.nil?
+            s += " and"
+            s += " " + prefix2 unless prefix2.nil?
+            s += " " + street2
+            s += " " + street_type2 unless street_type2.nil?
+            s += " " + suffix2 unless suffix2.nil?
+            s += ", " + city unless city.nil?
+            s += ", " + state unless state.nil?
+            s += " " + postal_code unless postal_code.nil?
+          else
+            s += line1(s)
+            s += ", " + city unless city.nil?
+            s += ", " + state unless state.nil?
+            s += " " + postal_code unless postal_code.nil?
+            s += "-" + postal_code_ext unless postal_code_ext.nil?
           end
-          s += " " + suffix unless suffix.nil?
-          s += ", " + city unless city.nil?
-          s += ", " + state unless state.nil?
-          s += " " + postal_code unless postal_code.nil?
-          s += "-" + postal_code_ext unless postal_code_ext.nil?
         end
         return s
       end  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: StreetAddress
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Derrek Long
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 -07:00
+date: 2011-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []