wepay-rails 0.1.39 → 0.1.40

data/VERSION

@@ -1 +1 @@
-0.1.39
+0.1.40

data/lib/helpers/controller_helpers.rb

@@ -6,12 +6,8 @@ module WepayRails
         redirect_to gateway.auth_code_url(scope)
       end
 
-      def redirect_to_wepay_for_token
-        redirect_to gateway.token_url
-      end
-
       def gateway
-        @gateway ||= WepayRails::Payments::Gateway.new
+        @gateway ||= WepayRails::Payments::Gateway.new(wepay_access_token)
       end
 
       # From https://stage.wepay.com/developer/tutorial/authorization
@@ -25,11 +21,9 @@ module WepayRails
       # Response
       # {"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))
-        File.open('/tmp/redirect_loop.log','a') {|f| f.write(wepay_access_token)}
+        session[unique_wepay_access_token_key] = gateway.access_token(auth_code)
         return
       rescue WepayRails::Exceptions::ExpiredTokenError => e
-        File.open('/tmp/redirect_loop.log','a') {|f| f.write(e.message)}
         redirect_to_wepay_for_auth(gateway.scope) and return
       end
 
@@ -40,12 +34,6 @@ module WepayRails
         :IODDR8856UUFG6788
       end
 
-      # Access token is the OAUTH access token that is used for future
-      # comunique
-      def wepay_access_token=(value)
-        session[unique_wepay_access_token_key] = value
-      end
-
       # Access token is the OAUTH access token that is used for future
       # comunique
       def wepay_access_token

data/lib/wepay-rails.rb

@@ -17,15 +17,24 @@ module WepayRails
       attr_accessor :wepay_access_token, :wepay_auth_code, :scope
 
       def initialize(*args)
+        @wepay_access_token = args.first
+
         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"
+
+        # Build the base uri
+        # Default if there isn't a setting for version and/or api uri
+        version = @config[:wepay_api_version].present? ? @config[:wepay_api_version] : "v2"
+        api_uri = @config[:wepay_api_uri].present? ? @config[:wepay_api_uri] : "https://wepayapi.com"
+
+        @base_uri = "#{api_uri}/#{version}"
       end
 
       def access_token(auth_code)
         @wepay_auth_code = auth_code
-        response = self.class.get("#{@base_uri}/v2/oauth2/token", :query => @config.merge(:code => auth_code))
+        response = self.class.get("#{@base_uri}/oauth2/token", :query => @config.merge(:code => auth_code))
         json = JSON.parse(response.body)
 
         if json.has_key?("error")
@@ -50,7 +59,7 @@ module WepayRails
           "#{k.to_s}=#{v}"
         end.join('&')
 
-        "#{@base_uri}/v2/oauth2/authorize?#{query}"
+        "#{@base_uri}/oauth2/authorize?#{query}"
       end
 
       def token_url
@@ -58,7 +67,7 @@ module WepayRails
           "#{k.to_s}=#{v}"
         end.join('&')
 
-        "#{@base_uri}/v2/oauth2/authorize?#{query}"
+        "#{@base_uri}/oauth2/authorize?#{query}"
       end
 
       def wepay_auth_header
@@ -66,7 +75,7 @@ module WepayRails
       end
 
       def wepay_user
-        response = self.class.get("#{@base_uri}/v2/user", {:headers => wepay_auth_header})
+        response = self.class.get("#{@base_uri}/user", {:headers => wepay_auth_header})
         JSON.parse(response.body)
       end
     end

data/wepay-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wepay-rails}
-  s.version = "0.1.39"
+  s.version = "0.1.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = %q{2011-07-20}
+  s.date = %q{2011-07-21}
   s.description = %q{Rails gem that interfaces with the WePay API}
   s.email = %q{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.39
+  version: 0.1.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00.000000000 -07:00
+date: 2011-07-21 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2151871020 !ruby/object:Gem::Requirement
+  requirement: &2151870980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151871020
+  version_requirements: *2151870980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151868600 !ruby/object:Gem::Requirement
+  requirement: &2151868920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151868600
+  version_requirements: *2151868920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151865960 !ruby/object:Gem::Requirement
+  requirement: &2151866540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151865960
+  version_requirements: *2151866540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151864800 !ruby/object:Gem::Requirement
+  requirement: &2151864920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2151864800
+  version_requirements: *2151864920
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151863380 !ruby/object:Gem::Requirement
+  requirement: &2151863760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151863380
+  version_requirements: *2151863760
 description: Rails gem that interfaces with the WePay API
 email: adammede@gmail.com
 executables: []
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -103736050342055788
+      hash: -3827481191935128799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: