oauth2 0.4.1 → 0.5.0

metadata

@@ -1,109 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oauth2
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Michael Bleigh
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: faraday
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70092424464720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70092424464720
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70092424463940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.5
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json_pure
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70092424463940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70092424463400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70092424463400
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70092424462900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70092424462900
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70092424462440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70092424462440
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &70092424461860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '4.5'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70092424461860
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: &70092424461480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.
-email: michael@intridea.com
+  prerelease: false
+  version_requirements: *70092424461480
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70092424460880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70092424460880
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70092424460060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70092424460060
+description: A Ruby wrapper for the OAuth 2.0 protocol built with a similar style
+  to the original OAuth gem.
+email:
+- michael@intridea.com
+- sferik@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .autotest
 - .document
 - .gemtest
 - .gitignore
 - .rspec
 - .travis.yml
-- CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -111,50 +136,49 @@ files:
 - lib/oauth2.rb
 - lib/oauth2/access_token.rb
 - lib/oauth2/client.rb
-- lib/oauth2/response_object.rb
+- lib/oauth2/error.rb
+- lib/oauth2/response.rb
+- lib/oauth2/strategy/auth_code.rb
 - lib/oauth2/strategy/base.rb
 - lib/oauth2/strategy/password.rb
-- lib/oauth2/strategy/web_server.rb
 - lib/oauth2/version.rb
 - oauth2.gemspec
+- spec/helper.rb
 - spec/oauth2/access_token_spec.rb
 - spec/oauth2/client_spec.rb
+- spec/oauth2/response_spec.rb
+- spec/oauth2/strategy/auth_code_spec.rb
 - spec/oauth2/strategy/base_spec.rb
 - spec/oauth2/strategy/password_spec.rb
-- spec/oauth2/strategy/web_server_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/intridea/oauth2
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5.1
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for the OAuth 2.0 protocol.
-test_files: 
+test_files:
+- spec/helper.rb
 - spec/oauth2/access_token_spec.rb
 - spec/oauth2/client_spec.rb
+- spec/oauth2/response_spec.rb
+- spec/oauth2/strategy/auth_code_spec.rb
 - spec/oauth2/strategy/base_spec.rb
 - spec/oauth2/strategy/password_spec.rb
-- spec/oauth2/strategy/web_server_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 

data/CHANGELOG.md

@@ -1,21 +0,0 @@
-# CHANGELOG
-
-* [0.4.1 - April 20, 2011](https://github.com/intridea/oauth2/compare/v0.4.0...v0.4.1)
-* [0.4.0 - April 20, 2011](https://github.com/intridea/oauth2/compare/v0.3.0...v0.4.0)
-* [0.3.0 - April 8, 2011](https://github.com/intridea/oauth2/compare/v0.2.0...v0.3.0)
-* [0.2.0 - April 1, 2011](https://github.com/intridea/oauth2/compare/v0.1.1...v0.2.0)
-* [0.1.1 - January 12, 2011](https://github.com/intridea/oauth2/compare/v0.1.0...v0.1.1)
-* [0.1.0 - October 13, 2010](https://github.com/intridea/oauth2/compare/v0.0.13...v0.1.0)
-* [0.0.13 - August 17, 2010](https://github.com/intridea/oauth2/compare/v0.0.12...v0.0.13)
-* [0.0.12 - August 17, 2010](https://github.com/intridea/oauth2/compare/v0.0.11...v0.0.12)
-* [0.0.11 - August 17, 2010](https://github.com/intridea/oauth2/compare/v0.0.10...v0.0.11)
-* [0.0.10 - June 19, 2010](https://github.com/intridea/oauth2/compare/v0.0.9...v0.0.10)
-* [0.0.9 - June 18, 2010](https://github.com/intridea/oauth2/compare/v0.0.8...v0.0.9)
-* [0.0.8 - April 27, 2010](https://github.com/intridea/oauth2/compare/v0.0.7...v0.0.8)
-* [0.0.7 - April 27, 2010](https://github.com/intridea/oauth2/compare/v0.0.6...v0.0.7)
-* [0.0.6 - April 25, 2010](https://github.com/intridea/oauth2/compare/v0.0.5...v0.0.6)
-* [0.0.5 - April 23, 2010](https://github.com/intridea/oauth2/compare/v0.0.4...v0.0.5)
-* [0.0.4 - April 22, 2010](https://github.com/intridea/oauth2/compare/v0.0.3...v0.0.4)
-* [0.0.3 - April 22, 2010](https://github.com/intridea/oauth2/compare/v0.0.2...v0.0.3)
-* [0.0.2 - April 22, 2010](https://github.com/intridea/oauth2/compare/v0.0.1...v0.0.2)
-* [0.0.1 - April 22, 2010](https://github.com/intridea/oauth2/compare/311d9f42e52b832119170d90e818f0f0b0078851...v0.0.1)

data/lib/oauth2/response_object.rb

@@ -1,58 +0,0 @@
-module OAuth2
-  module ResponseObject
-    def self.from(response)
-      object = MultiJson.decode(response.body)
-
-      case object
-        when Array
-          ResponseArray.new(response, object)
-        when Hash
-          ResponseHash.new(response, object)
-        else
-          ResponseString.new(response)
-      end
-    rescue
-      ResponseString.new(response)
-    end
-
-    def self.included(base)
-      base.class_eval do
-        attr_accessor :response
-      end
-    end
-
-    def headers; response.headers end
-    def status; response.status end
-  end
-
-  class ResponseHash < Hash
-    include ResponseObject
-
-    def initialize(response, hash)
-      self.response = response
-      hash.keys.each{|k| self[k] = hash[k]}
-    end
-  end
-
-  class ResponseArray < Array
-    include ResponseObject
-
-    def initialize(response, array)
-      self.response = response
-      super(array)
-    end
-  end
-
-  # This special String class is returned from HTTP requests
-  # and contains the original full response along with convenience
-  # methods for accessing the HTTP status code and headers. It
-  # is returned from all access token requests.
-  class ResponseString < String
-    include ResponseObject
-
-    def initialize(response)
-      super(response.body.to_s)
-      self.response = response
-    end
-  end
-end

data/lib/oauth2/strategy/web_server.rb

@@ -1,58 +0,0 @@
-require 'multi_json'
-
-module OAuth2
-  module Strategy
-    class WebServer < Base
-      def authorize_params(options={}) #:nodoc:
-        super(options).merge('response_type' => 'code')
-      end
-
-      # Retrieve an access token given the specified validation code.
-      # Note that you must also provide a <tt>:redirect_uri</tt> option
-      # in order to successfully verify your request for most OAuth 2.0
-      # endpoints.
-      def get_access_token(code, options={})
-        response = @client.request(@client.token_method, @client.access_token_url, access_token_params(code, options))
-        parse_response(response)
-      end
-
-      def refresh_access_token(refresh_token, options={})
-        response = @client.request(@client.token_method, @client.access_token_url, refresh_token_params(refresh_token, options))
-        parse_response(response, refresh_token)
-      end
-
-      def access_token_params(code, options={}) #:nodoc:
-        super(options).merge({
-          'grant_type' => 'authorization_code',
-          'code' => code,
-        })
-      end
-
-      def refresh_token_params(refresh_token, options={}) #:nodoc:
-        super(options).merge({
-          'grant_type' => 'refresh_token',
-          'refresh_token' => refresh_token,
-        })
-      end
-
-      def parse_response(response, refresh_token = nil)
-        if response.is_a? Hash
-          params = response
-        else
-          params = MultiJson.decode(response) rescue nil
-          # the ActiveSupport JSON parser won't cause an exception when
-          # given a formencoded string, so make sure that it was
-          # actually parsed in an Hash. This covers even the case where
-          # it caused an exception since it'll still be nil.
-          params = Rack::Utils.parse_query(response) unless params.is_a? Hash
-        end
-
-        access = params.delete('access_token')
-        refresh = params.delete('refresh_token') || refresh_token
-        # params['expires'] is only for Facebook
-        expires_in = params.delete('expires_in') || params.delete('expires')
-        OAuth2::AccessToken.new(@client, access, refresh, expires_in, params)
-      end
-    end
-  end
-end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -1,138 +0,0 @@
-require 'spec_helper'
-
-describe OAuth2::Strategy::WebServer do
-  let(:client) do
-    cli = OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com')
-    cli.connection.build do |b|
-      b.adapter :test do |stub|
-        stub.get('/oauth/access_token?client_id=abc&client_secret=def&code=sushi&grant_type=authorization_code') do |env|
-          case @mode
-          when "formencoded"
-            [200, {}, 'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve']
-          when "json"
-            [200, {}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout","extra_param":"steve"}']
-          when "from_facebook"
-            [200, {}, 'expires=600&access_token=salmon&refresh_token=trout&extra_param=steve']
-          end
-        end
-        stub.post('/oauth/access_token', { 'client_id' => 'abc', 'client_secret' => 'def', 'code' => 'sushi', 'grant_type' => 'authorization_code' }) do |env|
-          case @mode
-          when "formencoded"
-            [200, {}, 'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve']
-          when "json"
-            [200, {}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout","extra_param":"steve"}']
-          when "from_facebook"
-            [200, {}, 'expires=600&access_token=salmon&refresh_token=trout&extra_param=steve']
-          end
-        end
-        stub.get('/oauth/access_token?client_id=abc&client_secret=def&grant_type=refresh_token&refresh_token=trout') do |env|
-          case @mode
-          when "formencoded"
-            [200, {}, 'expires_in=600&access_token=tuna']
-          when "json"
-            [200, {}, '{"expires_in":600,"access_token":"tuna"}']
-          end
-        end
-        stub.post('/oauth/access_token', { 'client_id' => 'abc', 'client_secret' => 'def', 'refresh_token' => 'trout', 'grant_type' => 'refresh_token' }) do |env|
-          case @mode
-          when "formencoded"
-            [200, {}, 'expires_in=600&access_token=tuna']
-          when "json"
-            [200, {}, '{"expires_in":600,"access_token":"tuna"}']
-          end
-        end
-      end
-    end
-    cli
-  end
-  subject{client.web_server}
-
-  describe '#authorize_url' do
-    it 'should include the client_id' do
-      subject.authorize_url.should be_include('client_id=abc')
-    end
-
-    it 'should include the type' do
-      subject.authorize_url.should be_include('response_type=code')
-    end
-
-    it 'should include passed in options' do
-      cb = 'http://myserver.local/oauth/callback'
-      subject.authorize_url(:redirect_uri => cb).should be_include("redirect_uri=#{Rack::Utils.escape(cb)}")
-    end
-  end
-
-  %w(json formencoded from_facebook).each do |mode|
-    [false, true].each do |parse_json|
-      [:get, :post].each do |verb|
-        describe "#get_access_token (#{mode}, token_method=#{verb} parse_json=#{parse_json})" do
-          before do
-            @mode = mode
-            client.json=parse_json
-            client.token_method=verb
-            @access = subject.get_access_token('sushi')
-          end
-
-          it 'returns AccessToken with same Client' do
-            @access.client.should == client
-          end
-
-          it 'returns AccessToken with #token' do
-            @access.token.should == 'salmon'
-          end
-
-          it 'returns AccessToken with #refresh_token' do
-            @access.refresh_token.should == 'trout'
-          end
-
-          it 'returns AccessToken with #expires_in' do
-            @access.expires_in.should == 600
-          end
-
-          it 'returns AccessToken with #expires_at' do
-            @access.expires_at.should be_kind_of(Time)
-          end
-
-          it 'returns AccessToken with params accessible via []' do
-            @access['extra_param'].should == 'steve'
-          end
-        end
-      end
-    end
-  end
-
-  %w(json formencoded).each do |mode|
-    [false, true].each do |parse_json|
-      [:get].each do |verb|
-        describe "#refresh_access_token (#{mode}, token_method=#{verb} parse_json=#{parse_json})" do
-          before do
-            @mode = mode
-            client.json=parse_json
-            client.token_method=verb
-            @access = subject.refresh_access_token('trout')
-          end
-
-           it 'returns AccessToken with same Client' do
-             @access.client.should == client
-           end
-
-          it 'returns AccessToken with #token' do
-            @access.token.should == 'tuna'
-          end
-
-          it 'returns AccessToken with #refresh_token' do
-            @access.refresh_token.should == 'trout'
-          end
-
-          it 'returns AccessToken with #expires_in' do
-            @access.expires_in.should == 600
-          end
-
-          it 'returns AccessToken with #expires_at' do
-            @access.expires_at.should be_kind_of(Time)
-          end
-        end
-      end
-    end
-  end
-end