us_street 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c13a0e9d18bb2aaf9fc6311cae3322b3d3be582
-  data.tar.gz: ffaeffddf9d4237f730479c754b0374e83d23f6c
+  metadata.gz: 7c0f7b5ead83b5bec497036178f541dec7f9b23f
+  data.tar.gz: d6545e0c76c6f755d9d67d66952043ebfd2e4eb2
 SHA512:
-  metadata.gz: d91e8b113fb8e9acb1eb3598492c8d1a713dbf2ec2100264b527ddafa5e96f1879d5d710725fcc0f4bca0b4383e692b1b94ef6491c8c7ecfff8f0d61b7ccc28d
-  data.tar.gz: 6871c87474a63ab99591d9fbc04aa2cbfa058faf7cdc44431f5fabc049b13ee7a29d5a6a1413dcd148edde40e41ecf9809516b74fd6b15ae7214b433e13a6bb3
+  metadata.gz: 1ab0900411dcbd2e5baf10b7bea2c6cc65989236ef9864d4991fbbe3c250377e273edd82bad80c07b31b63417eb4a50b4eef9b6596141af1f276ff3ac91c7f2d
+  data.tar.gz: 589785122c7482f6f3f06516b326ee3e52bdd9c042e57b81c28dd289bccc2808afb0cdee289811c66aef2dd4f040604860454736e734f54ece930a86b2b2fcf9

data/lib/us_street/version.rb

@@ -1,3 +1,3 @@
 class UsStreet
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 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(/.#\d+$/, '').gsub(/\s+/, ' ').strip.downcase.presence
   end
 
   def self.clean_hash(hash)
@@ -125,8 +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)
     out = {
-      unit: overrides[:unit].presence || unit_number,
+      unit: overrides_unit || unit_number,
       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

@@ -188,6 +188,11 @@ describe UsStreet do
       expect(us_street.unit).to eq('12')
     end
 
+    it 'handles units containing #' do
+      us_street = UsStreet.parse('123 Fake st', "unit" => "#12")
+      expect(us_street.unit).to eq('12')
+    end
+
     it 'handles country roads' do
       street1 = UsStreet.parse('1455 Indian Rte 9500')
       street2 = UsStreet.parse('1455 Country Road 2085')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_street
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,11 +90,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Normalizes Us Streets
 test_files:
 - spec/spec_helper.rb
 - spec/us_street_spec.rb
-has_rdoc: