yandex-delivery 0.0.6 → 0.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/generators/yandex_delivery/install/templates/yandex_delivery.rb +2 -1
- data/lib/generators/yandex_delivery/install/templates/yandex_delivery.yml +1 -0
- data/lib/yandex-delivery/api_request.rb +5 -0
- data/lib/yandex-delivery/request.rb +8 -4
- data/lib/yandex-delivery/version.rb +1 -1
- data/lib/yandex-delivery.rb +2 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a4b5f7718f9fce8c3f38751e8a22110b4e423ce91f371a9a04333fe21304b683
|
4
|
+
data.tar.gz: 2309b887d9c901b0463cf232ff3be0782344dec9583063a4e508a164f2f249be
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9995b7da04daf443f8f2691dfa1984479560bc4a4676fa15bfc3bdc64c6d670466114e9351148840bc0ed7286e2dd0bc499ceaa2ab94a6a8f66fcd6993291d00
|
7
|
+
data.tar.gz: 5d47b1d83f76dace84cee2099cd2b25d22715c877be4df22e73930779455904e82efe704dc8f2203c2c8b75c51bddc7ae5cbfb053150b7a4cf4369e424dcd236
|
@@ -1,10 +1,11 @@
|
|
1
|
-
require '
|
1
|
+
require 'yandex-delivery'
|
2
2
|
|
3
3
|
YandexDelivery.setup do |config|
|
4
4
|
if File.exist?('config/yandex_delivery2.yml')
|
5
5
|
template = ERB.new(File.new('config/yandex_delivery2.yml').read)
|
6
6
|
processed = YAML.safe_load(template.result(binding))
|
7
7
|
|
8
|
+
config::Request.app_id = processed['YANDEX_DELIVERY_APP_ID']
|
8
9
|
config::Request.api_key = processed['YANDEX_DELIVERY_ACCESS_TOKEN']
|
9
10
|
config::Request.timeout = 15
|
10
11
|
config::Request.open_timeout = 15
|
@@ -81,6 +81,10 @@ module YandexDelivery
|
|
81
81
|
@request_builder.api_key
|
82
82
|
end
|
83
83
|
|
84
|
+
def app_id
|
85
|
+
@request_builder.app_id
|
86
|
+
end
|
87
|
+
|
84
88
|
def api_endpoint
|
85
89
|
@request_builder.api_endpoint
|
86
90
|
end
|
@@ -141,6 +145,7 @@ module YandexDelivery
|
|
141
145
|
request.params.merge!(params) if params
|
142
146
|
request.headers['Content-Type'] = 'application/json'
|
143
147
|
request.headers['Authorization'] = "OAuth #{self.api_key}"
|
148
|
+
request.headers['User-Agent'] = "OzonLogistics/#{YandexDelivery::VERSION} Ruby gem"
|
144
149
|
request.headers.merge!(headers) if headers
|
145
150
|
request.body = body if body
|
146
151
|
request.options.timeout = self.timeout
|
@@ -1,14 +1,16 @@
|
|
1
1
|
module YandexDelivery
|
2
2
|
class Request
|
3
|
-
attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
|
3
|
+
attr_accessor :api_key, :app_id, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
|
4
4
|
|
5
5
|
DEFAULT_TIMEOUT = 60
|
6
6
|
DEFAULT_OPEN_TIMEOUT = 60
|
7
7
|
|
8
|
-
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)
|
8
|
+
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)
|
9
9
|
@path_parts = []
|
10
10
|
@api_key = api_key || self.class.api_key || ENV['YANDEX_DELIVERY_ACCESS_TOKEN']
|
11
11
|
@api_key = @api_key.strip if @api_key
|
12
|
+
@app_id = app_id || self.class.app_id || ENV['YANDEX_DELIVERY_APP_ID']
|
13
|
+
@app_id = @app_id.strip if @app_id
|
12
14
|
@api_endpoint = api_endpoint || self.class.api_endpoint
|
13
15
|
@timeout = timeout || self.class.timeout || DEFAULT_TIMEOUT
|
14
16
|
@open_timeout = open_timeout || self.class.open_timeout || DEFAULT_OPEN_TIMEOUT
|
@@ -80,10 +82,12 @@ module YandexDelivery
|
|
80
82
|
end
|
81
83
|
|
82
84
|
class << self
|
83
|
-
attr_accessor :api_key, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
|
85
|
+
attr_accessor :api_key, :app_id, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
|
84
86
|
|
85
87
|
def method_missing(sym, *args, &block)
|
86
|
-
new(api_key: self.api_key,
|
88
|
+
new(api_key: self.api_key, app_id: self.app_id, api_endpoint: self.api_endpoint, timeout: self.timeout,
|
89
|
+
open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys,
|
90
|
+
debug: self.debug, proxy: self.proxy, logger: self.logger).send(sym, *args, &block)
|
87
91
|
end
|
88
92
|
|
89
93
|
def respond_to_missing?(method_name, include_private = false)
|
data/lib/yandex-delivery.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
|
+
require 'faraday'
|
1
2
|
require 'yandex-delivery/yandex_delivery_error'
|
2
3
|
require 'yandex-delivery/yandex_error'
|
3
4
|
require 'yandex-delivery/request'
|
4
5
|
require 'yandex-delivery/api_request'
|
5
6
|
require 'yandex-delivery/response'
|
7
|
+
require 'ozon-logistics/version'
|
6
8
|
|
7
9
|
module YandexDelivery
|
8
10
|
class << self
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: yandex-delivery
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pavel Osetrov
|
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
76
76
|
- !ruby/object:Gem::Version
|
77
77
|
version: '0'
|
78
78
|
requirements: []
|
79
|
-
rubygems_version: 3.
|
79
|
+
rubygems_version: 3.2.32
|
80
80
|
signing_key:
|
81
81
|
specification_version: 4
|
82
82
|
summary: Yandex delivery
|