yandex-delivery 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20948af6947ba0c5eacd0d0a8e0f46bf818f1a15eae22180309cc6781550a91a
-  data.tar.gz: 68fabec7fa939e083146b7f6ce8f8ebe701d5a1722aab54c09f4663ac09b8b67
+  metadata.gz: 6ba338d37a068e4369364fc6f381913f1e6a968c532ee5db77f5b1df1302fc97
+  data.tar.gz: 73d448721cdfbe808bcf696e93ecded3e94e66e59533689a9772efe269442ee1
 SHA512:
-  metadata.gz: 052ef2f8e89462737a5db6fa555bec56945fba5907c93a302382aae0589c833f734bc4009f4a05b33fc5b4be37a7e80867dd7cb929a092d084d1a2003089c8d1
-  data.tar.gz: 258765b235e43f80a363a75eb724e824a7b414fe9b8b3e011d0a1c7c366f054d0a58bb909545d3787acf3b09fa4d3bcabbf82a3a4fadda7ebdbadc271a96cbe0
+  metadata.gz: dbda8e042c4d4f9f956d9f49cae7c492d1d3207b6580b744a60b59596e9611294dedac81d348c1347eb3f306ac0fd669428ab63b5422468ce4745880d2d98d9e
+  data.tar.gz: c6a070acd02dea393683083073ef4b267e382051ff99c973f86433f722b802cc915dbc28c2870f08f17cd6c3b58c56f158b0d79d17028014464e9c51171172dc

data/README.markdown

@@ -70,7 +70,9 @@ YandexDelivery::Request.logger = MyLogger.new
 
 ## Примеры
 
-### Поиск вариантов доставки
+### Варианты доставки
+
+#### Поиск вариантов доставки
 
 ```ruby
 # для Rails senderId указывать не обязательно, в запрос подставится значение из config/yandex_delivery2.yml
@@ -80,4 +82,173 @@ body = {
 }
 
 YandexDelivery::Request.delivery_options.upsert(body: body)
+```
+
+#### Поиск пунктов выдачи заказов
+
+```ruby
+YandexDelivery::Request.pickup_points.upsert(body: {locationId: 2})
+```
+
+### Операции с заказами
+
+#### Создать черновик заказа
+
+```ruby
+response = YandexDelivery::Request.orders.create(body: {deliveryType: 'COURIER'})
+order_id = response.body
+```
+
+#### Обновить черновик заказа
+
+```ruby
+YandexDelivery::Request.orders(order_id).upsert(body: {deliveryType: 'PICKUP'})
+```
+
+#### Оформить заказ
+
+```ruby
+YandexDelivery::Request.orders.submit.create(body: {orderIds: [order_id]})
+```
+
+#### Получить данные о заказе
+
+```ruby
+response = YandexDelivery::Request.orders(order_id).retrieve
+order = response.body
+```
+
+#### Удалить заказ
+
+```ruby
+YandexDelivery::Request.orders(order_id).delete
+```
+
+#### Получить ярлык заказа
+
+```ruby
+YandexDelivery::Request.orders(order_id).label.retrieve
+```
+
+#### Поиск заказов
+
+```ruby
+sender_ids = YandexDelivery.senders.map{|sender| sender['id']}
+YandexDelivery::Request.orders.search.upsert(body: {senderIds: sender_ids, orderIds: [order_id]})
+```
+
+#### Получить историю статусов заказа
+
+```ruby
+YandexDelivery::Request.orders(order_id).statuses.retrieve
+```
+
+#### Получить статус заказов
+
+```ruby
+YandexDelivery::Request.orders.status.upsert
+```
+
+### Операции с отгрузками
+
+#### Создать заявку на отгрузку
+
+```ruby
+body = {
+  cabinetId: YandexDelivery.client['id'],
+  shipment: {
+                type: "WITHDRAW",
+                date: "2020-10-05",
+                warehouseFrom: YandexDelivery.warehouses.first['id'],
+                warehouseTo: 123,
+                partnerTo: 678
+              },
+  intervalId: 765478,
+  dimensions: {
+                length: 10,
+                width: 15,
+                height: 40,
+                weight: 5.5
+               },
+  courier: {
+                type: "CAR",
+                firstName: "Василий",
+                middleName: "Иванович",
+                lastName: "Пупкин",
+                phone: "+79998887766",
+                carNumber: "о000оо",
+                carBrand: "Maybach"
+            },
+  comment: "comment"
+}
+response = YandexDelivery::Request.shipments.application.create(body: body)
+shipment_id = response.body['id']
+```
+
+#### Подтвердить отгрузку
+
+```ruby
+body = {
+  cabinetId: YandexDelivery.client['id'],
+  shipmentApplicationIds: [shipment_id]
+}
+YandexDelivery::Request.shipments.application.submit.create(body: body)
+```
+
+#### Получить список отгрузок
+
+```ruby
+body = {
+          cabinetId: YandexDelivery.client['id'],
+          shipmentType: "IMPORT",
+          dateFrom: "2020-10-05",
+          "dateTo": "2020-11-05",
+          "partnerIds": 
+          [
+            239847,
+            98234,
+            54968
+          ]
+       }
+YandexDelivery::Request.shipments.search.upsert(body: body)
+```
+
+#### Получить интервалы самопривозов
+
+```ruby
+warehouse_id = YandexDelivery.warehouses.first['id']
+YandexDelivery::Request.shipments.intervals.import.retrieve(params: {warehouseId: warehouse_id, date: '2020-10-06'})
+```
+
+#### Получить интервалы заборов
+
+```ruby
+YandexDelivery::Request.shipments.intervals.withdraw.retrieve(params: {partnerId: 106, date: '2020-10-06'})
+```
+
+#### Получить акт передачи заказов
+
+```ruby
+YandexDelivery::Request.shipments.applications(shipment_id).act.retrieve(params: {cabinetId: YandexDelivery.client['id']})
+```
+
+### Справочные данные
+
+#### Получить полный адрес
+
+```ruby
+YandexDelivery::Request.location.retrieve(params: {term: 'Санкт-Петербург'})
+```
+
+#### Получить индекс по адресу
+
+```ruby
+response = YandexDelivery::Request.location.postal_code.retrieve(params: {address: 'Санкт-Петербург, ул. Профессора Попова, д. 37Щ, БЦ "Сенатор"'})
+postal_code = response.body.first[:postalCode]
+```
+
+#### Получить список служб доставки
+
+```ruby
+YandexDelivery::Request.delivery_services.retrieve(params: {cabinetId: YandexDelivery.client['id']})
 ```

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

@@ -1,10 +1,11 @@
 require 'yandex_delivery'
 
 YandexDelivery.setup do |config|
-  if File.exist?('config/yandex_delivery.yml')
+  if File.exist?('config/yandex_delivery2.yml')
     template = ERB.new(File.new('config/yandex_delivery2.yml').read)
     processed = YAML.safe_load(template.result(binding))
 
+    config::Request.app_id = processed['YANDEX_DELIVERY_APP_ID']
     config::Request.api_key = processed['YANDEX_DELIVERY_ACCESS_TOKEN']
     config::Request.timeout = 15
     config::Request.open_timeout = 15

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

@@ -1,3 +1,4 @@
+YANDEX_DELIVERY_APP_ID: ''
 YANDEX_DELIVERY_ACCESS_TOKEN: ''
 
 YANDEX_DELIVERY: {

data/lib/yandex-delivery/api_request.rb

@@ -81,6 +81,10 @@ module YandexDelivery
       @request_builder.api_key
     end
 
+    def app_id
+      @request_builder.app_id
+    end
+
     def api_endpoint
       @request_builder.api_endpoint
     end
@@ -145,7 +149,6 @@ module YandexDelivery
         request.body = body if body
         request.options.timeout = self.timeout
         request.options.open_timeout = self.open_timeout
-        p request
       end
     end
 
@@ -179,8 +182,7 @@ module YandexDelivery
     end
 
     def validate_api_key
-      api_key = self.api_key
-      unless api_key && (api_key["-"] || self.api_endpoint)
+      unless self.api_key
         raise YandexDelivery::YandexDeliveryError, "You must set an api_key prior to making a call"
       end
     end

data/lib/yandex-delivery/request.rb

@@ -1,14 +1,16 @@
 module YandexDelivery
   class Request
-    attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
+    attr_accessor :api_key, :app_id, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
 
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    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)
+    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)
       @path_parts = []
       @api_key = api_key || self.class.api_key || ENV['YANDEX_DELIVERY_ACCESS_TOKEN']
       @api_key = @api_key.strip if @api_key
+      @app_id = app_id || self.class.app_id || ENV['YANDEX_DELIVERY_APP_ID']
+      @app_id = @app_id.strip if @app_id
       @api_endpoint = api_endpoint || self.class.api_endpoint
       @timeout = timeout || self.class.timeout || DEFAULT_TIMEOUT
       @open_timeout = open_timeout || self.class.open_timeout || DEFAULT_OPEN_TIMEOUT
@@ -80,10 +82,12 @@ module YandexDelivery
     end
 
     class << self
-      attr_accessor :api_key, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
+      attr_accessor :api_key, :app_id, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger
 
       def method_missing(sym, *args, &block)
-        new(api_key: self.api_key, api_endpoint: self.api_endpoint, timeout: self.timeout, open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys, debug: self.debug, proxy: self.proxy, logger: self.logger).send(sym, *args, &block)
+        new(api_key: self.api_key, app_id: self.app_id, api_endpoint: self.api_endpoint, timeout: self.timeout,
+            open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys,
+            debug: self.debug, proxy: self.proxy, logger: self.logger).send(sym, *args, &block)
       end
 
       def respond_to_missing?(method_name, include_private = false)

data/lib/yandex-delivery/version.rb

@@ -1,3 +1,3 @@
 module YandexDelivery
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: yandex-delivery
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Pavel Osetrov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-08-11 00:00:00.000000000 Z
@@ -61,7 +61,7 @@ homepage: https://github.com/osetrov/yandex-delivery
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Yandex delivery
 test_files: []