wepay-rails 0.1.110 → 0.1.111

data/VERSION

@@ -1 +1 @@
-0.1.110
+0.1.111

data/app/controllers/wepay/authorize_controller.rb

@@ -1,14 +1,15 @@
 class Wepay::AuthorizeController < Wepay::ApplicationController
   def index
-    ref_id, code = if params[:refID].include?('?')
-                     parts = params[:refID].split('?')
-                     key,val = parts[1].split('=')
-                     [parts[0], (key == 'code' ? val : '')]
-                   else
-                     [params[:refID], params[:code]]
-                   end
+    #ref_id, code = if params[:refID].include?('?')
+    #                 parts = params[:refID].split('?')
+    #                 key,val = parts[1].split('=')
+    #                 [parts[0], (key == 'code' ? val : '')]
+    #               else
+    #                 [params[:refID], params[:code]]
+    #               end
+    ref_id = session[:wepay_auth_code_ref_id]
     wepayable = wepayable_class.all(:conditions => ["#{wepayable_column} = ?", ref_id])[0]
-    wepayable.update_attribute(wepayable_column.to_sym, code)
+    wepayable.update_attribute(wepayable_column.to_sym, params[:code])
     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/wepay-rails.rb

@@ -60,7 +60,7 @@ module WepayRails
       def initialize(*args)
         @wepay_access_token = args.first
 
-        @wepay_config = Configuration.settings
+        @wepay_config = WepayRails::Configuration.settings
 
         # Build the base uri
         # Default if there isn't a setting for version and/or api uri
@@ -106,12 +106,9 @@ module WepayRails
         # the original wepayable, and then save the new auth code into the reference ID's
         # place
         ref_id = Digest::SHA1.hexdigest("#{Time.now.to_i+rand(4)}")
-
+        session[:wepay_auth_code_ref_id] = ref_id
         wepayable_object.update_attribute(WepayRails::Configuration.wepayable_column.to_sym, ref_id)
 
-        parms[:redirect_uri] += (parms[:redirect_uri] =~ /\?/ ? "&" : "?") + "refID=#{ref_id}"
-        parms[:redirect_uri] = CGI::escape(parms[:redirect_uri])
-
         query = parms.map do |k, v|
           "#{k.to_s}=#{v}"
         end.join('&')

data/wepay-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wepay-rails}
-  s.version = "0.1.110"
+  s.version = "0.1.111"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Adam Medeiros}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wepay-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.110
+  version: 0.1.111
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &21919180 !ruby/object:Gem::Requirement
+  requirement: &26297580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21919180
+  version_requirements: *26297580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &21918580 !ruby/object:Gem::Requirement
+  requirement: &26297080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21918580
+  version_requirements: *26297080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21917980 !ruby/object:Gem::Requirement
+  requirement: &26296600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21917980
+  version_requirements: *26296600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21917240 !ruby/object:Gem::Requirement
+  requirement: &26296080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21917240
+  version_requirements: *26296080
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21916680 !ruby/object:Gem::Requirement
+  requirement: &26295560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21916680
+  version_requirements: *26295560
 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: 2046650123395354507
+      hash: 2041870449886481610
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: