oauth2 0.1.1 → 0.2.0

data/.gitignore

@@ -26,6 +26,7 @@ log
 *.gem
 .bundle
 pkg
+Gemfile.lock
 
 ## RCOV
 coverage.data

data/.rspec

@@ -1,3 +1,3 @@
 --color
---backtrace
 --format=nested
+--backtrace

data/Rakefile

@@ -2,25 +2,10 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-desc "Run all examples"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w[--color]
-end
-
-task :cleanup_rcov_files do
-  rm_rf 'coverage.data'
-end
-
-namespace :spec do
-  desc "Run all examples using rcov"
-  RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-    t.rcov = true
-    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
-    t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
-  end
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+task :test => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/lib/oauth2/access_token.rb

@@ -10,7 +10,7 @@ module OAuth2
       @expires_in = (expires_in.nil? || expires_in == '') ? nil : expires_in.to_i
       @expires_at = Time.now + @expires_in if @expires_in
       @params = params
-      @token_param = 'access_token'
+      @token_param = 'oauth_token'
     end
 
     def [](key)
@@ -22,6 +22,10 @@ module OAuth2
       !!@expires_in
     end
 
+    def expired?
+      expires? && expires_at < Time.now
+    end
+
     def request(verb, path, params = {}, headers = {})
       params = params.merge token_param => @token
       headers = headers.merge 'Authorization' => "OAuth #{@token}"

data/lib/oauth2/client.rb

@@ -2,18 +2,6 @@ require 'faraday'
 
 module OAuth2
   class Client
-    class << self
-      def default_connection_adapter
-        warn '[DEPRECATED] OAuth2::Client#default_connection_adapter is deprecated, use Faraday.default_adapter instead. Will be removed in 0.1.0'
-        Faraday.default_adapter
-      end
-
-      def default_connection_adapter=(adapter)
-        warn '[DEPRECATED] OAuth2::Client#default_connection_adapter is deprecated, use Faraday.default_adapter instead. Will be removed in 0.1.0'
-        Faraday.default_adapter = adapter
-      end
-    end
-
     attr_accessor :id, :secret, :site, :connection, :options
     attr_writer :json
 
@@ -62,7 +50,7 @@ module OAuth2
       else
         resp = connection.run_request(verb, url, params, headers)
       end
-      
+
       case resp.status
         when 200..299
           if json?

data/lib/oauth2/response_object.rb

@@ -14,35 +14,35 @@ module OAuth2
     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
@@ -55,4 +55,4 @@ module OAuth2
       self.response = response
     end
   end
-end
+end

data/lib/oauth2/strategy/web_server.rb

@@ -4,7 +4,7 @@ module OAuth2
   module Strategy
     class WebServer < Base
       def authorize_params(options = {}) #:nodoc:
-        super(options).merge('type' => 'web_server')
+        super(options).merge('response_type' => 'code')
       end
 
       # Retrieve an access token given the specified validation code.
@@ -14,16 +14,20 @@ module OAuth2
       def get_access_token(code, options = {})
         response = @client.request(:post, @client.access_token_url, access_token_params(code, options))
 
-        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
+        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['access_token']
         refresh  = params['refresh_token']
-        expires_in = params['expires_in']
+        expires_in = params['expires_in'] || params['expires'] # params['expires'] is only for facebook
         OAuth2::AccessToken.new(@client, access, refresh, expires_in, params)
       end
 
@@ -35,7 +39,7 @@ module OAuth2
 
       def access_token_params(code, options = {}) #:nodoc:
         super(options).merge({
-          'type' => 'web_server',
+          'grant_type' => 'authorization_code',
           'code' => code
         })
       end

data/lib/oauth2/version.rb

@@ -1,3 +1,3 @@
 module OAuth2
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/oauth2.gemspec

@@ -4,7 +4,6 @@ require File.expand_path("../lib/oauth2/version", __FILE__)
 Gem::Specification.new do |s|
   s.name = "oauth2"
   s.version = OAuth2::VERSION
