samurai 0.2.9 → 0.2.10

data/Gemfile.lock

@@ -1,28 +1,32 @@
 PATH
   remote: .
   specs:
-    samurai (0.2.8)
+    samurai (0.2.10)
       activeresource (>= 2.2.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    builder (2.1.2)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
     columnize (0.3.4)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    i18n (0.5.0)
+    i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    multi_json (1.0.3)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)

data/lib/samurai.rb

@@ -41,4 +41,24 @@ require 'samurai/transaction'
 require 'samurai/message'
 require 'samurai/processor_response'
 
-require 'samurai/rails'
+require 'samurai/rails'
+
+
+# Monkey-patch AR::Base, because chunked encoding isn't handled properly
+# see: https://github.com/jkrall/rails/commit/00920bb374a73626159e0002fe620f3aa4b5cfcf
+#      https://github.com/rails/rails/pull/2079
+module ActiveResource
+  class Base
+    protected
+      def load_attributes_from_response(response)
+        has_content_length = !response['Content-Length'].blank? && response['Content-Length'] != "0"
+        has_body = !response.body.nil? && response.body.strip.size > 0
+        is_chunked = response["Transfer-Encoding"] == "chunked"
+
+        if has_body && (has_content_length || is_chunked)
+          load(self.class.format.decode(response.body), true)
+          @persisted = true
+        end
+      end
+  end
+end

data/lib/samurai/base.rb

@@ -19,7 +19,9 @@ class Samurai::Base < ActiveResource::Base
   protected
 
   def load_attributes_from_response(response)
-    super.tap { |instance| instance.process_response_errors }
+    super
+    process_response_errors
+    self
   end
   def self.instantiate_record(record, prefix_options = {})
     super.tap { |instance| instance.send :process_response_errors }

data/lib/samurai/payment_method.rb

@@ -38,14 +38,22 @@ class Samurai::PaymentMethod < Samurai::Base
   end
   protected :process_response_errors
 
-  # Initialize the known attributes from the schema as empty strings, so that they can be accessed via method-missing
   KNOWN_ATTRIBUTES = [
     :first_name, :last_name, :address_1, :address_2, :city, :state, :zip,
     :card_number, :cvv, :expiry_month, :expiry_year
   ]
-  EMPTY_ATTRIBUTES = KNOWN_ATTRIBUTES.inject(ActiveSupport::HashWithIndifferentAccess.new) {|h, k| h[k] = ''; h}
-  def initialize(attrs={})
-    super(EMPTY_ATTRIBUTES.merge(attrs))
+  if ActiveResource::VERSION::MAJOR <= 3 && ActiveResource::VERSION::MINOR < 1
+    # If we're using ActiveResource pre-3.1, there's no schema class method, so we resort to some tricks...
+    # Initialize the known attributes from the schema as empty strings, so that they can be accessed via method-missing
+    EMPTY_ATTRIBUTES = KNOWN_ATTRIBUTES.inject(ActiveSupport::HashWithIndifferentAccess.new) {|h, k| h[k] = ''; h}
+    def initialize(attrs={})
+      super(EMPTY_ATTRIBUTES.merge(attrs))
+    end
+  else
+    # Post AR 3.1, we can use the schema method to define our attributes
+    schema do
+      string *KNOWN_ATTRIBUTES
+    end
   end
 
   # Prepare a new PaymentMethod for use with a transparent redirect form

data/lib/samurai/processor.rb

@@ -48,10 +48,14 @@ class Samurai::Processor < Samurai::Base
   def execute(action, options = {})
     transaction = Samurai::Transaction.transaction_payload(options)
     begin
+      @persisted = true # keep AR 3.1 from using the new_ resource path
+
       # 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|

data/lib/samurai/transaction.rb

@@ -86,14 +86,22 @@ class Samurai::Transaction < Samurai::Base
       to_xml(:skip_instruct => true, :root => 'transaction', :dasherize => false)
   end
 
-  # Initialize the known attributes from the schema as empty strings, so that they can be accessed via method-missing
   KNOWN_ATTRIBUTES = [
     :amount, :type, :payment_method_token, :currency_code,
-    :descriptor, :custom, :customer_reference, :billing_reference
+    :descriptor, :custom, :customer_reference, :billing_reference, :processor_response
   ]
-  EMPTY_ATTRIBUTES = KNOWN_ATTRIBUTES.inject(ActiveSupport::HashWithIndifferentAccess.new) {|h, k| h[k] = ''; h}
-  def initialize(attrs={})
-    super(EMPTY_ATTRIBUTES.merge(attrs))
+  if ActiveResource::VERSION::MAJOR <= 3 && ActiveResource::VERSION::MINOR < 1
+    # If we're using ActiveResource pre-3.1, there's no schema class method, so we resort to some tricks...
+    # Initialize the known attributes from the schema as empty strings, so that they can be accessed via method-missing
+    EMPTY_ATTRIBUTES = KNOWN_ATTRIBUTES.inject(ActiveSupport::HashWithIndifferentAccess.new) {|h, k| h[k] = ''; h}
+    def initialize(attrs={})
+      super(EMPTY_ATTRIBUTES.merge(attrs))
+    end
+  else
+    # Post AR 3.1, we can use the schema method to define our attributes
+    schema do
+      string *KNOWN_ATTRIBUTES
+    end
   end
 
 end

data/lib/samurai/version.rb

@@ -1,3 +1,3 @@
 module Samurai
-  VERSION = "0.2.9".freeze
+  VERSION = "0.2.10".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samurai
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70359512757220 !ruby/object:Gem::Requirement
+  requirement: &70135382363820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70359512757220
+  version_requirements: *70135382363820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70359512756760 !ruby/object:Gem::Requirement
+  requirement: &70135382363360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70359512756760
+  version_requirements: *70135382363360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359512756300 !ruby/object:Gem::Requirement
+  requirement: &70135382362900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70359512756300
+  version_requirements: *70135382362900
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70359512755920 !ruby/object:Gem::Requirement
+  requirement: &70135382362520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359512755920
+  version_requirements: *70135382362520
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70359512755420 !ruby/object:Gem::Requirement
+  requirement: &70135382362020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359512755420
+  version_requirements: *70135382362020
 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.