xdelivery 0.2.4 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d92f2aaad01c0ebc7a226cbb22fc08b52d74c697
-  data.tar.gz: 070694f59a56765b20971805470f712704b74ded
+SHA256:
+  metadata.gz: 355fb7f6c6cbc86ac8471c2b70f05dfefc87353cded96521b0b44bc5c538ee28
+  data.tar.gz: c001a8e1e7c561f4782420dca6c5de9c0b8d4db15012d5472751fb735ba83bde
 SHA512:
-  metadata.gz: dfa8a207525114da3d26f2268be95bbf4023ab3330cdeb796ec5518e2f4612844f5b76d82b1792531c170d9145f61445f8096165f19c3f0965e29f92c0ee6ee1
-  data.tar.gz: 0735a33a6509d8f53993287b667b6dd6da1dbb702813c54a3657cb4a760406cc412e3e53db43b89da3c31afba76c5521d9f36c0e096479fe8d92e04fe8157c7f
+  metadata.gz: 8070cce10383f1579f90b859fc9471ec1ae371def5a42b225a558783bd83b6ef568a4f9642f0c0460aefe7cd77d4de03b1653cd759b84b00a99e3cc1d2bfb0d4
+  data.tar.gz: 7bfe8c7d89ff4e0c20be5af13249e88837c5e405df8475ef7a40fefab4ef11b54a25fc29cc70ec308b695269a20278306bd42feb5da42f5831b16a25b9279aac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xdelivery (0.2.3)
+    xdelivery (1.0.1)
       rest-client
 
 GEM
@@ -50,4 +50,4 @@ DEPENDENCIES
   xdelivery!
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/lib/xdelivery/api/base.rb

@@ -16,23 +16,31 @@ module Xdelivery
       protected
 
       def patch(path)
-        RestClient.patch(uri(path).to_s, patch_data)
+        RestClient::Request.execute(method: :patch, url: uri(path).to_s, payload: patch_data, open_timeout: open_timeout, read_timeout: read_timeout)
       rescue RestClient::ExceptionWithResponse => e
         e.response
       end
 
       def post(path)
-        RestClient.post(uri(path).to_s, post_data)
+        RestClient::Request.execute(method: :post, url: uri(path).to_s, payload: post_data, open_timeout: open_timeout, read_timeout: read_timeout)
       rescue RestClient::ExceptionWithResponse => e
         e.response
       end
 
       def get(path)
-        RestClient.get(uri(path).to_s)
+        RestClient::Request.execute(method: :get, url: uri(path).to_s, open_timeout: open_timeout, read_timeout: read_timeout)
       rescue RestClient::ExceptionWithResponse => e
         e.response
       end
 
+      def open_timeout
+        Xdelivery.open_timeout
+      end
+
+      def read_timeout
+        Xdelivery.read_timeout
+      end
+
       # [GET] query string params
       def params
         {}

data/lib/xdelivery/api/orders.rb

@@ -8,11 +8,11 @@ module Xdelivery
       COLUMNS = [
         :order_id, :provider, :recipient, :mobile, :email, :store_id, :store_name, :address,
         :items, :warehouse_items, :total_order_amount, :cash_on_delivery, :order_created_at,
-        :note, :callback_url, :ref_id, :tag, :merchant_note
+        :note, :callback_url, :ref_id, :tag, :merchant_note, :shop_id
       ]
 
       INVOICE_COLUMNS = [
-        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items, :invoice_setting_id
+        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items
       ]
 
       def add(params, invoice_params={})

data/lib/xdelivery/api/response/base.rb

@@ -6,16 +6,38 @@ module Xdelivery
 
         def initialize(response)
           self.response = response
-          self.data = JSON.parse(response.body)
+          handle_error!
+
+          self.data = begin
+            JSON.parse(response.body)
+          rescue JSON::ParserError
+            raise Client::UnknownResponse, "#{code}, Response is not json."
+          end
+        end
+
+        def code
+          response.code
         end
 
         def auth?
-          response.code == 200
+          code == 200
         end
 
         def status?
           data['status'] == true
         end
+
+        protected
+
+        def handle_error!
+          if Client::EXCEPTION_STATUSES[code]
+            raise Exceptions::EXCEPTIONS_MAP[code]
+          end
+
+          unless Client::EXPECTED_STATUSES[code]
+            raise Client::UnknownResponse, "Unexpected response status code: #{code}."
+          end
+        end
       end
     end
   end

data/lib/xdelivery/api/response/shops.rb

@@ -0,0 +1,20 @@
+module Xdelivery
+  module API
+    module Response
+      class Shops < Base
+
+        Shop = Struct.new(:id, :title, :pay2go_merchant_id, :default_shop)
+
+        def status?
+          auth?
+        end
+
+        def shops
+          data.map do |setting|
+            Shop.new(setting['id'], setting['title'], setting['pay2go_merchant_id'], setting['default_shop'])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xdelivery/api/sales.rb

@@ -8,11 +8,11 @@ module Xdelivery
       COLUMNS = [
         :order_id, :recipient, :mobile, :email, :address,
         :items, :warehouse_items, :total_order_amount, :cash_on_delivery, :order_created_at,
-        :note, :callback_url, :ref_id, :tag, :tracking_code, :merchant_note
+        :note, :callback_url, :ref_id, :tag, :tracking_code, :merchant_note, :shop_id
       ]
 
       INVOICE_COLUMNS = [
-        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items, :invoice_setting_id
+        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items
       ]
 
       def add(params, invoice_params={})

data/lib/xdelivery/api/shops.rb

@@ -0,0 +1,9 @@
+module Xdelivery
+  module API
+    class Shops < Base
+      def get!
+        Response::Shops.new(get('/shops.json'))
+      end
+    end
+  end
+end

data/lib/xdelivery/client.rb

@@ -26,8 +26,8 @@ module Xdelivery
       api.update!
     end
 
-    def get_invoice_settings!
-      API::InvoiceSettings.new(merchant_no, access_key).get!
+    def get_shops!
+      API::Shops.new(merchant_no, access_key).get!
     end
 
     def ping!

data/lib/xdelivery/exceptions.rb

@@ -0,0 +1,33 @@
+module Xdelivery
+
+  module Exceptions
+
+    EXCEPTIONS_MAP = {}
+  end
+
+  class Client
+    class UnknownResponse < StandardError; end
+
+    EXPECTED_STATUSES = {
+      200 => 'Ok' ,
+      401 => 'Unauthorized'
+    }
+
+    EXCEPTION_STATUSES = {
+      404 => 'Not Found',
+      500 => 'Internal Server Error',
+      502 => 'Bad Gateway',
+      503 => 'Service Unavailable',
+      504 => 'Gateway Timeout',
+    }
+
+    EXCEPTION_STATUSES.each_pair do |code, message|
+      klass = Class.new(StandardError) do
+        send(:define_method, :message) { "#{code}, #{message}" }
+      end
+      const_name = message.delete(',\.\-\'\"').split(' ').map(&:capitalize).join
+      klass_constant = const_set(const_name, klass)
+      Exceptions::EXCEPTIONS_MAP[code] = klass_constant
+    end
+  end
+end

data/lib/xdelivery/version.rb

@@ -1,3 +1,3 @@
 module Xdelivery
-  VERSION = "0.2.4"
+  VERSION = "1.0.2"
 end

data/lib/xdelivery.rb

@@ -3,20 +3,49 @@ require 'rest-client'
 require "xdelivery/version"
 require "xdelivery/callback"
 require "xdelivery/client"
+require "xdelivery/exceptions"
 require "xdelivery/api/base"
 require "xdelivery/api/orders"
 require "xdelivery/api/sales"
 require "xdelivery/api/products"
 require "xdelivery/api/ping"
-require "xdelivery/api/invoice_settings"
+require "xdelivery/api/shops"
 require "xdelivery/api/response/base"
 require "xdelivery/api/response/orders"
 require "xdelivery/api/response/products"
 require "xdelivery/api/response/ping"
-require "xdelivery/api/response/invoice_settings"
+require "xdelivery/api/response/shops"
 
 
 module Xdelivery
+
+  @@open_timeout = 5
+  @@read_timeout = 5
+
+  def self.open_timeout
+    @@open_timeout
+  end
+
+  def self.open_timeout=(timeout)
+    @@open_timeout = timeout
+  end
+
+  def self.read_timeout
+    @@read_timeout
+  end
+
+  def self.read_timeout=(timeout)
+    @@read_timeout = timeout
+  end
+
+  # Xdelivery.configure do |config|
+  #   config.open_timeout = 5
+  #   config.read_timeout = 5
+  # end
+  def self.configure
+    yield(self)
+  end
+
   def url
     API::Base::BASE_URL
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdelivery
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.2
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,18 +98,19 @@ files:
 - bin/setup
 - lib/xdelivery.rb
 - lib/xdelivery/api/base.rb
-- lib/xdelivery/api/invoice_settings.rb
 - lib/xdelivery/api/orders.rb
 - lib/xdelivery/api/ping.rb
 - lib/xdelivery/api/products.rb
 - lib/xdelivery/api/response/base.rb
-- lib/xdelivery/api/response/invoice_settings.rb
 - lib/xdelivery/api/response/orders.rb
 - lib/xdelivery/api/response/ping.rb
 - lib/xdelivery/api/response/products.rb
+- lib/xdelivery/api/response/shops.rb
 - lib/xdelivery/api/sales.rb
+- lib/xdelivery/api/shops.rb
 - lib/xdelivery/callback.rb
 - lib/xdelivery/client.rb
+- lib/xdelivery/exceptions.rb
 - lib/xdelivery/version.rb
 - xdelivery-ruby.gemspec
 homepage: https://github.com/superlanding/xdelivery-ruby
@@ -131,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: "火箭快遞 API 串接"
+summary: 火箭快遞 API 串接
 test_files: []

data/lib/xdelivery/api/invoice_settings.rb

@@ -1,9 +0,0 @@
-module Xdelivery
-  module API
-    class InvoiceSettings < Base
-      def get!
-        Response::InvoiceSettings.new(get('/invoice_settings.json'))
-      end
-    end
-  end
-end

data/lib/xdelivery/api/response/invoice_settings.rb

@@ -1,20 +0,0 @@
-module Xdelivery
-  module API
-    module Response
-      class InvoiceSettings < Base
-
-        Setting = Struct.new(:id, :title, :pay2go_merchant_id, :default_setting)
-
-        def status?
-          auth?
-        end
-
-        def settings
-          data.map do |setting|
-            Setting.new(setting['id'], setting['title'], setting['pay2go_merchant_id'], setting['default_setting'])
-          end
-        end
-      end
-    end
-  end
-end