-  s.rubyforge_project = 'oauth2'
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
   s.description = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
@@ -17,10 +16,11 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.add_runtime_dependency("faraday", "~> 0.5.0")
+  s.add_runtime_dependency("faraday", "~> 0.6.0")
   s.add_runtime_dependency("multi_json", "~> 0.0.4")
-  s.add_development_dependency("json_pure", "~> 1.4.6")
+  s.add_development_dependency("json_pure", "~> 1.5")
   s.add_development_dependency("rake", "~> 0.8")
-  s.add_development_dependency("rcov", "~> 0.9")
-  s.add_development_dependency("rspec", "~> 2.4.0")
+  s.add_development_dependency("simplecov", "~> 0.4")
+  s.add_development_dependency("rspec", "~> 2.5")
+  s.add_development_dependency("ZenTest", "~> 4.5")
 end

data/spec/oauth2/access_token_spec.rb

@@ -5,10 +5,10 @@ describe OAuth2::AccessToken do
     cli = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com')
     cli.connection.build do |b|
       b.adapter :test do |stub|
-        stub.get('/client?access_token=monkey') { |env| [200, {}, 'get']    }
-        stub.post('/client')                    { |env| [200, {}, 'access_token=' << env[:body]['access_token']] }
-        stub.put('/client')                     { |env| [200, {}, 'access_token=' << env[:body]['access_token']] }
-        stub.delete('/client')                  { |env| [200, {}, 'access_token=' << env[:body]['access_token']] }
+        stub.get('/client?oauth_token=monkey') { |env| [200, {}, 'get']    }
+        stub.post('/client')                   { |env| [200, {}, 'oauth_token=' << env[:body]['oauth_token']] }
+        stub.put('/client')                    { |env| [200, {}, 'oauth_token=' << env[:body]['oauth_token']] }
+        stub.delete('/client')                 { |env| [200, {}, 'oauth_token=' << env[:body]['oauth_token']] }
       end
     end
     cli
@@ -30,7 +30,7 @@ describe OAuth2::AccessToken do
 
     %w(post put delete).each do |http_method|
       it "makes #{http_method.upcase} requests with access token" do
-        subject.send(http_method.to_sym, 'client').should == 'access_token=monkey'
+        subject.send(http_method.to_sym, 'client').should == 'oauth_token=monkey'
       end
     end
   end
@@ -57,4 +57,21 @@ describe OAuth2::AccessToken do
       subject.expires_at.should == (@now + 600)
     end
   end
+
+  describe '#expired?' do
+    it 'should be false if there is no expires_at' do
+      OAuth2::AccessToken.new(client, token).should_not be_expired
+    end
+
+    it 'should be false if expires_at is in the future' do
+      OAuth2::AccessToken.new(client, token, 'abaca', 10800).should_not be_expired
+    end
+
+    it 'should be true if expires_at is in the past' do
+      access = OAuth2::AccessToken.new(client, token, 'abaca', 600)
+      @now = Time.now + 10800
+      Time.stub!(:now).and_return(@now)
+      access.should be_expired
+    end
+  end
 end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -11,6 +11,8 @@ describe OAuth2::Strategy::WebServer do
               [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
       end
@@ -25,7 +27,7 @@ describe OAuth2::Strategy::WebServer do
     end
 
     it 'should include the type' do
-      subject.authorize_url.should be_include('type=web_server')
+      subject.authorize_url.should be_include('response_type=code')
     end
 
     it 'should include passed in options' do
@@ -34,35 +36,38 @@ describe OAuth2::Strategy::WebServer do
     end
   end
 
-  %w(json formencoded).each do |mode|
-    describe "#get_access_token (#{mode})" do
-      before do
-        @mode = mode
-        @access = subject.get_access_token('sushi')
-      end
+  %w(json formencoded from_facebook).each do |mode|
+    [false, true].each do |parse_json|
+      describe "#get_access_token (#{mode}, parse_json=#{parse_json})" do
+        before do
+          @mode = mode
+          client.json=parse_json
+          @access = subject.get_access_token('sushi')
+        end
 
-      it 'returns AccessToken with same Client' do
-        @access.client.should == client
-      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 #token' do
+          @access.token.should == 'salmon'
+        end
 
-      it 'returns AccessToken with #refresh_token' do
-        @access.refresh_token.should == 'trout'
-      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_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 #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'
+        it 'returns AccessToken with params accessible via []' do
+          @access['extra_param'].should == 'steve'
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
+require 'simplecov'
+SimpleCov.start
 require 'oauth2'
 require 'rspec'
 require 'rspec/autorun'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: oauth2
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -06:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
         version: 0.0.4
   type: :runtime
   version_requirements: *id002
@@ -55,11 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+        version: "1.5"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -70,24 +54,18 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: simplecov
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+        version: "0.4"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -98,13 +76,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+        version: "2.5"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "4.5"
+  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
 executables: []
@@ -116,11 +101,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gemtest
 - .gitignore
 - .rspec
 - CHANGELOG.rdoc
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -137,7 +122,6 @@ files:
 - spec/oauth2/strategy/base_spec.rb
 - spec/oauth2/strategy/web_server_spec.rb
 - spec/spec_helper.rb
-- specs.watchr
 has_rdoc: true
 homepage: http://github.com/intridea/oauth2
 licenses: []
@@ -152,23 +136,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
-rubyforge_project: oauth2
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for the OAuth 2.0 protocol.

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    oauth2 (0.1.1)
-      faraday (~> 0.5.0)
-      multi_json (~> 0.0.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.1.2)
-    diff-lcs (1.1.2)
-    faraday (0.5.0)
-      addressable (~> 2.1.1)
-      multipart-post (~> 1.0.1)
-      rack (~> 1.2.1)
-    json_pure (1.4.6)
-    multi_json (0.0.4)
-    multipart-post (1.0.1)
-    rack (1.2.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  faraday (~> 0.5.0)
-  json_pure (~> 1.4.6)
-  multi_json (~> 0.0.4)
-  oauth2!
-  rake (~> 0.8)
-  rcov (~> 0.9)
-  rspec (~> 2.4.0)

data/specs.watchr

@@ -1,61 +0,0 @@
-# Run me with:
-#
-#   $ watchr specs.watchr
- 
-# --------------------------------------------------
-# Convenience Methods
-# --------------------------------------------------
-def all_test_files
-  Dir['spec/**/*_spec.rb']
-end
- 
-def run_test_matching(thing_to_match)
-  matches = all_test_files.grep(/#{thing_to_match}/i)
-  if matches.empty?
-    puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"  
-  else
-    run matches.join(' ')
-  end
-end
- 
-def run(files_to_run)
-  puts("Running: #{files_to_run}")
-  system("clear;spec -cfs --backtrace #{files_to_run}")
-  no_int_for_you
-end
- 
-def run_all_tests
-  # system("clear;rake spec")
-  run(all_test_files.join(' '))
-end
- 
-# --------------------------------------------------
-# Watchr Rules
-# --------------------------------------------------
-watch('^spec/(.*)_spec\.rb')   { |m| run_test_matching(m[1]) }
-watch('^lib/(.*)\.rb')         { |m| run_test_matching(m[1]) }
-watch('^sites/(.*)\.rb')         { |m| run_test_matching(m[1]) }
-watch('^spec/spec_helper\.rb') { run_all_tests }
-watch('^spec/support/.*\.rb')   { run_all_tests }
- 
-# --------------------------------------------------
-# Signal Handling
-# --------------------------------------------------
- 
-def no_int_for_you
-  @sent_an_int = nil
-end
- 
-Signal.trap 'INT' do
-  if @sent_an_int then      
-    puts "   A second INT?  Ok, I get the message.  Shutting down now."
-    exit
-  else
-    puts "   Did you just send me an INT? Ugh.  I'll quit for real if you do it again."
-    @sent_an_int = true
-    Kernel.sleep 1.5
-    run_all_tests
-  end
-end
- 
-# vim:ft=ruby