rack-oauth2 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.14.8)
+    rack-oauth2 (1.0.1)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -23,25 +23,25 @@ GEM
     cover_me (1.2.0)
       configatron
       hashie
-    crack (0.3.1)
+    crack (0.3.2)
     diff-lcs (1.1.3)
     hashie (1.2.0)
-    httpclient (2.2.7)
-    i18n (0.6.0)
-    jruby-openssl (0.7.7)
+    httpclient (2.3.2)
+    i18n (0.6.1)
+    jruby-openssl (0.8.2)
       bouncy-castle-java (>= 1.5.0146.1)
-    multi_json (1.3.6)
-    rack (1.4.1)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    multi_json (1.5.0)
+    rack (1.5.1)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    webmock (1.8.9)
+    rspec-mocks (2.12.1)
+    webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)

data/README.rdoc

@@ -3,14 +3,17 @@
 OAuth 2.0 Server & Client Library.
 Both Bearer and MAC token type are supported.
 
-The OAuth 2.0 Authorization Protocol (draft 18)
-http://tools.ietf.org/html/draft-ietf-oauth-v2-18
+{<img src="https://secure.travis-ci.org/nov/rack-oauth2.png" />}[http://travis-ci.org/nov/rack-oauth2]
+{<img src="http://www.pledgie.com/campaigns/19044.png?skin_name=chrome" />}[http://www.pledgie.com/campaigns/19044]
 
-The OAuth 2.0 Protocol: Bearer Tokens (draft 06)
+The OAuth 2.0 Authorization Framework (RFC 6749)
+http://www.rfc-editor.org/rfc/rfc6749.txt
+
+The OAuth 2.0 Authorization Framework: Bearer Token Usage (RFC 6750)
 http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-06
 
 HTTP Authentication: MAC Access Authentication (draft 01)
-http://www.ietf.org/id/draft-ietf-oauth-v2-http-mac-01.txt
+http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
 
 == Installation
 
@@ -62,7 +65,7 @@ Resource Request (request both for resource owner resource and for client resour
 https://gist.github.com/933885
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/rack/oauth2/access_token/legacy.rb

@@ -4,7 +4,10 @@ module Rack
       class Legacy < AccessToken
         def initialize(attributes = {})
           super
-          self.expires_in = self.expires_in.try(:to_i)
+          self.expires_in = (
+            self.expires_in ||
+            attributes[:expires]
+          ).try(:to_i)
         end
 
         def to_s # This is for fb_graph

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

@@ -6,7 +6,7 @@ module Rack
         # request:: HTTP::Message
         def filter_request(request)
           started = "======= [Rack::OAuth2] HTTP REQUEST STARTED ======="
-          OAuth2.logger.info [started, request.dump].join("\n")
+          log started, request.dump
         end
 
         # Callback called in HTTPClient (after received a response)
@@ -14,7 +14,15 @@ module Rack
         # response:: HTTP::Message
         def filter_response(request, response)
           finished = "======= [Rack::OAuth2] HTTP REQUEST FINISHED ======="
-          OAuth2.logger.info ['-' * 50, response.dump, finished].join("\n")
+          log '-' * 50, response.dump, finished
+        end
+
+        private
+
+        def log(*outputs)
+          outputs.each do |output|
+            OAuth2.logger.info output
+          end
         end
       end
     end

data/lib/rack/oauth2/server/resource/bearer.rb

@@ -27,7 +27,7 @@ module Rack
             end
 
             def access_token_in_header
-              if @auth_header.provided? && @auth_header.scheme == :bearer
+              if @auth_header.provided? && @auth_header.scheme.to_s == 'bearer'
                 @auth_header.params
               else
                 nil

data/lib/rack/oauth2/server/resource/mac.rb

@@ -24,7 +24,7 @@ module Rack
             end
 
             def oauth2?
-              @auth_header.provided? && @auth_header.scheme == :mac
+              @auth_header.provided? && @auth_header.scheme.to_s == 'mac'
             end
           end
         end

data/spec/mock_response/tokens/legacy.txt

@@ -1 +1 @@
-access_token=access_token&expires_in=3600
+access_token=access_token&expires=3600

data/spec/rack/oauth2/debugger/request_filter_spec.rb

@@ -8,21 +8,25 @@ describe Rack::OAuth2::Debugger::RequestFilter do
 
   describe '#filter_request' do
     it 'should log request' do
-      Rack::OAuth2.logger.should_receive(:info).with(
-        "======= [Rack::OAuth2] HTTP REQUEST STARTED =======\n" +
+      [
+        "======= [Rack::OAuth2] HTTP REQUEST STARTED =======",
         request.dump
-      )
+      ].each do |output|
+        Rack::OAuth2.logger.should_receive(:info).with output
+      end
       request_filter.filter_request(request)
     end
   end
 
   describe '#filter_response' do
     it 'should log response' do
-      Rack::OAuth2.logger.should_receive(:info).with(
-        "--------------------------------------------------\n" +
-        response.dump +
-        "\n======= [Rack::OAuth2] HTTP REQUEST FINISHED ======="
-      )
+      [
+        "--------------------------------------------------",
+        response.dump,
+        "======= [Rack::OAuth2] HTTP REQUEST FINISHED ======="
+      ].each do |output|
+        Rack::OAuth2.logger.should_receive(:info).with output
+      end
       request_filter.filter_response(request, response)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -296,6 +296,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1898578761038848884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: