xdelivery 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ed303bad8a770ac7c39f31b93e5e5901d92faef2c8362304031f453e6630210
-  data.tar.gz: 204deb46037e44ba3e0a471e5b2f1b3faf8722907a8a4b694226abfbb205e614
+  metadata.gz: 355fb7f6c6cbc86ac8471c2b70f05dfefc87353cded96521b0b44bc5c538ee28
+  data.tar.gz: c001a8e1e7c561f4782420dca6c5de9c0b8d4db15012d5472751fb735ba83bde
 SHA512:
-  metadata.gz: 95de1b1114ccae53265de8ebfcc2f3ad2d5c0cd539b6dcff73faf6584c02e6b0681c982ffda7f895af48ed2f8a9ff04dc4561bf8586de7979e5452f38ab24f25
-  data.tar.gz: 407f8bf9b6072a879730c66eb08d19e8c3a35a7cef93155ac8baf5abb0d8cc30d6e863faa0c129b36409dfc252958d6f27c53ae76774e3a116e7aad7043000b5
+  metadata.gz: 8070cce10383f1579f90b859fc9471ec1ae371def5a42b225a558783bd83b6ef568a4f9642f0c0460aefe7cd77d4de03b1653cd759b84b00a99e3cc1d2bfb0d4
+  data.tar.gz: 7bfe8c7d89ff4e0c20be5af13249e88837c5e405df8475ef7a40fefab4ef11b54a25fc29cc70ec308b695269a20278306bd42feb5da42f5831b16a25b9279aac

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 = "1.0.2"
 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdelivery
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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.0.3.1
 signing_key: 
 specification_version: 4
 summary: 火箭快遞 API 串接