gmo-pg 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0decbf3d4188db421f9b22b5a328cacbbf8a733
-  data.tar.gz: 0039ff2cba2a9b0ebdbabcd153d6c179c7159f11
+  metadata.gz: e3a81515f110621f9f9f948ad256056aa34dcf02
+  data.tar.gz: 79477f08628e97b821d024aa9b093731bd339907
 SHA512:
-  metadata.gz: 2168baf2ef8ce95054bab3eaf9b1d053018f56419bc0f63e668953bbe0a3efa05753b417372223d071371d438a174a4c385477ca63557314fec46f075a7e5f17
-  data.tar.gz: a278f46eb45e0132596039e54134af3730ee2e0749ce53af421947cc6ac44b7f2c74336673ffa4cd99a850bd41218bca237e5b89b204c56a35a57b7be9ebe310
+  metadata.gz: c04790e4430d920a67a7d6e364b6de0b363714da53b4d0b9d60e1da1ec5e849e36946023bf310b7b68c94f317a12ff1b38c9b8bbbfaf93ec2e71a31857f1a603
+  data.tar.gz: c03d0ea2eaf99ee3a4462acf887e32e97509e4f208c1802fd922033c88cbe560e5c43640c887cf6855f3fefe163b53a906469924212e048deb141c55896ba069

data/lib/gmo-pg/dispatcher.rb

@@ -48,7 +48,7 @@ module GMO
           when Net::HTTPSuccess
             payload = GMO::PG::Payload.decode(res.body)
             response = request.class.corresponding_response_class.new(payload)
-            raise_api_error request, response if @raise_on_api_error && response.error?
+            raise response.errors.first.to_error if @raise_on_api_error && response.error?
             response
           else
             res.value # raise Net::XxxError
@@ -67,14 +67,6 @@ module GMO
           raise GMO::PG::Error.from_http_error(e)
         end
       end
-
-      def raise_api_error(request, response)
-        e = response.errors.first.to_error
-        e.request  = request
-        e.response = response
-
-        raise e
-      end
     end
   end
 end

data/lib/gmo-pg/error.rb

@@ -26,7 +26,7 @@ module GMO
           # E0119: Invalid SiteID
           # E0120: Invalid SitePass
           # E0121: Invalid SiteID and/or SitePass
-          GMO::PG::AuthorizationError.new("Authorization error (#{err_code}|#{err_info})")
+          GMO::PG::AuthorizationError.new('Authorization error', err_code, err_info)
         when /\AE01(17|18|25|26|27|46|48)/, /\A(E41|42G)/
           # E0117: Invalid CardNo
           # E0118: Invalid Expire
@@ -37,15 +37,15 @@ module GMO
           # E0148: Invalid HolderName
           # E41  : Incorrect card
           # 42G  : Error on Card brand
-          GMO::PG::CardError.new("Card error (#{err_code}|#{err_info})")
+          GMO::PG::CardError.new('Card error', err_code, err_info)
         when /\A(E61|E91|E92|42C)/
           # E61: Shop configuration error
           # E91: System error
           # E92: Temporary unavailable
           # 42C: Error on CAFIS or Card brand
-          GMO::PG::APIServerError.new("Temporary unavailable (#{err_code}|#{err_info})")
+          GMO::PG::APIServerError.new('Temporary unavailable', err_code, err_info)
         else
-          GMO::PG::APIError.new("API error (#{err_code}|#{err_info})")
+          GMO::PG::APIError.new('API error', err_code, err_info)
         end
       end
     end
@@ -57,12 +57,12 @@ module GMO
     end
 
     class APIError < Error
-      attr_accessor :request, :response
+      attr_reader :err_code, :err_info
 
-      def initialize(message, request = nil, response = nil)
-        super(message)
-        @request  = request
-        @response = response
+      def initialize(message, err_code, err_info)
+        super("#{message} (#{err_code}|#{err_info})")
+        @err_code = err_code
+        @err_info = err_info
       end
     end
 

data/lib/gmo-pg/http_resource/errors.rb

@@ -1,7 +1,7 @@
 module GMO
   module PG
     class Errors
-      class Record < Struct.new(:err_code, :err_info)
+      class Error < Struct.new(:err_code, :err_info)
         def to_error
           GMO::PG::Error.from_api_error(err_code, err_info)
         end
@@ -20,7 +20,7 @@ module GMO
         return to_enum unless block_given?
         return nil if @err_code.nil? && @err_info.nil?
         @err_code.zip(@err_info).each do |(err_code, err_info)|
-          yield Record.new(err_code, err_info)
+          yield Error.new(err_code, err_info)
         end
       end
     end

data/lib/gmo-pg/version.rb

@@ -1,5 +1,5 @@
 module GMO
   module PG
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmo-pg
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - kissy2go