samurai 0.2.7 → 0.2.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    samurai (0.2.6)
+    samurai (0.2.8)
       activeresource (>= 2.2.2)
 
 GEM

data/app/views/application/_errors.html.erb

@@ -1,15 +1,15 @@
 <% transaction ||= (@transaction || Samurai::Transaction.new) %>
 <% payment_method ||= (@payment_method || Samurai::PaymentMethod.new) %>
-<% if transaction.errors.any? || payment_method.errors.any? %>
+<% if transaction.has_errors? || payment_method.has_errors? %>
   <div id="error_explanation">
     <h4>This transaction could not be processed:</h4>
     <ul>
     <% transaction.errors.full_messages.each do |msg| %>
       <li><%= msg %></li>
-    <% end %>
+    <% end if transaction.has_errors? %>
     <% payment_method.errors.full_messages.each do |msg| %>
       <li><%= msg %></li>
-    <% end %>
+    <% end if payment_method.has_errors? %>
     </ul>
   </div>
 <% end %>

data/app/views/application/_payment_method_form.html.erb

@@ -22,27 +22,27 @@
     <div class="field-group" id="credit_card_address_group">
       <div>
         <label for="credit_card_address_1">Address 1</label>
-        <input class="span-6" id="credit_card_address_1" name="credit_card[address_1]" size="30" type="text" value="<%= payment_method.address_1 %>" />
+        <input class="" id="credit_card_address_1" name="credit_card[address_1]" size="30" type="text" value="<%= payment_method.address_1 %>" />
       </div>
       <div>
         <label for="credit_card_address_2">Address 2</label>
-        <input class="span-6" id="credit_card_address_2" name="credit_card[address_2]" size="30" type="text" value="<%= payment_method.address_2 %>" />
+        <input class="" id="credit_card_address_2" name="credit_card[address_2]" size="30" type="text" value="<%= payment_method.address_2 %>" />
       </div>
     </div>
 
     <div class="field-group" id="location_group">
-      <div>
+      <span>
         <label for="credit_card_city">City</label>
         <input id="credit_card_city" name="credit_card[city]" size="30" type="text" value="<%= payment_method.city %>" />
-      </div>
-      <div>
+      </span>
+      <span>
         <label for="credit_card_state">State</label>
-        <input class="span-1" id="credit_card_state" name="credit_card[state]" size="30" type="text" value="<%= payment_method.state %>" />
-      </div>
-      <div>
+        <input class="" id="credit_card_state" name="credit_card[state]" size="30" type="text" value="<%= payment_method.state %>" />
+      </span>
+      <span>
         <label for="credit_card_zip">Zip</label>
-        <input class="span-2" id="credit_card_zip" name="credit_card[zip]" size="30" type="text" value="<%= payment_method.zip %>" />
-      </div>
+        <input class="" id="credit_card_zip" name="credit_card[zip]" size="30" type="text" value="<%= payment_method.zip %>" />
+      </span>
     </div>
   </fieldset>
 
@@ -51,40 +51,44 @@
       <span>
         <label for="credit_card_card_number">Card Number</label>
         <input id="credit_card_card_number" name="credit_card[card_number]" size="30" type="text" value="<%= payment_method.card_number %>" />
+        <label data-samurai="card_previews">
+          <span class='visa'></span>
+          <span class='mastercard'></span>
+          <span class='amex'></span>
+          <span class='discover'></span>
+        </label>
       </span>
       <span>
         <label for="credit_card_cvv">CVV</label>
-        <input class="span-1" id="credit_card_cvv" name="credit_card[cvv]" size="30" type="text" value="<%= payment_method.cvv %>" />
+        <input class="" id="credit_card_cvv" name="credit_card[cvv]" size="30" type="text" value="<%= payment_method.cvv %>" />
+      </span>
+      <span>
+        <label for="credit_card_expiry_month">Expires on</label>
+        <select id="credit_card_expiry_month" name="credit_card[expiry_month]">
+          <option value="1" <%= 'selected' if payment_method.expiry_month.to_s=='1' %>>01</option>
+          <option value="2" <%= 'selected' if payment_method.expiry_month.to_s=='2' %>>02</option>
+          <option value="3" <%= 'selected' if payment_method.expiry_month.to_s=='3' %>>03</option>
+          <option value="4" <%= 'selected' if payment_method.expiry_month.to_s=='4' %>>04</option>
+          <option value="5" <%= 'selected' if payment_method.expiry_month.to_s=='5' %>>05</option>
+          <option value="6" <%= 'selected' if payment_method.expiry_month.to_s=='6' %>>06</option>
+          <option value="7" <%= 'selected' if payment_method.expiry_month.to_s=='7' %>>07</option>
+          <option value="8" <%= 'selected' if payment_method.expiry_month.to_s=='8' %>>08</option>
+          <option value="9" <%= 'selected' if payment_method.expiry_month.to_s=='9' %>>09</option>
+          <option value="10" <%= 'selected' if payment_method.expiry_month.to_s=='10' %>>10</option>
+          <option value="11" <%= 'selected' if payment_method.expiry_month.to_s=='11' %>>11</option>
+          <option value="12" <%= 'selected' if payment_method.expiry_month.to_s=='12' %>>12</option>
+        </select>
+        <select id="credit_card_expiry_year" name="credit_card[expiry_year]">
+          <option value="2011" <%= 'selected' if payment_method.expiry_year.to_s=='2011' %>>2011</option>
+          <option value="2012" <%= 'selected' if payment_method.expiry_year.to_s=='2012' %>>2012</option>
+          <option value="2013" <%= 'selected' if payment_method.expiry_year.to_s=='2013' %>>2013</option>
+          <option value="2014" <%= 'selected' if payment_method.expiry_year.to_s=='2014' %>>2014</option>
+          <option value="2015" <%= 'selected' if payment_method.expiry_year.to_s=='2015' %>>2015</option>
+          <option value="2016" <%= 'selected' if payment_method.expiry_year.to_s=='2016' %>>2016</option>
+        </select>
       </span>
     </div>
-
-     <div>
-      <label for="credit_card_expiry_month">Expires on</label>
-      <select id="credit_card_expiry_month" name="credit_card[expiry_month]">
-        <option value="1" <%= 'selected' if payment_method.expiry_month.to_s=='1' %>>01</option>
-        <option value="2" <%= 'selected' if payment_method.expiry_month.to_s=='2' %>>02</option>
-        <option value="3" <%= 'selected' if payment_method.expiry_month.to_s=='3' %>>03</option>
-        <option value="4" <%= 'selected' if payment_method.expiry_month.to_s=='4' %>>04</option>
-        <option value="5" <%= 'selected' if payment_method.expiry_month.to_s=='5' %>>05</option>
-        <option value="6" <%= 'selected' if payment_method.expiry_month.to_s=='6' %>>06</option>
-        <option value="7" <%= 'selected' if payment_method.expiry_month.to_s=='7' %>>07</option>
-        <option value="8" <%= 'selected' if payment_method.expiry_month.to_s=='8' %>>08</option>
-        <option value="9" <%= 'selected' if payment_method.expiry_month.to_s=='9' %>>09</option>
-        <option value="10" <%= 'selected' if payment_method.expiry_month.to_s=='10' %>>10</option>
-        <option value="11" <%= 'selected' if payment_method.expiry_month.to_s=='11' %>>11</option>
-        <option value="12" <%= 'selected' if payment_method.expiry_month.to_s=='12' %>>12</option>
-      </select>
-      <select id="credit_card_expiry_year" name="credit_card[expiry_year]">
-        <option value="2011" <%= 'selected' if payment_method.expiry_year.to_s=='2011' %>>2011</option>
-        <option value="2012" <%= 'selected' if payment_method.expiry_year.to_s=='2012' %>>2012</option>
-        <option value="2013" <%= 'selected' if payment_method.expiry_year.to_s=='2013' %>>2013</option>
-        <option value="2014" <%= 'selected' if payment_method.expiry_year.to_s=='2014' %>>2014</option>
-        <option value="2015" <%= 'selected' if payment_method.expiry_year.to_s=='2015' %>>2015</option>
-        <option value="2016" <%= 'selected' if payment_method.expiry_year.to_s=='2016' %>>2016</option>
-      </select>
-    </div>
-
   </fieldset>
 
-  <button type='submit' class='button blue'>Submit Payment</button>
+  <p><button type='submit' class='button blue'>Submit Payment</button></p>
 </form>

data/app/views/application/_transaction.html.erb

@@ -1,28 +1,29 @@
 <% transaction ||= @transaction %>
-<h3><%= transaction.errors.empty? ? 'Successful' : 'Failed' %> <%= transaction.transaction_type.titleize %> Transaction</h3>
-<h4>Reference ID: <%= transaction.reference_id %></h4>
+<% if transaction %><h3><%= transaction.has_errors? ? 'Failed' : 'Successful' %> <%= transaction.transaction_type.titleize %></h3><% end %>
 
-<%= render Samurai::Views.errors :transaction=>transaction %>
+<%= @errors || render(Samurai::Rails::Views.errors) %>
 
-<p>
-  <strong>Amount:</strong>
-  <%= transaction.amount %> (<%= transaction.currency_code %>)
-</p>
+<% if transaction %>
+  <p>
+    <strong>Amount:</strong>
+    <%= transaction.amount %> (<%= transaction.currency_code %>)
+  </p>
 
-<p>
-  <strong>Credit Card:</strong>
-  <em>XXXX XXXX XXXX</em> <%= transaction.payment_method.last_four_digits %>
-  (<%= "%02d" % transaction.payment_method.expiry_month %> / <%= "%04d" % transaction.payment_method.expiry_year %>)
-</p>
+  <p>
+    <strong>Credit Card:</strong>
+    <em>XXXX XXXX XXXX</em> <%= transaction.payment_method.last_four_digits %>
+    (<%= "%02d" % transaction.payment_method.expiry_month %> / <%= "%04d" % transaction.payment_method.expiry_year %>)
+  </p>
 
-<p><strong>Date / Time:</strong> <%= transaction.created_at %></p>
-<p>
-  <strong>Descriptor:</strong> <%= transaction.descriptor %><br>
-  <strong>Billing Reference:</strong> <%= transaction.billing_reference %><br>
-  <strong>Customer Reference: </strong> <%= transaction.customer_reference %><br>
-  <strong>Custom Data: </strong> <%= transaction.custom %><br>
-</p>
+  <p><strong>Date / Time:</strong> <%= transaction.created_at %></p>
+  <p>
+    <strong>Descriptor:</strong> <%= transaction.descriptor %><br>
+    <strong>Billing Reference:</strong> <%= transaction.billing_reference %><br>
+    <strong>Customer Reference: </strong> <%= transaction.customer_reference %><br>
+    <strong>Custom Data: </strong> <%= transaction.custom %><br>
+  </p>
 
-<p>
-  <strong>AVS Response:</strong> <%= transaction.processor_response.avs_result_code || 'None' %>
-</p>
+  <p>
+    <strong>AVS Response:</strong> <%= transaction.processor_response.try(:avs_result_code) || 'None' %>
+  </p>
+<% end %>

data/lib/samurai/processor.rb

@@ -47,10 +47,20 @@ class Samurai::Processor < Samurai::Base
   
   def execute(action, options = {})
     transaction = Samurai::Transaction.transaction_payload(options)
-    # send a purchase request
-    resp = post(action, {}, transaction)
-    # return the response, wrapped in a Samurai::Transaction
-    Samurai::Transaction.new.load_attributes_from_response(resp)
+    begin
+      # send a purchase request
+      resp = post(action, {}, transaction)
+      # return the response, wrapped in a Samurai::Transaction
+      Samurai::Transaction.new.load_attributes_from_response(resp)
+    rescue ActiveResource::BadRequest=>e
+      # initialize a fresh transaction with the give options, add a generic error to it, and return it
+      Samurai::Transaction.new(options.merge(:transaction_type=>action.to_s)).tap do |transaction|
+        transaction.payment_method = Samurai::PaymentMethod.find options[:payment_method_token]
+        transaction.created_at = Time.now
+        transaction.processor_response = nil
+        transaction.errors[:base] << "Invalid request."
+      end
+    end
   end
   
 end

data/lib/samurai/rails/views.rb

@@ -15,7 +15,7 @@ module Samurai::Rails
           Pathname.new(__FILE__).dirname.join('../../..', 'app', 'views', 'application', "_#{partial}.html.erb").to_s
         end
         define_method "#{partial}_html" do
-          File.read(send partial)
+          File.read send("#{partial}_file")
         end
       end
 

data/lib/samurai/transaction.rb

@@ -45,9 +45,18 @@ class Samurai::Transaction < Samurai::Base
   private
   
   def execute(action, options = {})
-    resp = post(action, {}, self.class.transaction_payload(options))
-    # return the response, wrapped in a Samurai::Transaction
-    Samurai::Transaction.new.load_attributes_from_response(resp)
+    begin
+      resp = post(action, {}, self.class.transaction_payload(options))
+      # return the response, wrapped in a Samurai::Transaction
+      Samurai::Transaction.new.load_attributes_from_response(resp)
+    rescue ActiveResource::BadRequest=>e
+      # initialize a fresh transaction with the give options, add a generic error to it, and return it
+      Samurai::Transaction.new(options.merge(:transaction_type=>action.to_s)).tap do |transaction|
+        transaction.created_at = Time.now
+        transaction.processor_response = nil
+        transaction.errors[:base] << "Invalid request."
+      end
+    end
   end
 
   def process_response_errors
@@ -87,19 +96,4 @@ class Samurai::Transaction < Samurai::Base
     super(EMPTY_ATTRIBUTES.merge(attrs))
   end
 
-
-  require 'pathname'
-  def self.form_html
-    File.read(form_partial_path)
-  end
-  def self.form_partial_path
-    Pathname.new(__FILE__).dirname.join('..', '..', 'app', 'views', 'application', '_transaction_form.html.erb')
-  end
-  def self.show_html
-    File.read(show_partial_path)
-  end
-  def self.show_partial_path
-    Pathname.new(__FILE__).dirname.join('..', '..', 'app', 'views', 'application', '_transaction.html.erb')
-  end
-
 end

data/lib/samurai/version.rb

@@ -1,3 +1,3 @@
 module Samurai
-  VERSION = "0.2.7".freeze
+  VERSION = "0.2.8".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samurai
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70212280242520 !ruby/object:Gem::Requirement
+  requirement: &70208845185200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70212280242520
+  version_requirements: *70208845185200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70212280242060 !ruby/object:Gem::Requirement
+  requirement: &70208845184740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70212280242060
+  version_requirements: *70208845184740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212280241600 !ruby/object:Gem::Requirement
+  requirement: &70208845184280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70212280241600
+  version_requirements: *70208845184280
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70212280241220 !ruby/object:Gem::Requirement
+  requirement: &70208845183900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212280241220
+  version_requirements: *70208845183900
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70212280240720 !ruby/object:Gem::Requirement
+  requirement: &70208845183400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212280240720
+  version_requirements: *70208845183400
 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.