samurai 0.2.26 → 0.2.27

data/Gemfile.lock

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

data/lib/samurai/base.rb

@@ -19,7 +19,7 @@ class Samurai::Base < ActiveResource::Base
   end
 
   def has_errors?
-    respond_to?(:errors) && !errors.empty?
+    respond_to?(:errors) && errors && errors.count > 0
   end
 
   protected

data/lib/samurai/message.rb

@@ -33,7 +33,7 @@ class Samurai::Message < Samurai::Base
     'error processor.transaction type_invalid'    => 'Requested transaction type is not allowed for this card/merchant.',
     'error processor.transaction method_invalid'  => 'The requested transaction could not be performed for this merchant.',
     'error input.amount exceeds_limit'            => 'The maximum transaction amount was exceeded.',
-    'error input.cvv invalid'                     => 'The CVV data entered is not correct.',
+    'error input.cvv invalid'                     => 'The CVV code was not correct.',
     'error processor.network_gateway communication_error'     => 'There was a fatal communication error.',
     'error processor.network_gateway unresponsive'            => 'The processing network is temporarily unavailable.',
     'error processor.network_gateway merchant_invalid'        => 'The merchant number is not on file.',
@@ -52,7 +52,21 @@ class Samurai::Message < Samurai::Base
 
     # CVV Responses
     'error input.cvv declined' => 'The CVV code was not correct.',
-    'error input.cvv declined' => 'The CVV code was invalid.',
+
+    # Input validations
+    'error input.card_number is_blank'        => 'The card number was blank.',
+    'error input.card_number not_numeric'     => 'The card number was invalid.',
+    'error input.card_number too_short'       => 'The card number was too short.',
+    'error input.card_number too_long'        => 'The card number was too long.',
+    'error input.card_number failed_checksum' => 'The card number was invalid.',
+    'error input.cvv is_blank'                => 'The CVV was blank.',
+    'error input.cvv not_numeric'             => 'The CVV was invalid.',
+    'error input.cvv too_short'               => 'The CVV was too short.',
+    'error input.cvv too_long'                => 'The CVV was too long.',
+    'error input.expiry_month is_blank'       => 'The expiration month was blank.',
+    'error input.expiry_month not_numeric'    => 'The expiration month was invalid.',
+    'error input.expiry_year is_blank'        => 'The expiration year was blank.',
+    'error input.expiry_year not_numeric'     => 'The expiration year was invalid.',
   }
 
   def self.response_mappings

data/lib/samurai/payment_method.rb

@@ -37,8 +37,10 @@ class Samurai::PaymentMethod < Samurai::Base
   # Examine the `<messages>` array, and add an error to the Errors object for each `<message>`
   def process_response_errors
     if respond_to?(:messages) && self.messages
-      self.messages.each do |message|
-        self.errors.add message.context, message.description
+      # Sort the messages so that more-critical/relevant ones appear first, since only the first error is added to a field
+      sorted_messages = self.messages.sort_by {|m| ['is_blank', 'not_numeric', 'too_short', 'too_long', 'failed_checksum'].index(m.key) || 0 }
+      sorted_messages.each do |message|
+        self.errors.add message.context, message.description if self.errors[message.context].blank?
       end
     end
   end

data/lib/samurai/version.rb

@@ -1,3 +1,3 @@
 module Samurai
-  VERSION = "0.2.26".freeze
+  VERSION = "0.2.27".freeze
 end

data/spec/lib/payment_method_spec.rb

@@ -3,18 +3,96 @@ require 'spec_helper'
 describe "PaymentMethod actions" do
 
   it "should create a new PaymentMethod using S2S endpoint" do
-    p = Samurai::PaymentMethod.create(
-        :city => "Chicago", 
-        :zip => "53211", 
-        :expiry_month => 03, 
-        :cvv => "123", 
-        :card_number => "4111111111111111", 
-        :address_1 => "1240 W Monroe #1", 
-        :address_2 => "", 
-        :last_name => "harper", 
-        :expiry_year => "2015", 
-        :first_name => "sean", 
+    Samurai::PaymentMethod.create(
+        :city => "Chicago",
+        :zip => "53211",
+        :expiry_month => 03,
+        :cvv => "123",
+        :card_number => "4111111111111111",
+        :address_1 => "1240 W Monroe #1",
+        :address_2 => "",
+        :last_name => "harper",
+        :expiry_year => "2015",
+        :first_name => "sean",
         :state => "IL")
   end
 
+  describe 'with errors' do
+    before(:each) do
+      @params = {
+        :city => "Chicago",
+        :zip => "53211",
+        :expiry_month => 03,
+        :cvv => "123",
+        :card_number => "4111111111111111",
+        :address_1 => "1240 W Monroe #1",
+        :address_2 => "",
+        :last_name => "harper",
+        :expiry_year => "2015",
+        :first_name => "sean",
+        :state => "IL",
+      }
+    end
+
+    it 'should validate blank card number' do
+      pm = Samurai::PaymentMethod.create @params.merge(:card_number=>'')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.card_number'].should == [ 'The card number was blank.' ]
+    end
+    it 'should validate invalid card number' do
+      pm = Samurai::PaymentMethod.create @params.merge(:card_number=>'abc123')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.card_number'].should == [ 'The card number was invalid.' ]
+    end
+    it 'should validate short card number' do
+      pm = Samurai::PaymentMethod.create @params.merge(:card_number=>'1234')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.card_number'].should == [ 'The card number was too short.' ]
+    end
+    it 'should validate long card number' do
+      pm = Samurai::PaymentMethod.create @params.merge(:card_number=>'41111111111111111')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.card_number'].should == [ 'The card number was too long.' ]
+    end
+    it 'should not validate blank cvv' do
+      pm = Samurai::PaymentMethod.create @params.merge(:cvv=>'')
+      pm.has_errors?.should be_false
+      pm.errors.count.should == 0
+    end
+    it 'should validate invalid cvv' do
+      pm = Samurai::PaymentMethod.create @params.merge(:cvv=>'abc')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.cvv'].should == [ 'The CVV was invalid.' ]
+    end
+    it 'should validate short cvv' do
+      pm = Samurai::PaymentMethod.create @params.merge(:cvv=>'1')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.cvv'].should == [ 'The CVV was too short.' ]
+    end
+    it 'should validate long cvv' do
+      pm = Samurai::PaymentMethod.create @params.merge(:cvv=>'11111')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.cvv'].should == [ 'The CVV was too long.' ]
+    end
+    it 'should validate blank expiry_month' do
+      pm = Samurai::PaymentMethod.create @params.merge(:expiry_month=>'')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.expiry_month'].should == [ 'The expiration month was blank.' ]
+    end
+    it 'should validate blank expiry_year' do
+      pm = Samurai::PaymentMethod.create @params.merge(:expiry_year=>'')
+      pm.has_errors?.should be_true
+      pm.errors.count.should == 1
+      pm.errors['input.expiry_year'].should == [ 'The expiration year was blank.' ]
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samurai
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
+date: 2011-11-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70225231947560 !ruby/object:Gem::Requirement
+  requirement: &70263286980460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70225231947560
+  version_requirements: *70263286980460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70225231947000 !ruby/object:Gem::Requirement
+  requirement: &70263286980000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70225231947000
+  version_requirements: *70263286980000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225231946440 !ruby/object:Gem::Requirement
+  requirement: &70263286979520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70225231946440
+  version_requirements: *70263286979520
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70225231946060 !ruby/object:Gem::Requirement
+  requirement: &70263286978900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225231946060
+  version_requirements: *70263286978900
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70225231945480 !ruby/object:Gem::Requirement
+  requirement: &70263286969400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225231945480
+  version_requirements: *70263286969400
 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.