yandex-delivery 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a2fc2639ef507d2e4f38a0f344aadcf214f861ffd8a62cc628dd26f547b6c92
-  data.tar.gz: 1efaafc00e1454ea7df4cd58eac5eb5b35aca08fce8d3ac4ec0c94e3f3aa0c36
+  metadata.gz: 879dec72178429f7404eda56de3ffa39002530a8451a82753ce79e26cb64e38e
+  data.tar.gz: 99cb8023968d3a40c9b03a834a812b418ac410a79287fcfd72a5fe1f36f20493
 SHA512:
-  metadata.gz: 66bd2349a7c9dcd081f5bc25ea0baab44121701386e2d281da43e8481ff632faaac800563ffe38682b23ad809110a31d1bb3b39ce3736eab8e37216bbebe0e9e
-  data.tar.gz: 63b9aa136866b19245b485a6843a7bf2f5b075986eb87cdca991ff05ffdf6c2f509ff102f216849a033d2737c2ba1134a4667fb6839c27f35d6f6717fa82cd1e
+  metadata.gz: 0bc51ee3f55b3fbab1c6939fc926435d6e25b27cdc06e80d9691166e579c8207a8c565353081b4aa6999aa746bad7c9ce9689800d0c11f479235e4259d3fb108
+  data.tar.gz: b6ea88f077d315ed92a2be1512c25a4ca202db48ee2c2ef352290004afeee27642e1183cdb75d1cf4cea2a85ad1f6810b9f07c1905d27e17616c904e5fa612fb

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

@@ -5,6 +5,7 @@ YandexDelivery.setup do |config|
     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
@@ -140,7 +144,7 @@ module YandexDelivery
       if request
         request.params.merge!(params) if params
         request.headers['Content-Type'] = 'application/json'
-        request.headers['Authorization'] = "OAuth #{self.api_key}"
+        request.headers['Authorization'] = "OAuth oauth_token=\"#{self.api_key}\", oauth_client_id=\"#{self.app_id}\""
         request.headers.merge!(headers) if headers
         request.body = body if body
         request.options.timeout = self.timeout
@@ -181,6 +185,9 @@ module YandexDelivery
       unless self.api_key
         raise YandexDelivery::YandexDeliveryError, "You must set an api_key prior to making a call"
       end
+      unless self.app_id
+        raise YandexDelivery::YandexDeliveryError, "You must set an app_id prior to making a call"
+      end
     end
 
     def api_url

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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex-delivery
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Pavel Osetrov