novaposhta_api 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27acc51844dd0c133dbf3adde6f4f6576f6b73a71cabe0b1b3a295c623ff6f35
-  data.tar.gz: b2ebad750d002ce9be1b43e5c1f4619dcbb7bd1c9bbeff1c75d7a6fa6e18368e
+  metadata.gz: 98e36754022f3732bbbdc06adcc7bc7e608283fc6db5cb94241ee657059aa0b6
+  data.tar.gz: 6b2274236c86b30e5b94b4b3108a878d1eff97a3df1c99616c345ebea70e5a30
 SHA512:
-  metadata.gz: '06956d928678a28a6c4d864a17c15e7cbe57e1fd2c71d6d90cf4666597ecc98bcb39f69a78d103a2ffb37d6a8544ebaea5e18b206aa1b16a0ae5abcaf5b42984'
-  data.tar.gz: 50a49ca1354844f0cbe4d9aaf54b126ff2bdb318c06f0fe454b6dad3b27563eca5ee1ce3b0e3e92330433cb27291491e41d2ace0ac96c02134e543a53ad6d171
+  metadata.gz: 2d91fa9b6c0a526657e766485f2a52bac4018660a21a588b12ff6f9971583f35149573a1c966fe9a1f7c4c448ca34c1b98a570bf34fa26e1c4e983ddc8aa8e7a
+  data.tar.gz: 34ba3c325732e714f0a59b512be09770e658ef9bcaa73cb42b304945450b58e55d0692e4cf3dea422bb532ce8ae9a0b578216e580b2024d54eb23e12c8e4601e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    novaposhta_api (0.1.8)
+    novaposhta_api (0.2.1)
       faraday (~> 2.2)
       hashie (~> 4.1)
 
@@ -9,18 +9,24 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    faraday (2.2.0)
-      faraday-net_http (~> 2.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.1)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-net_http (3.3.0)
+      net-http
     hashie (4.1.0)
+    json (2.7.2)
+    logger (1.6.1)
+    net-http (0.4.1)
+      uri
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (12.3.3)
     regexp_parser (2.2.1)
-    rexml (3.2.5)
+    rexml (3.3.8)
     rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -33,8 +39,8 @@ GEM
     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)
+    uri (0.13.1)
 
 PLATFORMS
   ruby

data/lib/novaposhta_api/http_client.rb

@@ -24,7 +24,7 @@ module NovaposhtaApi
     end
 
     def request(http_method, path, params = {})
-      options = build_options(path).merge(methodProperties: transform_keys(params))
+      options = build_options(path).merge(methodProperties: params)
       response = connection.public_send(http_method, '', options.to_json)
       response.body
     end
@@ -55,17 +55,5 @@ module NovaposhtaApi
         headers: DEFAULT_HEADERS
       }
     end
-
-    def transform_keys(params)
-      convert_params_to_hash(params).deep_transform_keys { |key| key.to_s.camelcase }
-    end
-
-    def convert_params_to_hash(params)
-      if params.respond_to?(:to_unsafe_h)
-        params.to_unsafe_h
-      else
-        params
-      end
-    end
   end
 end

data/lib/novaposhta_api/model.rb

@@ -3,6 +3,7 @@
 module NovaposhtaApi
   class Model < Hashie::Trash
     include Hashie::Extensions::IndifferentAccess
+    include Hashie::Extensions::Coercion
     include Hashie::Extensions::IgnoreUndeclared
 
     class << self

data/lib/novaposhta_api/models/city.rb

@@ -3,13 +3,13 @@
 module NovaposhtaApi
   module Models
     class City < Model
-      property :ref, from: :Ref
-      property :city_id, from: :CityID
-      property :area, from: :Area
-      property :description, from: :Description
-      property :description_ru, from: :DescriptionRu
-      property :settlement_type_description, from: :SettlementTypeDescription
-      property :settlement_type_description_ru, from: :SettlementTypeDescriptionRu
+      property :Ref
+      property :CityID
+      property :Area
+      property :Description
+      property :DescriptionRu
+      property :SettlementTypeDescription
+      property :SettlementTypeDescriptionRu
     end
   end
 end

