yandex-delivery 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a2fc2639ef507d2e4f38a0f344aadcf214f861ffd8a62cc628dd26f547b6c92
-  data.tar.gz: 1efaafc00e1454ea7df4cd58eac5eb5b35aca08fce8d3ac4ec0c94e3f3aa0c36
+  metadata.gz: a4b5f7718f9fce8c3f38751e8a22110b4e423ce91f371a9a04333fe21304b683
+  data.tar.gz: 2309b887d9c901b0463cf232ff3be0782344dec9583063a4e508a164f2f249be
 SHA512:
-  metadata.gz: 66bd2349a7c9dcd081f5bc25ea0baab44121701386e2d281da43e8481ff632faaac800563ffe38682b23ad809110a31d1bb3b39ce3736eab8e37216bbebe0e9e
-  data.tar.gz: 63b9aa136866b19245b485a6843a7bf2f5b075986eb87cdca991ff05ffdf6c2f509ff102f216849a033d2737c2ba1134a4667fb6839c27f35d6f6717fa82cd1e
+  metadata.gz: 9995b7da04daf443f8f2691dfa1984479560bc4a4676fa15bfc3bdc64c6d670466114e9351148840bc0ed7286e2dd0bc499ceaa2ab94a6a8f66fcd6993291d00
+  data.tar.gz: 5d47b1d83f76dace84cee2099cd2b25d22715c877be4df22e73930779455904e82efe704dc8f2203c2c8b75c51bddc7ae5cbfb053150b7a4cf4369e424dcd236

data/lib/generators/yandex_delivery/install/templates/yandex_delivery.rb

@@ -1,10 +1,11 @@
-require 'yandex_delivery'
+require 'yandex-delivery'
 
 YandexDelivery.setup do |config|
   if File.exist?('config/yandex_delivery2.yml')
     template = ERB.new(File.new('config/yandex_delivery2.yml').read)
     processed = YAML.safe_load(template.result(binding))
 
+    config::Request.app_id = processed['YANDEX_DELIVERY_APP_ID']
     config::Request.api_key = processed['YANDEX_DELIVERY_ACCESS_TOKEN']
     config::Request.timeout = 15
     config::Request.open_timeout = 15

data/lib/generators/yandex_delivery/install/templates/yandex_delivery.yml

@@ -1,3 +1,4 @@
+YANDEX_DELIVERY_APP_ID: ''
 YANDEX_DELIVERY_ACCESS_TOKEN: ''
 
 YANDEX_DELIVERY: {

data/lib/yandex-delivery/api_request.rb

@@ -81,6 +81,10 @@ module YandexDelivery
       @request_builder.api_key
     end
 
+    def app_id
+      @request_builder.app_id
+    end
+
     def api_endpoint
       @request_builder.api_endpoint
     end
@@ -141,6 +145,7 @@ module YandexDelivery
         request.params.merge!(params) if params
         request.headers['Content-Type'] = 'application/json'
         request.headers['Authorization'] = "OAuth #{self.api_key}"
+        request.headers['User-Agent'] = "OzonLogistics/#{YandexDelivery::VERSION} Ruby gem"
         request.headers.merge!(headers) if headers
         request.body = body if body
         request.options.timeout = self.timeout

data/lib/yandex-delivery/request.rb

@@ -1,14 +1,16 @@
 module YandexDelivery
   class Request
-    attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
+    attr_accessor :api_key, :app_id, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
 
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    def initialize(api_key: nil, api_endpoint: nil, timeout: nil, open_timeout: nil, proxy: nil, faraday_adapter: nil, symbolize_keys: false, debug: false, logger: nil)
+    def initialize(api_key: nil, app_id: nil, api_endpoint: nil, timeout: nil, open_timeout: nil, proxy: nil, faraday_adapter: nil, symbolize_keys: false, debug: false, logger: nil)
       @path_parts = []
       @api_key = api_key || self.class.api_key || ENV['YANDEX_DELIVERY_ACCESS_TOKEN']
       @api_key = @api_key.strip if @api_key
+      @app_id = app_id || self.class.app_id || ENV['YANDEX_DELIVERY_APP_ID']
+      @app_id = @app_id.strip if @app_id
       @api_endpoint = api_endpoint || self.class.api_endpoint
       @timeout = timeout || self.class.timeout || DEFAULT_TIMEOUT
       @open_timeout = open_timeout || self.class.open_timeout || DEFAULT_OPEN_TIMEOUT
@@ -80,10 +82,12 @@ module YandexDelivery
     end
 
     class << self
-      attr_accessor :api_key, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
+      attr_accessor :api_key, :app_id, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
 
       def method_missing(sym, *args, &block)
-        new(api_key: self.api_key, api_endpoint: self.api_endpoint, timeout: self.timeout, open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys, debug: self.debug, proxy: self.proxy, logger: self.logger).send(sym, *args, &block)
+        new(api_key: self.api_key, app_id: self.app_id, api_endpoint: self.api_endpoint, timeout: self.timeout,
+            open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys,
+            debug: self.debug, proxy: self.proxy, logger: self.logger).send(sym, *args, &block)
       end
 
       def respond_to_missing?(method_name, include_private = false)

data/lib/yandex-delivery/version.rb

@@ -1,3 +1,3 @@
 module YandexDelivery
-  VERSION = "0.0.5"
+  VERSION = "0.0.9"
 end

data/lib/yandex-delivery.rb

@@ -1,8 +1,10 @@
+require 'faraday'
 require 'yandex-delivery/yandex_delivery_error'
 require 'yandex-delivery/yandex_error'
 require 'yandex-delivery/request'
 require 'yandex-delivery/api_request'
 require 'yandex-delivery/response'
+require 'ozon-logistics/version'
 
 module YandexDelivery
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex-delivery
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
 platform: ruby
 authors:
 - Pavel Osetrov
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Yandex delivery