paypal-express 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/paypal.rb

@@ -57,7 +57,9 @@ module Paypal
 end
 
 require 'paypal/util'
-require 'paypal/exceptions'
+require 'paypal/exception'
+require 'paypal/exception/http_error'
+require 'paypal/exception/api_error'
 require 'paypal/base'
 require 'paypal/ipn'
 require 'paypal/nvp/request'

data/lib/paypal/exception.rb

@@ -0,0 +1,4 @@
+module Paypal
+  class Exception < StandardError
+  end
+end

data/lib/paypal/exception/api_error.rb

@@ -0,0 +1,75 @@
+module Paypal
+  class Exception
+    class APIError < Exception
+      attr_accessor :response
+      def initialize(response = {})
+        @response = if response.is_a?(Hash)
+          Response.new response
+        else
+          response
+        end
+        super 'PayPal API Error'
+      end
+
+      class Response
+        cattr_reader :attribute_mapping
+        @@attribute_mapping = {
+          :ACK => :ack,
+          :BUILD => :build,
+          :CORRELATIONID => :colleration_id,
+          :TIMESTAMP => :timestamp,
+          :VERSION => :version
+        }
+        attr_accessor *@@attribute_mapping.values
+        attr_accessor :raw, :details
+
+        class Detail
+          cattr_reader :attribute_mapping
+          @@attribute_mapping = {
+            :ERRORCODE => :error_code,
+            :SEVERITYCODE => :severity_code,
+            :LONGMESSAGE => :long_message,
+            :SHORTMESSAGE => :short_message
+          }
+          attr_accessor *@@attribute_mapping.values
+
+          def initialize(attributes = {})
+            @raw = attributes
+            attrs = attributes.dup
+            @@attribute_mapping.each do |key, value|
+              self.send "#{value}=", attrs.delete(key)
+            end
+
+            # warn ignored params
+            attrs.each do |key, value|
+              Paypal.log "Ignored Parameter (#{self.class}): #{key}=#{value}", :warn
+            end
+          end
+        end
+
+        def initialize(attributes = {})
+          attrs = attributes.dup
+          @raw = attributes
+          @@attribute_mapping.each do |key, value|
+            self.send "#{value}=", attrs.delete(key)
+          end
+          details = []
+          attrs.keys.each do |attribute|
+            key, index = attribute.to_s.scan(/^L_(\S+)(\d+)$/).first
+            next if [key, index].any?(&:blank?)
+            details[index.to_i] ||= {}
+            details[index.to_i][key.to_sym] = attrs.delete(attribute)
+          end
+          @details = details.collect do |_attrs_|
+            Detail.new _attrs_
+          end
+
+          # warn ignored params
+          attrs.each do |key, value|
+            Paypal.log "Ignored Parameter (#{self.class}): #{key}=#{value}", :warn
+          end
+        end
+      end
+    end
+  end
+end

data/lib/paypal/exception/http_error.rb

@@ -0,0 +1,12 @@
+module Paypal
+  class Exception
+    class HttpError < Exception
+      attr_accessor :code, :message, :body
+      def initialize(code, message, body = '')
+        @code = code
+        @message = message
+        @body = body
+      end
+    end
+  end
+end

data/lib/paypal/ipn.rb

@@ -16,7 +16,7 @@ module Paypal
       when 'VERIFIED'
         true
       else
-        raise APIError.new(response.body)
+        raise Exception::APIError.new(response.body)
       end
     end
   end

data/lib/paypal/nvp/request.rb

@@ -52,10 +52,10 @@ module Paypal
         when 'Success', 'SuccessWithWarning'
           response
         else
-          raise APIError.new(response)
+          raise Exception::APIError.new(response)
         end
       rescue RestClient::Exception => e
-        raise HttpError.new(e.http_code, e.message, e.http_body)
+        raise Exception::HttpError.new(e.http_code, e.message, e.http_body)
       end
     end
   end

data/spec/paypal/exception/api_error_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper.rb'
+
+describe Paypal::Exception::APIError do
+  describe '.new' do
+    let :error do
+      Paypal::Exception::APIError.new response
+    end
+
+    context 'when Hash is given' do
+      let :response do
+        {
+          :VERSION=>"66.0",
+          :TIMESTAMP=>"2011-03-03T06:33:51Z",
+          :CORRELATIONID=>"758ebdc546b9c",
+          :L_SEVERITYCODE0=>"Error",
+          :L_ERRORCODE0=>"10411",
+          :L_LONGMESSAGE0=>"This Express Checkout session has expired.  Token value is no longer valid.",
+          :BUILD=>"1741654",
+          :ACK=>"Failure",
+          :L_SHORTMESSAGE0=>"This Express Checkout session has expired."
+        }
+      end
+
+      it 'should have Paypal::Exception::APIError::Response as response' do
+        Paypal::Exception::APIError::Response.attribute_mapping.each do |key, value|
+          error.response.send(value).should == response[key]
+        end
+      end
+
+      it 'should have Paypal::Exception::APIError::Response::Detail as response.detail' do
+        detail = error.response.details.first
+        Paypal::Exception::APIError::Response::Detail.attribute_mapping.each do |key, value|
+          detail.send(value).should == response[:"L_#{key}0"]
+        end
+      end
+
+      it 'should have raw response as response.raw' do
+        error.response.raw.should == response
+      end
+
+      context 'when unknown params given' do
+        let :response do
+          {
+            :UNKNOWN => 'Unknown',
+            :L_UNKNOWN0 => 'Unknown Detail'
+          }
+        end
+
+        it 'should warn it and keep it only in response.raw' do
+          Paypal.logger.should_receive(:warn).with(
+            "Ignored Parameter (Paypal::Exception::APIError::Response): UNKNOWN=Unknown"
+          )
+          Paypal.logger.should_receive(:warn).with(
+            "Ignored Parameter (Paypal::Exception::APIError::Response::Detail): UNKNOWN=Unknown Detail"
+          )
+          error
+        end
+      end
+    end
+
+    context 'otherwise' do
+      let :response do
+        'Failure'
+      end
+
+      it 'should store response in raw format' do
+        error = Paypal::Exception::APIError.new response
+        error.response.should == response
+      end
+    end
+  end
+  
+end

data/spec/paypal/exception/http_error_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper.rb'
+
+describe Paypal::Exception::HttpError do
+  it 'should have code, message and body' do
+    error = Paypal::Exception::HttpError.new(400, 'BadRequest', 'You are bad man!')
+    error.code.should == 400
+    error.message.should == 'BadRequest'
+    error.body.should == 'You are bad man!'
+  end
+end

data/spec/paypal/ipn_spec.rb

@@ -17,10 +17,10 @@ describe Paypal::IPN do
         fake_response 'IPN/invalid', :IPN
       end
 
-      it 'should raise Paypal::APIError' do
+      it 'should raise Paypal::Exception::APIError' do
         lambda do
           Paypal::IPN.verify!("raw-post-body")
-        end.should raise_error(Paypal::APIError)
+        end.should raise_error(Paypal::Exception::APIError)
       end
     end
   end

data/spec/paypal/nvp/request_spec.rb

@@ -61,10 +61,10 @@ describe Paypal::NVP::Request do
         fake_response 'SetExpressCheckout/failure'
       end
 
-      it 'should raise Paypal::APIError' do
+      it 'should raise Paypal::Exception::APIError' do
         lambda do
           instance.request :SetExpressCheckout
-        end.should raise_error(Paypal::APIError)
+        end.should raise_error(Paypal::Exception::APIError)
       end
     end
 
@@ -78,10 +78,10 @@ describe Paypal::NVP::Request do
         )
       end
 
-      it 'should raise Paypal::APIError' do
+      it 'should raise Paypal::Exception::APIError' do
         lambda do
           instance.request :SetExpressCheckout
-        end.should raise_error(Paypal::HttpError)
+        end.should raise_error(Paypal::Exception::HttpError)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paypal-express
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +09:00
+date: 2011-03-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,7 +159,9 @@ files:
 - lib/cert
 - lib/paypal.rb
 - lib/paypal/base.rb
-- lib/paypal/exceptions.rb
+- lib/paypal/exception.rb
+- lib/paypal/exception/api_error.rb
+- lib/paypal/exception/http_error.rb
 - lib/paypal/express.rb
 - lib/paypal/express/request.rb
 - lib/paypal/express/response.rb
@@ -195,7 +197,8 @@ files:
 - spec/fake_response/SetExpressCheckout/failure.txt
 - spec/fake_response/SetExpressCheckout/success.txt
 - spec/helpers/fake_response_helper.rb
-- spec/paypal/exception_spec.rb
+- spec/paypal/exception/api_error_spec.rb
+- spec/paypal/exception/http_error_spec.rb
 - spec/paypal/express/request_spec.rb
 - spec/paypal/express/response_spec.rb
 - spec/paypal/ipn_spec.rb
@@ -264,7 +267,8 @@ test_files:
 - spec/fake_response/SetExpressCheckout/failure.txt
 - spec/fake_response/SetExpressCheckout/success.txt
 - spec/helpers/fake_response_helper.rb
-- spec/paypal/exception_spec.rb
+- spec/paypal/exception/api_error_spec.rb
+- spec/paypal/exception/http_error_spec.rb
 - spec/paypal/express/request_spec.rb
 - spec/paypal/express/response_spec.rb
 - spec/paypal/ipn_spec.rb

data/lib/paypal/exceptions.rb

@@ -1,21 +0,0 @@
-module Paypal
-
-  class Exception < StandardError; end
-
-  class HttpError < Exception
-    attr_accessor :code, :message, :body
-    def initialize(code, message, body = '')
-      @code = code
-      @message = message
-      @body = body
-    end
-  end
-
-  class APIError < Exception
-    attr_accessor :response
-    def initialize(response = {})
-      @response = response
-    end
-  end
-
-end

data/spec/paypal/exception_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper.rb'
-
-describe Paypal::HttpError do
-  it 'should have code, message and body' do
-    error = Paypal::HttpError.new(400, 'BadRequest', 'You are bad man!')
-    error.code.should == 400
-    error.message.should == 'BadRequest'
-    error.body.should == 'You are bad man!'
-  end
-end
-
-describe Paypal::APIError do
-  it 'should have raw response' do
-    error = Paypal::APIError.new({:error => 'ERROR!!'})
-    error.response.should == {:error => 'ERROR!!'}
-  end
-end