ozon-logistics 0.0.4 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e04197096b5e5586b65a1a9fb4fa8fc31599975fc29b837c22bb66355d8ea30
-  data.tar.gz: 6aedfbb7e1167f6d62368666ea01e8d29c34722e36a37fd4037b7d65db2332ff
+  metadata.gz: e4c4f351393367ec940e0f7abd55135de1587ec44a4b26c4145b8f30143db09f
+  data.tar.gz: dd723292b024d65d594b4140539427fbcf6a83575137b85778b74e3ceca5fd4c
 SHA512:
-  metadata.gz: 3ff95569e63c572e1c7fccd15b96009785498fb5eb7a4d2a1904f677f5521c0846c5f1b9d6116e9696b7a169e5fcf569392f3a4439f805c32f82a59f68e6a380
-  data.tar.gz: 1029a14114a1e6689da6bd7cb1671070d966b2223303144f5050c5847cddb2d97e03ab417bcc5c699e8c47743e648e2b5cb7f7fddc21e4ca63e1f0129fc77093
+  metadata.gz: 5aef5ad14830fdaae7d65ea352b57c4244897dd51e09df1a8cd3d88f196dc6ae1cf8316a0742eec31a546c020826a4b25190ae9f4cce1eba586607455368b9d1
+  data.tar.gz: c82628cf9568ee9354b2bead904aad23737a6776b16f8ae8782710b14a863ff7cdcc31213e0f696c70e05cfee49c12bfdc5bbe469d351788ddb58dc0cd833af6

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,12 +13,13 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers, body: MultiJson.dump(body))
         end
         parse_response(response)
-      rescue => e
-        if e.response[:status] == 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.post(params: params, headers: headers, body: body, first_time: false)
+        else
+          handle_error(e)
         end
-        handle_error(e)
       end
     end
 
@@ -31,12 +32,13 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers, body: MultiJson.dump(body))
         end
         parse_response(response)
-      rescue => e
-        if e.response[:status] == 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
+          handle_error(e)
         end
-        handle_error(e)
       end
     end
 
@@ -48,12 +50,13 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers, body: MultiJson.dump(body))
         end
         parse_response(response)
-      rescue => e
-        if e.response[:status] == 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
+          handle_error(e)
         end
-        handle_error(e)
       end
     end
 
@@ -65,12 +68,13 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers)
         end
         parse_response(response)
-      rescue => e
-        if e.response[:status] == 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
+          handle_error(e)
         end
-        handle_error(e)
       end
     end
 
@@ -82,12 +86,13 @@ module OzonLogistics
           configure_request(request: request, params: params, headers: headers)
         end
         parse_response(response)
-      rescue => e
-        if e.response[:status] == 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
+          handle_error(e)
         end
-        handle_error(e)
       end
     end
 
@@ -158,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
@@ -196,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.14"
 end

data/lib/ozon-logistics.rb

@@ -3,6 +3,7 @@ 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.4
+  version: 0.0.14
 platform: ruby
 authors:
 - Pavel Osetrov