wepay-rails 2.5.0 → 2.5.1

data/Gemfile

@@ -8,6 +8,7 @@ gem 'httparty'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rails", "3.1.0"
+  gem "rake"
   gem 'turn', '0.8.2', :require => false
   gem 'thor'
   gem "bundler"

data/Gemfile.lock

@@ -110,6 +110,7 @@ DEPENDENCIES
   httparty
   jeweler (~> 1.6.4)
   rails (= 3.1.0)
+  rake
   rcov
   thor
   turn (= 0.8.2)

data/README.rdoc

@@ -6,6 +6,7 @@ Wepay-Rails allows your rails app to accept payments with Wepay (http://www.wepa
 
 = Features
 
+* Added PREAPPROVAL and DELAYED CHARGE ability 09/2012
 * Built in IPN that listens to push notifications from wepay and updates saved checkout records for you
 * Allows you to fetch your access token easily through a web interface
 * Built in API tools to allow you to make all wepay-api calls easily

data/VERSION

@@ -1 +1 @@
-2.5.0
+2.5.1

data/app/controllers/wepay/charge_controller.rb

@@ -0,0 +1,43 @@
+class Wepay::ChargeController < Wepay::ApplicationController
+  include WepayRails::Payments
+  
+  def index
+    record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
+
+      if record.present?
+          wepay_gateway = WepayRails::Payments::Gateway.new( record.access_token )
+          charge = wepay_gateway.lookup_preapproval(record.preapproval_id)
+
+          # remove unnecessary attributes
+          charge.delete_if {|k,v| !record.attributes.include? k.to_s}
+
+          record.update_attributes(charge)
+          redirect_to "#{wepay_gateway.configuration[:after_charge_redirect_uri]}?checkout_id=#{params[:checkout_id]}"
+      else
+          raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
+      end
+  end
+  
+  def success
+    response = WepayCheckoutRecord.find(:last)
+    wepay_gateway = WepayRails::Payments::Gateway.new( response.access_token )
+    charge = wepay_gateway.lookup_checkout(response.checkout_id)
+
+    response.update_attributes(charge)
+    logger.info params
+    render :text => "Wepay charge OK from #{response.payer_email} with Checkout ID # #{response.checkout_id} from the Pre-approval ID # #{response.preapproval_id}."
+  end
+  
+  def new
+    # The following is from the Wepay API sample checkout call
+    # create the checkout
+    charge_params = {
+        :amount             => '50.00', 
+        :short_description  => 'A Checkout on the Wepay PreApproval.', 
+        :type               => 'GOODS',
+        :preapproval_id     => xxxxx # To test, be sure to manually add the preapproval_id from the preapproval response which will skip having to go to Wepay to add CC info.
+    }
+    # Finally, send user to charge on the preapproval.
+    init_charge_and_return_success(charge_params)
+  end
+end

data/app/controllers/wepay/checkout_controller.rb

@@ -1,18 +1,32 @@
 class Wepay::CheckoutController < Wepay::ApplicationController
+  include WepayRails::Payments
+  
   def index
-    record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
+        record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
 
-    if record.present?
-      wepay_gateway = WepayRails::Payments::Gateway.new( record.access_token )
-      checkout = wepay_gateway.lookup_checkout(record.checkout_id)
-      
-      # remove unnecessary attributes
-      checkout.delete_if {|k,v| !record.attributes.include? k.to_s}
-      
-      record.update_attributes(checkout)
-      redirect_to "#{wepay_gateway.configuration[:after_checkout_redirect_uri]}?checkout_id=#{params[:checkout_id]}"
-    else
-      raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
-    end
+        if record.present?
+              wepay_gateway = WepayRails::Payments::Gateway.new( record.access_token )
+              checkout = wepay_gateway.lookup_checkout(record.checkout_id)
+
+              # remove unnecessary attributes
+              checkout.delete_if {|k,v| !record.attributes.include? k.to_s}
+
+              record.update_attributes(checkout)
+              redirect_to "#{wepay_gateway.configuration[:after_checkout_redirect_uri]}?checkout_id=#{params[:checkout_id]}"
+            else
+              raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
+            end
+  end
+  
+  def new
+    # create the checkout - This is TEST info from Wepay only
+    checkout_params = {
+        :amount             => '255.00', 
+        :short_description  => 'A transaction for WePay Testing', 
+        :type               => 'GOODS'
+    }
+    # Finally, send the user off to wepay so you can get paid! - CASH MONEY
+    init_checkout_and_send_user_to_wepay(checkout_params)
   end
+  
 end

data/app/controllers/wepay/ipn_controller.rb

@@ -1,20 +1,22 @@
 class Wepay::IpnController < Wepay::ApplicationController
-  def create
+  include WepayRails::Payments
+  def update
+      record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
 
-    record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
+      if record.present?
+        wepay_gateway = WepayRails::Payments::Gateway.new
 
-    if record.present?
-      wepay_gateway = WepayRails::Payments::Gateway.new
-      checkout = wepay_gateway.lookup_checkout(record.checkout_id)
-      
-      # remove unnecessary attributes
-      checkout.delete_if {|k,v| !record.attributes.include? k.to_s}
-      
-      record.update_attributes(checkout)
-      render :text => "ok"
-    else
-      raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
-    end
+        if record.checkout_id.present?
+          checkout = wepay_gateway.lookup_checkout(record.checkout_id)
+        else
+          checkout = wepay_gateway.lookup_preapproval(record.preapproval_id)
+        end
+        checkout.delete_if {|k,v| !record.attributes.include? k.to_s}
+        record.update_attributes(checkout)
+        render :text => "ok"
+      else
+        raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
+      end
 
-  end
+    end
 end

data/app/controllers/wepay/preapproval_controller.rb

@@ -0,0 +1,47 @@
+class Wepay::PreapprovalController < Wepay::ApplicationController
+  include WepayRails::Payments
+  
+  def index
+        record = WepayCheckoutRecord.find_by_preapproval_id_and_security_token(params[:preapproval_id],params[:security_token])
+        
+        
+        if record.present?
+          wepay_gateway = WepayRails::Payments::Gateway.new ( record.access_token )
+          preapproval = wepay_gateway.lookup_preapproval(record.preapproval_id)
+
+          #remove unneccesary attributes
+          preapproval.delete_if {|k,v| !record.attributes.include? k.to_s}
+          
+          record.update_attributes(preapproval)
+          redirect_to "#{wepay_gateway.configuration[:after_preapproval_redirect_uri]}?preapproval_id=#{params[:preapproval_id]}"
+        else
+          raise StandardError.new("Wepay IPN: No record found for preapproval_id #{params[:preapproval_id]} and security_token #{params[:security_token]}")
+        end
+  end
+  
+  def success
+    response = WepayCheckoutRecord.find(:last)
+    wepay_gateway = WepayRails::Payments::Gateway.new( response.access_token )
+    charge = wepay_gateway.lookup_preapproval(response.preapproval_id)
+
+    response.update_attributes(charge)
+    logger.info params
+    render :text => "PRE-APPROVAL OK from #{response.payer_email} with Pre-approval ID # #{response.preapproval_id}. You can use this Pre-approval Id# to run a charge at a later time."
+  end
+  
+  def new
+    # create the preapproval - This is TEST info
+    preapproval_params = {
+            :period               => 'once',
+            :end_time             => '2013-12-25',
+            :amount               => '50.00',
+            :mode                 => 'regular',
+            :short_description    => 'A Preapproval for MyApp.',
+            :app_fee              => "10",
+            :fee_payer            => 'payee',
+            :payer_email_message  => "You just approved MyApp to charge you for a some money later. You have NOT been charged at this time!"
+    }
+    # Finally, send the user off to wepay for the preapproval
+    init_preapproval_and_send_user_to_wepay(preapproval_params)
+  end
+end

data/lib/api/charge_methods.rb

@@ -0,0 +1,113 @@
+require 'digest/sha2'
+module WepayRails
+  module Api
+    module ChargeMethods
+      # Many of the settings you pass in here are already factored in from
+      # the wepay.yml file and only need to be overridden if you insist on doing
+      # so when this method is called. The following list of key values are pulled
+      # in for you from your wepay.yml file:
+      #
+      # Note: @wepay_config is your wepay.yml as a Hash
+      # :callback_uri     => @wepay_config[:ipn_callback_uri],
+      # :redirect_uri     => @wepay_config[:checkout_redirect_uri],
+      # :fee_payer        => @wepay_config[:fee_payer],
+      # :type             => @wepay_config[:checkout_type],
+      # :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
+      # :app_fee          => @wepay_config[:app_fee],
+      # :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
+      # :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
+      # :shipping_fee     => @wepay_config[:shipping_fee],
+      # :charge_tax       => @wepay_config[:charge_tax],
+      # :account_id       => wepay_user['account_id'] # wepay-rails goes and gets this for you, but you can override it if you want to.
+      #
+      #
+      # params hash key values possibilities are:
+      # Parameter:	Required:	Description:
+      # :account_id	Yes	The unique ID of the account you want to create a checkout for.
+      # :short_description	Yes	A short description of what is being paid for.
+      # :long_description	No	A long description of what is being paid for.
+      # :type	Yes	The the checkout type (one of the following: GOODS, SERVICE, DONATION, or PERSONAL)
+      # :reference_id	No	The unique reference id of the checkout (set by the application in /checkout/create
+      # :amount	Yes	The amount that the payer will pay.
+      # :app_fee	No	The amount that the application will receive in fees.
+      # :fee_payer	  No	Who will pay the fees (WePay's fees and any app fees). Set to "Payer" to charge fees to the person paying (Payer will pay amount + fees, payee will receive amount). Set to "Payee" to charge fees to the person receiving money (Payer will pay amount, Payee will receive amount - fees). Defaults to "Payer".
+      # :redirect_uri 	No	The uri the payer will be redirected to after paying.
+      # :callback_uri	  No	The uri that will receive any Instant Payment Notifications sent. Needs to be a full uri (ex https://www.wepay.com )
+      # :auto_capture	No	A boolean value (0 or 1). Default is 1. If set to 0 then the payment will not automatically be released to the account and will be held by WePay in payment state 'reserved'. To release funds to the account you must call /checkout/capture
+      # :require_shipping	No	A boolean value (0 or 1). If set to 1 then the payer will be asked to enter a shipping address when they pay. After payment you can retrieve this shipping address by calling /checkout
+      # :shipping_fee	No	The amount that you want to charge for shipping.
+      # :charge_tax	No	A boolean value (0 or 1). If set to 1 and the account has a relevant tax entry (see /account/set_tax), then tax will be charged.
+      def perform_charge(params)
+        security_token = Digest::SHA2.hexdigest("#{Rails.env.production? ? rand(4) : 1}#{Time.now.to_i}") # Make less random during tests
+        
+        # add the security token to any urls that were passed in from the app
+        if params[:callback_uri]
+          params[:callback_uri] = apply_security_token( params[:callback_uri], security_token )
+        end
+        
+        if params[:redirect_uri]
+          params[:redirect_uri] = apply_security_token( params[:redirect_uri], security_token )
+        end
+        
+        defaults = {
+            :callback_uri     => ipn_callback_uri(security_token),
+            :redirect_uri     => checkout_redirect_uri(security_token),
+            :fee_payer        => @wepay_config[:fee_payer],
+            :type             => @wepay_config[:checkout_type],
+            :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
+            :app_fee          => @wepay_config[:app_fee],
+            :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
+            :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
+            :shipping_fee     => @wepay_config[:shipping_fee],
+            :account_id       => @wepay_config[:account_id]
+        }.merge(params)
+
+        resp = self.call_api("/checkout/create", defaults)
+        resp.merge({:security_token => security_token})
+      end
+
+      def lookup_checkout(checkout_id)
+        co = self.call_api("/checkout", {:checkout_id => checkout_id})
+        co.delete(:type)
+        co
+      end
+      
+      def lookup_preapproval(preapproval_id)
+        co = self.call_api("/preapproval", {:preapproval_id => preapproval_id})
+        co.delete("type")
+        co
+      end
+
+      def ipn_callback_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:ipn_callback_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/ipn"
+              end
+        apply_security_token(uri, security_token)
+      end
+      
+      def charge_redirect_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:charge_redirect_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/charge"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      def checkout_redirect_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:checkout_redirect_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/checkout"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      def apply_security_token(uri, security_token)
+        uri += (uri =~ /\?/ ? '&' : '?') + "security_token=#{security_token}"
+      end
+    end
+  end
+end

data/lib/api/checkout_methods.rb

@@ -71,6 +71,12 @@ module WepayRails
         co.delete(:type)
         co
       end
+      
+      def lookup_preapproval(preapproval_id)
+        co = self.call_api("/preapproval", {:preapproval_id => preapproval_id})
+        co.delete("type")
+        co
+      end
 
       def ipn_callback_uri(security_token)
         uri = if @wepay_config[:ipn_callback_uri].present?

data/lib/api/preapproval_methods.rb

@@ -0,0 +1,97 @@
+require 'digest/sha2'
+module WepayRails
+  module Api
+    module PreapprovalMethods
+      # Many of the settings you pass in here are already factored in from
+      # the wepay.yml file and only need to be overridden if you insist on doing
+      # so when this method is called. The following list of key values are pulled
+      # in for you from your wepay.yml file:
+      #
+      # Note: @wepay_config is your wepay.yml as a Hash
+      # :callback_uri     => @wepay_config[:ipn_callback_uri],
+      # :redirect_uri     => @wepay_config[:checkout_redirect_uri],
+      # :fee_payer        => @wepay_config[:fee_payer],
+      # :type             => @wepay_config[:checkout_type],
+      # :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
+      # :app_fee          => @wepay_config[:app_fee],
+      # :auto_capture     => @wepay_config[:auto_capture] ? 1 : 0,
+      # :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
+      # :shipping_fee     => @wepay_config[:shipping_fee],
+      # :charge_tax       => @wepay_config[:charge_tax],
+      # :account_id       => wepay_user['account_id'] # wepay-rails goes and gets this for you, but you can override it if you want to.
+      #
+      #
+      # params hash key values possibilities are:
+      # Parameter:	Required:	Description:
+      # :account_id	Yes	The unique ID of the account you want to create a checkout for.
+      # :short_description	Yes	A short description of what is being paid for.
+      # :long_description	No	A long description of what is being paid for.
+      # :type	Yes	The the checkout type (one of the following: GOODS, SERVICE, DONATION, or PERSONAL)
+      # :reference_id	No	The unique reference id of the checkout (set by the application in /checkout/create
+      # :amount	Yes	The amount that the payer will pay.
+      # :app_fee	No	The amount that the application will receive in fees.
+      # :fee_payer	  No	Who will pay the fees (WePay's fees and any app fees). Set to "Payer" to charge fees to the person paying (Payer will pay amount + fees, payee will receive amount). Set to "Payee" to charge fees to the person receiving money (Payer will pay amount, Payee will receive amount - fees). Defaults to "Payer".
+      # :redirect_uri 	No	The uri the payer will be redirected to after paying.
+      # :callback_uri	  No	The uri that will receive any Instant Payment Notifications sent. Needs to be a full uri (ex https://www.wepay.com )
+      # :auto_capture	No	A boolean value (0 or 1). Default is 1. If set to 0 then the payment will not automatically be released to the account and will be held by WePay in payment state 'reserved'. To release funds to the account you must call /checkout/capture
+      # :require_shipping	No	A boolean value (0 or 1). If set to 1 then the payer will be asked to enter a shipping address when they pay. After payment you can retrieve this shipping address by calling /checkout
+      # :shipping_fee	No	The amount that you want to charge for shipping.
+      # :charge_tax	No	A boolean value (0 or 1). If set to 1 and the account has a relevant tax entry (see /account/set_tax), then tax will be charged.
+      def perform_preapproval(params)
+        security_token = Digest::SHA2.hexdigest("#{Rails.env.production? ? rand(4) : 1}#{Time.now.to_i}") # Make less random during tests
+        
+        # add the security token to any urls that were passed in from the app
+        if params[:callback_uri]
+          params[:callback_uri] = apply_security_token( params[:callback_uri], security_token )
+        end
+        
+        if params[:redirect_uri]
+          params[:redirect_uri] = apply_security_token( params[:redirect_uri], security_token )
+        end
+        
+        defaults = {
+            :callback_uri     => ipn_callback_uri(security_token),
+            :redirect_uri     => preapproval_redirect_uri(security_token),
+            :fee_payer        => @wepay_config[:fee_payer],
+            :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
+            :app_fee          => @wepay_config[:app_fee],
+            :require_shipping => @wepay_config[:require_shipping] ? 1 : 0,
+            :shipping_fee     => @wepay_config[:shipping_fee],
+            :account_id       => @wepay_config[:account_id]
+        }.merge(params)
+
+        resp = self.call_api("/preapproval/create", defaults)
+        resp.merge({:security_token => security_token})
+      end
+      
+      def lookup_preapproval(preapproval_id)
+        co = self.call_api("/preapproval", {:preapproval_id => preapproval_id})
+        co.delete("type")
+        co
+      end
+
+      def ipn_callback_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:ipn_callback_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/ipn"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      
+      def preapproval_redirect_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:preapproval_redirect_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/preapproval/success" #redirect to success action with text - ALT: "#{@wepay_config[:root_callback_uri]}/wepay/preapproval"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      def apply_security_token(uri, security_token)
+        uri += (uri =~ /\?/ ? '&' : '?') + "security_token=#{security_token}"
+      end
+    end
+  end
+end

data/lib/generators/wepay_rails/install/templates/create_wepay_checkout_records.rb

@@ -3,6 +3,7 @@ class CreateWepayCheckoutRecords < ActiveRecord::Migration
 
         create_table :wepay_checkout_records do |t|
             t.integer :checkout_id
+            t.integer :preapproval_id
             t.integer :account_id
             t.string :state
             t.string :short_description
@@ -17,6 +18,7 @@ class CreateWepayCheckoutRecords < ActiveRecord::Migration
             t.text :redirect_uri
             t.text :callback_uri
             t.text :checkout_uri
+            t.text :preapproval_uri
             t.string :payer_email
             t.string :payer_name
             t.text :cancel_reason
@@ -28,11 +30,19 @@ class CreateWepayCheckoutRecords < ActiveRecord::Migration
             t.string :security_token
             t.string :access_token
             t.string :mode
+            t.string :period
+            t.integer :frequency
+            t.datetime :start_time
+            t.datetime :end_time
+            t.string :manage_uri
+            t.datetime :create_time
+            t.boolean :auto_recur
 
             t.timestamps
         end
 
         add_index :wepay_checkout_records, :checkout_id
+        add_index :wepay_checkout_records, :preapproval_id
     end
 
     def self.down

data/lib/generators/wepay_rails/install/templates/wepay.yml

@@ -5,7 +5,9 @@ production:
   access_token: <your access token that you received when you went to http://your.domain.com/wepay/authorize>
   root_callback_uri: "http://www.example.com"
   after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
-  scope: [refund_payments,collect_payments,view_balance,view_user]
+  after_preapproval_redirect_uri: "http://www.example.com/preapproval/success"
+  after_charge_redirect_uri: "http://www.example.com/charge/success"
+  scope: [manage_accounts,refund_payments,collect_payments,view_balance,view_user,preapprove_payments]
   wepay_ui_endpoint: "https://www.wepay.com/v2"
   wepay_api_endpoint: "https://wepayapi.com/v2"
   fee_payer: Payee
@@ -23,7 +25,9 @@ development:
   access_token: <your access token that you received when you went to http://your.domain.com/wepay/authorize>
   root_callback_uri: "http://www.example.com"
   after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
-  scope: [refund_payments,collect_payments,view_balance,view_user]
+  after_preapproval_redirect_uri: "http://www.example.com/preapproval/success"
+  after_charge_redirect_uri: "http://www.example.com/charge/success" 
+  scope: [manage_accounts,refund_payments,collect_payments,view_balance,view_user,preapprove_payments]
   wepay_ui_endpoint: "https://stage.wepay.com/v2"
   wepay_api_endpoint: "https://stage.wepayapi.com/v2"
   fee_payer: Payee
@@ -41,7 +45,9 @@ test:
   access_token: <your access token that you received when you went to http://your.domain.com/wepay/authorize>
   root_callback_uri: "http://www.example.com"
   after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
-  scope: [refund_payments,collect_payments,view_balance,view_user]
+  after_preapproval_redirect_uri: "http://www.example.com/preapproval/success"
+  after_charge_redirect_uri: "http://www.example.com/charge/success"
+  scope: [manage_accounts,refund_payments,collect_payments,view_balance,view_user,preapprove_payments]
   wepay_ui_endpoint: "https://stage.wepay.com/v2"
   wepay_api_endpoint: "https://stage.wepayapi.com/v2"
   fee_payer: Payee

data/lib/generators/wepay_rails/install/templates/wepay_checkout_record.rb

@@ -1,2 +1,36 @@
 class WepayCheckoutRecord < ActiveRecord::Base
+  belongs_to :checkout
+  belongs_to :preapproval
+  belongs_to :ipn
+  belongs_to :authorize
+  attr_accessible :amount, 
+                  :short_description, 
+                  :access_token, 
+                  :checkout_id, 
+                  :security_token, 
+                  :checkout_uri, 
+                  :account_id, 
+                  :currency, 
+                  :fee_payer, 
+                  :state, 
+                  :redirect_uri, 
+                  :auto_capture, 
+                  :app_fee, 
+                  :gross, 
+                  :fee, 
+                  :callback_uri, 
+                  :tax, 
+                  :payer_email, 
+                  :payer_name, 
+                  :mode, 
+                  :preapproval_id, 
+                  :preapproval_uri,
+                  :reference_id,
+                  :period, 
+                  :frequency, 
+                  :start_time, 
+                  :end_time, 
+                  :auto_recur, 
+                  :create_time, 
+                  :manage_uri
 end

data/lib/helpers/controller_helpers.rb

@@ -59,9 +59,80 @@ module WepayRails
 
       def init_checkout_and_send_user_to_wepay(params, access_token=nil)
         record = init_checkout(params, access_token)
-        redirect_to record.checkout_uri and return
+        redirect_to record.checkout_uri and return record
       end
+      
+      #Parameter				Required	Format			Description
+      #account_id				Yes		Number			The WePay account where the money will go when you use this pre-approval to execute a payment.
+      #amount					No		Number			The amount for the pre-approval. The API application can charge up to this amount every period.
+      #short_description			Yes		String			A short description of what the payer is paying for.
+      #period					Yes		String			Can be: hourly, daily, weekly, biweekly, monthly, bimonthly, quarterly, yearly, or once. The API application can charge the payer every period.
+      #reference_id				No		String			The reference id of the pre-approval. Can be any string, but must be unique for the application/user pair.
+      #app_fee					No		Number			The application fee that will go to the API application's account.
+      #fee_payer				No		String			Who will pay the WePay fees and app fees (if set). Can be payee or payer. Defaults to payer.
+      #redirect_uri				No		String			The uri the payer will be redirected to after approving the pre-approval.
+      #callback_uri				No		String			The uri that any instant payment notifications will be sent to. Needs to be a full uri (ex https://www.wepay.com ) and must NOT be localhost or 127.0.0.1 or include wepay.com. Max 2083 										chars.
+      #require_shipping			No		Boolean			Defaults to false. If set to true then the payer will be require to enter their shipping address when they approve the pre-approval.
+      #shipping_fee				No		Number			The dollar amount of shipping fees that will be charged.
+      #charge_tax				No		Boolean			Defaults to false. If set to true then any applicable taxes will be charged.
+      #payer_email_message			No		String			A short message that will be included in the payment confirmation email to the payer.
+      #payee_email_message			No		String			A short message that will be included in the payment confirmation email to the payee.
+      #long_description			No		String			An optional longer description of what the payer is paying for.
+      #frequency				No		Number			How often per period the API application can charge the payer.
+      #start_time				No		Number or String	When the API application can start charging the payer. Can be a unix_timestamp or a parse-able date-time.
+      #end_time				No		Number or String	The last time the API application can charge the payer. Can be a unix_timestamp or a parse-able date-time. The default value is five (5) years from the preapproval creation time.
+      #auto_recur				No		Boolean			Set to true if you want the payments to automatically execute every period. Useful for subscription use cases. Default value is false. Only the following periods are allowed if you set 										auto_recur to true: Weekly, Biweekly, Monthly, Quarterly, Yearly
+      #mode					No		String			What mode the pre-approval confirmation flow will be displayed in. The options are 'iframe' or 'regular'. Choose 'iframe' if this is an iframe pre-approval. Mode defaults to 'regular'.
+      #prefill_info				No		Object			A JSON object that lets you pre fill certain fields in the pre-approval flow. Allowed fields are 'name', 'email', 'phone_number', 'address', 'city', 'state', 'zip', Pass the prefill-info 										as a JSON object like so: {"name":"Bill Clerico","phone_number":"855-469-3729"}
+      #funding_sources				No		String			What funding sources you want to accept for this checkout. Options are: "bank,cc" to accept both bank and cc payments, "cc" to accept just credit card payments, and "bank" to accept just 										bank payments.
+      
+      
+      def init_preapproval(params, access_token=nil)
+        wepay_gateway = WepayRails::Payments::Gateway.new(access_token)
+        response      = wepay_gateway.perform_preapproval(params)
+
+        if response[:preapproval_uri].blank?
+          raise WepayRails::Exceptions::WepayPreapprovalError.new("An error occurred: #{response.inspect}")
+        end
+
+        params.merge!({
+            :access_token   => wepay_gateway.access_token,
+            :preapproval_id    => response[:preapproval_id],
+            :security_token => response[:security_token],
+            :preapproval_uri   => response[:preapproval_uri]
+        })
+        
+        params.delete_if {|k,v| !WepayCheckoutRecord.attribute_names.include? k.to_s}
 
+        WepayCheckoutRecord.create(params)
+      end
+      
+      def init_preapproval_and_send_user_to_wepay(params, access_token=nil)
+        record = init_preapproval(params, access_token)
+        redirect_to record.preapproval_uri and return record
+      end
+      
+      def init_charge(params, access_token=nil)
+        wepay_gateway = WepayRails::Payments::Gateway.new(access_token)
+        response      = wepay_gateway.perform_charge(params)
+
+        params.merge!({
+            :access_token   => wepay_gateway.access_token,
+            :preapproval_id => response[:preapproval_id],
+            :checkout_id    => response[:checkout_id],
+            :security_token => response[:security_token],
+        })
+        
+        params.delete_if {|k,v| !WepayCheckoutRecord.attribute_names.include? k.to_s}
+
+        WepayCheckoutRecord.create(params)
+      end
+
+      def init_charge_and_return_success(params, access_token=nil)
+        record = init_charge(params, access_token)
+        redirect_to charge_success_url and return record
+      end
+    
 
     end
   end

data/lib/wepay-rails.rb

@@ -2,6 +2,8 @@ require 'active_record'
 require 'helpers/controller_helpers'
 require 'api/account_methods'
 require 'api/checkout_methods'
+require 'api/preapproval_methods'
+require 'api/charge_methods'
 require 'httparty'
 
 module WepayRails
@@ -37,7 +39,13 @@ module WepayRails
           resources :ipn
           resources :authorize
           resources :checkout
+          resources :finalize
+          resources :preapproval
+          resources :charge
         end
+        match '/preapproval/success'  => 'wepay/preapproval#success'
+        match '/preapproval/charge'   => 'wepay/charge#new'
+        match '/charge/success'       => 'wepay/charge#success'
       end
     end
   end
@@ -49,6 +57,8 @@ module WepayRails
     class AuthorizationError < StandardError; end
     class WepayCheckoutError < StandardError; end
     class WepayApiError < StandardError; end
+    class WepayPreapprovalError < StandardError; end
+    class WepayChargeError < StandardError; end
   end
 
   module Payments
@@ -149,6 +159,8 @@ module WepayRails
 
       include WepayRails::Api::AccountMethods
       include WepayRails::Api::CheckoutMethods
+      include WepayRails::Api::PreapprovalMethods
+      include WepayRails::Api::ChargeMethods
     end
 
     include WepayRails::Exceptions

data/test/helper.rb

@@ -99,4 +99,9 @@ class ActiveSupport::TestCase
 	{ "checkout_id" => "6789",
 	  "checkout_uri" => "http://stage.wepay.com/api/checkout/6789" }.merge(options).to_json
   end
+  
+  def sample_preapproval_response(options={})
+	{ "preapproval_id" => "6789",
+	  "preapproval_uri" => "http://stage.wepay.com/api/preapproval/6789" }.merge(options).to_json
+  end
 end

data/test/test_wepay_rails_checkout_methods.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestWepayRailsCheckoutMethods < ActiveSupport::TestCase
-  include WepayRails::Helpers::ControllerHelpers
+    include WepayRails::Helpers::ControllerHelpers
 
   def setup
     create_wepay_config_file(false, true)

data/test/test_wepay_rails_preapproval_methods.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestWepayRailsPreapprovalMethods < ActiveSupport::TestCase
+  include WepayRails::Helpers::ControllerHelpers
+
+  def setup
+    create_wepay_config_file(false, true)
+    initialize_wepay_config
+    @checkout_params = {
+      :amount => 300,
+      :period => "once",
+      :short_description => "This is a checkout test!",
+      :account_id => "12345"
+    }
+  end
+
+  def teardown
+    delete_wepay_config_file
+  end
+
+  test "should create a new WePay preapproval object" do
+  stub_request(:post, "https://stage.wepayapi.com/v2/preapproval/create").
+      with(:headers => wepay_gateway.wepay_auth_header).
+      to_return(:status => 200, :body => sample_preapproval_response, :headers => {})
+
+    @response = wepay_gateway.perform_preapproval(@checkout_params)
+    assert_equal "6789", @response[:preapproval_id]
+    assert_equal "http://stage.wepay.com/api/preapproval/6789", @response[:preapproval_uri]
+    assert_not_nil @response[:security_token]
+  end
+end

data/wepay-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wepay-rails"
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = "2012-09-16"
+  s.date = "2013-04-11"
   s.description = "Rails gem that interfaces with the WePay API"
   s.email = "adammede@gmail.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".DS_Store",
     ".document",
     ".travis.yml",
     "Gemfile",
@@ -27,13 +28,18 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/.DS_Store",
     "app/controllers/wepay/application_controller.rb",
     "app/controllers/wepay/authorize_controller.rb",
+    "app/controllers/wepay/charge_controller.rb",
     "app/controllers/wepay/checkout_controller.rb",
     "app/controllers/wepay/ipn_controller.rb",
+    "app/controllers/wepay/preapproval_controller.rb",
     "build",
     "lib/api/account_methods.rb",
+    "lib/api/charge_methods.rb",
     "lib/api/checkout_methods.rb",
+    "lib/api/preapproval_methods.rb",
     "lib/generators/wepay_rails/install/install_generator.rb",
     "lib/generators/wepay_rails/install/templates/create_wepay_checkout_records.rb",
     "lib/generators/wepay_rails/install/templates/wepay.yml",
@@ -45,6 +51,7 @@ Gem::Specification.new do |s|
     "test/test_wepay_rails_authorize.rb",
     "test/test_wepay_rails_checkout_methods.rb",
     "test/test_wepay_rails_initialize.rb",
+    "test/test_wepay_rails_preapproval_methods.rb",
     "wepay-rails.gemspec"
   ]
   s.homepage = "http://github.com/adamthedeveloper/wepay-rails"
