dadata 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0715b9f8b83e804a3229c6e1c474b951c45290f257c12b85587786f536e0dde
-  data.tar.gz: c87d221a87dde75a401609d735f1804041cd55f175c10cd4373a55bb5a752d51
+  metadata.gz: 96139da1318c0fd03e980d03f7352c08e9ec76987e4b3f9254c7c6e0835d53c3
+  data.tar.gz: f61aa03caaf8fc2accfa8fbc3cb4662b8ae542d9ba6c6795f90a4e5810d42bb4
 SHA512:
-  metadata.gz: 0cbe2004c4b78d0f252977f83983f5fb1ca02280fd429bae57e1aef9b4b10c46f26d4179599ab2a603e97ceeb87a875bd57928a6cc619d741f52f7be18833399
-  data.tar.gz: 538e87653850a23353bf128d04da96b10023dc9db1847294246bb5c998795b0e71c1e3c5c8be61138c6a1fdc4bdc83ff96f53cc6f369344156ef041ce0f78f83
+  metadata.gz: cdeefa2206e0bf9313ecb8a19f8a31cccc6ff16ef2e38d808cc11bb2d4df14d8c4c9ebab51d875dda299d9efc8e8bd97276ec69c1a61f74281be1cb17bf8f313
+  data.tar.gz: 0dbd643b7643b1e037f75f46d42aa04dc134c574e42bd0db864137d1fcbfaeabb1ab6d84ab2dbb109f3010e5245b98e7672803d502ef897e9e58aecdcb9cd5a0

data/.gitignore

@@ -1,6 +1,8 @@
 /.bundle/
 Gemfile.lock
 
+*.gem
+
 /.yardoc
 /_yardoc/
 /coverage/

data/.rubocop.yml

@@ -1,10 +1,16 @@
-Style/ClassAndModuleChildren:
+AllCops:
+  NewCops: enable
+
+Layout/LineLength:
+  Max: 80
+
+Metrics/BlockLength:
   Exclude:
     - test/**/*
 
-Metrics/BlockLength:
+Style/ClassAndModuleChildren:
   Exclude:
     - test/**/*
 
-String/StringLiterals:
+Style/StringLiterals:
   EnforcedStyle: single_quotes

data/CHANGELOG.md

@@ -3,3 +3,7 @@
 ## 0.1.0 - 2019-12-09
 
 * Added organizations request of Suggestion API.
+
+## 0.2.0 - 2020-11-19
+
+* Support address by FIAS ID method.

data/README.md

@@ -25,6 +25,10 @@ require 'dadata'
 
 dadata = Dadata::Suggestion.new(api_key: 'YOURKEY')
 dadata.organization('ООО Рога и копыта')
+# => { suggestions: {{ value: "ПАО БАНК", ... }] }
+
+dadata.address_by_id('203221a4-dde4-4954-99cb-e788df9d0ce8')
+# => { suggestions: [{ value: "г Казань, ул Кремлевская, д 1", ... }] }
 ```
 
 ## Contributing

data/dadata.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 1.17', '< 3.0'
   spec.add_development_dependency 'ffaker', '~> 2.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.4'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.77'
+  spec.add_development_dependency 'rubocop', '~> 1.3'
   spec.add_development_dependency 'webmock', '~> 3.7'
 end

data/lib/dadata/suggestion.rb

@@ -6,14 +6,24 @@ require 'net/http'
 module Dadata
   # Suggestion API
   class Suggestion
-    BASE_URL = 'https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/'
+    BASE_URL = 'https://suggestions.dadata.ru/suggestions/api/4_1/rs/'
 
     def initialize(config)
       @config = config
     end
 
-    def organization(term)
-      url = URI(URI.join(BASE_URL, 'party'))
+    def organization(query: term)
+      call_method('suggest/party', query: query)
+    end
+
+    def address_by_fias_id(query: fias_id)
+      call_method('findById/address', query: query)
+    end
+
+    private
+
+    def call_method(method, **query_data)
+      url = URI(URI.join(BASE_URL, method))
 
       req = Net::HTTP::Post.new(url)
 
@@ -21,19 +31,17 @@ module Dadata
       req['Accept'] = 'application/json'
       req['Authorization'] = "Token #{@config[:api_key]}"
 
-      req.body = { query: term }.to_json
+      req.body = query_data.to_json
 
       resp = perform_request(url, req)
 
       if resp.code == '200'
-        [true, JSON.parse(resp.body, symbolize_names: true)]
+        [true, JSON.parse(resp.body, symbolize_names: true)[:suggestions]]
       else
-        [false, code: resp.code.to_i, message: resp.body]
+        [false, { code: resp.code.to_i, message: resp.body }]
       end
     end
 
-    private
-
     def perform_request(url, request)
       http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = true

data/lib/dadata/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dadata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rinat Garifullin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-description: 
+description:
 email:
 - ringarifullin@gmail.com
 executables: []
@@ -128,7 +142,7 @@ metadata:
   homepage_uri: https://github.com/rgarifullin/dadata
   source_code_uri: https://github.com/rgarifullin/dadata
   changelog_uri: https://github.com/rgarifullin/dadata/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Dadata.ru API integration
 test_files: []