laundry 0.0.2 → 0.0.3

data/lib/laundry/lib/soap_model.rb

@@ -94,15 +94,12 @@ module Laundry
           def client(&block)
             self.class.client(&block)
           end
-          
-          def default_body(hash)
-            @default_body = hash
-          end
-        
+                  
           private
         
           def merged_default_body(body = {})
-            (@default_body || {}).merge (body || {})
+            default = self.respond_to?(:default_body) ? self.default_body : nil
+            (default || {}).merge (body || {})
           end
 
         end.tap { |mod| include(mod) }

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

@@ -22,6 +22,7 @@ module Laundry
       
       # Returns the payment method id
       def create!(options = {})
+        raise ArgumentError, "Tried to create an account on an invalid client." if self.client.nil? || self.client.blank?
         options = {merchant_id: self.merchant.id, client_id: self.client.id, payment_method_id: 0}.merge(options)
         options = AccountDriver.uglify_hash(options)
         r = client_driver.create_payment_method({'payment' => options}) do

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

@@ -9,9 +9,11 @@ module Laundry
       def initialize(merchant)
         # Save the merchant.
         self.merchant = merchant
+      end
       
+      def default_body
         # Log in via the merchant's login credentials.
-        default_body self.merchant.login_credentials.merge("MerchantID" => self.merchant.id)
+        self.merchant.login_credentials.merge("MerchantID" => self.merchant.id)
       end
       
       def self.prettifiable_fields

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

@@ -19,8 +19,12 @@ module Laundry
         record
       end
       
+      def blank?
+        record == {} || record.nil? || !record
+      end
+      
       def method_missing(id, *args)
-        return record[id.to_sym] if record.try(:has_key?, id.to_sym)
+        return record[id.to_sym] if record.is_a?(Hash) && record.has_key?(id.to_sym)
         super
       end
         

data/lib/laundry/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: laundry
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-09 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: 2170319772523828423
+      hash: -1941831342828825987
 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: 2170319772523828423
+      hash: -1941831342828825987
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24