wepay-rails 0.1.33 → 0.1.34

data/VERSION

@@ -1 +1 @@
-0.1.33
+0.1.34

data/lib/exceptions.rb

@@ -0,0 +1,6 @@
+module WepayRails
+  module Exceptions
+    class AccessTokenError < StandardError; end
+    class ExpiredTokenError < StandardError; end
+  end
+end

data/lib/helpers/controller_helpers.rb

@@ -2,7 +2,7 @@ module WepayRails
   module Helpers
     module ControllerHelpers
 
-      def redirect_to_wepay_for_auth(scope)
+      def redirect_to_wepay_for_auth(scope=gateway.scope)
         redirect_to gateway.auth_code_url(scope)
       end
 
@@ -26,7 +26,9 @@ module WepayRails
       # {"user_id":"123456","access_token":"1337h4x0rzabcd12345","token_type":"BEARER"} Example
       def initialize_wepay_access_token(auth_code)
         wepay_access_token = gateway.access_token(auth_code)
-        raise unless wepay_access_token.present?
+      rescue WepayRails::Exceptions::ExpiredTokenError => e
+        redirect_to_wepay_for_auth gateway.scope
+        return
       end
 
       # Since we are saving the access token in the session,

data/lib/wepay-rails.rb

@@ -7,22 +7,29 @@ module WepayRails
 
       base_uri @base_uri
 
-      attr_accessor :wepay_access_token, :wepay_auth_code
+      attr_accessor :wepay_access_token, :wepay_auth_code, :scope
 
       def initialize(*args)
         yml = Rails.root.join('config', 'wepay.yml').to_s
         @config = YAML.load_file(yml)[Rails.env].symbolize_keys
+        @scope = @config.delete(:scope)
         @base_uri = Rails.env.production? ? "https://api.wepay.com" : "https://stage.wepay.com"
       end
 
       def access_token(auth_code)
         @wepay_auth_code = auth_code
-        File.open('/tmp/wepay-rails.log','a') {|f| f.write(auth_code)}
-        File.open('/tmp/wepay-rails.log','a') {|f| f.write(@config.merge(:code => auth_code).inspect)}
         response = self.class.get("#{@base_uri}/v2/oauth2/token", :query => @config.merge(:code => auth_code))
         json = JSON.parse(response.body)
-        File.open('/tmp/wepay-rails.log','a') {|f| f.write(response.body)}
-        File.open('/tmp/wepay-rails.log','a') {|f| f.write(json.inspect)}
+
+        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"
+            raise WepayRails::Exceptions::AccessTokenError.new(json["error_description"])
+          end
+        end
+
+        raise WepayRails::Exceptions::AccessTokenError.new("A problem occurred trying to get the access token: #{json.inspect}") unless json.has_key?("access_token")
+
         @wepay_access_token = json["access_token"]
       end
 

data/wepay-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wepay-rails}
-  s.version = "0.1.33"
+  s.version = "0.1.34"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/exceptions.rb",
     "lib/helpers/controller_helpers.rb",
     "lib/helpers/model_helpers.rb",
     "lib/wepay-rails.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wepay-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2151872860 !ruby/object:Gem::Requirement
+  requirement: &2151865140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151872860
+  version_requirements: *2151865140
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151870720 !ruby/object:Gem::Requirement
+  requirement: &2151863680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151870720
+  version_requirements: *2151863680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151868540 !ruby/object:Gem::Requirement
+  requirement: &2151861880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151868540
+  version_requirements: *2151861880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151865960 !ruby/object:Gem::Requirement
+  requirement: &2151859660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2151865960
+  version_requirements: *2151859660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151865020 !ruby/object:Gem::Requirement
+  requirement: &2151857180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151865020
+  version_requirements: *2151857180
 description: Rails gem that interfaces with the WePay API
 email: adammede@gmail.com
 executables: []
@@ -84,6 +84,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/exceptions.rb
 - lib/helpers/controller_helpers.rb
 - lib/helpers/model_helpers.rb
 - lib/wepay-rails.rb
@@ -106,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4397495673617339772
+      hash: -214898700293280677
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: