rack-oauth2 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90fa661cf571c18624c58c6dfe85a3616809075f
-  data.tar.gz: db05caa92211bc5ce751fb85ab4ccac4e1838da0
+  metadata.gz: d4f8ab7573542af30fbe99bfd06a10c441bfd525
+  data.tar.gz: 842c686858c196d10450911d8dfc6122f765914a
 SHA512:
-  metadata.gz: 50a031423c464511fba404360d87caf811b865996e1d9e569a397ad301fd7aab51c5742022e015264a01db6f1321290feb6c6aa793f0af0bd372241297ea4803
-  data.tar.gz: 72be0f93db4b6e023de1ae3a98bf779603b2d3a426bf4c06698f65b15db340364a6a1588c613e49a01eb9a3cded31a26f0fdae376cbf4f98ada02e169dadaf11
+  metadata.gz: bca0b37a82253f9246926bd47438580da3f006d06280e3a211dab8c446737fe147c9d4906c09a5df28b331006c2c89adc692ba66ac17984405e606d42317f2db
+  data.tar.gz: 3a0ce7a0ae2b2fd0d8e152e011fa5d054b304293f5674c5ffc3e64224639648658d8cb1851d06e39f0188c3c694df1b1cf6ec52fa7eb8c728d523ddd76bf453c

data/.travis.yml

@@ -1,4 +1,3 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0

data/Rakefile

@@ -13,7 +13,7 @@ if RUBY_VERSION >= '1.9'
     end
   end
   task :spec do
-    Rake::Task['cover_me:report'].invoke
+    Rake::Task['cover_me:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
   end
 else
   RSpec::Core::RakeTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/rack/oauth2/client.rb

@@ -45,8 +45,17 @@ module Rack
         )
       end
 
-      def access_token!(client_auth_method = :basic)
+      def access_token!(*args)
         headers, params = {}, @grant.as_json
+
+        # NOTE:
+        #  Using Array#estract_options! for backward compatibility.
+        #  Until v1.0.5, the first argument was 'client_auth_method' in scalar.
+        options = args.extract_options!
+        client_auth_method = args.first || options[:client_auth_method] || :basic
+
+        params[:scope] = Array(options[:scope]).join(' ') if options[:scope].present?
+
         if secret && client_auth_method == :basic
           cred = ["#{identifier}:#{secret}"].pack('m').tr("\n", '')
           headers.merge!(

data/spec/rack/oauth2/client_spec.rb

@@ -96,7 +96,7 @@ describe Rack::OAuth2::Client do
         client.access_token!
       end
 
-      context 'when' do
+      context 'when other auth method specified' do
         it do
           mock_response(
             :post,
@@ -115,6 +115,23 @@ describe Rack::OAuth2::Client do
       end
     end
 
+    describe 'scopes' do
+      context 'when scope option given' do
+        it 'should specify given scope' do
+          mock_response(
+            :post,
+            'https://server.example.com/oauth2/token',
+            'tokens/bearer.json',
+            :params => {
+              :grant_type => 'client_credentials',
+              :scope => 'a b'
+            }
+          )
+          client.access_token! :scope => [:a, :b]
+        end
+      end
+    end
+
     context 'when bearer token is given' do
       before  do
         client.authorization_code = 'code'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported
@@ -321,4 +321,3 @@ test_files:
 - spec/rack/oauth2/server/token_spec.rb
 - spec/rack/oauth2/util_spec.rb
 - spec/spec_helper.rb
-has_rdoc: