rack-oauth2 0.9.2 → 0.9.3

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - ree

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.9.1)
+    rack-oauth2 (0.9.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.9)
+    activesupport (3.0.10)
     addressable (2.2.6)
     attr_required (0.0.3)
     bouncy-castle-java (1.5.0146.1)
@@ -36,7 +36,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    webmock (1.6.4)
+    webmock (1.7.4)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 

data/README.rdoc

@@ -18,27 +18,28 @@ http://www.ietf.org/id/draft-ietf-oauth-v2-http-mac-00.txt
 
 == Resources
 
-* View Source on GitHub (http://github.com/nov/rack-oauth2)
-* Report Issues on GitHub (http://github.com/nov/rack-oauth2/issues)
-* Subscribe Update Info (http://www.facebook.com/pages/RackOAuth2/141477809244105)
+* View Source on GitHub (https://github.com/nov/rack-oauth2)
+* Report Issues on GitHub (https://github.com/nov/rack-oauth2/issues)
+* Subscribe Update Info (https://www.facebook.com/rackoauth2)
+* Q&A on Google Groups (https://groups.google.com/group/rack-oauth2)
 
 == Sample Server Application (Rails3)
 
 === Bearer
 
 Running on Heroku
-http://rack-oauth2-sample.heroku.com
+https://rack-oauth2-sample.heroku.com
 
 Source on GitHub
-http://github.com/nov/rack-oauth2-sample
+https://github.com/nov/rack-oauth2-sample
 
 === MAC
 
 Running on Heroku
-http://rack-oauth2-sample-mac.heroku.com
+https://rack-oauth2-sample-mac.heroku.com
 
 Source on GitHub
-http://github.com/nov/rack-oauth2-sample-mac
+https://github.com/nov/rack-oauth2-sample-mac
 
 == Sample Client
 

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/rack/oauth2.rb

@@ -1,18 +1,48 @@
+require 'rack'
+require 'json'
+require 'httpclient'
+require 'logger'
+require 'active_support/core_ext'
+require 'attr_required'
+require 'attr_optional'
+
 module Rack
   module OAuth2
     VERSION = ::File.read(
       ::File.join(::File.dirname(__FILE__), '../../VERSION')
     )
+
+    def self.logger
+      @@logger
+    end
+    def self.logger=(logger)
+      @@logger = logger
+    end
+    self.logger = ::Logger.new(STDOUT)
+    self.logger.progname = 'Rack::OAuth2'
+
+    def self.debugging?
+      @@debugging
+    end
+    def self.debugging=(boolean)
+      @@debugging = boolean
+    end
+    def self.debug!
+      self.debugging = true
+    end
+    def self.debug(&block)
+      original = self.debugging?
+      self.debugging = true
+      yield
+    ensure
+      self.debugging = original
+    end
+    self.debugging = false
   end
 end
 
-require 'rack'
-require 'json'
-require 'httpclient'
-require 'active_support/core_ext'
-require 'attr_required'
-require 'attr_optional'
 require 'rack/oauth2/util'
 require 'rack/oauth2/server'
 require 'rack/oauth2/client'
-require 'rack/oauth2/access_token'
+require 'rack/oauth2/access_token'
+require 'rack/oauth2/debugger'

data/lib/rack/oauth2/access_token.rb

@@ -15,6 +15,7 @@ module Rack
           :agent_name => "#{self.class} (#{VERSION})"
         )
         @httpclient.request_filter << Authenticator.new(self)
+        @httpclient.request_filter << Debugger::RequestFilter.new if Rack::OAuth2.debugging?
         attr_missing!
       end
 

data/lib/rack/oauth2/client.rb

@@ -51,14 +51,20 @@ module Rack
           :client_secret => self.secret
         )
         handle_response do
-          HTTPClient.new(
-            :agent_name => "#{self.class} (#{VERSION})"
-          ).post absolute_uri_for(token_endpoint), Util.compact_hash(params)
+          http_client.post absolute_uri_for(token_endpoint), Util.compact_hash(params)
         end
       end
 
       private
 
+      def http_client
+        _http_client_ = HTTPClient.new(
+          :agent_name => "#{self.class} (#{VERSION})"
+        )
+        _http_client_.request_filter << Debugger::RequestFilter.new if Rack::OAuth2.debugging?
+        _http_client_
+      end
+
       def absolute_uri_for(endpoint)
         _endpoint_ = Util.parse_uri endpoint
         _endpoint_.scheme ||= self.scheme || 'https'

data/lib/rack/oauth2/debugger.rb

@@ -0,0 +1 @@
+require 'rack/oauth2/debugger/request_filter'

data/lib/rack/oauth2/debugger/request_filter.rb

@@ -0,0 +1,22 @@
+module Rack
+  module OAuth2
+    module Debugger
+      class RequestFilter
+        # Callback called in HTTPClient (before sending a request)
+        # request:: HTTP::Message
+        def filter_request(request)
+          started = "======= [Rack::OAuth2] HTTP REQUEST STARTED ======="
+          FbGraph.logger.info [started, request.dump].join("\n")
+        end
+
+        # Callback called in HTTPClient (after received a response)
+        # request::  HTTP::Message
+        # response:: HTTP::Message
+        def filter_response(request, response)
+          finished = "======= [Rack::OAuth2] HTTP REQUEST FINISHED ======="
+          FbGraph.logger.info ['-' * 50, response.dump, finished].join("\n")
+        end
+      end
+    end
+  end
+end

data/spec/helpers/webmock_helper.rb

@@ -13,10 +13,6 @@ module WebMockHelper
 
   def request_for(method, options = {})
     request = {}
-    if options[:access_token]
-      options[:params] ||= {}
-      options[:params][:oauth_token] = options[:access_token].to_s
-    end
     if options[:params]
       case method
       when :post, :put

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: 
-  version: 0.9.2
+  segments: 
+  - 0
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 Z
+date: 2011-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
@@ -42,6 +56,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 123
+        segments: 
+        - 2
+        - 2
+        - 0
+        - 2
         version: 2.2.0.2
   type: :runtime
   version_requirements: *id003
@@ -53,6 +73,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
   type: :runtime
   version_requirements: *id004
@@ -64,6 +88,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -75,6 +102,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id006
@@ -86,6 +118,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id007
@@ -97,6 +133,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id008
@@ -108,6 +148,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id009
@@ -119,6 +162,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id010
@@ -135,6 +183,7 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -157,6 +206,8 @@ files:
 - lib/rack/oauth2/client/grant/client_credentials.rb
 - lib/rack/oauth2/client/grant/password.rb
 - lib/rack/oauth2/client/grant/refresh_token.rb
+- lib/rack/oauth2/debugger.rb
+- lib/rack/oauth2/debugger/request_filter.rb
 - lib/rack/oauth2/server.rb
 - lib/rack/oauth2/server/abstract.rb
 - lib/rack/oauth2/server/abstract/error.rb
@@ -241,12 +292,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []