wepay-rails 0.1.104 → 0.1.105

data/VERSION

@@ -1 +1 @@
-0.1.104
+0.1.105

data/lib/helpers/controller_helpers.rb

@@ -26,16 +26,10 @@ module WepayRails
       #
       # Response
       # {"user_id":"123456","access_token":"1337h4x0rzabcd12345","token_type":"BEARER"} Example
-      def initialize_wepay_access_token(wepayable_object) #auth_code)
-        iwat_log = File.open('/tmp/init-wepay-access-token.log','w')
-        iwat_log.puts "wepayable_object is #{wepayable_object.inspect}"
-        iwat_log.puts "wepayable_column is #{WepayRails::Configuration.wepayable_column}"
-        auth_code = wepayable_object.send(WepayRails::Configuration.wepayable_column.to_sym)
-        iwat_log.puts "Auth code was #{auth_code}"
-        session[unique_wepay_access_token_key] = wepay_gateway.access_token(auth_code)
+      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
-        iwat_log.puts "Exception happened: #{e.message}"
         redirect_to_wepay_for_auth(wepayable_object) and return
       end
 

data/lib/wepay-rails.rb

@@ -29,16 +29,10 @@ module WepayRails
   class Engine < Rails::Engine
     # Initializers
     initializer "WepayRails.initialize_wepay_rails" do |app|
-      init_log = File.open('/tmp/wepay-rails-init.log','w')
-      init_log.puts "Inside initializer"
       yml = Rails.root.join('config', 'wepay.yml').to_s
       settings = YAML.load_file(yml)[Rails.env].symbolize_keys
-      init_log.puts settings.inspect
       klass, column = settings[:auth_code_location].split('.')
-      init_log.puts "Class is #{klass}"
-      init_log.puts "Wepayable Column is #{column}"
       Configuration.init_conf(eval(klass), column, settings)
-      init_log.puts "Settings in the configuration are #{Configuration.settings.inspect}"
     end
   end
 
@@ -76,10 +70,8 @@ module WepayRails
         @base_uri = "#{api_uri}/#{version}"
       end
 
-      def access_token(auth_code)
-        at_log = File.open('/tmp/access-token.log','a')
-        at_log.puts "Auth code passed in was #{auth_code}"
-        @wepay_auth_code = auth_code
+      def access_token(wepayable_object)
+        auth_code = wepayable_object.send(WepayRails::Configuration.wepayable_column.to_s)
         query = {
           :client_id => @wepay_config[:client_id],
           :client_secret => @wepay_config[:client_secret],
@@ -91,7 +83,10 @@ module WepayRails
 
         if json.has_key?("error")
           if json.has_key?("error_description")
-            raise WepayRails::Exceptions::ExpiredTokenError.new("You will need to get a new authorization code") if json["error_description"] == "the code has expired"
+            if ['invalid code parameter','the code has expired'].include?(json['error_description'])
+              # Go get an auth_code
+              redirect_to_wepay_for_auth(wepayable_object) and return
+            end
             raise WepayRails::Exceptions::AccessTokenError.new(json["error_description"])
           end
         end
@@ -105,12 +100,8 @@ module WepayRails
       # 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)
-        acu_log = File.open('/tmp/auth-code-url.log','a')
-        acu_log.puts "Inside auth_code_url"
-        acu_log.puts "Settings are #{WepayRails::Configuration.settings.inspect}"
-        acu_log.puts "Scope is #{WepayRails::Configuration.settings[:scope].inspect}"
         parms = @wepay_config.merge(:scope => WepayRails::Configuration.settings[:scope].join(','))
-        acu_log.puts "auth_code parms are #{parms.inspect}"
+
         # 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
@@ -126,9 +117,7 @@ module WepayRails
           "#{k.to_s}=#{v}"
         end.join('&')
 
-        return "#{@base_uri}/oauth2/authorize?#{query}"
-      rescue => e
-        acu_log.puts "Exception in auth_code_url: #{e.message}"
+        "#{@base_uri}/oauth2/authorize?#{query}"
       end
 
       def token_url

data/wepay-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wepay-rails}
-  s.version = "0.1.104"
+  s.version = "0.1.105"
 
   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.104
+  version: 0.1.105
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &17177800 !ruby/object:Gem::Requirement
+  requirement: &15600460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17177800
+  version_requirements: *15600460
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17177200 !ruby/object:Gem::Requirement
+  requirement: &15599980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17177200
+  version_requirements: *15599980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17176600 !ruby/object:Gem::Requirement
+  requirement: &15599480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17176600
+  version_requirements: *15599480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17175860 !ruby/object:Gem::Requirement
+  requirement: &15599000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *17175860
+  version_requirements: *15599000
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &17175300 !ruby/object:Gem::Requirement
+  requirement: &15598480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17175300
+  version_requirements: *15598480
 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: 1677052997788248005
+      hash: -4197583452893841877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: