xdelivery 1.0.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ed303bad8a770ac7c39f31b93e5e5901d92faef2c8362304031f453e6630210
-  data.tar.gz: 204deb46037e44ba3e0a471e5b2f1b3faf8722907a8a4b694226abfbb205e614
+  metadata.gz: '09446a0eba629a611cbe3fc4b56f751fcb5cdd34f02c30e88cd7c941cbbf6645'
+  data.tar.gz: cf34ac202d5d055b741e8db30fe3cf0b551a1ef1dd8e642e013f5c6075030d1c
 SHA512:
-  metadata.gz: 95de1b1114ccae53265de8ebfcc2f3ad2d5c0cd539b6dcff73faf6584c02e6b0681c982ffda7f895af48ed2f8a9ff04dc4561bf8586de7979e5452f38ab24f25
-  data.tar.gz: 407f8bf9b6072a879730c66eb08d19e8c3a35a7cef93155ac8baf5abb0d8cc30d6e863faa0c129b36409dfc252958d6f27c53ae76774e3a116e7aad7043000b5
+  metadata.gz: cad357967a7b44da238f6084ba67cbd1cbc3b1ae21088b7ac7a3d2c2128cb0678b4fc01385a42fcd4d4b0c569b5df07856545c5a25cf610b99fd0c530af3a2b8
+  data.tar.gz: 1ca96bc7f43b2a034666430dee8b47c78dacb4bb50eede1d225635645cc1dd42ce2c1e9f35ad4eac567d6fcf5d8724583d50b6b21eee4cc1a2199d7068f7bd11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xdelivery (1.0.1)
+    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.17.3
+   2.3.14

data/lib/xdelivery/api/base.rb

@@ -6,13 +6,22 @@ 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)
@@ -59,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.1"
+  VERSION = "2.0.1"
 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"
@@ -21,6 +22,16 @@ module Xdelivery
   @@open_timeout = 5
   @@read_timeout = 5
 
+  @@env = :production
+
+  def self.env(env)
+    @@env
+  end
+
+  def self.env=(env)
+    @@env = env
+  end
+
   def self.open_timeout
     @@open_timeout
   end
@@ -45,7 +56,11 @@ module Xdelivery
     yield(self)
   end
 
-  def url
-    API::Base::BASE_URL
+  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.1
+  version: 2.0.1
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 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,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: 火箭快遞 API 串接