rack-oauth2 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d323b7513cd60355bbdf46ce163a68f6e75f63cb
-  data.tar.gz: f508b741b88d65f5bf09ab18d6b679014cfacb3d
+  metadata.gz: 85fbc5f6cc2f9216589bebdf3f9e56e0a3b2af4a
+  data.tar.gz: 9c9774de8ba9e8b4bd4ff346dec70626105ebea1
 SHA512:
-  metadata.gz: fc1f0130aecb1bb3eb84d5b2f4bf49ff22de41b21cbb64bbf150e6c98c9e5d89cfe61fda81757f180cabe96d3e630c2e9a502375c2a0e96da3f9ba3634aa7ab0
-  data.tar.gz: 1d2ab83033f3609f6a0458034917fcc1954ff419cd77e247c4d06fb0de2008192ebd5e1aa9d9804e8a05d7269586ed6f924972087d0e3d0b8863b4d92b91d78e
+  metadata.gz: 989642e1ae224eee2deab2738024d2214fe2b3478f13367be33371af8141297ce363d8ae8845acf4117a1da13ca320c6932d3bc74f77964ca7facc825fcf4c07
+  data.tar.gz: 58c119cabf5525303d7166a34833196c63814a4082bfb13a5744eafc4fb2faee66de32b628e357d9e6881b5b553acf4b80f8487b203ccff23771be54907aa589

data/README.rdoc

@@ -21,9 +21,8 @@ http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
 == Resources
 
 * View Source on GitHub (https://github.com/nov/rack-oauth2)
+* Docs on GitHub (https://github.com/nov/rack-oauth2/wiki)
 * 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)
 

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/rack/oauth2.rb

@@ -2,7 +2,8 @@ require 'rack'
 require 'multi_json'
 require 'httpclient'
 require 'logger'
-require 'active_support/all'
+require 'active_support'
+require 'active_support/core_ext'
 require 'attr_required'
 require 'attr_optional'
 

data/lib/rack/oauth2/util.rb

@@ -47,7 +47,7 @@ module Rack
           given.path = '/' if given.path.blank?
           [:scheme, :host, :port].all? do |key|
             base.send(key) == given.send(key)
-          end && /^#{base.path}/ =~ given.path
+          end && !!(/^#{base.path}/ =~ given.path)
         rescue
           false
         end

data/rack-oauth2.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.add_runtime_dependency "rack", ">= 1.1"
   s.add_runtime_dependency "multi_json", ">= 1.3.6"
-  s.add_runtime_dependency "httpclient", ">= 2.2.0.2"
+  s.add_runtime_dependency "httpclient", ">= 2.4"
   s.add_runtime_dependency "activesupport", ">= 2.3"
   s.add_runtime_dependency "attr_required", ">= 0.0.5"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "rspec", ">= 2"
-  s.add_development_dependency "webmock", ">= 1.6.2"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-its"
+  s.add_development_dependency "webmock"
 end

data/spec/helpers/webmock_helper.rb

@@ -13,13 +13,12 @@ module WebMockHelper
 
   def request_for(method, options = {})
     request = {}
-    if options[:params]
-      case method
-      when :post, :put
-        request[:body] = options[:params]
-      else
-        request[:query] = options[:params]
-      end
+    params = options.try(:[], :params) || {}
+    case method
+    when :post, :put, :delete
+      request[:body] = params
+    else
+      request[:query] = params
     end
     if options[:request_header]
       request[:headers] = options[:request_header]

data/spec/rack/oauth2/access_token/authenticator_spec.rb

@@ -7,7 +7,7 @@ describe Rack::OAuth2::AccessToken::Authenticator do
 
   shared_examples_for :authenticator do
     it 'should let the token authenticate the request' do
-      token.should_receive(:authenticate).with(request)
+      expect(token).to receive(:authenticate).with(request)
       authenticator.filter_request(request)
     end
   end

data/spec/rack/oauth2/access_token/bearer_spec.rb

@@ -11,7 +11,7 @@ describe Rack::OAuth2::AccessToken::Bearer do
 
   describe '.authenticate' do
     it 'should set Authorization header' do
-      request.header.should_receive(:[]=).with('Authorization', 'Bearer access_token')
+      expect(request.header).to receive(:[]=).with('Authorization', 'Bearer access_token')
       token.authenticate(request)
     end
   end

data/spec/rack/oauth2/access_token/legacy_spec.rb

@@ -16,7 +16,7 @@ describe Rack::OAuth2::AccessToken::Legacy do
 
   describe '.authenticate' do
     it 'should set Authorization header' do
-      request.header.should_receive(:[]=).with('Authorization', 'OAuth access_token')
+      expect(request.header).to receive(:[]=).with('Authorization', 'OAuth access_token')
       token.authenticate(request)
     end
   end

data/spec/rack/oauth2/access_token/mac_spec.rb

@@ -121,8 +121,8 @@ describe Rack::OAuth2::AccessToken::MAC do
       let(:signature) { 'pOBaL6HRawe4tUPmcU4vJEj1f2GJqrbQOlCcdAYgI/s=' }
 
       it 'should set Authorization header' do
-        token.should_receive(:generate_nonce).and_return(nonce)
-        request.header.should_receive(:[]=).with('Authorization', "MAC id=\"access_token\", nonce=\"#{nonce}\", ts=\"#{ts.to_i}\", mac=\"#{signature}\"")
+        expect(token).to receive(:generate_nonce).and_return(nonce)
+        expect(request.header).to receive(:[]=).with('Authorization', "MAC id=\"access_token\", nonce=\"#{nonce}\", ts=\"#{ts.to_i}\", mac=\"#{signature}\"")
         token.authenticate(request)
       end
     end
@@ -131,8 +131,8 @@ describe Rack::OAuth2::AccessToken::MAC do
       let(:signature) { 'vgU0fj6rSpwUCAoCOrXlu8pZBR8a5Q5xIVlB4MCvJeM=' }
       let(:ext) { '3d011e09502a84552a0f8ae112d024cc2c115597e3a577d5f49007902c221dc5' }
       it 'should set Authorization header with ext_verifier' do
-        token_with_ext_verifier.should_receive(:generate_nonce).and_return(nonce)
-        request.header.should_receive(:[]=).with('Authorization', "MAC id=\"access_token\", nonce=\"#{nonce}\", ts=\"#{ts.to_i}\", mac=\"#{signature}\", ext=\"#{ext}\"")
+        expect(token_with_ext_verifier).to receive(:generate_nonce).and_return(nonce)
+        expect(request.header).to receive(:[]=).with('Authorization', "MAC id=\"access_token\", nonce=\"#{nonce}\", ts=\"#{ts.to_i}\", mac=\"#{signature}\", ext=\"#{ext}\"")
         token_with_ext_verifier.authenticate(request)
       end
     end

data/spec/rack/oauth2/access_token_spec.rb

@@ -51,7 +51,7 @@ describe Rack::OAuth2::AccessToken do
   [:get, :delete, :post, :put].each do |method|
     describe method do
       it 'should delegate to HTTPClient with Authenticator filter' do
-        token.httpclient.should_receive(method).with(resource_endpoint)
+        expect(token.httpclient).to receive(method).with(resource_endpoint)
         token.httpclient.request_filter.last.should be_a Rack::OAuth2::AccessToken::Authenticator
         token.send method, resource_endpoint
       end

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

@@ -12,7 +12,7 @@ describe Rack::OAuth2::Debugger::RequestFilter do
         "======= [Rack::OAuth2] HTTP REQUEST STARTED =======",
         request.dump
       ].each do |output|
-        Rack::OAuth2.logger.should_receive(:info).with output
+        expect(Rack::OAuth2.logger).to receive(:info).with output
       end
       request_filter.filter_request(request)
     end
@@ -25,7 +25,7 @@ describe Rack::OAuth2::Debugger::RequestFilter do
         response.dump,
         "======= [Rack::OAuth2] HTTP REQUEST FINISHED ======="
       ].each do |output|
-        Rack::OAuth2.logger.should_receive(:info).with output
+        expect(Rack::OAuth2.logger).to receive(:info).with output
       end
       request_filter.filter_response(request, response)
     end

data/spec/rack/oauth2/oauth2_spec.rb

@@ -5,27 +5,27 @@ describe Rack::OAuth2 do
   after { Rack::OAuth2.debugging = false }
 
   its(:logger) { should be_a Logger }
-  its(:debugging?) { should be_false }
+  its(:debugging?) { should == false }
 
   describe '.debug!' do
     before { Rack::OAuth2.debug! }
-    its(:debugging?) { should be_true }
+    its(:debugging?) { should == true }
   end
 
   describe '.debug' do
     it 'should enable debugging within given block' do
       Rack::OAuth2.debug do
-        Rack::OAuth2.debugging?.should be_true
+        Rack::OAuth2.debugging?.should == true
       end
-      Rack::OAuth2.debugging?.should be_false
+      Rack::OAuth2.debugging?.should == false
     end
 
     it 'should not force disable debugging' do
       Rack::OAuth2.debug!
       Rack::OAuth2.debug do
-        Rack::OAuth2.debugging?.should be_true
+        Rack::OAuth2.debugging?.should == true
       end
-      Rack::OAuth2.debugging?.should be_true
+      Rack::OAuth2.debugging?.should == true
     end
   end
 
@@ -33,7 +33,7 @@ describe Rack::OAuth2 do
     context 'when request_filter added' do
       context 'when "debug!" is called' do
         after { Rack::OAuth2.reset_http_config! }
-  
+
         it 'should put Debugger::RequestFilter at last' do
           Rack::OAuth2.debug!
           Rack::OAuth2.http_config do |config|

data/spec/rack/oauth2/util_spec.rb

@@ -73,24 +73,24 @@ describe Rack::OAuth2::Util do
   describe '.uri_match?' do
     context 'when invalid URI is given' do
       it do
-        util.uri_match?('::', '::').should be_false
-        util.uri_match?(123, 'http://client.example.com/other').should be_false
-        util.uri_match?('http://client.example.com/other', nil).should be_false
+        util.uri_match?('::', '::').should == false
+        util.uri_match?(123, 'http://client.example.com/other').should == false
+        util.uri_match?('http://client.example.com/other', nil).should == false
       end
     end
 
     context 'when exactry same' do
-      it { util.uri_match?(uri, uri).should be_true }
+      it { util.uri_match?(uri, uri).should == true }
     end
 
     context 'when path prefix matches' do
-      it { util.uri_match?(uri, "#{uri}/deep_path").should be_true }
+      it { util.uri_match?(uri, "#{uri}/deep_path").should == true }
     end
 
     context 'otherwise' do
       it do
-        util.uri_match?(uri, 'http://client.example.com/other').should be_false
-        util.uri_match?(uri, 'http://attacker.example.com/callback').should be_false
+        util.uri_match?(uri, 'http://client.example.com/other').should == false
+        util.uri_match?(uri, 'http://attacker.example.com/callback').should == false
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,15 @@ SimpleCov.start do
 end
 
 require 'rspec'
+require 'rspec/its'
 require 'rack/oauth2'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
 require 'helpers/time'
 require 'helpers/webmock_helper'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 description: OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are
   supported.
 email: nov@matake.jp