address_line_divider 1.0.2 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab33cb2334436bfab10c543f40ebc441fc13b7a61e9ae4d8ffccd7199394d6d3
-  data.tar.gz: ed9bbc34a12bac864772027ae73299ff76b0ac8c4fb808a00698fdb0e0b04811
+  metadata.gz: 678fdc52d5f68e75e97ff2f67d260c325747273287c4e0fe7054dbca7258277c
+  data.tar.gz: 1c5b3ffda58132cafcf8632d06a1b77243cccd096b680a634f3b0b7ca070164c
 SHA512:
-  metadata.gz: 04e1de519f1c6427d07a15f5d222b16ff6da46f9ee6f8b680d628333cd1f43993552122ebd9ab048bccef8529945b30388ab8c6a0c2d67bd891c88967267fc4d
-  data.tar.gz: 1e427cf8c1e54f8357eeb7baeb9be7f9562cf65c01dcb53591b87bc591ac70a609646094cfda90bbbdd19a11adc02cd7b63ad120bcb5cf2ef38436a61991f7b2
+  metadata.gz: b02307bdbad519d388d2f3c97d1849b61404c1629174c90f2b43026371fdaeeb387013d0528e51687b65ad99c0c52ec8b62de19b1aa90d3e9b1cab06fcaf8d68
+  data.tar.gz: 66a5ddc6ed60ec17c49683e9e017ae114ebb65130c3b21bb885152923e3e0cd02649003157e5e125d7cc2f1a64f633fffa264cd113f1b77e8a923510ef44b1d8

data/.github/workflows/cd.yml

@@ -0,0 +1,31 @@
+name: CD
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  log:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log
+        run: |
+          echo "GITHUB_REF: $GITHUB_REF"
+          echo "github.head_ref: ${{ github.head_ref }}"
+          echo "github.base_ref: ${{ github.base_ref }}"
+          echo "contains(github.head_ref, 'release/v'): ${{ contains(github.head_ref, 'release/v') }}"
+          echo "github.base_ref == 'master': ${{ github.base_ref == 'master' }}"
+          echo "github.event.pull_request.merged: ${{ github.event.pull_request.merged }}"
+  cd:
+    runs-on: ubuntu-latest
+    if: ${{ contains(github.head_ref, 'release/v') && github.base_ref == 'master' && github.event.pull_request.merged == true }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Release Gem
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: bundle exec rake release
+

data/.github/workflows/main.yml

@@ -1,9 +1,9 @@
-name: Ruby
+name: CI
 
-on: [push,pull_request]
+on: [push]
 
 jobs:
-  build:
+  ci:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.byebug_history

data/.rubocop.yml

@@ -1,3 +1,12 @@
+AllCops:
+  TargetRubyVersion: 2.4
+
+Metrics/BlockLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
-
-## V1.0.2
+## v1.0.6
+  *  Improve verifying results.
+## v1.0.5
+  *  Verify results and return nil if it's invalid.
+## v1.0.4
+  *  Improve Regex
+## v1.0.3
+  *  Small fixes
+  *  CI Status badge
+## v1.0.2
   *  Add MIT LICENSE
-## V1.0.0
+## v1.0.0
 ###  Initial version
 #### Features
   *  Parse address lines using a Regex

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    address_line_divider (1.0.2)
+    address_line_divider (1.0.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,3 +1,6 @@
+[![Ruby](https://github.com/matiasalbarello/address_line_divider/actions/workflows/main.yml/badge.svg)](https://github.com/matiasalbarello/address_line_divider/actions/workflows/main.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/maintainability)](https://codeclimate.com/github/codeclimate/codeclimate/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/test_coverage)](https://codeclimate.com/github/codeclimate/codeclimate/test_coverage)
 # AddressLineDivider
 
 The purpose of this GEM is to provide a tool to correctly parse address lines into Street + Street Number. Sometimes it's trivial and it can be solved with a regular expression, but when the street itself contains numbers, the task needs some extra considerations.

data/address_line_divider.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |spec|
   spec.version       = AddressLineDivider::VERSION
   spec.authors       = ["Matias Albarello"]
   spec.email         = ["matias.albarello@gmail.com"]
-  spec.licenses      = ['MIT']
+  spec.licenses      = ["MIT"]
 
   spec.summary       = "Divide an address line into street and street number based on a Streets file."
   spec.homepage      = "https://github.com/matiasalbarello/address_line_divider"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/lib/address_line_divider/address_parser.rb

@@ -8,16 +8,41 @@ module AddressLineDivider
 
     def parse(address_line)
       street = search_street_on_file(address_line)
-      return [street, street_no(address_line, street)] if street
+      result = [street, street_no(address_line, street)] if street
+      result ||= parse_using_regex(address_line)
 
-      parse_using_regex(address_line)
+      return if invalid_result(address_line, result)
+
+      result
     end
 
     private
 
     def parse_using_regex(address_line)
-      /^(?<street>\D+) (?<street_no>.*)/ =~ address_line
-      [street, street_no]
+      last_number = last_number(address_line)
+      return unless last_number
+
+      last_number_index = address_line.index(last_number)
+      street_name = address_line[0..last_number_index - 1].strip
+      street_no = address_line[last_number_index..-1].strip
+
+      [street_name, street_no]
+    end
+
+    def invalid_result(address_line, result)
+      result.nil? ||
+        result.any? { |r| r.nil? || r.strip.empty? } ||
+        squish(result.join(" ")) != squish(address_line)
+    end
+
+    def last_number(address_line)
+      squish(address_line).split(" ").select do |substr|
+        substr =~ /[[:digit:]]/
+      end.last
+    end
+
+    def squish(string)
+      string.gsub("  ", " ").strip
     end
 
     def search_street_on_file(address_line)
@@ -35,4 +60,4 @@ module AddressLineDivider
       address_line.gsub(street, "").strip
     end
   end
-end
+end

data/lib/address_line_divider/configuration.rb

@@ -10,8 +10,9 @@ module AddressLineDivider
         return if path.nil?
 
         raise FileNotFound, "Couldn't find a file with the path `#{path}`." unless File.exist? path
+
         @streets_file_path = path
       end
     end
   end
-end
+end

data/lib/address_line_divider/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AddressLineDivider
-  VERSION = "1.0.2"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: address_line_divider
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.6
 platform: ruby
 authors:
 - Matias Albarello
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/cd.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -50,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="