us_street 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c0f7b5ead83b5bec497036178f541dec7f9b23f
-  data.tar.gz: d6545e0c76c6f755d9d67d66952043ebfd2e4eb2
+  metadata.gz: 2ef48a37d102c911b24152c2f77485b964c6e874
+  data.tar.gz: 5cfa71014710d2f69cb9f39e737e45e88011bd18
 SHA512:
-  metadata.gz: 1ab0900411dcbd2e5baf10b7bea2c6cc65989236ef9864d4991fbbe3c250377e273edd82bad80c07b31b63417eb4a50b4eef9b6596141af1f276ff3ac91c7f2d
-  data.tar.gz: 589785122c7482f6f3f06516b326ee3e52bdd9c042e57b81c28dd289bccc2808afb0cdee289811c66aef2dd4f040604860454736e734f54ece930a86b2b2fcf9
+  metadata.gz: a6afeaec5a91f008c6789921b488f35204db9177dadeb8e42c6e3718ce14572f30c57303bdb3f76487e8f1a337372af58fe8ad0679e45937150eee1f2d991854
+  data.tar.gz: 5b3d4e54f5c146fba3d7cbe99eb67c74fe2f0b72bc53f4f97635b1198276cdddd62db6410f3db14fca86ed13e56cd4058dc3827123e25e104d55a1c6a5d289a6

data/README.md

@@ -1,6 +1,6 @@
 # UsStreet
 
-Parses and normalizes the street part of an address for US streets into it's parts.
+Parses and normalizes the street part of an address for US streets into its parts.
 
 
 ## Installation

data/lib/us_street/version.rb

@@ -1,3 +1,3 @@
 class UsStreet
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/us_street.rb

@@ -36,7 +36,7 @@ class UsStreet
   def self.components; COMPONENTS; end
 
   def self.clean(str)
-    str.to_s.gsub(/([\.,:;]|\(.*?\))/, '').gsub(/.#\d+$/, '').gsub(/\s+/, ' ').strip.downcase.presence
+    str.to_s.gsub(/([\.,:;]|\(.*?\))/, '').gsub(/.#[a-zA-Z0-9]+$/, '').gsub(/\s+/, ' ').strip.downcase.presence
   end
 
   def self.clean_hash(hash)
@@ -82,8 +82,8 @@ class UsStreet
     sidx, eidx = 0, parts.length - 1
     unit_number = dir_suffix = dir_prefix = street_suffix = street_number = road_number = nil
 
-    # 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+)$/)
+    # We could have a unit number last. Format '#[a-zA-Z0-9]+' but it's removed by the cleaners so match the original
+    if match = original_full_street.match(/#([a-zA-Z0-9]+)$/)
       unit_number = match[1]
     end
 
@@ -125,9 +125,9 @@ class UsStreet
     # Time to build up the output, prefer what was passed in
     # Note: We needed to decompose the street because the street may have had the components put into it
     # by some unsavoury operators :'(
-    overrides_unit = overrides[:unit].to_s.try(:match, /(\d+)/).try(:captures).try(:first)
+    overrides_unit = overrides[:unit].to_s.try(:match, /([a-zA-Z0-9]+)/).try(:captures).try(:first)
     out = {
-      unit: overrides_unit || unit_number,
+      unit: (overrides_unit || unit_number).try(:upcase),
       dir_prefix: direction_mapping(overrides[:dir_prefix]).presence || dir_prefix,
       street_name: overrides[:street_name].presence || parts[sidx..eidx].join(' '),
       street_suffix: road_mapping(overrides[:street_suffix]).presence || street_suffix,

data/spec/us_street_spec.rb

@@ -167,6 +167,20 @@ describe UsStreet do
       expect(us_street.display).to eq('123 123rd St #15')
     end
 
+    it 'handles alpha unit numbers' do
+      us_street = UsStreet.parse('123 123rd st #C')
+      expect(us_street.unit).to eq('C')
+      expect(us_street.full_street).to eq('123 123rd St')
+      expect(us_street.display).to eq('123 123rd St #C')
+    end
+
+    it 'handles alpha unit numbers' do
+      us_street = UsStreet.parse('123 123rd st', unit: 'C')
+      expect(us_street.unit).to eq('C')
+      expect(us_street.full_street).to eq('123 123rd St')
+      expect(us_street.display).to eq('123 123rd St #C')
+    end
+
     it 'handles 123rd st without ordinals or street number' do
       us_street = UsStreet.parse('123 st')
       expect(us_street.street_number).to eq(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_street
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport