regio 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f1f77fb4ff83302a5591e138bface9f60913e2649727bee81b7460067d8d44
-  data.tar.gz: 7e10c3b4eb3826aaf0865888c98507f3cdf5a97e550f3100e8f91beb89bffe41
+  metadata.gz: 6e261a4a360140c0487bac9af20b744a6aaf08e3e7a8c3a0cbbe49db4fd5df71
+  data.tar.gz: 7c31479d24d0ec78bc9fc92453cf31edddea059a9289034efdab676483f61db5
 SHA512:
-  metadata.gz: 6702d492cb1b10ee6f6795ef16be9c1d7f8e36009d2e3667e513974b642ceed446c41a83e106b832176aa90f7eadc05d7185fb5c5f24b23f1a0e8676bb68975f
-  data.tar.gz: a9e6cf6a456cdcda8d5abb1adb718199df81295aca6bc1fe7d488276b5f6a7ba1aa6eb94f35435fb34e551b5c6bc3da9eabab1e26534918dd68bea080914f5e8
+  metadata.gz: 9a1690f9811b69963b9e385171a9f090982404efab18df5530cc409fa7f8c9b2544bc6c50366348fdec6c29d50906793534cf01a86ebc179b0fde4edca01a8cd
+  data.tar.gz: 55b472111aa1563f5cc30c66d318bdaf659d734103ae8c46fc6f973d3805967f2b7972a6ff3d9bd7902c49f1cf7991e13393af57ea91960da8d42250e800550c

data/.github/workflows/checks.yml

@@ -7,13 +7,17 @@ concurrency:
   cancel-in-progress: true
 jobs:
   rspec:
-    name: RSpec
+    name: RSpec with ruby ${{matrix.ruby}}
     runs-on: ubuntu-latest
+    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: 3.1.2
+          ruby-version: ${{matrix.ruby}}
           bundler-cache: true
       - name: Test with RSpec
         run: COVERAGE=true bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log
 
+## v0.3.1 (28.02.2023)
+
+* 1 minor enhancement:
+  * Update httparty dependency
+
+## v0.3.0 (02.01.2023)
+
+* 2 major enhancements:
+  * Regio [routing](https://api.regio.ee/documentation/#docs/routing_and_directions)
+  * Regio [gazetteer](https://api.regio.ee/documentation/#docs/gazetteer)
+  * Minor refactoring
+
 ## v0.2.0 (15.10.2022)
 
 * 1 major enhancement:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    regio (0.2.0)
-      httparty (~> 0.20.0)
+    regio (0.3.1)
+      httparty (>= 0.20, < 0.22)
 
 GEM
   remote: https://rubygems.org/
@@ -15,54 +15,52 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     hashdiff (1.0.1)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.6.2)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    json (2.6.3)
+    mini_mime (1.1.2)
     multi_xml (0.6.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     public_suffix (5.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.41.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.16.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -84,11 +82,11 @@ DEPENDENCIES
   bundler (~> 2.3.0)
   rake (~> 13.0.6)
   regio!
-  rspec (~> 3.11.0)
+  rspec (~> 3.12.0)
   rubocop (~> 1.36)
   rubocop-performance (~> 1.15)
-  rubocop-rspec (~> 2.13.2)
-  simplecov (~> 0.21.2)
+  rubocop-rspec (~> 2.16.0)
+  simplecov (~> 0.22.0)
   webmock (~> 3.18.1)
 
 BUNDLED WITH

data/README.md

@@ -11,7 +11,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'regio', '~> 0.2.0'
+gem 'regio', '~> 0.3.1'
 ```
 
 And then execute:
@@ -30,6 +30,15 @@ Get your own API key
 REGIO_API_KEY=SECRET
 ```
 
+```
+export REGIO_API_KEY=SECRET && irb -I lib
+
+irb(main):001:0> require 'regio'
+=> true
+
+...
+```
+
 ### Geocoding
 
 Use `Geocode` class in your code
@@ -56,7 +65,6 @@ end
 
 Check Regio [geocode](https://api.regio.ee/documentation/#docs/geocode) documentation
 
-
 ### Reverse geocoding
 
 Use `ReverseGeocode` class in your code
@@ -83,6 +91,59 @@ end
 
 Check Regio [reverse geocode](https://api.regio.ee/documentation/#docs/reverse_geocode) documentation
 
+### Gazetteer
+
+Use `Gazetteer` class in your code
+
+```ruby
+require 'regio'
+
+class Geocoding
+
+  private
+
+  def results
+    @results ||= Regio::Gazetteer.new(options).results
+  end
+
+  def options
+    {
+      id: 16004253,
+      query: 'address_children'
+    }
+  end
+end
+```
+
+Check Regio [Gazetteer](https://api.regio.ee/documentation/#docs/gazetteer) documentation
+
+### Routing and directions
+
+Use `Routing` class in your code
+
+```ruby
+require 'regio'
+
+class Routing
+
+  private
+
+  def results
+    @results ||= Regio::Routing.new(options).results
+  end
+
+  def options
+    {
+      coordinates: [[24.649138022268, 59.14048887149], [25.853136227622, 59.00678681919]],
+      service: 'optimize',
+      overview: 'full'
+    }
+  end
+end
+```
+
+Check Regio [routing and directions](https://api.regio.ee/documentation/#docs/routing_and_directions) documentation
+
 ## 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.

data/lib/regio/gazetteer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Regio
+  class Gazetteer < Core
+    def results
+      raise Unprocessable, response[:message] if response[:message]
+
+      response.merge(
+        collection: response[:data]&.map { |result| transform(result) } || []
+      )
+    end
+
+    private
+
+    def response
+      @response ||= run('/gazetteer', options)
+    end
+
+    # NOTE: all options described in the documentation
+    # https://api.regio.ee/documentation/#docs/gazetteer
+    def default_options
+      {
+        apikey: Configuration.api_key,
+        address_format: 'long_address',
+        output_format: 'json'
+      }
+    end
+  end
+end

data/lib/regio/geocode.rb

@@ -13,7 +13,7 @@ module Regio
     private
 
     def response
-      run('/geocode', options)
+      @response ||= run('/geocode', options)
     end
 
     # NOTE: all options described in the documentation

data/lib/regio/reverse_geocode.rb

@@ -13,7 +13,7 @@ module Regio
     private
 
     def response
-      run('/revgeocode', options)
+      @response ||= run('/revgeocode', options)
     end
 
     # NOTE: all options described in the documentation

data/lib/regio/routing.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Regio
+  class Routing < Core
+    def results
+      response.tap do |response|
+        raise Unprocessable, response[:message] if response[:message]
+      end
+    end
+
+    private
+
+    def response
+      options[:coordinates]&.map { |lnglat| lnglat.join(',') }&.join(';')
+
+      @response ||= run('/routing', options)
+    end
+
+    # NOTE: all options described in the documentation
+    # https://api.regio.ee/documentation/#docs/routing_and_directions
+    def default_options
+      {
+        apikey: Configuration.api_key,
+        output_format: 'json',
+        limit: 25
+      }
+    end
+  end
+end

data/lib/regio/version.rb

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

data/lib/regio.rb

@@ -2,8 +2,10 @@
 
 require 'regio/configuration'
 require 'regio/core'
+require 'regio/gazetteer'
 require 'regio/geocode'
 require 'regio/reverse_geocode'
+require 'regio/routing'
 require 'regio/errors/failed'
 require 'regio/errors/forbidden'
 require 'regio/errors/not_found'

data/regio.gemspec

@@ -37,15 +37,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty', '~> 0.20.0'
+  spec.add_dependency 'httparty', '>= 0.20', '< 0.22'
 
   spec.add_development_dependency 'bundler', '~> 2.3.0'
   spec.add_development_dependency 'rake', '~> 13.0.6'
-  spec.add_development_dependency 'rspec', '~> 3.11.0'
+  spec.add_development_dependency 'rspec', '~> 3.12.0'
   spec.add_development_dependency 'rubocop', '~> 1.36'
   spec.add_development_dependency 'rubocop-performance', '~> 1.15'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.13.2'
-  spec.add_development_dependency 'simplecov', '~> 0.21.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.16.0'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'webmock', '~> 3.18.1'
 
   spec.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: regio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - tab
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -167,8 +173,10 @@ files:
 - lib/regio/errors/forbidden.rb
 - lib/regio/errors/not_found.rb
 - lib/regio/errors/unprocessable.rb
+- lib/regio/gazetteer.rb
 - lib/regio/geocode.rb
 - lib/regio/reverse_geocode.rb
+- lib/regio/routing.rb
 - lib/regio/version.rb
 - regio.gemspec
 homepage: https://github.com/tab/regio