@@ -59,6 +66,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["= 3.1.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<turn>, ["= 0.8.2"])
       s.add_development_dependency(%q<thor>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -68,6 +76,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<rails>, ["= 3.1.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<turn>, ["= 0.8.2"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -78,6 +87,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<rails>, ["= 3.1.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<turn>, ["= 0.8.2"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wepay-rails
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -43,6 +43,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +164,7 @@ extra_rdoc_files:
 - README
 - README.rdoc
 files:
+- .DS_Store
 - .document
 - .travis.yml
 - Gemfile
@@ -157,13 +174,18 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/.DS_Store
 - app/controllers/wepay/application_controller.rb
 - app/controllers/wepay/authorize_controller.rb
+- app/controllers/wepay/charge_controller.rb
 - app/controllers/wepay/checkout_controller.rb
 - app/controllers/wepay/ipn_controller.rb
+- app/controllers/wepay/preapproval_controller.rb
 - build
 - lib/api/account_methods.rb
+- lib/api/charge_methods.rb
 - lib/api/checkout_methods.rb
+- lib/api/preapproval_methods.rb
 - lib/generators/wepay_rails/install/install_generator.rb
 - lib/generators/wepay_rails/install/templates/create_wepay_checkout_records.rb
 - lib/generators/wepay_rails/install/templates/wepay.yml
@@ -175,6 +197,7 @@ files:
 - test/test_wepay_rails_authorize.rb
 - test/test_wepay_rails_checkout_methods.rb
 - test/test_wepay_rails_initialize.rb
+- test/test_wepay_rails_preapproval_methods.rb
 - wepay-rails.gemspec
 homepage: http://github.com/adamthedeveloper/wepay-rails
 licenses:
@@ -191,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1100875515219871170
+      hash: -3118389177307710448
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: