oauth2 0.0.6 → 0.0.7

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.0.7 (April 27)
+
+* Updating Faraday dependency for improved SSL support (via technoweenie)
+
 == 0.0.6 (April 25)
 
 * Added ResponseString so as not to throw away response information when making requests.

data/README.rdoc

@@ -22,7 +22,7 @@ Below is a fully functional example of a Sinatra application that would authenti
     require 'json'
 
     def client
-      OAuth2::Client.new('api_key', 'api_secret', :site => 'https://graph.facebook.com')
+      OAuth2::Client.new('app_id', 'app_secret', :site => 'https://graph.facebook.com')
     end
 
     get '/auth/facebook' do

data/Rakefile

@@ -10,7 +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_dependency 'faraday', '~> 0.4.1'
     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.6
+0.0.7

data/lib/oauth2/client.rb

@@ -3,9 +3,16 @@ require 'faraday'
 module OAuth2
   class Client
     class << self
-      attr_accessor :default_connection_adapter
+      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
-    self.default_connection_adapter = :net_http
 
     attr_accessor :id, :secret, :site, :connection, :options
 
@@ -21,13 +28,13 @@ 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 = {})
-      adapter         = opts.delete(:adapter) || self.class.default_connection_adapter
+      adapter         = opts.delete(: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
+      if adapter && adapter != :test
         connection.build { |b| b.adapter(adapter) }
       end
     end

data/oauth2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth2}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-04-25}
+  s.date = %q{2010-04-27}
   s.description = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [
@@ -57,14 +57,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_runtime_dependency(%q<faraday>, ["~> 0.4.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<faraday>, ["~> 0.3.0"])
+      s.add_dependency(%q<faraday>, ["~> 0.4.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<faraday>, ["~> 0.3.0"])
+    s.add_dependency(%q<faraday>, ["~> 0.4.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 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, {}, 'post']   }
-        stub.put('/client')    { |env| [200, {}, 'put']    }
-        stub.delete('/client') { |env| [200, {}, 'delete'] }
+        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']] }
       end
     end
     cli
@@ -24,9 +24,13 @@ describe OAuth2::AccessToken do
       subject.token.should  == token
     end
 
-    %w(get post put delete).each do |http_method|
+    it "makes GET requests with access token" do
+      subject.send(:get, 'client').should == 'get'
+    end
+
+    %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 == http_method
+        subject.send(http_method.to_sym, 'client').should == 'access_token=monkey'
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'oauth2'
 require 'spec'
 require 'spec/autorun'
 
-OAuth2::Client.default_connection_adapter = :test
+Faraday.default_adapter = :test
 
 Spec::Runner.configure do |config|
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -04:00
+date: 2010-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        - 4
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency