rack-payment 0.0.3 → 0.0.4

data/lib/rack-payment/billing_address.rb

@@ -13,17 +13,34 @@ module Rack     #:nodoc:
       end
 
       def partially_filled_out?
-        %w( name address1 city state zip country ).each do |field|
+        %w( name address1 city state zip ).each do |field|
           return true unless send(field).nil?
         end
 
         return false
       end
 
+      # defaults to 'US'
+      def country
+        @country ||= 'US'
+      end
+
       # Aliases
 
       def street()       address1              end
       def street=(value) self.address1=(value) end
+
+      # Returns a hash that can be passed to a Gateway#authorize call
+      def active_merchant_hash
+        { 
+          :name     => name,
+          :address1 => street,
+          :city     => city,
+          :state    => state,
+          :country  => country,
+          :zip      => zip
+        }
+      end
     end
 
   end

data/lib/rack-payment/helper.rb

@@ -135,7 +135,7 @@ module Rack     #:nodoc:
             # TODO should pass :billing_address, if the billing address isn't empty.
             #      fields: name, address1, city, state, country, zip.
             #      Some gateways (eg. PayPal Pro) require a billing_address!
-            self.raw_authorize_response = gateway.authorize amount_in_cents, credit_card.active_merchant_card, :ip => options[:ip]
+            self.raw_authorize_response = gateway.authorize amount_in_cents, credit_card.active_merchant_card, :ip => options[:ip], :billing_address => billing_address.active_merchant_hash
             unless raw_authorize_response.success?
               errors << raw_authorize_response.message
               log_authorize_unsuccessful(transaction_id, options)
@@ -175,12 +175,15 @@ module Rack     #:nodoc:
       # By default, the form will POST to the current URL (action='')
       #
       # You can pass a different URL for the form action
-      def form post_to = ''
-        css  = ::File.dirname(__FILE__) + '/views/credit-card-and-billing-info-form.css'
+      def form post_to = '', options = nil
         view = ::File.dirname(__FILE__) + '/views/credit-card-and-billing-info-form.html.erb'
         erb  = ::File.read view
+        html = ''
+
+        if options and options[:inline_css]
+          html << "<style type='text/css'>\n#{ options[:inline_css] }\n</style>"
+        end
 
-        html = "<style type='text/css'>\n#{ ::File.read(css) }\n</style>"
         html << ERB.new(erb).result(binding)
       end
 

data/lib/rack-payment/request.rb

@@ -202,7 +202,8 @@ module Rack     #:nodoc:
       end
 
       def credit_card_and_billing_info_response
-        form_html = payment.form built_in_form_path
+        css_file  = ::File.dirname(__FILE__) + '/views/credit-card-and-billing-info-form.css'
+        form_html = payment.form built_in_form_path, :inline_css => ::File.read(css_file)
         layout    = ::File.dirname(__FILE__) + '/views/layout.html'
         html      = ::File.read(layout)
         html      = html.sub 'CONTENT', form_html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-payment
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - remi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -07:00
+date: 2010-01-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency