ozon-logistics 0.0.6 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435947ecbb9b47558a5610a41123d5b075a2120d6b68bf869ab3b53117685def
-  data.tar.gz: fc432a84ae37d456622f62e9e7095834ad07a1fb7719a9ea16b62365cf99d076
+  metadata.gz: da443e41a0808bb891ccb8a1a8597378f323c07d62ee8761cc27702ec8c9c90a
+  data.tar.gz: 71c6cac8d72571c314b65851b078c244eb42dfb980eed30fc97b2b3d37c91c54
 SHA512:
-  metadata.gz: 64f7a27b9ab6e5ecccbb9c3047b01d95ddaf2896a75898f19dc08b602cf46b92f22b54c2c33519eca364ea2b8ac298dc6aad1f6735a39dd82ed295ebb68f2ed7
-  data.tar.gz: 6935d1def31c667bc04d999e55c6811ed7fd3b00a5ca2c4cefddd4908455bd9cbf5c63d4bb7d6abf237d89952abc271a64a12b2e5af92a9e69b17bdffa0a0894
+  metadata.gz: 8628a1dbd033f9b79e879741d15b24d2cc93b174f05667cf173edaf19ef6c5c815843ab49c4d8148da7e9b30bb6b71501f10acf1726e17d5714e3d4dce7f33f3
+  data.tar.gz: b07dfd2e924d0e5cb60b5b0ab4e3c32b9b7e1738a88c4ea26fbb89d3394fa0ac63f9b254fe56f68877c19e640f0b9e56c1b98321f1893d3c0adc5b55a4f9df08

data/README.markdown

@@ -160,6 +160,10 @@ amount = response.body[:amount]
 ```ruby
 body = {
   orderNumber: '1',
+  firstMileTransfer: {
+    type: 'DropOff',
+    fromPlaceId: OzonLogistics.from_places.to_s
+  },
   buyer: {
     name: 'Павел',
     phone: '+71234567890',
@@ -203,6 +207,19 @@ body = {
 response = OzonLogistics::Request.order.create(body: body)
 order = response[:data]
 ```
+
+### Shipment
+#### Метод создания заявки на отгрузку на складе OZON
+```ruby
+body = {
+  orderIds: [
+    order_id
+  ]
+}
+response = OzonLogistics::Request.shipmentRequest.create(body: body)
+result = response.body
+```
+
 ### Tariff
 #### Получение списка тарифов 
 ```ruby

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

@@ -2,12 +2,12 @@ defaults: &defaults
   GRANT_TYPE: 'client_credentials'
   CLIENT_ID: 'ApiTest_11111111-1111-1111-1111-111111111111'
   CLIENT_SECRET: 'SRYksX3PBPUYj73A6cNqbQYRSaYNpjSodIMeWoSCQ8U='
-  URL_TOKEN: 'https://api-stg.ozonru.me/principal-auth-api/connect/token'
-  HOST: 'https://api-stg.ozonru.me/principal-integration-api'
+  URL_TOKEN: 'https://xapi.ozon.ru/principal-auth-api/connect/token'
+  HOST: 'https://xapi.ozon.ru/principal-integration-api'
 production:
   <<: *defaults
-  URL_TOKEN: 'https://api.ozon.ru/principal-auth-api/connect/token'
-  HOST: 'https://api.ozon.ru/principal-integration-api'
+  URL_TOKEN: 'https://xapi.ozon.ru/principal-auth-api/connect/token'
+  HOST: 'https://xapi.ozon.ru/principal-integration-api'
   CLIENT_ID: ''
   CLIENT_SECRET: ''
 development:

data/lib/ozon-logistics/api_request.rb

@@ -13,8 +13,8 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers, body: MultiJson.dump(body))
         end
         parse_response(response)
-      rescue => e
-        if e.response.try(:code) == 401 && first_time
+      rescue StandardError => e
+        if e.response.try(:dig, :status) == 401 && first_time
           OzonLogistics::Request.access_token = OzonLogistics.generate_access_token.try(:dig, "access_token")
           self.post(params: params, headers: headers, body: body, first_time: false)
         else
@@ -32,8 +32,8 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers, body: MultiJson.dump(body))
         end
         parse_response(response)
-      rescue => e
-        if e.response.try(:code) == 401 && first_time
+      rescue StandardError => e
+        if e.response.dig(:status) == 401 && first_time
           OzonLogistics::Request.access_token = OzonLogistics.generate_access_token.try(:dig, "access_token")
           self.patch(params: params, headers: headers, body: body, first_time: false)
         else
@@ -50,8 +50,8 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers, body: MultiJson.dump(body))
         end
         parse_response(response)
-      rescue => e
-        if e.response.try(:code) == 401 && first_time
+      rescue StandardError => e
+        if e.response.dig(:status) == 401 && first_time
           OzonLogistics::Request.access_token = OzonLogistics.generate_access_token.try(:dig, "access_token")
           self.put(params: params, headers: headers, body: body, first_time: false)
         else
@@ -68,8 +68,8 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers)
         end
         parse_response(response)
-      rescue => e
-        if e.response.try(:code) == 401 && first_time
+      rescue StandardError => e
+        if e.response.dig(:status) == 401 && first_time
           OzonLogistics::Request.access_token = OzonLogistics.generate_access_token.try(:dig, "access_token")
           self.get(params: params, headers: headers, first_time: false)
         else
@@ -86,8 +86,8 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers)
         end
         parse_response(response)
-      rescue => e
-        if e.response.try(:code) == 401 && first_time
+      rescue StandardError => e
+        if e.response.dig(:status) == 401 && first_time
           OzonLogistics::Request.access_token = OzonLogistics.generate_access_token.try(:dig, "access_token")
           self.delete(params: params, headers: headers, first_time: false)
         else
@@ -163,7 +163,8 @@ module OzonLogistics
       if request
         request.params.merge!(params) if params
         request.headers['Content-Type'] = 'application/json'
-        request.headers['Authorization'] = "Bearer #{self.access_token}"
+        request.headers['Authorization'] = "Bearer #{OzonLogistics::Request.access_token}"
+        request.headers['User-Agent'] = "OzonLogistics/#{OzonLogistics::VERSION} Ruby gem"
         request.headers.merge!(headers) if headers
         request.body = body if body
         request.options.timeout = self.timeout
@@ -201,8 +202,7 @@ module OzonLogistics
     end
 
     def validate_access_token
-      access_token = self.access_token
-      unless access_token && (access_token["-"] || self.api_endpoint)
+      unless self.access_token
         raise OzonLogistics::OzonLogisticsError, "You must set an access_token prior to making a call"
       end
     end

data/lib/ozon-logistics/request.rb

@@ -21,7 +21,7 @@ module OzonLogistics
     end
 
     def method_missing(method, *args)
-      @path_parts << method.to_s.downcase
+      @path_parts << method.to_s
       @path_parts << args if args.length > 0
       @path_parts.flatten!
       self

data/lib/ozon-logistics/version.rb

@@ -1,3 +1,3 @@
 module OzonLogistics
-  VERSION = "0.0.1"
+  VERSION = "0.0.15"
 end

data/lib/ozon-logistics.rb

@@ -1,8 +1,10 @@
+require 'faraday'
 require 'ozon-logistics/ozon_logistics_error'
 require 'ozon-logistics/ozon_error'
 require 'ozon-logistics/request'
 require 'ozon-logistics/api_request'
 require 'ozon-logistics/response'
+require 'ozon-logistics/version'
 
 module OzonLogistics
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ozon-logistics
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.15
 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: Ozon logistics