address_tokens 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b1a28d3ec30e0a50d99a5cfbf1e65de5b874d6c6
-  data.tar.gz: 67ecb3340d2937bdf78858184d70c44c07f197db
+SHA256:
+  metadata.gz: 338481474df19c95270ab38dfd42eb10d1ecb4876535f85699502f456ee095b5
+  data.tar.gz: a10bde1104104a40b903753d9ba43c1582ad02bb9921ce2317213b5a7853539b
 SHA512:
-  metadata.gz: 6b60f7868b2711235d549da32dfa4db8897fb8e930987d7e3cbda3aad3444742866b739a7eb3d4211acb1754dd36141eb054404f9cbe2ce6fe606818fa6c870b
-  data.tar.gz: 3de92ebec50deedc93ca9aa0575ee829da7315db761a1ae6ebf9c946a9a48207a76f6d8ff785fda97a9f0c0435cf83f7cca0d5181df165f93523bae8ce724ceb
+  metadata.gz: 944a77b2f05ae96f67907a621979f8ecaced9a4d72362cad3f1a8ec7b972e59585c7b76edb361aaf2728561b973cb2b03fca8c2e1fae19677b3aaf9971c2fbb9
+  data.tar.gz: 0f9ae18a90d8925fda0d1203e50cbaab276037b2f65f2664e83e6587d60a2f620c667df597b352e0295d25089045b9cab2960d573d28f3520cd94746b56e247a

data/README.md

@@ -69,7 +69,6 @@ Load the cities and states:
 ```ruby
 finder.load(:states, '/tmp/states.yml')
 finder.load(:cities, '/tmp/cities.yml')
-finder.find
 ```
 
 And ask to find:
@@ -81,7 +80,6 @@ matches = finder.find
 We'll get something like this:
 
 ```ruby
-p matches
 {
    :state_abbr     => "CA", 
    :state_name     => "California", 
@@ -89,11 +87,14 @@ p matches
    :city_name      => "San Francisco",
    :city_string    => "San Francisco",
    :city_start_at  => 23, 
-   :address        => "88 Colin P Kelly Jr St"
+   :address        => "88 Colin P Kelly Jr St",
+   :zipcode        => "94107",
+   :zipcode_string => "94107"
 }
 ```
-The `start_at` values shows where the strings were found. The `city_string` is 
-the way the city name was found.
+
+The `start_at` values shows where the strings were found. The `*_string` methods
+shows the way the strings were originally found.
 
 We can use the `find` method with an already instance of the `Finder` object
 sending a string to it:
@@ -106,17 +107,17 @@ finder.find('my other string New York, Ny')
 
 As we saw, the default city and states separator on USA is a comma (','), but on
 Brasil is a hyphen ('-'), so, **before asking to find the address**, we must
-change it:
+change it. The zipcode format is also different:
 
 ```ruby
 finder.state_separator = '-'
+finder.zip_format  = AddressTokens::Zip::BR
 ```
 
 Using a Brazilian address:
 
 ```ruby
-finder = AddressTokens::Finder.new('Rua Tratado de Tordesihas, 88, Pq. Estoril,
-S. J. do Rio Preto - SP')
+finder = AddressTokens::Finder.new('Rua Tratado de Tordesihas, 88, Pq. Estoril, 15085-110 S. J. do Rio Preto - SP')
 finder.state_separator = '-'
 finder.load(:states, '/tmp/states.yml')
 finder.load(:cities, '/tmp/cities.yml')
@@ -133,7 +134,9 @@ will return:
    :city_name        => "São José do Rio Preto", 
    :city_string      => "S. J. do Rio Preto", 
    :city_start_at    => 44, 
-   :address          => "Rua Tratado de Tordesihas, 88, Pq. Estoril,"
+   :address          => "Rua Tratado de Tordesihas, 88, Pq. Estoril,",
+   :zipcode        => "15085-110",
+   :zipcode_string => "15085-110"
 }
 ```
 

data/lib/address_tokens/version.rb

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

data/lib/finder.rb

@@ -3,13 +3,14 @@ require 'i18n'
 
 module AddressTokens
   class Finder
-    attr_accessor :states, :cities, :state_separator, :string
+    attr_accessor :states, :cities, :state_separator, :string, :zip_format
     attr_reader :city_tokens
 
     def initialize(str = nil)
-      @string, @states, @cities, = str, {}, {}
       I18n.config.available_locales = :en
+      @string, @states, @cities, = str, {}, {}
       @state_separator = ','
+      @zip_format      = Zip::US
     end
 
     def load(var, file)

data/lib/matcher.rb

@@ -8,6 +8,7 @@ module AddressTokens
       state_info   = find_state(str)
       city_info    = find_city(str, state_info)
       address_info = find_address(str, city_info)
+      zip_info     = find_zip(str, address_info)
 
       {
         state_abbr:     state_info[:state],
@@ -16,7 +17,9 @@ module AddressTokens
         city_name:      city_info[:city_name],
         city_string:    city_info[:city_string],
         city_start_at:  city_info[:start_at],
-        address:        address_info[:address]
+        address:        address_info[:address],
+        zipcode:        zip_info[:zip],
+        zipcode_string: zip_info[:zip_string]
       }
     end
 
@@ -86,5 +89,14 @@ module AddressTokens
       return { address: str[0 ... city_info[:start_at]].strip } if city_info[:start_at] > 0
       { address: str.split(city_info[:city_string])[0].strip }
     end
+
+    def find_zip(str, address_info)
+      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 }
+    end
   end
 end

data/lib/zip.rb

@@ -0,0 +1,6 @@
+module AddressTokens
+  module Zip
+    US = { format: /(\d{5})/ }
+    BR = { format: /(\d{5})-?(\d{3})/, join: ['-'] }
+  end
+end

data.tar.gz.sig

@@ -1 +1,3 @@
-r/^l}!�͓Dt~T���f
+��O���]��V�+���%��=Kٓ!��}�\Ԣ�PT8�;qm$6����y��]6w�[)�'�
+N�UvV;��-�\���b����H���Ѿ�"eO=�'ظ���k�H[K_P޸�3��~h�b�����d1��ڙ
+r�2��j{?Ȍ�S5��Y�@Y�B!_�;��
���ξ���#��������.W�?nK��'v<%=ک-�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: address_tokens
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Eustaquio Rangel
@@ -112,6 +112,7 @@ files:
 - lib/finder.rb
 - lib/matcher.rb
 - lib/state_not_found.rb
+- lib/zip.rb
 homepage: http://github.com/taq/address_tokens
 licenses: []
 metadata: {}
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Find address tokens on a string