data/lib/novaposhta_api/models/contact_person.rb

@@ -3,13 +3,13 @@
 module NovaposhtaApi
   module Models
     class ContactPerson < Model
-      property :ref, from: :Ref
-      property :first_name, from: :FirstName
-      property :middle_name, from: :MiddleName
-      property :last_name, from: :LastName
-      property :phones, from: :Phones
-      property :description, from: :Description
-      property :email, from: :Email
+      property :Ref
+      property :FirstName
+      property :MiddleName
+      property :LastName
+      property :Phones
+      property :Description
+      property :Email
     end
   end
 end

data/lib/novaposhta_api/models/counterparty.rb

@@ -3,18 +3,18 @@
 module NovaposhtaApi
   module Models
     class Counterparty < Model
-      property :ref, from: :Ref
-      property :first_name, from: :FirstName
-      property :middle_name, from: :MiddleName
-      property :last_name, from: :LastName
-      property :phone, from: :Phone
-      property :description, from: :Description
-      property :city, from: :City
-      property :persons, from: :ContactPerson
+      property :Ref
+      property :FirstName
+      property :MiddleName
+      property :LastName
+      property :Phone
+      property :Description
+      property :City
+      property :ContactPerson
 
-      def person
-        @person ||= NovaposhtaApi::Models::Counterparty.extract_single(persons['data']&.first)
-      end
+      coerce_key :ContactPerson, lambda { |value|
+        NovaposhtaApi::Models::ContactPerson.extract_single(value['data'])
+      }
     end
   end
 end

data/lib/novaposhta_api/models/counterparty_address.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module NovaposhtaApi
+  module Models
+    class CounterpartyAddress < Model
+      property :Ref
+      property :Description
+    end
+  end
+end

data/lib/novaposhta_api/models/internet_document.rb

@@ -3,34 +3,34 @@
 module NovaposhtaApi
   module Models
     class InternetDocument < Model
-      property :ref, from: :Ref
-      property :cost_on_site, from: :CostOnSite
-      property :estimated_delivery_date, from: :EstimatedDeliveryDate
-      property :int_doc_number, from: :IntDocNumber
-      property :type_document, from: :TypeDocument
+      property :Ref
+      property :CostOnSite
+      property :EstimatedDeliveryDate
+      property :IntDocNumber
+      property :TypeDocument
 
-      property :sender, from: :Sender
-      property :city_sender, from: :CitySender
-      property :sender_address, from: :SenderAddress
-      property :contact_sender, from: :ContactSender
-      property :senders_phone, from: :SendersPhone
+      property :Sender
+      property :CitySender
+      property :SenderAddress
+      property :ContactSender
+      property :SendersPhone
 
-      property :recipient, from: :Recipient
-      property :city_recipient, from: :CityRecipient
-      property :recipient_address, from: :RecipientAddress
-      property :contact_recipient, from: :ContactRecipient
-      property :recipients_phone, from: :RecipientsPhone
+      property :Recipient
+      property :CityRecipient
+      property :RecipientAddress
+      property :ContactRecipient
+      property :RecipientsPhone
 
-      property :sevice_type, from: :SeviceType
-      property :cargo_type, from: :CargoType
-      property :payment_method, from: :PaymentMethod
-      property :payer_type, from: :PayerType
-      property :cost, from: :Cost
-      property :seats_amount, from: :SeatsAmount
-      property :description, from: :Description
-      property :weight, from: :Weight
-      property :date_time, from: :DateTime
-      property :options_seat, from: :OptionsSeat
+      property :SeviceType
+      property :CargoType
+      property :PaymentMethod
+      property :PayerType
+      property :Cost
+      property :SeatsAmount
+      property :Description
+      property :Weight
+      property :DateTime
+      property :OptionsSeat
     end
   end
 end

data/lib/novaposhta_api/models/settlement.rb

@@ -3,12 +3,12 @@
 module NovaposhtaApi
   module Models
     class Settlement < Model
-      property :ref, from: :Ref
-      property :present, from: :Present
-      property :area, from: :Area
-      property :delivery_city, from: :DeliveryCity
-      property :main_description, from: :MainDescription
-      property :region, from: :Region
+      property :Ref
+      property :Present
+      property :Area
+      property :DeliveryCity
+      property :MainDescription
+      property :Region
     end
   end
 end

data/lib/novaposhta_api/models/tracking_document.rb

@@ -3,10 +3,10 @@
 module NovaposhtaApi
   module Models
     class TrackingDocument < Model
-      property :number, from: :Number
-      property :status, from: :Status
-      property :status_code, from: :StatusCode
-      property :scheduled_delivery_date, from: :ScheduledDeliveryDate
+      property :Number
+      property :Status
+      property :StatusCode
+      property :ScheduledDeliveryDate
     end
   end
 end

data/lib/novaposhta_api/models/warehouse.rb

@@ -3,15 +3,15 @@
 module NovaposhtaApi
   module Models
     class Warehouse < Model
-      property :ref, from: :Ref
-      property :city_ref, from: :CityRef
-      property :city_description, from: :CityDescription
-      property :city_description_ru, from: :CityDescriptionRu
-      property :description, from: :Description
-      property :description_ru, from: :DescriptionRu
-      property :short_address, from: :ShortAddress
-      property :longitude, from: :Longitude
-      property :latitude, from: :Latitude
+      property :Ref
+      property :CityRef
+      property :CityDescription
+      property :CityDescriptionRu
+      property :Description
+      property :DescriptionRu
+      property :ShortAddress
+      property :Longitude
+      property :Latitude
     end
   end
 end

data/lib/novaposhta_api/resources/counterparty_resource.rb

@@ -10,19 +10,19 @@ module NovaposhtaApi
       end
 
       def senders
-        response = request('Counterparty/getCounterparties', counterparty_property: 'Sender')
+        response = request('Counterparty/getCounterparties', CounterpartyProperty: 'Sender')
 
         NovaposhtaApi::Models::Counterparty.extract_collection(response)
       end
 
       def addresses(ref)
-        response = request('Counterparty/getCounterpartyAddresses', ref: ref)
+        response = request('Counterparty/getCounterpartyAddresses', Ref: ref)
 
-        NovaposhtaApi::Models::Address.extract_collection(response)
+        NovaposhtaApi::Models::CounterpartyAddress.extract_collection(response)
       end
 
       def contacts(ref)
-        response = request('Counterparty/getCounterpartyContactPersons', ref: ref)
+        response = request('Counterparty/getCounterpartyContactPersons', Ref: ref)
 
         NovaposhtaApi::Models::ContactPerson.extract_collection(response)
       end

data/lib/novaposhta_api/resources/tracking_document_resource.rb

@@ -6,7 +6,11 @@ module NovaposhtaApi
       def track(number)
         response = request(
           'TrackingDocument/getStatusDocuments',
-          documents: [{document_number: number}]
+          Documents: [
+            {
+              DocumentNumber: number
+            }
+          ]
         )
 
         NovaposhtaApi::Models::TrackingDocument.extract_single(response)

data/lib/novaposhta_api/version.rb

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

data/lib/novaposhta_api.rb

@@ -31,6 +31,7 @@ module NovaposhtaApi
     autoload :Settlement, 'novaposhta_api/models/settlement'
     autoload :Warehouse, 'novaposhta_api/models/warehouse'
     autoload :ContactPerson, 'novaposhta_api/models/contact_person'
+    autoload :CounterpartyAddress, 'novaposhta_api/models/counterparty_address'
   end
 
   Error = Class.new(StandardError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: novaposhta_api
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
 platform: ruby
 authors:
 - venet
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-19 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -82,6 +82,7 @@ files:
 - lib/novaposhta_api/models/city.rb
 - lib/novaposhta_api/models/contact_person.rb
 - lib/novaposhta_api/models/counterparty.rb
+- lib/novaposhta_api/models/counterparty_address.rb
 - lib/novaposhta_api/models/internet_document.rb
 - lib/novaposhta_api/models/settlement.rb
 - lib/novaposhta_api/models/tracking_document.rb