laundry 0.0.3 → 0.0.4

data/README.md

@@ -10,7 +10,15 @@ The basic idea is to have a somewhat ActiveRecord-y syntax to making payments, u
 
 Add this line to your application's Gemfile:
 
-    gem 'laundry'
+```ruby
+gem 'laundry'
+```
+
+There is a [bug in Savon's XML parser](https://github.com/rubiii/nori/issues/19) that can affect you if you are intending to serialize any of Laundry's objects to YAML. For the time being, adding the following line to your Gemfile can resolve this:
+
+```ruby
+gem 'nori', git: 'git@github.com:supapuerco/nori.git' # Fixes some YAML serialization issues.
+```
 
 And then execute:
 

data/lib/laundry/payments_gateway/drivers/account_driver.rb

@@ -17,7 +17,7 @@ module Laundry
         r = client_driver.get_payment_method({'ClientID' => self.client.id, 'PaymentMethodID' => payment_method_id}) do
           http.headers["SOAPAction"] = 'https://ws.paymentsgateway.net/v1/IClientService/getPaymentMethod'
         end
-        Account.new(r, self.merchant)
+        Account.from_response(r, self.merchant)
       end
       
       # Returns the payment method id

data/lib/laundry/payments_gateway/drivers/client_driver.rb

@@ -16,7 +16,7 @@ module Laundry
         r = get_client({'ClientID' => id}) do
           http.headers["SOAPAction"] = 'https://ws.paymentsgateway.net/v1/IClientService/getClient'
         end
-        Client.new(r, self.merchant)
+        Client.from_response(r, self.merchant)
       end
       
       # Creates a client and returns the newly created client id.

data/lib/laundry/payments_gateway/drivers/transaction_driver.rb

@@ -16,7 +16,7 @@ module Laundry
         r = get_transaction({'ClientID' => client_id, 'TransactionID' => transaction_id}) do
           http.headers["SOAPAction"] = "https://ws.paymentsgateway.net/v1/ITransactionService/getTransaction"
         end
-        Transaction.new(r, self.merchant)
+        Transaction.from_response(r, self.merchant)
       end
 
     end

data/lib/laundry/payments_gateway/models/account.rb

@@ -2,11 +2,11 @@ module Laundry
   module PaymentsGateway
 
     class Account < ResponseModel
-      
-      def record
-        response[:get_payment_method_response][:get_payment_method_result][:payment_method]
+            
+      def initialize_with_response(response)
+        self.record = response[:get_payment_method_response][:get_payment_method_result][:payment_method]
       end
-      
+
       # EFT TRANSACTION_CODES
       EFT_SALE = 20
       EFT_AUTH_ONLY = 21
@@ -33,6 +33,7 @@ module Laundry
       end
       
       def perform_transaction(dollars, type, options = {})
+        require_merchant!
         options = {
          'pg_merchant_id' => self.merchant.id, 
          'pg_password' => self.merchant.transaction_password,       
@@ -42,7 +43,7 @@ module Laundry
          'pg_transaction_type' => type
          }.merge(options)
         r = self.merchant.socket_driver.exec(options)
-        TransactionResponse.new(r, self.merchant)
+        TransactionResponse.from_response(r, self.merchant)
       end
             
       def id

data/lib/laundry/payments_gateway/models/client.rb

@@ -3,8 +3,8 @@ module Laundry
 
     class Client < ResponseModel
       
-      def record
-        response[:get_client_response][:get_client_result][:client_record]
+      def initialize_with_response(response)
+        self.record = response[:get_client_response][:get_client_result][:client_record]
       end
 
       def id
@@ -12,6 +12,7 @@ module Laundry
       end
       
       def accounts_driver
+        require_merchant!
         AccountDriver.new(self, self.merchant)
       end
       alias_method :accounts, :accounts_driver

data/lib/laundry/payments_gateway/models/response_model.rb

@@ -1,33 +1,62 @@
 module Laundry
   module PaymentsGateway
 
+    class MerchantNotSetError < StandardError; end
+
     class ResponseModel
 
-      attr_accessor :response
+      attr_accessor :record
       attr_accessor :merchant
-      def initialize(response, merchant)
-        self.response = response
-        self.merchant = merchant
-      end
       
-      # Override please.
-      def record
-        response.try(:to_hash) || {}
+      def self.from_response(response, merchant)
+        model = self.new
+        model.merchant = merchant
+        model.initialize_with_response response
+        model
       end
       
+      def initialize_with_response(response)
+        self.record = response.try(:to_hash) || {}
+      end
+            
       def to_hash
-        record
+        record.try(:to_hash)
       end
       
       def blank?
         record == {} || record.nil? || !record
       end
       
+      def require_merchant!
+        unless merchant && merchant.class == Laundry::PaymentsGateway::Merchant
+          raise MerchantNotSetError, "Tried to call a method that requires a merchant to be set on the model. Try calling merchant= first."
+        end
+      end
+      
       def method_missing(id, *args)
         return record[id.to_sym] if record.is_a?(Hash) && record.has_key?(id.to_sym)
         super
       end
-        
+      
+      ## Support cleaner serialization to ActiveRecord
+      ## Apparently supported in Rails >= 3.1
+      
+      # We don't want to serialize the merchant because it has upsetting
+      # amounts of passwords in it.
+      def dumpable
+        d = self.dup
+        d.merchant = nil
+        d
+      end
+      
+      def self.dump(model)
+        model ? YAML::dump(model.dumpable) : nil
+      end
+      
+      def self.load(model_text)
+        model_text ? YAML::load(model_text) : nil
+      end
+
     end
 
   end

data/lib/laundry/payments_gateway/models/transaction.rb

@@ -2,9 +2,9 @@ module Laundry
   module PaymentsGateway
 
     class Transaction < ResponseModel
-    
-      def record
-        response[:get_transaction_response][:get_transaction_result]
+          
+      def initialize_with_response(response)
+        self.record = response[:get_transaction_response][:get_transaction_result]
       end
       
       def status

data/lib/laundry/payments_gateway/models/transaction_response.rb

@@ -2,16 +2,9 @@ module Laundry
   module PaymentsGateway
 
     class TransactionResponse < ResponseModel
-      
-      attr_accessor :response_record
-      
-      def initialize(response, merchant)
-        super
-        parse
-      end
-      
-      def record
-        self.response_record
+            
+      def initialize_with_response(response)
+        self.record = parse(response)
       end
       
       def success?
@@ -19,21 +12,22 @@ module Laundry
       end
       
       def full_transaction
+        require_merchant!
         self.merchant.transactions.find pg_payment_method_id, pg_trace_number
       end
             
       private
         
-      def parse
+      def parse(response)
         data = {}
-        res = self.response[:execute_socket_query_response][:execute_socket_query_result].split("\n")
+        res = response[:execute_socket_query_response][:execute_socket_query_result].split("\n")
         res.each do |key_value_pair|
           kv = key_value_pair.split('=')
           if kv.size == 2
             data[ kv[0].to_sym ] = kv[1]
           end
         end
-        self.response_record = data
+        data
       end
       
     end

data/lib/laundry/version.rb

@@ -1,3 +1,3 @@
 module Laundry
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: laundry
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1941831342828825987
+      hash: 759543362406420744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1941831342828825987
+      hash: 759543362406420744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24