address_line_divider 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be149c4f4c64a96b9b83a516c3302aef706c8322f37d6a132a5ae49980585bd9
-  data.tar.gz: 31b6a557f012035fe67769f670574c14620fe485f5e6ba51c8192959638d7d5f
+  metadata.gz: e6ef2ffffc4e459d9c4ebf283cb7eafaf2c725ceff1da8ae3f06fcfbc77b8f45
+  data.tar.gz: f72ee12e5fdb98453d3653175fba57567d48da21e6917b125d60e04d93e76497
 SHA512:
-  metadata.gz: 7c2d9f0f18f68cf871f6c96e44d06ed4aaaeb49d4980c5913194a0db590cd7d1186b8566004e3bbd101e6e11214dbd1d101ce0d26f68263181c3bfa84dc039fb
-  data.tar.gz: 5bb7ed14e52d695d2cb117dbf496df17eef46e1a59798263ec4d3e790e37262fe44f203149d82aabbf3f70f0863d86d1dea53289c50617f06639903e3368c195
+  metadata.gz: 93f7cec2d436c1eb97459451d5b7a38505355d7b730d1886b4db37bdce2bf4ecfad02a29ed90cfd8478a5ee5d572aa516ca91d54142c48a43465507ac249325a
+  data.tar.gz: 19459ff082a0d8ad3c33369c4d4b0a2fa351a6e8cc941973258bf0ed5f637def7b9b88f238804d37c7d60b5cab57174f513e05a231b3356e1cc991280de62107

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/.rubocop.yml

@@ -1,6 +1,9 @@
 AllCops:
   TargetRubyVersion: 2.4
 
+Metrics/BlockLength:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
-
-## V1.0.3
+## v1.0.4
+  *  Improve Regex
+## v1.0.3
   *  Small fixes
   *  CI Status badge
-## V1.0.2
+## 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.3)
+    address_line_divider (1.0.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,4 +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/lib/address_line_divider/address_parser.rb

@@ -16,8 +16,21 @@ module AddressLineDivider
     private
 
     def parse_using_regex(address_line)
-      /^(?<street>\D+) (?<street_no>.*)/ =~ address_line
-      [street, street_no]
+      last_number_index = address_line.index(last_number(address_line))
+      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 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)

data/lib/address_line_divider/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: address_line_divider
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Matias Albarello
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-15 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"