wepay-rails 1.0.0 → 1.1.0

data/README.rdoc

@@ -11,7 +11,7 @@ add a column to one of your models to hold the authentication token. For example
 
 Your migration:
 
-    add_column :my_model, :wepay_auth_code, :string
+    add_column :users, :wepay_auth_code, :string
 
 You need to also create a new model called WepayCheckoutRecord. It will be updated by wepay's IPN system as changes to the checkout change - such as the status.
 Wepay-rails handles those IPN notifications for you. You can write observers watching the WepayCheckoutRecord model if you need to have
@@ -30,7 +30,7 @@ Modify config/wepay.yml.example to your needs. You will need to set the model an
 Snippet of wepay.yml showing the auth_code_location directive:
 
     production:
-      auth_code_location: MyModel.wepay_auth_code
+      auth_code_location: User.wepay_auth_code
 
 You will have to set up a few new controllers in your rails app to handle callbacks and redirects from wepay.
 I created one called finalize_controller and I use it for a landing page when the customer is finished paying
@@ -44,20 +44,10 @@ For now, here's what I am doing in my rails app to handle it...
                         |_ checkout_controller.rb
                         |_ finalize_controller.rb
 
-The wepay-rails gem comes with an IpnController already built in for
-handling requests from wepay about a specific checkout. If you wish to override it,
-you can create an IpnController in your rails app.
-
-    class IpnController < Wepay::ApplicationController
-        def index
-            #Do something with the instant payment notifications back from Wepay
-        end
-    end
-
 Finally, your checkout controller (or some controller that will interact with the Wepay API):
 
     class Purchase::CheckoutController < Purchase::PurchaseController
-        before_filter :authenticate_account! # I am using devise - this line depends on your authentication scheme
+        before_filter :authenticate_user! # I am using devise - this line depends on your authentication scheme
 
         # PLEASE READ
         # I am saving the wepay_auth_code in my Profile model. Somewhere in my rails app, I have a method called
@@ -70,18 +60,17 @@ Finally, your checkout controller (or some controller that will interact with th
 
         def index
 
-            cart = current_account.cart # EXAMPLE - get my shopping cart
+            cart = current_user.cart # EXAMPLE - get my shopping cart
             tx_id = cart.transaction_id # EXAMPLE - I use a column in my cart to have a way to look up the cart upon the user's return from wepay
 
             checkout_params = {
                 :amount => cart.grand_total,
                 :short_description => cart.short_description,
                 :long_description => cart.long_description,
-                :redirect_uri => purchase_finalize_index_url(:txID => tx_id) # Wepay redirects the user back to this url after purchase
             }
 
             # Finally, send the user off to wepay so you can get paid! - CASH MONEY
-            init_checkout_and_send_user_to_wepay(checkout_params, current_profile)
+            init_checkout_and_send_user_to_wepay(checkout_params, current_user)
         end
     end
 
@@ -90,11 +79,12 @@ wepay to checkout.
 
     class Purchase::FinalizeController < Wepay::ApplicationController
       def index
-        cart = Cart.find_by_transaction_id(params[:txID])
         wcr  = WepayCheckoutRecord.find_by_checkout_id(params[:checkout_id])
 
-        checkout = wepay_gateway.lookup_checkout(wcr.checkout_id)
-        wcr.update_attributes(checkout)
+        # Set the association of the wepay checkout record to my cart - then, on to order.
+        cart = current_account.cart
+        cart.wepay_checkout_record = wcr
+        cart.save!
 
         # Convert cart to an order?? Move to observer of WepayCheckoutRecord??
         cart.convert_cart_to_order if wcr.state == 'authorized'
@@ -103,13 +93,6 @@ wepay to checkout.
       end
     end
 
-Example Routes for these:
-    namespace :purchase do
-        resource :cart, :has_many => :purchase_items
-        resources :checkout, :only => [:index]
-        resources :finalize, :only => [:index]
-    end
-
 
 == Special Thanks to additional contributers of Wepay-Rails
 * lucisferre (Chris Nicola) https://github.com/lucisferre

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/app/controllers/wepay/authorize_controller.rb

@@ -1,13 +1,15 @@
 class Wepay::AuthorizeController < Wepay::ApplicationController
   def index
     ref_id = session[unique_wepay_auth_token_key]
+
     if WepayRails::Configuration.settings[:orm] == 'mongoid'
       wepayable = wepayable_class.where(wepayable_column => ref_id)[0]
     else
       wepayable = wepayable_class.all(:conditions => ["#{wepayable_column} = ?", ref_id])[0]
     end
+
     wepayable.update_attribute(wepayable_column.to_sym, params[:code])
-    redirect_to session[:after_authorize_redirect_uri] if session[:after_authorize_redirect_uri]
+    redirect_to session[:after_authorize_redirect_uri] and return if session[:after_authorize_redirect_uri]
     redirect_to WepayRails::Configuration.settings[:after_authorize_redirect_uri]
   rescue => e
     raise AuthorizationError.new("WepayRails was unable to find the record to save the auth code to. : #{e.message}") unless wepayable.present?

data/config/routes.rb

@@ -2,5 +2,6 @@ Rails.application.routes.draw do
   namespace :wepay do
     resources :ipn
     resources :authorize
+    resources :checkout
   end
 end

data/lib/api/checkout_methods.rb

@@ -38,8 +38,8 @@ module WepayRails
       # :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_checkout(parms)
         defaults = {
-            :callback_uri => @wepay_config[:ipn_callback_uri],
-            :redirect_uri => @wepay_config[:checkout_redirect_uri],
+            :callback_uri => (@wepay_config[:ipn_callback_uri].present? ? @wepay_config[:ipn_callback_uri] : "#{@wepay_config[:root_callback_uri]}/wepay/ipn"),
+            :redirect_uri => (@wepay_config[:checkout_redirect_uri].present? ? @wepay_config[:checkout_redirect_uri] : "#{@wepay_config[:root_callback_uri]}/wepay/checkout"),
             :fee_payer => @wepay_config[:fee_payer],
             :type => @wepay_config[:checkout_type],
             :charge_tax => @wepay_config[:charge_tax] ? 1 : 0,

data/lib/generators/wepay_rails/install/install_generator.rb

@@ -1,25 +1,25 @@
-require 'rails/generators/migration'
-
-module WepayRails
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      include Rails::Generators::Migration
-      source_root File.expand_path('../templates', __FILE__)
-      desc "add a migration for the Wepay Rails - WepayCheckoutRecord Model - Used to capture your transactions from Wepay"
-      def self.next_migration_number(path)
-        unless @prev_migration_nr
-          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        else
-          @prev_migration_nr += 1
-        end
-        @prev_migration_nr.to_s
-      end
-
-      def copy_migrations
-        migration_template "create_wepay_checkout_records.rb", "db/migrate/create_wepay_checkout_records.rb"
-        copy_file "wepay_checkout_record.rb", "lib/models/wepay_checkout_record.rb"
-        copy_file "wepay.yml", "config/wepay.yml.example"
-      end
-    end
-  end
+require 'rails/generators/migration'
+
+module WepayRails
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      include Rails::Generators::Migration
+      source_root File.expand_path('../templates', __FILE__)
+      desc "add a migration for the Wepay Rails - WepayCheckoutRecord Model - Used to capture your transactions from Wepay"
+      def self.next_migration_number(path)
+        unless @prev_migration_nr
+          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+        else
+          @prev_migration_nr += 1
+        end
+        @prev_migration_nr.to_s
+      end
+
+      def copy_migrations
+        migration_template "create_wepay_checkout_records.rb", "db/migrate/create_wepay_checkout_records.rb"
+        copy_file "wepay_checkout_record.rb", "lib/models/wepay_checkout_record.rb"
+        copy_file "wepay.yml", "config/wepay.yml.example"
+      end
+    end
+  end
 end

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

@@ -1,23 +1,22 @@
-production:
-  client_id: <your client id from wepay>
-  client_secret: <your client secret from wepay>
-  account_id: <your account id from wepay>
-  auth_code_location: MyModel.wepay_auth_code #model and column where you store the auth code for each of your customers eg. Profile.wepay_auth_code
-  redirect_uri: "http://www.example.com/wepay/authorize" # where to send the user on their trip back from wepay for payment
-  after_authorize_redirect_uri: "http://www.example.com/purchase/checkout" # after the user gets an auth token from wepay, where should they come?
-  scope: [refund_payments,collect_payments,view_balance,view_user]
-  wepay_api_uri: "https://api.wepay.com" # Use https://stage.wepay.com for development
-  wepay_api_version: "v2"
-  ipn_callback_uri: "http://www.example.com/wepay/ipn" # Future requests from wepay to you should go where?
-  fee_payer: Payee
-  checkout_type: GOODS
-  charge_tax: false
-  app_fee: 0
-  auto_capture: true
-  require_shipping: false
-  shipping_fee: 0
-  charge_tax: false
-  wepay_checkout_model: WepayCheckoutRecord # This is where the transactions for the checkouts will be stored
-development:
-
+production:
+  client_id: <your client id from wepay>
+  client_secret: <your client secret from wepay>
+  account_id: <your account id from wepay>
+  auth_code_location: MyModel.wepay_auth_code #model and column where you store the auth code for each of your customers eg. Profile.wepay_auth_code
+  root_callback_uri: "http://www.example.com"
+  after_authorize_redirect_uri: "http://www.example.com/purchase/checkout"
+  after_checkout_redirect_uri: "http://www.example.com/purchase/finalize"
+  scope: [refund_payments,collect_payments,view_balance,view_user]
+  wepay_api_uri: "https://api.wepay.com"
+  wepay_api_version: "v2"
+  fee_payer: Payee
+  checkout_type: GOODS
+  charge_tax: false
+  app_fee: 0
+  auto_capture: true
+  require_shipping: false
+  shipping_fee: 0
+  charge_tax: false
+development:
+
 test:

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

@@ -1,2 +1,2 @@
-class WepayCheckoutRecord < ActiveRecord::Base
+class WepayCheckoutRecord < ActiveRecord::Base
 end

data/lib/helpers/controller_helpers.rb

@@ -108,8 +108,8 @@ module WepayRails
       # :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 init_checkout_and_send_user_to_wepay(params, wepayable_object=nil)
-        initialize_wepay_access_token(wepayable_object) if wepayable_object.present?
+      def init_checkout_and_send_user_to_wepay(params, wepayable_object)
+        initialize_wepay_access_token(wepayable_object)
         response = wepay_gateway.perform_checkout(params)
 
         unless response && response.has_key?('checkout_uri')
@@ -118,8 +118,11 @@ module WepayRails
           Params were: #{params}, Token was: #{wepay_access_token}")
         end
 
+        wepayable_column = WepayRails::Configuration.wepayable_column
+        raise unless wepayable_object.send(wepayable_column.to_sym).present?
+
         wcr_params = {
-            :auth_code    => wepay_gateway.wepay_auth_code,
+            :auth_code    => wepayable_object.send(wepayable_column),
             :access_token => wepay_access_token,
             :checkout_id  => response['checkout_id']
         }

data/lib/wepay-rails.rb

@@ -87,7 +87,7 @@ module WepayRails
         params = {
           :client_id => @wepay_config[:client_id],
           :client_secret => @wepay_config[:client_secret],
-          :redirect_uri => @wepay_config[:redirect_uri],
+          :redirect_uri => (@wepay_config[:redirect_uri].present? ? @wepay_config[:redirect_uri] : "#{@wepay_config[:root_callback_uri]}/wepay/authorize"),
           :code => auth_code
         }
 
@@ -113,7 +113,7 @@ module WepayRails
       # ex. ['manage_accounts','collect_payments','view_balance','view_user']
       def auth_code_url(params = {})
         params[:client_id]    ||= @wepay_config[:client_id]
-        params[:redirect_uri] ||= @wepay_config[:redirect_uri]
+        params[:redirect_uri] ||= (@wepay_config[:redirect_uri].present? ? @wepay_config[:redirect_uri] : "#{@wepay_config[:root_callback_uri]}/wepay/authorize")
         params[:scope]        ||= WepayRails::Configuration.settings[:scope].join(',')
 
         query = params.map do |k, v|

data/wepay-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wepay-rails"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = "2011-11-25"
+  s.date = "2011-11-26"
   s.description = "Rails gem that interfaces with the WePay API"
   s.email = "adammede@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wepay-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2011-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &21936620 !ruby/object:Gem::Requirement
+  requirement: &10731560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21936620
+  version_requirements: *10731560
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &21934320 !ruby/object:Gem::Requirement
+  requirement: &10729980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21934320
+  version_requirements: *10729980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21932700 !ruby/object:Gem::Requirement
+  requirement: &10728420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21932700
+  version_requirements: *10728420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21931200 !ruby/object:Gem::Requirement
+  requirement: &10726600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21931200
+  version_requirements: *10726600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21929880 !ruby/object:Gem::Requirement
+  requirement: &10704300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21929880
+  version_requirements: *10704300
 description: Rails gem that interfaces with the WePay API
 email: adammede@gmail.com
 executables: []
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 454732368271274683
+      hash: 1601135752143681885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: