wepay-rails 0.1.115 → 0.1.116

data/VERSION

@@ -1 +1 @@
-0.1.115
+0.1.116

data/app/controllers/wepay/authorize_controller.rb

@@ -7,6 +7,7 @@ class Wepay::AuthorizeController < Wepay::ApplicationController
       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 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/lib/helpers/controller_helpers.rb

@@ -2,7 +2,7 @@ module WepayRails
   module Helpers
     module ControllerHelpers
 
-      def redirect_to_wepay_for_auth(wepayable_object)
+      def redirect_to_wepay_for_auth(wepayable_object, params = {})
         # Initially set a reference ID to the column created for the wepayable
         # so that when the redirect back from wepay happens, we can reference
         # the original wepayable, and then save the new auth code into the reference ID's
@@ -11,7 +11,7 @@ module WepayRails
         session[unique_wepay_auth_token_key] = ref_id
         wepayable_object.update_attribute(WepayRails::Configuration.wepayable_column.to_sym, ref_id)
 
-        redirect_to wepay_gateway.auth_code_url(wepayable_object)
+        redirect_to wepay_gateway.auth_code_url(params)
       end
 
       # @deprecated Use wepay_gateway instead of gateway
@@ -37,8 +37,6 @@ module WepayRails
       def initialize_wepay_access_token(wepayable_object)
         session[unique_wepay_access_token_key] = wepay_gateway.access_token(wepayable_object)
         return
-      rescue WepayRails::Exceptions::ExpiredTokenError => e
-        redirect_to_wepay_for_auth(wepayable_object) and return
       end
 
       # Since we are saving the access token in the session,
@@ -59,7 +57,7 @@ module WepayRails
       end
 
       def wepay_access_token_exists?
-        @access_token_exists ||= wepay_access_token.present?
+        wepay_access_token.present?
       end
 
       # Many of the settings you pass in here are already factored in from
@@ -97,11 +95,12 @@ 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(parms)
-        response = wepay_gateway.perform_checkout(parms)
-        raise WepayRails::Exceptions::InitializeCheckoutError.new("A problem occurred while trying to checkout. Wepay didn't send us back a checkout uri. Response was: #{response.inspect}") unless response && response.has_key?('checkout_uri')
+      def init_checkout_and_send_user_to_wepay(params)
+        response = wepay_gateway.perform_checkout(params)
+        checkout = WepayCheckoutRecord.create(params.merge({ checkout_id: response['checkout_id'] }))
+        raise WepayRails::Exceptions::InitializeCheckoutError.new("A problem occurred while trying to checkout. Wepay didn't send us back a checkout uri. Response was: #{response.inspect}, Params were: #{params}, Token was: #{wepay_access_token}") unless response && response.has_key?('checkout_uri')
         redirect_to response['checkout_uri'] and return
       end
     end
   end
-end
+end

data/lib/wepay-rails.rb

@@ -71,13 +71,13 @@ module WepayRails
 
       def access_token(wepayable_object)
         auth_code = wepayable_object.send(WepayRails::Configuration.wepayable_column.to_s)
-        query = {
+        params = {
           :client_id => @wepay_config[:client_id],
           :client_secret => @wepay_config[:client_secret],
           :redirect_uri => @wepay_config[:redirect_uri],
           :code => auth_code
         }
-        response = self.class.post("#{@base_uri}/oauth2/token", :body => query)
+        response = self.class.post("#{@base_uri}/oauth2/token", :body => params)
         json = JSON.parse(response.body)
 
         if json.has_key?("error")
@@ -97,14 +97,12 @@ module WepayRails
       # Get the auth code url that will be used to fetch the auth code for the customer
       # arguments are the redirect_uri and an array of permissions that your application needs
       # ex. ['manage_accounts','collect_payments','view_balance','view_user']
-      def auth_code_url(wepayable_object)
-        parms = {
-          :client_id => @wepay_config[:client_id],
-          :redirect_uri => @wepay_config[:redirect_uri],
-          :scope => WepayRails::Configuration.settings[:scope].join(',')
-        }
+      def auth_code_url(params = {})
+        params[:client_id] ||= @wepay_config[:client_id]
+        params[:redirect_uri] ||= @wepay_config[:redirect_uri]
+        params[:scope] ||= WepayRails::Configuration.settings[:scope].join(',')
 
-        query = parms.map do |k, v|
+        query = params.map do |k, v|
           "#{k.to_s}=#{v}"
         end.join('&')
 
@@ -112,6 +110,9 @@ module WepayRails
       end
 
       def wepay_auth_header
+        unless @wepay_access_token
+          raise WepayRails::Exceptions::AccessTokenError.new("No access token available")
+        end
         {'Authorization' => "Bearer: #{@wepay_access_token}"}
       end
 

data/wepay-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wepay-rails"
-  s.version = "0.1.115"
+  s.version = "0.1.116"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = "2011-10-14"
+  s.date = "2011-11-15"
   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: 0.1.115
+  version: 0.1.116
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &13232840 !ruby/object:Gem::Requirement
+  requirement: &15515820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13232840
+  version_requirements: *15515820
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13231320 !ruby/object:Gem::Requirement
+  requirement: &15514680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13231320
+  version_requirements: *15514680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13226500 !ruby/object:Gem::Requirement
+  requirement: &15513480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13226500
+  version_requirements: *15513480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13225100 !ruby/object:Gem::Requirement
+  requirement: &15512360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13225100
+  version_requirements: *15512360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &13223720 !ruby/object:Gem::Requirement
+  requirement: &15507620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13223720
+  version_requirements: *15507620
 description: Rails gem that interfaces with the WePay API
 email: adammede@gmail.com
 executables: []
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3713795422808856888
+      hash: 3634481726847388061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: