address_tokens 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 338481474df19c95270ab38dfd42eb10d1ecb4876535f85699502f456ee095b5
-  data.tar.gz: a10bde1104104a40b903753d9ba43c1582ad02bb9921ce2317213b5a7853539b
+  metadata.gz: 27d5779cab9c82cec1bab958968a296aeb8ff2961333cb3fc6563f5375faec9c
+  data.tar.gz: 87ae2f37a3b28c2b1d218fc52ce84b8669d0c00394645c4324c1708dc7ca41b5
 SHA512:
-  metadata.gz: 944a77b2f05ae96f67907a621979f8ecaced9a4d72362cad3f1a8ec7b972e59585c7b76edb361aaf2728561b973cb2b03fca8c2e1fae19677b3aaf9971c2fbb9
-  data.tar.gz: 0f9ae18a90d8925fda0d1203e50cbaab276037b2f65f2664e83e6587d60a2f620c667df597b352e0295d25089045b9cab2960d573d28f3520cd94746b56e247a
+  metadata.gz: daa657990faf5138c8b266a26656959b9a7dd5e9e736901c6838521bac2afe9b04ea8085bf5983f9374953740524ffd512d01407be29f17418e20fb2ff8badd0
+  data.tar.gz: dfb7bafe985852db0236321cb97e3075ec6f22b1068c974c5633dbf632a92be6336fffe01ce5a91890d57435ede43fbf577d444d685ceb2d12d75a0cd19debc6

data/lib/address_tokens/version.rb

@@ -1,3 +1,3 @@
 module AddressTokens
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/matcher.rb

@@ -5,10 +5,10 @@ module AddressTokens
     end
 
     def match(str)
-      state_info   = find_state(str)
+      zip_info     = find_zip(str)
+      state_info   = find_state(str, zip_info)
       city_info    = find_city(str, state_info)
-      address_info = find_address(str, city_info)
-      zip_info     = find_zip(str, address_info)
+      address_info = remove_zip(find_address(str, city_info), zip_info)
 
       {
         state_abbr:     state_info[:state],
@@ -25,7 +25,15 @@ module AddressTokens
 
     private
 
-    def find_state(str)
+    def remove_end_zip_for_state(str, zip_info)
+      return str if !@finder.zip_format[:format].to_s.include?(@finder.state_separator) 
+      return str if !zip_info
+      return str if !zip_info[:zip_on_end]
+      str.strip.sub(Regexp.new("#{zip_info[:zip_string]}\\z"), '')
+    end
+
+    def find_state(str, zip_info)
+      str       = remove_end_zip_for_state(str, zip_info)
       last_char = str.rindex(@finder.state_separator)
       token     = str[last_char .. -1]
       token     = token.gsub(/\s{2,}/, ' ')
@@ -90,13 +98,18 @@ module AddressTokens
       { address: str.split(city_info[:city_string])[0].strip }
     end
 
-    def find_zip(str, address_info)
+    def find_zip(str)
       matches = str.match @finder.zip_format[:format]
       joiner  = @finder.zip_format[:join] || [ nil ]
       zip     = matches ? matches[1..-1].zip(joiner).flatten.join : nil
       zip_str = matches ? matches[0] : nil
-      address_info[:address] = address_info[:address].sub(zip_str, '').strip if zip_str && address_info
-      { zip: zip, zip_string: zip_str }
+      { zip: zip, zip_string: zip_str, zip_on_end: zip_str && Regexp.new("#{zip_str}\\z").match?(str) }
+    end
+
+    def remove_zip(address_info, zip_info)
+      return address_info if !address_info || !zip_info || !zip_info[:zip_string]
+      address_info[:address] = address_info[:address].sub(zip_info[:zip_string], '').strip
+      address_info
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: address_tokens
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Eustaquio Rangel
@@ -31,7 +31,7 @@ cert_chain:
   G+/hO8DFcpmRPCD/YXu/rFkKHquizBGSfr1BR/es/HhfrIoT3BUN2uDUT02aaWmB
   JMg=
   -----END CERTIFICATE-----
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler