regio 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33db1ff3f8b85f69b9dd9a305ec77e9fbf5f4f7f127ed5286a5b1ad5a1abd83a
-  data.tar.gz: 860d8377889cbf7893d5868a5e73af61748057e9f77a4cd6854453d752e476bd
+  metadata.gz: 31398e20f35c92dda1741f1aa3130bde18d9d53192ed708dda0613cfa288faa2
+  data.tar.gz: cf25884d244f0ed37f93d11eda30b124b0e80436a82b8de4e4857cda7550fbde
 SHA512:
-  metadata.gz: a68c78729907b94fb0fd6fab2a33ac53b1b8bdc661ab33cacd3b70d93f4c94712a64ba8b7c108df4d4c48e35df2ab0f8f967ac26b94fe955318ea37bccf4bcd9
-  data.tar.gz: f3794cb61072a66c2ecbae6f9dcb30fcb07e1b7de3950c8a48a4ccde17c3002e26a969ffa24588057d65da023f885af12c7d3f5e430fe812bd0868c393d1a466
+  metadata.gz: 03ad3c09e053973747ec234318b899a481056fe7cfaebb8dbec649e6b76da8529c8b5bbf8f1aae77433fc78df4a2a7d88a00fcd8ec7439155e3d39e99bcf6c3a
+  data.tar.gz: ad3d80ee9e683bd90b4514674f4032a442959a07609af99be3cbebb431ed8c0929bf713f6e55fce1ca303badceee3320def1b6ca726abd9358b0364019ad1042

data/.dockerignore

@@ -0,0 +1,13 @@
+**/.git
+**/.idea
+/.github
+/docs
+/log
+/tmp
+/.dockerignore
+/.editorconfig
+/.gitattributes
+/.gitignore
+/docker-compose.yaml
+/Dockerfile
+/README.md

data/.github/workflows/{checks.yml → checks.yaml}

@@ -6,9 +6,27 @@ concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 jobs:
+  rspec-legacy:
+    name: RSpec with legacy ruby ${{matrix.ruby}}
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/ruby_${{matrix.ruby}}.gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.4', '2.5', '2.6']
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
+      - name: Test with RSpec
+        run: bundle exec rspec
   rspec:
     name: RSpec with ruby ${{matrix.ruby}}
     runs-on: ubuntu-latest
+    needs: rubocop
     strategy:
       fail-fast: false
       matrix:
@@ -20,7 +38,7 @@ jobs:
           ruby-version: ${{matrix.ruby}}
           bundler-cache: true
       - name: Test with RSpec
-        run: COVERAGE=true bundle exec rspec
+        run: bundle exec rspec
   rubocop:
     name: RuboCop
     runs-on: ubuntu-latest
@@ -28,7 +46,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.2
+          ruby-version: 3.1.3
           bundler-cache: true
       - name: Check with RuboCop
         run: bundle exec rubocop

data/.github/workflows/release.yaml

@@ -0,0 +1,70 @@
+name: Release
+on:
+  release:
+    types: [ released ]
+jobs:
+  rubocop:
+    name: RuboCop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1.3
+          bundler-cache: true
+      - name: Check with RuboCop
+        run: bundle exec rubocop
+  rspec-legacy:
+    name: RSpec with legacy ruby ${{matrix.ruby}}
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/ruby_${{matrix.ruby}}.gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.4', '2.5', '2.6']
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
+      - name: Test with RSpec
+        run: bundle exec rspec
+  rspec:
+    name: RSpec with ruby ${{matrix.ruby}}
+    runs-on: ubuntu-latest
+    needs: rubocop
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.6', '2.7', '3.0', '3.1', head]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
+      - name: Test with RSpec
+        run: bundle exec rspec
+  build-and-push:
+    name: Build and push gem
+    runs-on: ubuntu-latest
+    needs: rspec
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1.3
+          bundler-cache: true
+      - name: Setup credentials
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+      - name: Release gem
+        run: |
+          bundle exec rake release

data/.rubocop.yml

@@ -5,7 +5,7 @@ require:
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.4
 
 RSpec/NestedGroups:
   Enabled: true

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change log
 
+## v0.3.4 (06.07.2023)
+
+* 2 minor enhancements:
+  * Add `ads_adr_id` into default options
+  * Set ruby 2.4 as minimum ruby version
+
+## v0.3.3 (21.03.2023)
+
+* 1 minor enhancement:
+  * Development in docker
+
 ## v0.3.2 (10.03.2023)
 
 * 1 minor enhancement:

data/Dockerfile

@@ -0,0 +1,13 @@
+FROM ruby:3.1.3-alpine3.17
+
+WORKDIR /package
+
+COPY . .
+
+RUN apk add --update-cache --no-cache --virtual .build-deps g++ make  \
+    && apk add --update-cache --no-cache gcompat git openssh-client \
+    && bundle install --jobs $(nproc) --retry 3 \
+    && rm -rf /usr/local/bundle/cache/*.gem \
+    && find /usr/local/bundle/gems/ -name "*.c" -delete \
+    && find /usr/local/bundle/gems/ -name "*.o" -delete \
+    && apk --purge del .build-deps

data/Gemfile

@@ -8,7 +8,8 @@ gemspec
 
 group :development, :test do
   gem 'rspec', '~> 3.12.0'
-  gem 'rubocop', '~> 1.48.0'
+
+  gem 'rubocop', '~> 1.48.1'
   gem 'rubocop-performance', '~> 1.16.0'
   gem 'rubocop-rspec', '~> 2.19.0'
 end

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    regio (0.3.2)
+    regio (0.3.4)
       httparty (>= 0.20, < 0.22)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     crack (0.4.5)
@@ -21,28 +21,30 @@ GEM
     json (2.6.3)
     mini_mime (1.1.2)
     multi_xml (0.6.0)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     public_suffix (5.0.1)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.48.0)
+    rspec-support (3.12.1)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -52,9 +54,9 @@ GEM
       rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
     rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
@@ -86,11 +88,11 @@ DEPENDENCIES
   rake (~> 13.0.6)
   regio!
   rspec (~> 3.12.0)
-  rubocop (~> 1.48.0)
+  rubocop (~> 1.48.1)
   rubocop-performance (~> 1.16.0)
   rubocop-rspec (~> 2.19.0)
   simplecov (~> 0.22.0)
   webmock (~> 3.18.1)
 
 BUNDLED WITH
-   2.3.7
+   2.3.26

data/README.md

@@ -1,6 +1,7 @@
 # Regio
 
 [![Gem Version](https://badge.fury.io/rb/regio.svg)](https://badge.fury.io/rb/regio)
+[![Release](https://github.com/tab/regio/actions/workflows/release.yaml/badge.svg?event=release)](https://github.com/tab/regio/actions/workflows/release.yaml)
 
 [Regio geocoding API](https://api.regio.ee/documentation/#docs/geocode) lets you search for addresses from complete Estonian address database.
 
@@ -11,7 +12,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'regio', '~> 0.3.2'
+gem 'regio', '~> 0.3.4'
 ```
 
 And then execute:
@@ -146,9 +147,25 @@ Check Regio [routing and directions](https://api.regio.ee/documentation/#docs/ro
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Build docker container with compose:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```bash
+docker-compose build
+docker-compose up
+```
+
+Access to the container:
+
+```bash
+docker-compose exec regio sh
+```
+
+Run rspec or rubocop checks:
+
+```bash
+/package # bundle exec rubocop
+/package # bundle exec rspec
+```
 
 ## Contributing
 

data/docker-compose.yaml

@@ -0,0 +1,7 @@
+services:
+  regio:
+    build: .
+    tty: true
+    stdin_open: true
+    volumes:
+      - .:/package

data/gemfiles/ruby_2.4.gemfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+gemspec path: '../'
+
+group :development, :test do
+  gem 'rspec', '~> 3.12.0'
+end
+
+group :test do
+  gem 'simplecov', '~> 0.18.0'
+  gem 'webmock', '~> 3.18.1'
+end

data/gemfiles/ruby_2.4.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: ..
+  specs:
+    regio (0.3.4)
+      httparty (>= 0.20, < 0.22)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    docile (1.3.5)
+    hashdiff (1.0.1)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
+      multi_xml (>= 0.5.2)
+    mini_mime (1.1.2)
+    multi_xml (0.6.0)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  x86_64-linux-musl
+
+DEPENDENCIES
+  bundler (~> 2.3.0)
+  rake (~> 13.0.6)
+  regio!
+  rspec (~> 3.12.0)
+  simplecov (~> 0.18.0)
+  webmock (~> 3.18.1)
+
+BUNDLED WITH
+   2.3.26

data/gemfiles/ruby_2.5.gemfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+gemspec path: '../'
+
+group :development, :test do
+  gem 'rspec', '~> 3.12.0'
+end
+
+group :test do
+  gem 'simplecov', '~> 0.18.0'
+  gem 'webmock', '~> 3.18.1'
+end

data/gemfiles/ruby_2.5.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: ..
+  specs:
+    regio (0.3.4)
+      httparty (>= 0.20, < 0.22)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    hashdiff (1.0.1)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
+      multi_xml (>= 0.5.2)
+    mini_mime (1.1.2)
+    multi_xml (0.6.0)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  x86_64-linux-musl
+
+DEPENDENCIES
+  bundler (~> 2.3.0)
+  rake (~> 13.0.6)
+  regio!
+  rspec (~> 3.12.0)
+  simplecov (~> 0.18.0)
+  webmock (~> 3.18.1)
+
+BUNDLED WITH
+   2.3.26

data/gemfiles/ruby_2.6.gemfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+gemspec path: '../'
+
+group :development, :test do
+  gem 'rspec', '~> 3.12.0'
+end
+
+group :test do
+  gem 'simplecov', '~> 0.18.0'
+  gem 'webmock', '~> 3.18.1'
+end

data/gemfiles/ruby_2.6.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: ..
+  specs:
+    regio (0.3.4)
+      httparty (>= 0.20, < 0.22)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    hashdiff (1.0.1)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
+      multi_xml (>= 0.5.2)
+    mini_mime (1.1.2)
+    multi_xml (0.6.0)
+    public_suffix (5.0.1)
+    rake (13.0.6)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  x86_64-linux-musl
+
+DEPENDENCIES
+  bundler (~> 2.3.0)
+  rake (~> 13.0.6)
+  regio!
+  rspec (~> 3.12.0)
+  simplecov (~> 0.18.0)
+  webmock (~> 3.18.1)
+
+BUNDLED WITH
+   2.3.26

data/lib/regio/core.rb

@@ -45,6 +45,7 @@ module Regio
 
     def default_hash_for(result)
       {
+        ads_adr_id: result[:ads_adr_id],
         regio_id: result[:id],
         title: result[:address],
         valid: result[:is_valid],

data/lib/regio/geocode.rb

@@ -23,7 +23,7 @@ module Regio
         country: 'ee',
         apikey: Configuration.api_key,
         address_format: 'long_address',
-        details: 'id,address,postcode,type,components,geometry,is_valid,is_complete',
+        details: 'id,address,ads_adr_id,postcode,type,components,geometry,is_valid,is_complete',
         output_format: 'json',
         limit: 25
       }

data/lib/regio/reverse_geocode.rb

@@ -22,7 +22,7 @@ module Regio
       {
         apikey: Configuration.api_key,
         address_format: 'long_address',
-        details: 'id,address,postcode,type,components,geometry,is_valid,is_complete',
+        details: 'id,address,ads_adr_id,postcode,type,components,geometry,is_valid,is_complete',
         output_format: 'json',
         limit: 25
       }

data/lib/regio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Regio
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

data/regio.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/tab/regio'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.4'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regio
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - tab
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -66,15 +66,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".editorconfig"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/dependabot.yml"
-- ".github/workflows/checks.yml"
+- ".github/workflows/checks.yaml"
+- ".github/workflows/release.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -82,6 +85,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yaml
+- gemfiles/ruby_2.4.gemfile
+- gemfiles/ruby_2.4.gemfile.lock
+- gemfiles/ruby_2.5.gemfile
+- gemfiles/ruby_2.5.gemfile.lock
+- gemfiles/ruby_2.6.gemfile
+- gemfiles/ruby_2.6.gemfile.lock
 - lib/regio.rb
 - lib/regio/configuration.rb
 - lib/regio/core.rb
@@ -103,7 +113,7 @@ metadata:
   source_code_uri: https://github.com/tab/regio
   changelog_uri: https://github.com/tab/regio/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -111,15 +121,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Regio geocoding API
 test_files: []