xdelivery 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 32e729a05b87441921a17b67e77554b16d1115b0
-  data.tar.gz: 9a1734fc97bb1424e72cbf0b637d2ca2996cb592
+SHA256:
+  metadata.gz: f5b44f938f1f48e3d3bf8003ea9bd3d316d2ccf5008ef1c07b1cd111fdabae5a
+  data.tar.gz: ea978fb994e963bfbb5b2d03f4fe17a9ddbae651aea43619dc9412f3bb746b65
 SHA512:
-  metadata.gz: f66bfcdad33a55d88e597c722995ad7611a5efea9af5dadcc17c1fcbebecb374b2c203f4c7446aba88bf390efb6364296e6347d0e4f1f27a053fb7a6244bb0a3
-  data.tar.gz: 8819f364dfa29f97ca66f4e44cc7cc0e76f71848b97a77d25e54ff3e0cde36a17701c9fda6182fd59ac28ecb5f948da25dda4267fdd7a607b91ab70e0778e435
+  metadata.gz: 91bb5cc8117bdae52cd7165df6a273a87dd5d0ee929aa39fab77f73195c01dec30a91a4cdac5106e6a7e6351aea9c825ceca37f0aabb5dacbed1678c8c1930cc
+  data.tar.gz: ed1f71dc8d7ff3525404ea7ae4ba7e6b9c3fcb58cf385c9ff1fce229ee134054cf5277affefd499eb411c45210842dee7467058d8738d9fb7feb193a7c0631d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xdelivery (1.0.0)
+    xdelivery (2.0.0)
       rest-client
 
 GEM
@@ -41,7 +41,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.3.14)
   minitest (~> 5.0)
   minitest-stub-const
   rake (~> 10.0)
@@ -50,4 +50,4 @@ DEPENDENCIES
   xdelivery!
 
 BUNDLED WITH
-   1.16.6
+   2.3.14

data/lib/xdelivery/api/base.rb

@@ -6,33 +6,50 @@ module Xdelivery
     class Base
       attr_accessor :merchant_no, :access_key
 
-      BASE_URL = 'https://api.xdelivery.io'
+      PRODUCTION_BASE_URL = 'https://api.xdelivery.io'
+      TEST_BASE_URL = 'https://api.staging.xdelivery.io'
 
       def initialize(merchant_no='', access_key='')
         self.merchant_no = merchant_no
         self.access_key = access_key
       end
 
+      def base_url
+        @base_url = if ::Xdelivery.production?
+          PRODUCTION_BASE_URL
+        else
+          TEST_BASE_URL
+        end
+      end
+
       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
         {}
@@ -51,7 +68,7 @@ module Xdelivery
       private
 
       def uri(path)
-        uri = URI.parse("#{BASE_URL}#{path}").tap { |u| u.query = query_auth_params }
+        uri = URI.parse("#{base_url}#{path}").tap { |u| u.query = query_auth_params }
       end
 
       def query_auth_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/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 = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/xdelivery.rb

@@ -3,6 +3,7 @@ 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"
@@ -17,7 +18,41 @@ require "xdelivery/api/response/shops"
 
 
 module Xdelivery
-  def url
-    API::Base::BASE_URL
+
+  @@open_timeout = 5
+  @@read_timeout = 5
+
+  @@env = :production
+
+  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 self.production?
+    @@env.to_s == "production"
+  end
+
+  def self.test?
+    @@env.to_s == "test"
   end
 end

data/xdelivery-ruby.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.3.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-stub-const"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdelivery
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.3.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ files:
 - 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.1.6
 signing_key: 
 specification_version: 4
-summary: "火箭快遞 API 串接"
+summary: 火箭快遞 API 串接
 test_files: []