rack-payment 0.1.0 → 0.1.1

data/lib/rack-payment.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 
 %w( active_merchant rack bigdecimal forwardable ostruct erb ).each {|lib| require lib }
 
+require 'rack-payment/callable_hash'
 require 'rack-payment/payment'
 require 'rack-payment/request'
 require 'rack-payment/response'

data/lib/rack-payment/billing_address.rb

@@ -33,6 +33,9 @@ module Rack     #:nodoc:
       def address()       address1              end
       def address=(value) self.address1=(value) end
 
+      def full_name()       name              end
+      def full_name=(value) self.name=(value) end
+
       # Returns a hash that can be passed to a Gateway#authorize call
       def active_merchant_hash
         { 

data/lib/rack-payment/callable_hash.rb

@@ -0,0 +1,41 @@
+# A Hash that you can call, like an OpenStruct, but you can still 
+# call [] on it.
+#
+#   >> hash = CallableHash.new :foo => 'bar'
+#
+#   >> hash.foo
+#   => 'bar'
+#
+#   >> hash[:foo]
+#   => 'bar'
+class CallableHash < Hash
+
+  def initialize hash
+    hash.each {|key, value| self[key] = value }
+  end
+
+  def method_missing name, *args
+    if self[name]
+      self[name]
+    else
+      super
+    end
+  end
+
+  # Override type so, if there's a :type or 'type' key in this Hash, we 
+  # return that value.  Else we return the actual object type.
+  def type
+    return self[:type]  if self[:type]
+    return self['type'] if self['type']
+    super
+  end
+
+  # Override zip so, if there's a :zip or 'zip' key in this Hash, we 
+  # return that value.  Else we return the actual object zip.
+  def zip
+    return self[:zip]  if self[:zip]
+    return self['zip'] if self['zip']
+    super
+  end
+
+end

data/lib/rack-payment/helper.rb

@@ -175,7 +175,11 @@ 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 = '', options = nil
+      def form options = nil
+        options ||= {}
+        post_to    = (options[:post_to] ||= '') # the url/path to post to
+        auth_token = options[:auth_token]       # if not nil, we include the authenticity_token in the form
+
         view = ::File.dirname(__FILE__) + '/views/credit-card-and-billing-info-form.html.erb'
         erb  = ::File.read view
         html = ''
@@ -218,6 +222,74 @@ module Rack     #:nodoc:
           end
         }.join
       end
+
+      def credit_card_values
+        %w( first_name last_name number cvv type expiration_month expiration_year ).inject({}) do |all, attribute|
+          all[attribute.to_sym] = credit_card[attribute.to_sym]
+          all
+        end
+      end
+
+      def billing_address_values
+        %w( name address1 city state zip country ).inject({}) do |all, attribute|
+          all[attribute.to_sym] = billing_address[attribute.to_sym]
+          all
+        end
+      end
+
+      # @return Hash of HTML fields with their values set
+      def fields values = nil
+        values ||= {}
+        values[:credit_card]     = credit_card_values.merge(     values[:credit_card]     || {} )
+        values[:billing_address] = billing_address_values.merge( values[:billing_address] || {} )
+
+        CallableHash.new({
+          :credit_card => CallableHash.new({
+            :first_name       => input_tag(  :credit_card, :first_name,       values[:credit_card][:first_name],  :autofocus => true),
+            :last_name        => input_tag(  :credit_card, :last_name,        values[:credit_card][:last_name]),
+            :number           => input_tag(  :credit_card, :number,           values[:credit_card][:number],      :autocomplete => 'off'),
+            :cvv              => input_tag(  :credit_card, :cvv,              values[:credit_card][:cvv],         :autocomplete => 'off'),
+            :type             => select_tag( :credit_card, :type,             values[:credit_card][:type]),
+            :expiration_month => select_tag( :credit_card, :expiration_month, values[:credit_card][:expiration_month]),
+            :expiration_year  => select_tag( :credit_card, :expiration_year,  values[:credit_card][:expiration_year])
+          }),
+
+          :billing_address => CallableHash.new({
+            :name     => input_tag(:billing_address, :name,     values[:billing_address][:name]),
+            :address1 => input_tag(:billing_address, :address1, values[:billing_address][:address1]),
+            :city     => input_tag(:billing_address, :city,     values[:billing_address][:city]),
+            :state    => input_tag(:billing_address, :state,    values[:billing_address][:state]),
+            :zip      => input_tag(:billing_address, :zip,      values[:billing_address][:zip]),
+            :country  => input_tag(:billing_address, :country,  values[:billing_address][:country])
+          })
+        })
+      end
+
+      def select_tag object, property, value = nil, options = nil
+        attributes = { :type => 'text', :id => "#{object}_#{property}", :name => "#{object}[#{property}]" }
+        attributes.merge!(options) if options
+
+        case property
+        when :type
+          options = options_for_credit_card_type(value)
+        when :expiration_month
+          options = options_for_expiration_month(value)
+        when :expiration_year
+          options = options_for_expiration_year(value)
+        end
+
+        "<select #{ attributes.map {|name, value| "#{name}='#{value}'" }.join(' ') }>#{ options }</select>"
+      end
+
+      # Returns the HTML for an <input /> element
+      # @return String
+      def input_tag object, property, value = nil, options = nil
+        attributes = { :type => 'text', :id => "#{object}_#{property}", :name => "#{object}[#{property}]" }
+        attributes[:value] = value if value.present?
+        attributes.merge!(options) if options
+
+        "<input #{ attributes.map {|name, value| "#{name}='#{value}'" }.join(' ') } />"
+      end
     end
 
   end

data/lib/rack-payment/request.rb

@@ -183,8 +183,20 @@ module Rack     #:nodoc:
           payment.errors = errors
           new_env = env.clone
           new_env['REQUEST_METHOD'] = 'GET'
+
+          # Rails keeps track of its own Request/Response.
+          #
+          # If we're using Rails, we need to delete these variables 
+          # to trick Rails into thinking that this is a new request.
+          #
+          # Kind of icky!
+          new_env.delete 'action_controller.rescue.request'
+          new_env.delete 'action_controller.rescue.response'
+
           new_env['PATH_INFO'] = on_success if request.path_info == express_ok_path # if express, we render on_success
-          app.call(new_env)
+          resp = app.call(new_env)
+          puts resp.inspect
+          resp
         end
       end
 
@@ -203,7 +215,7 @@ module Rack     #:nodoc:
 
       def credit_card_and_billing_info_response
         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)
+        form_html = payment.form :post_to => 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

data/lib/rack-payment/views/credit-card-and-billing-info-form.html.erb

@@ -1,6 +1,5 @@
 <%
-  # TODO use helper for select options for credit card type
-  # TODO use helper for select options for expiration
+  @fields = fields # so we don't recreate the fields abunchof times
 %>
 
 <div class='rack-payment'>
@@ -16,37 +15,33 @@
   <% end %>
 
   <form action='<%= post_to %>' method='post'>
-
+    <% if auth_token %>
+    <input name='authenticity_token' type='hidden' value='<%= auth_token %>' />
+    <% end %>
     <fieldset>
       <legend>Credit Card</legend>
 
       <div class='group'>
         <label for='credit_card_first_name'>First Name</label>
-        <input type='text' id='credit_card_first_name' name='credit_card[first_name]' value='<%= credit_card.first_name %>' autofocus='true' />
+        <%= @fields.credit_card.first_name %>
 
         <label for='credit_card_last_name'>Last Name</label>
-        <input type='text' id='credit_card_last_name' name='credit_card[last_name]' value='<%= credit_card.last_name %>' />
+        <%= @fields.credit_card.last_name %>
 
         <label for='credit_card_number'>Card Number</label>
-        <input type='text' id='credit_card_number' name='credit_card[number]' value='<%= credit_card.number %>' autocomplete='off' />
+        <%= @fields.credit_card.number %>
       </div>
 
       <div class='group'>
         <label for='credit_card_type'>Card Type</label>
-        <select id='credit_card_type' name='credit_card[type]' />
-          <%= options_for_credit_card_type credit_card.type %>
-        </select>
+        <%= @fields.credit_card.type %>
 
         <label for='credit_card_cvv'>CVV</label>
-        <input type='text' id='credit_card_cvv' name='credit_card[cvv]' value='<%= credit_card.cvv %>' autocomplete='off' />
+        <%= @fields.credit_card.cvv %>
 
         <label for='credit_card_expiration_month'>Expiration</label>
-        <select id='credit_card_expiration_month' name='credit_card[expiration_month]'>
-          <%= options_for_expiration_month credit_card.month %>
-        </select>
-        <select id='credit_card_expiration_year' name='credit_card[expiration_year]'>
-          <%= options_for_expiration_year credit_card.year %>
-        </select>
+        <%= @fields.credit_card.expiration_month %>
+        <%= @fields.credit_card.expiration_year %>
 
       </div>
     </fieldset>
@@ -56,24 +51,24 @@
 
       <div class='group'>
         <label for='billing_address_name'>Full Name</label>
-        <input type='text' id='billing_address_name' name='billing_address[name]' value='<%= billing_address.name %>' />
+        <%= @fields.billing_address.name %>
 
         <label for='billing_address_address1'>Address</label>
-        <input type='text' id='billing_address_address1' name='billing_address[address1]' value='<%= billing_address.address1 %>' />
+        <%= @fields.billing_address.address1 %>
 
         <label for='billing_address_city'>City</label>
-        <input type='text' id='billing_address_city' name='billing_address[city]' value='<%= billing_address.city %>' />
+        <%= @fields.billing_address.city %>
       </div>
 
       <div class='group'>
         <label for='billing_address_state'>State</label>
-        <input type='text' id='billing_address_state' name='billing_address[state]' value='<%= billing_address.state %>' />
+        <%= @fields.billing_address.state %>
 
         <label for='billing_address_country'>Country</label>
-        <input type='text' id='billing_address_country' name='billing_address[country]' value='<%= billing_address.country %>' />
+        <%= @fields.billing_address.country %>
 
         <label for='billing_address_zip'>Zip</label>
-        <input type='text' id='billing_address_zip' name='billing_address[zip]' value='<%= billing_address.zip %>' />
+        <%= @fields.billing_address.zip %>
       </div>
     </fieldset>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-payment
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - remi
@@ -36,6 +36,7 @@ files:
 - lib/rack-payment/test.rb
 - lib/rack-payment/payment.rb
 - lib/rack-payment/response.rb
+- lib/rack-payment/callable_hash.rb
 - lib/rack-payment/helper.rb
 - lib/rack-payment/billing_address.rb
 - lib/rack-payment/methods.rb