novaposhta_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb141215c0ba04abe8d7f9cfde0b63701dc76e6c79efda89cd71e143377c124
-  data.tar.gz: 2b3155414b8fd53bfe58228a43acf303b105764b4c6de935e932eb541e989475
+  metadata.gz: db0a59d6e83adee1e273164e0a7c3dc33828e2e0167451a4da1047dc88eaaf9e
+  data.tar.gz: 465497a98ad80b79aa90ee2722bfce629db455a7467f9e4f13a03bedef4ed79d
 SHA512:
-  metadata.gz: '04824c919c48bc77389f9001f153e9c8cf85153424a9144100af0ac519403dd98f5648a0ed469d7a1c8ca8b321fdf86a3ba69dc2fc68849740f4b0c0bbafe86e'
-  data.tar.gz: d974dae19075ce7585ca2b260eb7f2c9b760cd379862885d680e500c8c16386142b906d2dd60ffc67f9f4d0d779dc1da4caaa2f438f5bfd52c833829fb205add
+  metadata.gz: cf3b30451c7c21da4d71b7439f725c00b136c6240816501cb808b83ce738548a315509cc478473ca344ac9e2975521230e9654b78bc35db4e489dc47ed2c711d
+  data.tar.gz: c18707a6fc4f48be132091376dc6ec39322868aabd1fdcb5201ae53421947abfff3bcbc790cc6068345fe979f3cfb9b47db6fe3a3263fb0c7f7e225033ed9a9f

data/lib/novaposhta_api.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'novaposhta_api/version'
+require 'novaposhta_api/configuration'
 
 module NovaposhtaApi
   autoload :Client, 'novaposhta_api/client'
@@ -18,6 +19,7 @@ module NovaposhtaApi
     autoload :CityResource, 'novaposhta_api/resources/city_resource'
     autoload :CounterpartyResource, 'novaposhta_api/resources/counterparty_resource'
     autoload :InternetDocumentResource, 'novaposhta_api/resources/internet_document_resource'
+    autoload :TrackingDocumentResource, 'novaposhta_api/resources/tracking_document_resource'
     autoload :SettlementResource, 'novaposhta_api/resources/settlement_resource'
     autoload :WarehouseResource, 'novaposhta_api/resources/warehouse_resource'
   end
@@ -26,6 +28,7 @@ module NovaposhtaApi
     autoload :City, 'novaposhta_api/models/city'
     autoload :Counterparty, 'novaposhta_api/models/counterparty'
     autoload :InternetDocument, 'novaposhta_api/models/internet_document'
+    autoload :TrackingDocument, 'novaposhta_api/models/tracking_document'
     autoload :Settlement, 'novaposhta_api/models/settlement'
     autoload :Warehouse, 'novaposhta_api/models/warehouse'
   end
@@ -34,10 +37,31 @@ module NovaposhtaApi
   ResourceError = Class.new(Error)
   ResponseError = Class.new(Error)
 
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  # @example
+  #   NovaposhtaApi.setup do |config|
+  #     config.api_url = "https://api.novaposhta.ua/v2.0/json/"
+  #   end
+  #
+  def self.setup
+    yield configuration
+  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
 
-require 'novaposhta_api/rails'
+require 'novaposhta_api/rails'

data/lib/novaposhta_api/client.rb

@@ -2,8 +2,6 @@
 
 module NovaposhtaApi
   class Client
-    API_URL = 'https://api.novaposhta.ua/v2.0/json/'
-
     attr_reader :api_key
 
     def initialize(api_key: nil)
@@ -15,6 +13,7 @@ module NovaposhtaApi
         cities: Resources::CityResource,
         counterparties: Resources::CounterpartyResource,
         internet_documents: Resources::InternetDocumentResource,
+        tracking_documents: Resources::TrackingDocumentResource,
         settlements: Resources::SettlementResource,
         warehouses: Resources::WarehouseResource
       }
@@ -43,8 +42,8 @@ module NovaposhtaApi
 
     def connection
       @connection ||= NovaposhtaApi::HttpClient.new(
-        uri: API_URL,
-        api_key: api_key
+        uri: NovaposhtaApi.configuration.api_url,
+        api_key: api_key || NovaposhtaApi.configuration.api_key
       )
     end
   end

data/lib/novaposhta_api/configuration.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module NovaposhtaApi
+  class Configuration
+    attr_accessor :api_url, :api_key
+
+    def initialize
+      @api_url = 'https://api.novaposhta.ua/v2.0/json/'
+      @api_key = ''
+    end
+  end
+end

data/lib/novaposhta_api/middlewares/error_handling.rb

@@ -12,7 +12,7 @@ module NovaposhtaApi
       end
 
       def error_message(body)
-        (from_codes(body['errorCodes']) || body['errors']).join(SEPARATOR)
+        (from_codes(body['errorCodes']) || body['errors'] || body['message']).join(SEPARATOR)
       end
 
       def from_codes(codes = [])

data/lib/novaposhta_api/models/tracking_document.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+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
+    end
+  end
+end

data/lib/novaposhta_api/rails.rb

@@ -3,4 +3,4 @@
 module NovaposhtaApi
   class Engine < ::Rails::Engine
   end
-end
+end

data/lib/novaposhta_api/resources/tracking_document_resource.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NovaposhtaApi
+  module Resources
+    class TrackingDocumentResource < Resource
+      def track(number)
+        response = post(
+          'TrackingDocument/getStatusDocuments', documents: [{document_number: number}]
+        )
+
+        NovaposhtaApi::Models::TrackingDocument.extract_single(response)
+      end
+    end
+  end
+end

data/lib/novaposhta_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: novaposhta_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - venet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -81,6 +81,7 @@ files:
 - lib/novaposhta_api.rb
 - lib/novaposhta_api/client.rb
 - lib/novaposhta_api/collection.rb
+- 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
@@ -89,6 +90,7 @@ files:
 - lib/novaposhta_api/models/counterparty.rb
 - lib/novaposhta_api/models/internet_document.rb
 - lib/novaposhta_api/models/settlement.rb
+- lib/novaposhta_api/models/tracking_document.rb
 - lib/novaposhta_api/models/warehouse.rb
 - lib/novaposhta_api/rails.rb
 - lib/novaposhta_api/resource.rb
@@ -96,6 +98,7 @@ files:
 - lib/novaposhta_api/resources/counterparty_resource.rb
 - lib/novaposhta_api/resources/internet_document_resource.rb
 - lib/novaposhta_api/resources/settlement_resource.rb
+- lib/novaposhta_api/resources/tracking_document_resource.rb
 - lib/novaposhta_api/resources/warehouse_resource.rb
 - lib/novaposhta_api/version.rb
 - novaposhta_api.gemspec