yandex-delivery-api 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e4bfce3f0c4a577569ed137681e86f8fbbfc9674e3cf32affb021c7e4b130f
-  data.tar.gz: a65c591138740489ce1df8f9b106793258d5be1a400637b603ee62d6c2cf0549
+  metadata.gz: 45597ab0447b3d3fad27fc6d0f1aacc7c56f6475146e460d040653239a96ebd5
+  data.tar.gz: e71722bb3482e6a202e9ab2dac4ca00b478675f8c3e601660a9a074b4a150980
 SHA512:
-  metadata.gz: ca1dc9ff2ff620ae8528b52fc0cbe61bf2e8da162620572b07810ea7140de3c7eb6771a58a66ab78c56f2021065a1a23c7203e0f90719f4a9c6b0fd9f239f0ef
-  data.tar.gz: 10e59bc4080231d7dca5180c0e3d2c3a49619433a4a7d7c5a00551c2470c422577e066d819f8012576408742973da0e42b63cd0e13ed2fa168402fa146e4e602
+  metadata.gz: d2c8a485d69367d915e636254e09efe3c8ec87e46db4dc53caa6ee42af2b774ca2fec415cb86516cabbbe220ce5524d19a7a64f53dd4757cbd8bd848ab7c839f
+  data.tar.gz: 3e4e97235c7e2d60b22878869ed7115600f985bcdeb734a66c45aa5069dff15012c8c76c89124ed33f28cd466aa35dbe7c7ffc9e7adffc3963ad912c9e4d23e3

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Pavel Osetrov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,36 @@
+## Installation
+
+Добавьте в Gemfile:
+
+    gem 'yandex-delivery-api', github: 'osetrov/yandex-delivery-api'
+
+и запустите `bundle install`.
+
+Затем:
+
+    rails g yandex_delivery:install
+
+в файл `config/yandex_delivery.yml` вставьте ваши данные из настоек яндекс доставки:
+
+https://delivery.yandex.ru/integration/index
+
+Все возможные запросы:
+https://tech.yandex.ru/delivery/doc/dg/about-docpage/
+
+Например "Получить варианты доставки":
+```erb
+params = {
+    :city_from => 'Санкт-Петербург',
+    :city_to => 'Москва',
+    :delivery_type => 'todoor',
+    :weight => 2,
+    :length => 18,
+    :width => 3,
+    :height => 3,
+    :order_cost => 1000
+}
+
+YandexDelivery::search_delivery_list params
+```
+
+secret_key, client_id, sender_id указывать в параметрах не обязательно.

data/lib/generators/yandex_delivery/install/USAGE

@@ -0,0 +1,2 @@
+Description:
+  yandex_delivery:install

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+#
+module YandexDelivery
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+
+    def generate_install
+      copy_file 'yandex_delivery.yml', 'config/yandex_delivery.yml'
+      copy_file 'yandex_delivery.rb', 'config/initializers/yandex_delivery.rb'
+    end
+  end
+end
+

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

@@ -0,0 +1,17 @@
+require 'yandex_delivery'
+
+YandexDelivery.setup do |config|
+  if File.exist?('config/yandex_delivery.yml')
+    template = ERB.new(File.new('config/yandex_delivery.yml').read)
+    processed = YAML.safe_load(template.result(binding))
+
+    processed['YANDEX_DELIVERY_API_KEY'].each do |k, v|
+      config::create_method k.underscore.to_sym
+      config::register "#{k.underscore}_key".to_sym, v
+    end
+
+    processed['YANDEX_DELIVERY'].each do |k, v|
+      config::register k.underscore.to_sym, v
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+YANDEX_DELIVERY_API_KEY: {
+  "getPaymentMethods": "",
+  "getSenderOrders": "",
+  "getSenderOrderLabel": "",
+  "getSenderParcelDocs": "",
+  "autocomplete": "",
+  "getIndex": "",
+  "createOrder": "",
+  "updateOrder": "",
+  "deleteOrder": "",
+  "getSenderOrderStatus": "",
+  "getSenderOrderStatuses": "",
+  "getSenderInfo": "",
+  "getWarehouseInfo": "",
+  "getRequisiteInfo": "",
+  "getIntervals": "",
+  "createWithdraw": "",
+  "confirmSenderOrders": "",
+  "updateWithdraw": "",
+  "createImport": "",
+  "updateImport": "",
+  "getDeliveries": "",
+  "getOrderInfo": "",
+  "searchDeliveryList": "",
+  "confirmSenderParcels": "",
+  "searchSenderOrdersStatuses": "",
+  "getImports": "",
+  "getWithdraws": "",
+  "cancelImport": "",
+  "cancelWithdraw": ""
+}
+
+YANDEX_DELIVERY: {
+    "client": {
+      "id": 0
+    },
+    "warehouses": [
+    {
+      "id": 0,
+      "name": "Склад"
+    }
+    ],
+    "senders": [
+    {
+      "id": 0,
+      "name": "Магазин"
+    }
+    ],
+    "requisites": [
+    {
+      "id": 0,
+      "name": "Рога и Копыта"
+    }
+    ]
+}

data/lib/yandex_delivery.rb

@@ -1,5 +1,4 @@
 module YandexDelivery
-
   class << self
 
     def setup
@@ -15,14 +14,33 @@ module YandexDelivery
     def build_params method_name, params={}
       params[:client_id] = YandexDelivery.client["id"]
       params[:sender_id] = params[:sender_id] || YandexDelivery.senders.first["id"]
-      params[:secret_key] = Digest::MD5.hexdigest("#{params.sort.map{|k,v| v}.join('')}#{YandexDelivery.send("#{method_name}_key")}")
+      params.each do |k, v|
+        if v.kind_of?(Array)
+          params[k] = v.map.with_index {|v,i| [i,v]}.to_h
+        end
+      end
+      params[:secret_key] = Digest::MD5.hexdigest("#{post_values(params)}#{YandexDelivery.send("#{method_name}_key")}")
       params
     end
 
+    def post_values params
+      return params unless params.kind_of?(Array) || params.kind_of?(Hash)
+      if params.kind_of?(Array)
+        params.map(&method(:post_values)).join('')
+      else
+        params.sort.map{|k,v|
+          post_values(v)
+        }.join('')
+      end
+    end
+
     def create_method name
       define_singleton_method(name) do |params = {}|
         request name, params
       end
+      define_method(name) do |params = {}|
+        request name, params
+      end
     end
 
     def register(name, value, type = nil)
@@ -65,5 +83,5 @@ module YandexDelivery
       @setting
     end
   end
-
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex-delivery-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Pavel Osetrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -30,8 +30,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/generators/yandex_delivery/install/USAGE
+- lib/generators/yandex_delivery/install/install_generator.rb
+- lib/generators/yandex_delivery/install/templates/yandex_delivery.rb
+- lib/generators/yandex_delivery/install/templates/yandex_delivery.yml
 - lib/yandex_delivery.rb
-homepage: https://rubygems.org/gems/yandex-delivery-api
+homepage: https://github.com/osetrov/yandex-delivery-api
 licenses:
 - MIT
 metadata: {}