yandex-dostavka 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9640f2cfed42f6a1ad69212d4c255ca82482f1e4f98a2d4a0b5b50316aea99d7
-  data.tar.gz: 3c29642ce1ab73e829030fd3ba4a4a95eabc38b315370b891559c3a409beed35
+  metadata.gz: 5600dd5972244fcc3dee75ebfbc2f0a1169e7477fe7ee35475a73fd26f70dfb4
+  data.tar.gz: 05c59614e7887daf136c5a9d000d57774912f0d6295c34437cc128b8d58ef164
 SHA512:
-  metadata.gz: 51041e29403e882c72a1b4403428e1f8b9b65eeb521ad56472e6ddb3cb841dae25b097b2beee0c4756505a1694c95785d212620e641db6182652fd9bea0bf32f
-  data.tar.gz: a30bda566869acd6974153480b7571e5504e1e3d5a00e5241cf07cc467b0a125f237fe296328584db802ad63e855675de7aff27f182246e27e4b59631238d683
+  metadata.gz: 1fc46de563a4b26f5dd1d23753b277b8ada1b77b5cc33eea46676ed22ad3f0b2c980b626ac9937ce9399204afe90b5f78475c9ad77464d7a418503b5206c001d
+  data.tar.gz: 23249925762635335e541bd42751d24a3360761a74ecddaf8ee0c621ba0ba5984ee40d20d97112a2df4d44b82d5738b3df086f353a5e9c135ad3ce461fa7c5a4

data/README.markdown

@@ -34,6 +34,7 @@ API wrapper для [Yandex Dostavka API](https://yandex.ru/dev/logistics/deliver
 2. В разделе Токен для API нажмите Получить.
 3. На странице https://oauth.yandex.ru нажмите Разрешить.
 4. В Кабинете Корпоративного Клиента Яндекс Доставки на вкладке Профиль компании в разделе Токен для API будет отображен ваш OAuth-токен.
+5. Получите station id у менеджера.
 
 ## Ruby
     $ gem install yandex-dostavka
@@ -118,7 +119,7 @@ pricing_total = response.body[:pricing_total]
 ### <a name="api_b2b_platform_offers_info_get"></a> [Получение интервалов доставки](https://yandex.ru/dev/logistics/delivery-api/doc/ref/part1/api_b2b_platform_offers_info_get.html)
 ```ruby
 params = {
-        station_id: "03840f16-3c53-400c-b382-1ecf30e06b64",
+        station_id: YandexDostavka.station_id,
         full_address: "Санкт-Петербург, Професора Попова, 38",
         geo_id: 2
 }

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

@@ -4,9 +4,11 @@ production:
   <<: *defaults
   API_ENDPOINT: "https://b2b-authproxy.taxi.yandex.net"
   YANDEX_DOSTAVKA_TOKEN: "***"
+  STATION_ID: "***"
 development:
   <<: *defaults
   API_ENDPOINT: "https://b2b.taxi.tst.yandex.net"
   YANDEX_DOSTAVKA_TOKEN: "AgAAAADzeAQMAAAPeISvM_9LUkxCijQoFXOH5QE"
+  STATION_ID: "7c4054cd-d768-4062-8f8d-d0c9b3c8c4e8"
 test:
   <<: *defaults

data/lib/yandex-dostavka/api_request.rb

@@ -5,10 +5,10 @@ module YandexDostavka
       @request_builder = builder
     end
 
-    def post(params: nil, headers: nil, suffix: nil, body: {})
+    def post(params: nil, headers: nil, body: {})
       validate_api_key
       begin
-        response = self.rest_client(suffix).post do |request|
+        response = self.rest_client.post do |request|
           configure_request(request: request, params: params, headers: headers, body: body)
         end
         parse_response(response)
@@ -17,7 +17,7 @@ module YandexDostavka
       end
     end
 
-    def get(params: nil, headers: nil, body: {})
+    def get(params: nil, headers: nil, body: nil)
       validate_api_key
 
       begin
@@ -76,9 +76,14 @@ module YandexDostavka
           error_params[:status_code] = error.response[:status]
           error_params[:raw_body] = error.response[:body]
 
-          parsed_response = MultiJson.load(error.response[:body], symbolize_keys: symbolize_keys)
+          io = StringIO.new(error.response[:body])
+          gzip_reader = Zlib::GzipReader.new(io, encoding: 'ASCII-8BIT')
+          body = gzip_reader.read
+
+          parsed_response = MultiJson.load(body, symbolize_keys: symbolize_keys)
 
           if parsed_response
+
             error_params[:body] = parsed_response
 
             title_key = symbolize_keys ? :title : "title"
@@ -110,8 +115,8 @@ module YandexDostavka
       end
     end
 
-    def rest_client(suffix=nil)
-      client = Faraday.new("#{self.api_url}#{suffix.present? ? "/#{suffix}": ""}", proxy: self.proxy,
+    def rest_client
+      client = Faraday.new("#{self.api_url}", proxy: self.proxy,
                            ssl: self.ssl_options) do |faraday|
         faraday.request :gzip
         faraday.response :raise_error

data/lib/yandex-dostavka/error.rb

@@ -21,7 +21,6 @@ module YandexDostavka
     def instance_variables_to_s
       [:title, :detail, :body, :raw_body, :status_code].map do |attr|
         attr_value = send(attr)
-
         "@#{attr}=#{attr_value.inspect}"
       end.join(", ")
     end

data/lib/yandex-dostavka/request.rb

@@ -62,7 +62,7 @@ module YandexDostavka
       reset
     end
 
-    def retrieve(params: nil, headers: nil, body: {})
+    def retrieve(params: nil, headers: nil, body: nil)
       APIRequest.new(builder: self).get(params: params, headers: headers, body: body)
     ensure
       reset

data/lib/yandex-dostavka/version.rb

@@ -1,3 +1,3 @@
 module YandexDostavka
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

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