us_street 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 007d55a2a54e1d6e42573edb3f5dfab5515ff1b0
-  data.tar.gz: fb7aae9671e5168511a4de1708f6f6bb0068e3fc
+  metadata.gz: 8c13a0e9d18bb2aaf9fc6311cae3322b3d3be582
+  data.tar.gz: ffaeffddf9d4237f730479c754b0374e83d23f6c
 SHA512:
-  metadata.gz: a27b13fc431432e3fabb57a88e160f7340d53c00361cf60bb67c80d3a5d49e0ba8f2ff3cbf930f0a2f89b2d0b3657bbef5e5befa705585b941ed0efaa7366594
-  data.tar.gz: 1ec41605f2e513dfce2d05158b141bda74baef754051e13fba1baaf6498397df5a75afc938e6c31f1f70d0994761f90e9ab24d0e7c7cc6c41de71846a7a50ec1
+  metadata.gz: d91e8b113fb8e9acb1eb3598492c8d1a713dbf2ec2100264b527ddafa5e96f1879d5d710725fcc0f4bca0b4383e692b1b94ef6491c8c7ecfff8f0d61b7ccc28d
+  data.tar.gz: 6871c87474a63ab99591d9fbc04aa2cbfa058faf7cdc44431f5fabc049b13ee7a29d5a6a1413dcd148edde40e41ecf9809516b74fd6b15ae7214b433e13a6bb3

data/lib/us_street/version.rb

@@ -1,3 +1,3 @@
 class UsStreet
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/us_street.rb

@@ -82,8 +82,6 @@ class UsStreet
     sidx, eidx = 0, parts.length - 1
     unit_number = dir_suffix = dir_prefix = street_suffix = street_number = road_number = nil
 
-    # start at the end and chomp
-
     # We could have a unit number last. Format '#\d+' but it's removed by the cleaners so match the original
     if match = original_full_street.match(/#(\d+)$/)
       unit_number = match[1]
@@ -95,24 +93,31 @@ class UsStreet
       eidx -= 1
     end
 
-    # We may have a directional suffix, and or a street suffix
-    eidx -= 1 if dir_suffix    = direction_mapping(parts[eidx])
-    eidx -= 1 if street_suffix = road_mapping(parts[eidx])
-
-    # if our current spread is 0 then someone may have put in 12 st for 12th Street. We want to end it here if that's true.
-    if eidx - sidx > 0
-      # lets look at the start of the string
-
-      # is there a street number?
-      if parts[sidx] =~ /^\d+$/
-        street_number = parts[sidx]
-        sidx += 1
+    # strip suffixes starting at the end and working backwards
+    # Check for a postdirectional (directional suffix)
+    eidx -= 1 if eidx - sidx > 0 and dir_suffix    = direction_mapping(parts[eidx])
+
+    # Check for a street suffix. If there's already a street suffix override,
+    # don't strip from string unless it's the same suffix.
+    # Otherwise "Forest Trail Rd" gets stripped to "Forest Trl"
+    if eidx - sidx > 0 and street_suffix_maybe = road_mapping(parts[eidx])
+      if overrides[:street_suffix].blank? or street_suffix_maybe == road_mapping(overrides[:street_suffix])
+        street_suffix = street_suffix_maybe
+        eidx -= 1
       end
+    end
+
+    # remove components from the beginning
 
-      # is there a directional prefix?
-      sidx += 1 if dir_prefix = direction_mapping(parts[sidx])
+    # is there a street number at beginning
+    if eidx - sidx > 0 and parts[sidx] =~ /^\d+$/
+      street_number = parts[sidx]
+      sidx += 1
     end
 
+    # is there a predirectional?
+    sidx += 1 if eidx - sidx > 0 and dir_prefix    = direction_mapping(parts[sidx])
+
     # fix weirdo street names and make them consistent
     parts[sidx] = "St" if parts[sidx] =~ /^((st\.?)|(saint))$/i  # catch "Saint John Street"
     parts[sidx] = "Dr" if parts[sidx] =~ /^((dr\.?)|(doctor))$/i  # catch "Dr. Oz Road"

data/spec/us_street_spec.rb

@@ -84,6 +84,12 @@ describe UsStreet do
         us_street = UsStreet.from_attrs("  123", 'S', "North 12th St WEST", 'Street', 'E')
         expect(us_street.full_street).to eq('123 S 12th St E')
       end
+
+      # yes this is a real address: 2644 E North Ln, Phoenix, AZ 85028
+      it "doesn't strip North if it's the full street name" do
+        us_street = UsStreet.from_attrs("2644", "E", "North", "Ln", nil)
+        expect(us_street.full_street).to eq("2644 E North Ln")
+      end
     end
   end
 
@@ -125,6 +131,11 @@ describe UsStreet do
       expect(us_street.full_street).to eq("123 N Main Southy")
     end
 
+    it "doesn't strip directions in street name" do
+      us_street = UsStreet.parse("2644 E North Ln")
+      expect(us_street.full_street).to eq("2644 E North Ln")
+    end
+
     it "strips off spaces" do
       us_street = UsStreet.parse("  123 N    main   southy  ")
       expect(us_street.full_street).to eq("123 N Main Southy")
@@ -145,7 +156,8 @@ describe UsStreet do
     it 'prefers an explicit street_suffix' do
       us_street = UsStreet.parse("123 main southy road", street_suffix: "st")
       expect(us_street.street_suffix).to eq('St')
-      expect(us_street.full_street).to eq("123 Main Southy St")
+      # we can't strip Road here, it may be part of the street name in fact.
+      expect(us_street.full_street).to eq("123 Main Southy Road St")
     end
 
     it 'handles unit numbers' do
@@ -204,5 +216,13 @@ describe UsStreet do
       expect(street.street_suffix).to eq('Rd')
       expect(street.unit).to eq('12')
     end
+
+    it 'doesnt strip street when overrides are present' do
+      street = UsStreet.parse("PALM BEACH", {:street_number=>"20127", :dir_prefix=>"E", :street_suffix=>"Drive"})
+      expect(street.full_street).to eq('20127 E Palm Beach Dr')
+      expect(street.street_number).to eq('20127')
+      expect(street.street_name).to eq('Palm Beach')
+      expect(street.street_suffix).to eq('Dr')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_street
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport