novaposhta_api 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979e8503642e0311557adf2f503d6fea346d15bde8fc638f1fcdac4ab1b41b6a
-  data.tar.gz: 9f787311d1bac8896aa7db12033a6868797ee86455b49ae99895508fef586847
+  metadata.gz: 925e1e8df50cf0d3f3470ac5faaa032e122068b5c5761d497927e9286b88f87c
+  data.tar.gz: fbed4aefc418cbd0d40ee26420d57e915ee84856b7b71a594f7b403343973926
 SHA512:
-  metadata.gz: 3c02d4ce41f85b731e55e1271653d4679c3a36a06a677221017a1c7d70d9ea025340c764c7c34f42a6395f1754b079e67c52caeed1ba39468f32f431b3f13b92
-  data.tar.gz: 9522235cb31bb5ff29ed162c5a0630dfa60fe64363efa49353172d909b6d8fec1963b0f16c48a3e1f76f56ed5633d55bb3b8db7255602b8348d531d4cf1dbe25
+  metadata.gz: 3d73b31451ec9baf6c25073ca7d45c5d8a5fbb099c910103318c7eddd23787b666f1d3fa79c99b835157a89718007cc246914baf0e90a5d1166132ec84d7e9c8
+  data.tar.gz: 312c00f9caa3631d00c3d86973b1508c57bb74cf0f463d23686b2bec5c45185131e132e8bad4ae0f9eea4832a343200ecbe57714f12c28dcc80173b6f03e64d7

data/Gemfile.lock

@@ -1,38 +1,40 @@
 PATH
   remote: .
   specs:
-    novaposhta_api (0.1.3)
-      faraday (~> 1.0, >= 1.0.1)
+    novaposhta_api (0.1.8)
+      faraday (~> 2.2)
       hashie (~> 4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
+    ast (2.4.2)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.1)
     hashie (4.1.0)
-    multipart-post (2.1.1)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.21.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rubocop (0.86.0)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -40,7 +42,7 @@ PLATFORMS
 DEPENDENCIES
   novaposhta_api!
   rake (~> 12.0)
-  rubocop (~> 0.86.0)
+  rubocop (~> 1.25)
 
 BUNDLED WITH
-   2.1.4
+   2.3.3

data/lib/novaposhta_api/collection.rb

@@ -7,7 +7,7 @@ module NovaposhtaApi
 
       @collection = collection.map { |item| klass.new(item) }
 
-      __setobj__(@collection)
+      super(@collection)
     end
   end
 end

data/lib/novaposhta_api/middlewares/error_handling.rb

@@ -2,7 +2,7 @@
 
 module NovaposhtaApi
   module Middlewares
-    class ErrorHandling < Faraday::Response::Middleware
+    class ErrorHandling < Faraday::Middleware
       SEPARATOR = ', '
 
       def on_complete(env)

data/lib/novaposhta_api/models/contact_person.rb

@@ -12,4 +12,4 @@ module NovaposhtaApi
       property :email, from: :Email
     end
   end
-end
+end

data/lib/novaposhta_api/models/internet_document.rb

@@ -30,6 +30,7 @@ module NovaposhtaApi
       property :description, from: :Description
       property :weight, from: :Weight
       property :date_time, from: :DateTime
+      property :options_seat, from: :OptionsSeat
     end
   end
 end

data/lib/novaposhta_api/resource.rb

@@ -4,17 +4,13 @@ module NovaposhtaApi
   class Resource
     attr_reader :http
 
-    HTTP_METHODS = %i[get post patch put delete].freeze
-
     def initialize(http: nil)
       @http = http
     end
 
-    HTTP_METHODS.each do |http_method|
-      define_method http_method do |*args|
-        response = http.request(http_method, *args)
-        response['data']
-      end
+    def request(*args)
+      response = http.post(*args)
+      response['data']
     end
   end
 end

data/lib/novaposhta_api/resources/city_resource.rb

@@ -4,7 +4,7 @@ module NovaposhtaApi
   module Resources
     class CityResource < Resource
       def all(params = {})
-        response = post('Address/getCities', params)
+        response = request('Address/getCities', params)
 
         NovaposhtaApi::Models::City.extract_collection(response)
       end

data/lib/novaposhta_api/resources/counterparty_resource.rb

@@ -4,25 +4,25 @@ module NovaposhtaApi
   module Resources
     class CounterpartyResource < Resource
       def create(params = {})
-        response = post('Counterparty/save', params)
+        response = request('Counterparty/save', params)
 
         NovaposhtaApi::Models::Counterparty.extract_single(response)
       end
 
       def senders
-        response = post('Counterparty/getCounterparties', counterparty_property: 'Sender')
+        response = request('Counterparty/getCounterparties', counterparty_property: 'Sender')
 
         NovaposhtaApi::Models::Counterparty.extract_collection(response)
       end
 
       def addresses(ref)
-        response = post('Counterparty/getCounterpartyAddresses', ref: ref)
+        response = request('Counterparty/getCounterpartyAddresses', ref: ref)
 
         NovaposhtaApi::Models::Address.extract_collection(response)
       end
 
       def contacts(ref)
-        response = post('Counterparty/getCounterpartyContactPersons', ref: ref)
+        response = request('Counterparty/getCounterpartyContactPersons', ref: ref)
 
         NovaposhtaApi::Models::ContactPerson.extract_collection(response)
       end

data/lib/novaposhta_api/resources/internet_document_resource.rb

@@ -4,7 +4,7 @@ module NovaposhtaApi
   module Resources
     class InternetDocumentResource < Resource
       def create(params = {})
-        response = post('InternetDocument/save', params)
+        response = request('InternetDocument/save', params)
 
         NovaposhtaApi::Models::InternetDocument.extract_single(response)
       end

data/lib/novaposhta_api/resources/settlement_resource.rb

@@ -4,7 +4,7 @@ module NovaposhtaApi
   module Resources
     class SettlementResource < Resource
       def all(params = {})
-        response = post('Address/searchSettlements', params)
+        response = request('Address/searchSettlements', params)
 
         NovaposhtaApi::Models::Settlement.extract_collection(response[0]['Addresses'])
       end

data/lib/novaposhta_api/resources/tracking_document_resource.rb

@@ -4,8 +4,9 @@ module NovaposhtaApi
   module Resources
     class TrackingDocumentResource < Resource
       def track(number)
-        response = post(
-          'TrackingDocument/getStatusDocuments', documents: [{document_number: number}]
+        response = request(
+          'TrackingDocument/getStatusDocuments',
+          documents: [{document_number: number}]
         )
 
         NovaposhtaApi::Models::TrackingDocument.extract_single(response)

data/lib/novaposhta_api/resources/warehouse_resource.rb

@@ -4,7 +4,7 @@ module NovaposhtaApi
   module Resources
     class WarehouseResource < Resource
       def all(params = {})
-        response = post('Address/getWarehouses', params)
+        response = request('Address/getWarehouses', params)
 
         NovaposhtaApi::Models::Warehouse.extract_collection(response)
       end

data/lib/novaposhta_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NovaposhtaApi
-  VERSION = '0.1.5'
+  VERSION = '0.1.8'
 end

data/lib/novaposhta_api.rb

@@ -12,7 +12,6 @@ module NovaposhtaApi
 
   module Middlewares
     autoload :ErrorHandling, 'novaposhta_api/middlewares/error_handling'
-    autoload :ParseJson, 'novaposhta_api/middlewares/parse_json'
   end
 
   module Resources
@@ -60,7 +59,6 @@ module NovaposhtaApi
   end
 
   if Faraday::Middleware.respond_to? :register_middleware
-    Faraday::Response.register_middleware json: NovaposhtaApi::Middlewares::ParseJson
     Faraday::Response.register_middleware error_handling: NovaposhtaApi::Middlewares::ErrorHandling
   end
 end

data/novaposhta_api.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Ruby wrapper for NovaPoshta API 2.0.'
   spec.homepage      = 'https://github.com/venethub/novaposhta_api'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
 
@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 1.0', '>= 1.0.1'
+  spec.add_dependency 'faraday', '~> 2.2'
   spec.add_dependency 'hashie', '~> 4.1'
 
-  spec.add_development_dependency 'rubocop', '~> 0.86.0'
+  spec.add_development_dependency 'rubocop', '~> 1.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: novaposhta_api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - venet
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: '1.25'
 description: Ruby wrapper for NovaPoshta API 2.0.
 email:
 - venet.dev@gmail.com
@@ -84,7 +78,6 @@ files:
 - lib/novaposhta_api/configuration.rb
 - lib/novaposhta_api/http_client.rb
 - lib/novaposhta_api/middlewares/error_handling.rb
-- lib/novaposhta_api/middlewares/parse_json.rb
 - lib/novaposhta_api/model.rb
 - lib/novaposhta_api/models/city.rb
 - lib/novaposhta_api/models/contact_person.rb
@@ -116,14 +109,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Novaposhta API 2.0 client

data/lib/novaposhta_api/middlewares/parse_json.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module NovaposhtaApi
-  module Middlewares
-    class ParseJson < Faraday::Response::Middleware
-      def on_complete(env)
-        process_response(env)
-      end
-
-      def process_response(env)
-        env[:body] = JSON.parse(env[:body])
-      rescue Faraday::ParsingError => e
-        raise Faraday::ParsingError.new(e.wrapped_exception, env[:response])
-      end
-    end
-  end
-end