oauth2 0.0.3 → 0.0.4

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "michael@intridea.com"
     gem.homepage = "http://github.com/intridea/oauth2"
     gem.authors = ["Michael Bleigh"]
+    gem.add_dependency 'faraday', '~> 0.3.0'
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/oauth2.rb

@@ -4,7 +4,6 @@ module OAuth2
   class HTTPError < ErrorWithResponse; end
 end
 
-require 'oauth2/uri'
 require 'oauth2/client'
 require 'oauth2/strategy/base'
 require 'oauth2/strategy/web_server'

data/lib/oauth2/access_token.rb

@@ -1,6 +1,6 @@
 module OAuth2
   class AccessToken
-    attr_accessor :token
+    attr_reader :client, :token
 
     def initialize(client, token)
       @client = client

data/lib/oauth2/client.rb

@@ -1,8 +1,13 @@
-require 'net/https'
+require 'faraday'
 
 module OAuth2
   class Client
-    attr_accessor :id, :secret, :site, :options
+    class << self
+      attr_accessor :default_connection_adapter
+    end
+    self.default_connection_adapter = :net_http
+
+    attr_accessor :id, :secret, :site, :connection, :options
     
     # Instantiate a new OAuth 2.0 client using the
     # client ID and client secret registered to your
@@ -16,66 +21,41 @@ module OAuth2
     # <tt>:access_token_path</tt> :: Specify the path to the access token endpoint.
     # <tt>:access_token_url</tt> :: Specify the full URL of the access token endpoint.
     def initialize(client_id, client_secret, opts = {})
-      self.id = client_id
-      self.secret = client_secret
-      self.site = opts.delete(:site) if opts[:site]
-      self.options = opts
+      adapter         = opts.delete(:adapter) || self.class.default_connection_adapter
+      self.id         = client_id
+      self.secret     = client_secret
+      self.site       = opts.delete(:site) if opts[:site]
+      self.options    = opts
+      self.connection = Faraday::Connection.new(site)
+      if adapter != :test
+        connection.build { |b| b.adapter(adapter) }
+      end
     end
     
-    def authorize_url
-      return options[:authorize_url] if options[:authorize_url]
-
-      uri = URI.parse(site)
-      uri.path = options[:authorize_path] || "/oauth/authorize"
-      uri.to_s
+    def authorize_url(params = nil)
+      path = options[:authorize_url] || options[:authorize_path] || "/oauth/authorize"
+      connection.build_url(path, params).to_s
     end
     
-    def access_token_url
-      return options[:access_token_url] if options[:access_token_url]
-
-      uri = URI.parse(site)
-      uri.path = options[:access_token_path] || "/oauth/access_token"
-      uri.to_s
+    def access_token_url(params = nil)
+      path = options[:access_token_url] || options[:access_token_path] || "/oauth/access_token"
+      connection.build_url(path, params).to_s
     end
     
-    def request(verb, url_or_path, params = {}, headers = {})
-      if url_or_path[0..3] == 'http'
-        uri = URI.parse(url_or_path)
-        path = uri.path
-      else
-        uri = URI.parse(self.site)
-        path = (uri.path + url_or_path).gsub('//','/')
+    def request(verb, url, params = {}, headers = {})
+      resp = connection.run_request(verb, url, nil, headers) do |req|
+        req.params.update(params)
       end
-      
-      net = Net::HTTP.new(uri.host, uri.port)
-      net.use_ssl = (uri.scheme == 'https')
-      
-      net.start do |http|
-        if verb == :get
-          uri.query_hash = uri.query_hash.merge(params)
-          path += "?#{uri.query}"
-        end
-        
-        req = Net::HTTP.const_get(verb.to_s.capitalize).new(path, headers)
-        
-        unless verb == :get
-          req.set_form_data(params)
-        end
-        
-        response = http.request(req)
-        
-        case response
-          when Net::HTTPSuccess
-            response.body
-          when Net::HTTPUnauthorized
-            e = OAuth2::AccessDenied.new("Received HTTP 401 when retrieving access token.")
-            e.response = response
-            raise e
-          else
-            e = OAuth2::HTTPError.new("Received HTTP #{response.code} when retrieving access token.")
-            e.response = response
-            raise e
-        end
+      case resp.status
+        when 200...201 then resp.body
+        when 401
+          e = OAuth2::AccessDenied.new("Received HTTP 401 when retrieving access token.")
+          e.response = resp
+          raise e
+        else
+          e = OAuth2::HTTPError.new("Received HTTP #{resp.status} when retrieving access token.")
+          e.response = resp
+          raise e
       end
     end
     

data/lib/oauth2/strategy/base.rb

@@ -6,9 +6,7 @@ module OAuth2
       end
     
       def authorize_url(options = {}) #:nodoc:
-        uri = URI.parse(@client.authorize_url)
-        uri.query_hash = authorize_params(options)
-        uri.to_s
+        @client.authorize_url(authorize_params(options))
       end
     
       def authorize_params(options = {}) #:nodoc:
@@ -17,9 +15,7 @@ module OAuth2
       end
       
       def access_token_url(options = {})
-        uri = URI.parse(@client.access_token_url)
-        uri.query_hash = access_token_params(options)
-        uri.to_s
+        @client.access_token_url(access_token_params(options))
       end
       
       def access_token_params(options = {})

data/lib/oauth2/strategy/web_server.rb

@@ -7,7 +7,8 @@ module OAuth2
       
       def access_token(code, options = {})
         response = @client.request(:get, @client.access_token_url, access_token_params(code, options))
-        token = response.split('&').inject({}){|h,kv| (k,v) = kv.split('='); h[k] = v; h}['access_token']
+        params   = Rack::Utils.parse_query(response)
+        token    = params['access_token']
         OAuth2::AccessToken.new(@client, token)
       end
       

data/oauth2.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth2}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
@@ -28,12 +28,11 @@ Gem::Specification.new do |s|
      "lib/oauth2/client.rb",
      "lib/oauth2/strategy/base.rb",
      "lib/oauth2/strategy/web_server.rb",
-     "lib/oauth2/uri.rb",
      "oauth2.gemspec",
+     "spec/oauth2/access_token_spec.rb",
      "spec/oauth2/client_spec.rb",
      "spec/oauth2/strategy/base_spec.rb",
      "spec/oauth2/strategy/web_server_spec.rb",
-     "spec/oauth2/uri_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "specs.watchr"
@@ -44,10 +43,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Ruby wrapper for the OAuth 2.0 protocol.}
   s.test_files = [
-    "spec/oauth2/client_spec.rb",
+    "spec/oauth2/access_token_spec.rb",
+     "spec/oauth2/client_spec.rb",
      "spec/oauth2/strategy/base_spec.rb",
      "spec/oauth2/strategy/web_server_spec.rb",
-     "spec/oauth2/uri_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -56,11 +55,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.3.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
+      s.add_dependency(%q<faraday>, ["~> 0.3.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
+    s.add_dependency(%q<faraday>, ["~> 0.3.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/spec/oauth2/access_token_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe OAuth2::AccessToken do
+  let(:client) 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?access_token=monkey')   { |env| [200, {}, 'post']   }
+        stub.put('/client?access_token=monkey')    { |env| [200, {}, 'put']    }
+        stub.delete('/client?access_token=monkey') { |env| [200, {}, 'delete'] }
+      end
+    end
+    cli
+  end
+
+  let(:token)  { 'monkey' }
+
+  subject { OAuth2::AccessToken.new(client, token) }
+
+  describe '#initialize' do
+    it 'should assign client and token' do
+      subject.client.should == client
+      subject.token.should  == token
+    end
+
+    %w(get 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 == http_method
+      end
+    end
+  end
+end

data/spec/oauth2/client_spec.rb

@@ -1,7 +1,17 @@
 require 'spec_helper'
 
 describe OAuth2::Client do
-  subject{ OAuth2::Client.new('abc','def', :site => 'https://api.example.com')}
+  subject do
+    cli = OAuth2::Client.new('abc','def', :site => 'https://api.example.com')
+    cli.connection.build do |b|
+      b.adapter :test do |stub|
+        stub.get('/success')      { |env| [200, {}, 'yay'] }
+        stub.get('/unauthorized') { |env| [401, {}, '']    }
+        stub.get('/error')        { |env| [500, {}, '']    }
+      end
+    end
+    cli
+  end
   
   describe '#initialize' do
     it 'should assign id and secret' do
@@ -12,6 +22,10 @@ describe OAuth2::Client do
     it 'should assign site from the options hash' do
       subject.site.should == 'https://api.example.com'
     end
+
+    it 'should assign Faraday::Connection#host' do
+      subject.connection.host.should == 'api.example.com'
+    end
   end
   
   %w(authorize access_token).each do |path_type|
@@ -31,7 +45,21 @@ describe OAuth2::Client do
       end
     end
   end
-  
+
+  describe "#request" do
+    it "returns response body on successful response" do
+      subject.request(:get, '/success', {}, {}).should == 'yay'
+    end
+
+    it "raises OAuth2::AccessDenied on 401 response" do
+      lambda { subject.request(:get, '/unauthorized', {}, {}) }.should raise_error(OAuth2::AccessDenied)
+    end
+
+    it "raises OAuth2::HTTPError on error response" do
+      lambda { subject.request(:get, '/error', {}, {}) }.should raise_error(OAuth2::HTTPError)
+    end
+  end
+
   it '#web_server should instantiate a WebServer strategy with this client' do
     subject.web_server.should be_kind_of(OAuth2::Strategy::WebServer)
   end

data/spec/oauth2/strategy/web_server_spec.rb

@@ -1,8 +1,19 @@
 require 'spec_helper'
 
 describe OAuth2::Strategy::WebServer do
-  let(:client){ OAuth2::Client.new('abc','def', :site => 'http://api.example.com') }
+  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?code=sushi&client_id=abc&client_secret=def&type=web_server') do |env| 
+          [200, {}, 'a=1&access_token=salmon']
+        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')
@@ -14,7 +25,21 @@ describe OAuth2::Strategy::WebServer do
     
     it 'should include passed in options' do
       cb = 'http://myserver.local/oauth/callback'
-      subject.authorize_url(:redirect_uri => cb).should be_include("redirect_uri=#{CGI.escape(cb)}")
+      subject.authorize_url(:redirect_uri => cb).should be_include("redirect_uri=#{Rack::Utils.escape(cb)}")
+    end
+  end
+
+  describe "#access_token" do
+    before do
+      @access = subject.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
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'oauth2'
 require 'spec'
 require 'spec/autorun'
 
+OAuth2::Client.default_connection_adapter = :test
+
 Spec::Runner.configure do |config|
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -18,9 +18,23 @@ date: 2010-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -30,7 +44,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 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: []
@@ -52,12 +66,11 @@ files:
 - lib/oauth2/client.rb
 - lib/oauth2/strategy/base.rb
 - lib/oauth2/strategy/web_server.rb
-- lib/oauth2/uri.rb
 - oauth2.gemspec
+- spec/oauth2/access_token_spec.rb
 - spec/oauth2/client_spec.rb
 - spec/oauth2/strategy/base_spec.rb
 - spec/oauth2/strategy/web_server_spec.rb
-- spec/oauth2/uri_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - specs.watchr
@@ -92,8 +105,8 @@ signing_key:
 specification_version: 3
 summary: A Ruby wrapper for the OAuth 2.0 protocol.
 test_files: 
+- spec/oauth2/access_token_spec.rb
 - spec/oauth2/client_spec.rb
 - spec/oauth2/strategy/base_spec.rb
 - spec/oauth2/strategy/web_server_spec.rb
-- spec/oauth2/uri_spec.rb
 - spec/spec_helper.rb

data/lib/oauth2/uri.rb

@@ -1,14 +0,0 @@
-require 'uri'
-require 'cgi'
-
-module URI
-  class Generic
-    def query_hash
-      CGI.parse(self.query || '').inject({}){|hash, (k,v)| hash[k] = (v.size == 1 ? v.first : v); hash}
-    end
-    
-    def query_hash=(hash)
-      self.query = hash.map{|(k,v)| "#{k}=#{CGI.escape(v)}"}.join('&')
-    end
-  end
-end

data/spec/oauth2/uri_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe URI::Generic do
-  subject{ URI.parse('http://example.com')}
-  
-  describe '#query_hash' do
-    it 'should be a hash of the query parameters' do
-      subject.query_hash.should == {}
-      subject.query = 'abc=def&foo=123'
-      subject.query_hash.should == {'abc' => 'def', 'foo' => '123'}
-    end
-  end
-  
-  describe '#query_hash=' do
-    it 'should set the query' do
-      subject.query_hash = {'abc' => 'def'}
-      subject.query.should == 'abc=def'
-      subject.query_hash = {'abc' => 'foo', 'bar' => 'baz'}
-      subject.query.should be_include('abc=foo')
-      subject.query.should be_include('bar=baz')
-      subject.query.split('&').size.should == 2
-    end
-    
-    it 'should escape stuff' do
-      subject.query_hash = {'abc' => '$%!!'}
-      subject.query.should == "abc=#{CGI.escape('$%!!')}"
-    end
-  end
-end