ozon-logistics 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f4ea93391ed9353bca0813697688ce7f4e1e40124be5da8db39408ba9eb3e2d
-  data.tar.gz: 63acc74e32219a54c561054ee5d0a07885e2345607cb5c0a8c7dcd58b176e778
+  metadata.gz: 435947ecbb9b47558a5610a41123d5b075a2120d6b68bf869ab3b53117685def
+  data.tar.gz: fc432a84ae37d456622f62e9e7095834ad07a1fb7719a9ea16b62365cf99d076
 SHA512:
-  metadata.gz: 23a5ec4d76dbc0fedd5e8206c2c12f13b2732c17963d926484972363d716e04f9355747a0f583cee378dc3403ebb9bee8a31e8cd6acfd08b50641208dd4ab14f
-  data.tar.gz: a22b9a34526d59c6c3105c835caefcf4c61a6cae5e32c20d57ea6821d01adafebd5430784f7ee696d00de9eb44e30280ef2377c460628515350aa522d7d6c235
+  metadata.gz: 64f7a27b9ab6e5ecccbb9c3047b01d95ddaf2896a75898f19dc08b602cf46b92f22b54c2c33519eca364ea2b8ac298dc6aad1f6735a39dd82ed295ebb68f2ed7
+  data.tar.gz: 6935d1def31c667bc04d999e55c6811ed7fd3b00a5ca2c4cefddd4908455bd9cbf5c63d4bb7d6abf237d89952abc271a64a12b2e5af92a9e69b17bdffa0a0894

data/README.markdown

@@ -16,7 +16,7 @@ API wrapper для Ozon.Logistics [API](https://api-stg.ozonru.me/principal-inte
 
 Затем:
 
-    rails g ozon-logistics:install
+    rails g ozon_logistics:install
 
 ## Требования
 
@@ -304,4 +304,23 @@ params = {
 }
 response = OzonLogistics::Request.tracking.article.retrieve(params: params)
 article = response.body
+```
+
+### DropOff
+
+#### Метод создания завки на отгрузк
+```ruby
+body = {
+  "orderIds": [
+    0
+  ]
+}
+response = OzonLogistics::Request.dropoff.create(body: body).body
+drop_off_id = response[:id]
+```
+
+#### Метод для для получения акта по ID заявки на отгрузку
+```ruby
+response = OzonLogistics::Request.dropoff(drop_off_id).act
+p response.body
 ```

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

@@ -4,14 +4,14 @@ OzonLogistics.setup do |config|
   if File.exist?('config/ozon_logistics.yml')
     processed = YAML.load_file('config/ozon_logistics.yml')[Rails.env]
 
+    processed.each do |k, v|
+      config::register k.underscore.to_sym, v
+    end
+
     config::Request.access_token = ENV['OZON_LOGISTICS_ACCESS_TOKEN'] || OzonLogistics.generate_access_token.try(:dig, "access_token")
     config::Request.timeout = 15
     config::Request.open_timeout = 15
     config::Request.symbolize_keys = true
     config::Request.debug = false
-
-    processed.each do |k, v|
-      config::register k.underscore.to_sym, v
-    end
   end
 end

data/lib/ozon-logistics.rb

@@ -6,7 +6,6 @@ require 'ozon-logistics/response'
 
 module OzonLogistics
   class << self
-
     def generate_access_token(client_id=OzonLogistics.client_id, client_secret=OzonLogistics.client_secret, grant_type=OzonLogistics.grant_type)
       response = Faraday.post(OzonLogistics.url_token, "grant_type=#{grant_type}&client_id=#{client_id}&client_secret=#{client_secret}")
       JSON.parse(response.body)

data/lib/ozon-logistics/api_request.rb

@@ -5,7 +5,7 @@ module OzonLogistics
       @request_builder = builder
     end
 
-    def post(params: nil, headers: nil, body: {})
+    def post(params: nil, headers: nil, body: {}, first_time: true)
       validate_access_token
 
       begin
@@ -14,11 +14,16 @@ module OzonLogistics
         end
         parse_response(response)
       rescue => e
-        handle_error(e)
+        if e.response.try(:code) == 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
       end
     end
 
-    def patch(params: nil, headers: nil, body: {})
+    def patch(params: nil, headers: nil, body: {}, first_time: true)
       validate_access_token
 
       begin
@@ -28,11 +33,16 @@ module OzonLogistics
         end
         parse_response(response)
       rescue => e
-        handle_error(e)
+        if e.response.try(:code) == 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
       end
     end
 
-    def put(params: nil, headers: nil, body: {})
+    def put(params: nil, headers: nil, body: {}, first_time: true)
       validate_access_token
 
       begin
@@ -41,11 +51,16 @@ module OzonLogistics
         end
         parse_response(response)
       rescue => e
-        handle_error(e)
+        if e.response.try(:code) == 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
       end
     end
 
-    def get(params: nil, headers: nil)
+    def get(params: nil, headers: nil, first_time: true)
       validate_access_token
 
       begin
@@ -54,11 +69,16 @@ module OzonLogistics
         end
         parse_response(response)
       rescue => e
-        handle_error(e)
+        if e.response.try(:code) == 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
       end
     end
 
-    def delete(params: nil, headers: nil)
+    def delete(params: nil, headers: nil, first_time: true)
       validate_access_token
 
       begin
@@ -67,7 +87,12 @@ module OzonLogistics
         end
         parse_response(response)
       rescue => e
-        handle_error(e)
+        if e.response.try(:code) == 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
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ozon-logistics
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Pavel Osetrov