samurai 0.2.23 → 0.2.24

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    samurai (0.2.23)
+    samurai (0.2.24)
       activeresource (>= 2.2.2)
 
 GEM

data/lib/samurai/payment_method.rb

@@ -38,7 +38,7 @@ class Samurai::PaymentMethod < Samurai::Base
   def process_response_errors
     if respond_to?(:messages) && self.messages
       self.messages.each do |message|
-        self.errors.add message.context.gsub(/\./, ' '), message.key
+        self.errors.add message.context, message.description
       end
     end
   end

data/lib/samurai/transaction.rb

@@ -70,7 +70,7 @@ class Samurai::Transaction < Samurai::Base
     if self.processor_response && self.processor_response.messages
       self.processor_response.messages.each do |message|
         if message.subclass == 'error'
-          self.errors.add message.context.gsub(/\./, ' '), message.key
+          self.errors.add message.context, message.description
         end
       end
     end

data/lib/samurai/version.rb

@@ -1,3 +1,3 @@
 module Samurai
-  VERSION = "0.2.23".freeze
+  VERSION = "0.2.24".freeze
 end

data/spec/lib/purchase_spec.rb

@@ -2,39 +2,81 @@ require 'spec_helper'
 
 describe "processing purchases" do
 
-  before :each do
-    payment_method_token = create_payment_method(default_payment_method_params)[:payment_method_token]
-    @purchase = Samurai::Processor.purchase(payment_method_token, 1.0, :billing_reference=>rand(1000))
-  end
-  
-  it "should process successfully" do
-    @purchase.processor_response.success.should be_true
-  end
+  describe 'for a successful transaction' do
+    before :each do
+      @payment_method_token = create_payment_method(default_payment_method_params)[:payment_method_token]
+      @purchase = Samurai::Processor.purchase(@payment_method_token, 1.0, :billing_reference=>rand(1000))
+    end
 
-  it "should be able to void a recent purchase" do
-    void = @purchase.void
-    void.processor_response.success.should be_true
-  end
+    it "should process successfully" do
+      @purchase.processor_response.success.should be_true
+    end
+
+    it "should be able to void a recent purchase" do
+      void = @purchase.void
+      void.processor_response.success.should be_true
+    end
+
+    it "should not be able to credit a recent purchase" do
+      credit = @purchase.credit
+      credit.processor_response.success.should be_false
+    end
+
+    it "should be able to reverse a recent purchase" do
+      reverse = @purchase.reverse
+      reverse.processor_response.success.should be_true
+    end
+
+    it "should be able to reverse a settled purchase" do
+      pending "currently we cannot force settle a purchase, so can't test this properly"
+      reverse = @purchase.reverse
+      reverse.processor_response.success.should be_true
+    end
 
-  it "should not be able to credit a recent purchase" do
-    credit = @purchase.credit
-    credit.processor_response.success.should be_false
+    it "should be able to credit a settled purchase" do
+      pending "currently we cannot force settle a purchase, so can't test this properly"
+      credit = @purchase.credit
+      credit.processor_response.success.should be_true
+    end
   end
 
-  it "should be able to reverse a recent purchase" do
-    reverse = @purchase.reverse
-    reverse.processor_response.success.should be_true
+  describe 'for a declined transaction' do
+    before :each do
+      @payment_method_token = create_payment_method(default_payment_method_params)[:payment_method_token]
+      @purchase = Samurai::Processor.purchase(@payment_method_token, 1.02)
+    end
+
+    it "should process" do
+      @purchase.processor_response.success.should be_false
+      [@purchase.errors['processor.transaction']].flatten.first.should == 'The card was declined.'
+    end
   end
 
-  it "should be able to reverse a settled purchase" do
-    pending "currently we cannot force settle a purchase, so can't test this properly"
-    reverse = @purchase.reverse
-    reverse.processor_response.success.should be_true
+
+  describe 'for a invalid card number transaction' do
+    before :each do
+      @payment_method_token = create_payment_method(default_payment_method_params)[:payment_method_token]
+      @purchase = Samurai::Processor.purchase(@payment_method_token, 1.07)
+    end
+
+    it "should process" do
+      @purchase.processor_response.success.should be_false
+      [@purchase.errors['input.card_number']].flatten.first.should == 'The card number was invalid.'
+    end
   end
 
-  it "should be able to credit a settled purchase" do
-    pending "currently we cannot force settle a purchase, so can't test this properly"
-    credit = @purchase.credit
-    credit.processor_response.success.should be_true
+  describe 'for a expired card transaction' do
+    before :each do
+      @payment_method_token = create_payment_method(default_payment_method_params)[:payment_method_token]
+      @purchase = Samurai::Processor.purchase(@payment_method_token, 1.08)
+    end
+
+    it "should process" do
+      @purchase.processor_response.success.should be_false
+      [@purchase.errors['input.expiry_month']].flatten.first.should == 'The expiration date month was invalid, or prior to today.'
+      [@purchase.errors['input.expiry_year']].flatten.first.should == 'The expiration date year was invalid, or prior to today.'
+    end
   end
+
+
 end

data/spec/spec_helper.rb

@@ -38,41 +38,43 @@ Samurai.options = {
 require 'logger'
 ActiveResource::Base.logger = Logger.new(STDOUT)
 
-module ActiveResource
-  class Connection
-    private
-      # Makes a request to the remote service.
-      def request(method, path, *arguments)
-        result = ActiveSupport::Notifications.instrument("request.active_resource") do |payload|
-          payload[:method]      = method
-          payload[:request_uri] = "#{site.scheme}://#{site.host}:#{site.port}#{path}"
-          payload[:request_arguments] = arguments
-          payload[:result]      = http.send(method, path, *arguments)
+if [ActiveResource::VERSION::MAJOR, ActiveResource::VERSION::MINOR].compact.join('.').to_f >= 3.0
+  module ActiveResource
+    class Connection
+      private
+        # Makes a request to the remote service.
+        def request(method, path, *arguments)
+          result = ActiveSupport::Notifications.instrument("request.active_resource") do |payload|
+            payload[:method]      = method
+            payload[:request_uri] = "#{site.scheme}://#{site.host}:#{site.port}#{path}"
+            payload[:request_arguments] = arguments
+            payload[:result]      = http.send(method, path, *arguments)
+          end
+          handle_response(result)
+        rescue Timeout::Error => e
+          raise TimeoutError.new(e.message)
+        rescue OpenSSL::SSL::SSLError => e
+          raise SSLError.new(e.message)
         end
-        handle_response(result)
-      rescue Timeout::Error => e
-        raise TimeoutError.new(e.message)
-      rescue OpenSSL::SSL::SSLError => e
-        raise SSLError.new(e.message)
-      end
+    end
   end
-end
 
-module ActiveResource
-  class VerboseLogSubscriber < ActiveSupport::LogSubscriber
-    def request(event)
-      result = event.payload[:result]
-      info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}"
-      event.payload[:request_arguments].each {|s| debug s }
-      info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration]
-      debug result.body.to_s
-    end
+  module ActiveResource
+    class VerboseLogSubscriber < ActiveSupport::LogSubscriber
+      def request(event)
+        result = event.payload[:result]
+        info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}"
+        event.payload[:request_arguments].each {|s| debug s }
+        info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration]
+        debug result.body.to_s
+      end
 
-    def logger
-      ActiveResource::Base.logger
+      def logger
+        ActiveResource::Base.logger
+      end
     end
   end
-end
 
-ActiveSupport::Notifications.unsubscribe "request.active_resource"
-ActiveResource::VerboseLogSubscriber.attach_to :active_resource
+  ActiveSupport::Notifications.unsubscribe "request.active_resource"
+  ActiveResource::VerboseLogSubscriber.attach_to :active_resource
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samurai
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70268836094780 !ruby/object:Gem::Requirement
+  requirement: &70345403388140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70268836094780
+  version_requirements: *70345403388140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70268836094280 !ruby/object:Gem::Requirement
+  requirement: &70345403387640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70268836094280
+  version_requirements: *70345403387640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70268836093800 !ruby/object:Gem::Requirement
+  requirement: &70345403387140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70268836093800
+  version_requirements: *70345403387140
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70268836093420 !ruby/object:Gem::Requirement
+  requirement: &70345403386760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268836093420
+  version_requirements: *70345403386760
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70268836092920 !ruby/object:Gem::Requirement
+  requirement: &70345403386220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268836092920
+  version_requirements: *70345403386220
 description: If you are an online merchant and using samurai.feefighters.com, this
   gem will make your life easy. Integrate with the samurai.feefighters.com portal
   and process transaction.