street_address_ext 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a436fd9967293932e15659933402cacad4ead1ac
-  data.tar.gz: ef3434dc8d12de03c8296c0caa4560e61d7bab6f
+  metadata.gz: cc4d050df1823a1859fb52420939daae07c67ed0
+  data.tar.gz: 60cd0b2706173442c69934d513a0dbceaa4f7d70
 SHA512:
-  metadata.gz: 21917d5bf0fd9335bb03ec821073680eed44eb6d34e9382b72521802e612a0b6250aea1610e5389036333d3ac72e075e2f4790cabfbbf484827728461789044c
-  data.tar.gz: 2a295c0e7eceabdae18bfdd727e31cc362f082be02e04ba86d1a27bcbd8d93a07982abea01aacbe3a181a75be4f5df2e87b639a7f98b3979aca13a0efebbb3e7
+  metadata.gz: 050bc03d773a8c267a345fba92a7ed18a3a5da966fe045651456d5f51851394a5c44d37ef49f2df3845b5836a059b58fe5f98662a4396395926680180ce3a455
+  data.tar.gz: 622f1a9cdfba206d5fe04500f4991f455f58f1af8cd66532934045d11f03b27bfca31db9410d634bb224fe55d2209c962f46fa2cce0f1e932c7e427048253c28

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "2.0.0"
+  - "2.1.0"
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+0.0.3 (2014-02-24)
+------------------
+
+Bugs
+====
+
+- Removed Suffix Street modification
+- Address.street no longer contains suffix
+
+Features
+========
+
+- to_s places suffix after street
+
+
 0.0.2 (2014-02-02)
 ------------------
 

data/README.md

@@ -1,14 +1,15 @@
 # StreetAddressExt
 
-``StreetAddresExt`` is a thin wrapper around the [street-address](https://github.com/derrek/street-address) gem
+[![Build Status](https://travis-ci.org/zhon/street_address_ext.png)](https://travis-ci.org/zhon/street_address_ext)
 
-In fact, parse returns a modified ``StreetAddress::US::Address``
+``StreetAddresExt`` is a thin wrapper around the [street-address](https://github.com/derrek/street-address) gem
 
-with
+In fact, ``parse`` returns a modified ``StreetAddress::US::Address``
 
  - state and postal codes removed
  - street and city capitalized
- - suffix in correct position see [this issue](https://github.com/derrek/street-address/issues/9)
+ - suffix in correct position (see this [issue](https://github.com/derrek/street-address/issues/9))
+ - removes periods from prefix
 
 
 
@@ -23,13 +24,13 @@ gem 'street_address_ext'
 And then execute:
 
 ```bash
-$ bundle
+bundle
 ```
 
 Or install it yourself as:
 
 ```bash
-$ gem install street_address_ext
+gem install street_address_ext
 ```
 
 

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*test.rb']
+  t.verbose = true
+end
+
+task :default => [:test]

data/lib/street_address_ext/version.rb

@@ -1,3 +1,3 @@
 module StreetAddressFilter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/street_address_ext.rb

@@ -2,6 +2,42 @@ require "street_address_ext/version"
 
 require 'street_address'
 
+module StreetAddress
+  class US
+    class Address
+
+      def line1(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?
+        else
+          s += number
+          s += " " + prefix unless prefix.nil?
+          s += " " + street unless street.nil?
+          s += " " + street_type unless street_type.nil?
+          s += " " + suffix unless suffix.nil?
+          if( !unit_prefix.nil? && !unit.nil? )
+            s += " " + unit_prefix
+            s += " " + unit
+          elsif( unit_prefix.nil? && !unit.nil? )
+            s += " #" + unit
+          end
+        end
+
+        return s
+      end
+
+    end
+  end
+end
+
 module StreetAddressExt
   extend self
 
@@ -17,7 +53,6 @@ module StreetAddressExt
   def normalize address
     return nil unless address
     address = address.dup
-    move_suffix_after_street address
     capitialize 'street', address
     capitialize 'city', address
     remove_period 'prefix', address
@@ -40,11 +75,4 @@ module StreetAddressExt
     end
   end
 
-  def move_suffix_after_street address
-    if address.suffix
-      address.street += " #{address.suffix}"
-      address.suffix = nil
-    end
-  end
-
 end

data/street_address_ext.gemspec

@@ -20,39 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'StreetAddress', '~> 1.0'
 
-    #celluloid (0.15.2)
-      #timers (~> 1.1.0)
-    #coderay (1.1.0)
-    #ffi (1.9.3)
-    #formatador (0.2.4)
-    #guard (2.2.5)
-      #formatador (>= 0.2.4)
-      #listen (~> 2.1)
-      #lumberjack (~> 1.0)
-      #pry (>= 0.9.12)
-      #thor (>= 0.18.1)
-    #guard-minitest (2.1.3)
-      #guard (~> 2.0)
-      #minitest (>= 3.0)
-    #listen (2.4.0)
-      #celluloid (>= 0.15.2)
-      #rb-fsevent (>= 0.9.3)
-      #rb-inotify (>= 0.9)
-    #lumberjack (1.0.4)
-    #method_source (0.8.2)
-    #minitest (5.2.0)
-    #pry (0.9.12.4)
-      #coderay (~> 1.0)
-      #method_source (~> 0.8)
-      #slop (~> 3.4)
-    #rake (10.1.1)
-    #rb-fsevent (0.9.4)
-    #rb-inotify (0.9.3)
-      #ffi (>= 0.5.0)
-    #slop (3.4.7)
-    #thor (0.18.1)
-    #timers (1.1.0)
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rr", "~> 1.1"

data/test/street_address_ext_test.rb

@@ -49,6 +49,20 @@ describe StreetAddressExt do
 
   end
 
+  describe 'StreetAddress::US::Address' do
+
+    describe 'to_s' do
+
+      it 'places suffix before unit' do
+        text = '75 E 80 N Suite 202, American Fork'
+        addr = parse(text)
+        addr.to_s.must_equal text
+      end
+
+    end
+
+  end
+
   describe 'normalize' do
 
     before do
@@ -92,7 +106,6 @@ describe StreetAddressExt do
     end
 
 
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: street_address_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - zhon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: StreetAddress
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile