signet 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.1
+
+* Updated to keep in sync with the new httpadapter changes
+
 == 0.2.0
 
 * Added support for OAuth 2.0 draft 10

data/lib/signet/oauth_1/client.rb

@@ -587,7 +587,7 @@ module Signet
       #     The Authorization realm.  See RFC 2617.
       #   - <code>:adapter</code> —
       #     The HTTP adapter.
-      #     Defaults to <code>HTTPAdapter::NetHTTPRequestAdapter</code>.
+      #     Defaults to <code>HTTPAdapter::NetHTTPAdapter.new</code>.
       #   - <code>:connection</code> —
       #     An open, manually managed HTTP connection.
       #     Must be of type <code>HTTPAdapter::Connection</code> and the
@@ -607,11 +607,11 @@ module Signet
         unless adapter
           require 'httpadapter'
           require 'httpadapter/adapters/net_http'
-          adapter = HTTPAdapter::NetHTTPRequestAdapter
+          adapter = HTTPAdapter::NetHTTPAdapter.new
         end
         connection = options[:connection]
         request = self.generate_temporary_credential_request(options)
-        response = HTTPAdapter.transmit(request, adapter, connection)
+        response = adapter.transmit(request, connection)
         status, headers, body = response
         merged_body = StringIO.new
         body.each do |chunk|
@@ -657,7 +657,7 @@ module Signet
       #     The Authorization realm.  See RFC 2617.
       #   - <code>:adapter</code> —
       #     The HTTP adapter.
-      #     Defaults to <code>HTTPAdapter::NetHTTPRequestAdapter</code>.
+      #     Defaults to <code>HTTPAdapter::NetHTTPAdapter.new</code>.
       #   - <code>:connection</code> —
       #     An open, manually managed HTTP connection.
       #     Must be of type <code>HTTPAdapter::Connection</code> and the
@@ -762,7 +762,7 @@ module Signet
       #     The Authorization realm.  See RFC 2617.
       #   - <code>:adapter</code> —
       #     The HTTP adapter.
-      #     Defaults to <code>HTTPAdapter::NetHTTPRequestAdapter</code>.
+      #     Defaults to <code>HTTPAdapter::NetHTTPAdapter.new</code>.
       #   - <code>:connection</code> —
       #     An open, manually managed HTTP connection.
       #     Must be of type <code>HTTPAdapter::Connection</code> and the
@@ -780,11 +780,11 @@ module Signet
         unless adapter
           require 'httpadapter'
           require 'httpadapter/adapters/net_http'
-          adapter = HTTPAdapter::NetHTTPRequestAdapter
+          adapter = HTTPAdapter::NetHTTPAdapter.new
         end
         connection = options[:connection]
         request = self.generate_token_credential_request(options)
-        response = HTTPAdapter.transmit(request, adapter, connection)
+        response = adapter.transmit(request, connection)
         status, headers, body = response
         merged_body = StringIO.new
         body.each do |chunk|
@@ -830,7 +830,7 @@ module Signet
       #     The Authorization realm.  See RFC 2617.
       #   - <code>:adapter</code> —
       #     The HTTP adapter.
-      #     Defaults to <code>HTTPAdapter::NetHTTPRequestAdapter</code>.
+      #     Defaults to <code>HTTPAdapter::NetHTTPAdapter.new</code>.
       #   - <code>:connection</code> —
       #     An open, manually managed HTTP connection.
       #     Must be of type <code>HTTPAdapter::Connection</code> and the
@@ -895,9 +895,8 @@ module Signet
         if options[:request]
           if options[:request].kind_of?(Array)
             request = options[:request]
-          elsif options[:adapter] || options[:request].respond_to?(:to_ary)
-            request =
-              HTTPAdapter.adapt_request(options[:request], options[:adapter])
+          elsif options[:adapter]
+            request = options[:adapter].adapt_request(options[:request])
           end
           method, uri, headers, body = request
         else
@@ -992,7 +991,7 @@ module Signet
       #     The Authorization realm.  See RFC 2617.
       #   - <code>:adapter</code> —
       #     The HTTP adapter.
-      #     Defaults to <code>HTTPAdapter::NetHTTPRequestAdapter</code>.
+      #     Defaults to <code>HTTPAdapter::NetHTTPAdapter.new</code>.
       #   - <code>:connection</code> —
       #     An open, manually managed HTTP connection.
       #     Must be of type <code>HTTPAdapter::Connection</code> and the
@@ -1012,7 +1011,7 @@ module Signet
       #     :request => Typhoeus::Request.new(
       #       'http://www.example.com/protected/resource'
       #     ),
-      #     :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+      #     :adapter => HTTPAdapter::TyphoeusAdapter.new,
       #     :connection => connection
       #   )
       #   status, headers, body = response
@@ -1023,11 +1022,11 @@ module Signet
         unless adapter
           require 'httpadapter'
           require 'httpadapter/adapters/net_http'
-          adapter = HTTPAdapter::NetHTTPRequestAdapter
+          adapter = HTTPAdapter::NetHTTPAdapter.new
         end
         connection = options[:connection]
         request = self.generate_authenticated_request(options)
-        response = HTTPAdapter.transmit(request, adapter, connection)
+        response = adapter.transmit(request, connection)
         status, headers, body = response
         merged_body = StringIO.new
         body.each do |chunk|

data/lib/signet/oauth_2/client.rb

@@ -646,11 +646,11 @@ module Signet
         unless adapter
           require 'httpadapter'
           require 'httpadapter/adapters/net_http'
-          adapter = HTTPAdapter::NetHTTPRequestAdapter
+          adapter = HTTPAdapter::NetHTTPAdapter.new
         end
         connection = options[:connection]
         request = self.generate_access_token_request
-        response = HTTPAdapter.transmit(request, adapter, connection)
+        response = adapter.transmit(request, connection)
         status, headers, body = response
         merged_body = StringIO.new
         body.each do |chunk|
@@ -722,9 +722,8 @@ module Signet
         if options[:request]
           if options[:request].kind_of?(Array)
             request = options[:request]
-          elsif options[:adapter] || options[:request].respond_to?(:to_ary)
-            request =
-              HTTPAdapter.adapt_request(options[:request], options[:adapter])
+          elsif options[:adapter]
+            request = options[:adapter].adapt_request(options[:request])
           end
           method, uri, headers, body = request
         else
@@ -790,7 +789,7 @@ module Signet
       #     The Authorization realm.  See RFC 2617.
       #   - <code>:adapter</code> —
       #     The HTTP adapter.
-      #     Defaults to <code>HTTPAdapter::NetHTTPRequestAdapter</code>.
+      #     Defaults to <code>HTTPAdapter::NetHTTPAdapter.new</code>.
       #   - <code>:connection</code> —
       #     An open, manually managed HTTP connection.
       #     Must be of type <code>HTTPAdapter::Connection</code> and the
@@ -810,7 +809,7 @@ module Signet
       #     :request => Typhoeus::Request.new(
       #       'http://www.example.com/protected/resource'
       #     ),
-      #     :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+      #     :adapter => HTTPAdapter::TyphoeusAdapter.new,
       #     :connection => connection
       #   )
       #   status, headers, body = response
@@ -821,11 +820,11 @@ module Signet
         unless adapter
           require 'httpadapter'
           require 'httpadapter/adapters/net_http'
-          adapter = HTTPAdapter::NetHTTPRequestAdapter
+          adapter = HTTPAdapter::NetHTTPAdapter.new
         end
         connection = options[:connection]
         request = self.generate_authenticated_request(options)
-        response = HTTPAdapter.transmit(request, adapter, connection)
+        response = adapter.transmit(request, connection)
         status, headers, body = response
         merged_body = StringIO.new
         body.each do |chunk|

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 2
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/signet/oauth_1/services/google_spec.rb

@@ -15,6 +15,7 @@
 require 'spec_helper'
 
 require 'signet/oauth_1/client'
+require 'httpadapter'
 require 'httpadapter/adapters/typhoeus'
 require 'stringio'
 
@@ -63,7 +64,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
         :join => [:run, [], nil]
       )
       @client.fetch_temporary_credential!(
-        :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+        :adapter => HTTPAdapter::TyphoeusAdapter.new,
         :connection => connection,
         :additional_parameters => {
           :scope => 'https://www.google.com/m8/feeds/'
@@ -131,7 +132,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
     @client.temporary_credential_secret = '8E1BF0J6ovMva0j87atj/tTG'
     @client.fetch_token_credential!(
       :verifier => 'XbVKagBShNsAGBRJWoC4gtFR',
-      :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+      :adapter => HTTPAdapter::TyphoeusAdapter.new,
       :connection => connection,
       :additional_parameters => {
         :scope => 'https://www.google.com/m8/feeds/'
@@ -162,7 +163,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
       @client.temporary_credential_secret = '8E1BF0J6ovMva0j87atj/tTG'
       @client.fetch_token_credential!(
         :verifier => 'XbVKagBShNsAGBRJWoC4gtFR',
-        :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+        :adapter => HTTPAdapter::TyphoeusAdapter.new,
         :connection => connection,
         :additional_parameters => {
           :scope => 'https://www.google.com/m8/feeds/'
@@ -190,7 +191,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
       '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
     @client.token_credential_secret = 'Ew3YHAY4bcBryiOUvbdHGa57'
     response = @client.fetch_protected_resource(
-      :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+      :adapter => HTTPAdapter::TyphoeusAdapter.new,
       :connection => connection,
       :uri =>
         'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
@@ -221,7 +222,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
       '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
     @client.token_credential_secret = 'Ew3YHAY4bcBryiOUvbdHGa57'
     response = @client.fetch_protected_resource(
-      :adapter => HTTPAdapter::TyphoeusRequestAdapter,
+      :adapter => HTTPAdapter::TyphoeusAdapter.new,
       :connection => connection,
       :request => Typhoeus::Request.new(
         'http://www-opensocial.googleusercontent.com/api/people/@me/@self',

data/tasks/gem.rake

@@ -22,7 +22,7 @@ namespace :gem do
     s.extra_rdoc_files = %w( README )
     s.rdoc_options.concat ["--main",  "README"]
 
-    s.add_runtime_dependency("httpadapter", "~> 0.2.0")
+    s.add_runtime_dependency("httpadapter", "~> 1.0.0")
     s.add_runtime_dependency("addressable", "~> 2.2.1")
     s.add_runtime_dependency("json", "~> 1.5.0")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: signet
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
+        - 1
         - 0
-        - 2
         - 0
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency