signet 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.1.3
+
+* fixed issue with headers passed in as a Hash
+* fixed incompatibilities with Ruby 1.8.6
+
 == 0.1.2
 
 * fixed bug with overzealous normalization

data/lib/compat/digest/hmac.rb

@@ -37,6 +37,15 @@
 #
 
 require 'digest'
+if !''.respond_to?(:bytesize) || !''.respond_to?(:bytes)
+  begin
+    require 'backports/1.8.7'
+  rescue LoadError
+    STDERR.puts "Please install backports:"
+    STDERR.puts "sudo gem install backports"
+    exit(1)
+  end
+end
 
 unless defined?(Digest::HMAC)
   module Digest

data/lib/signet/oauth_1.rb

@@ -284,7 +284,9 @@ module Signet #:nodoc:
       # be a temporary credential secret when obtaining a token credential
       # for the first time
       base_string = self.generate_base_string(method, uri, parameters)
-      signature_method = Hash[parameters]['oauth_signature_method']
+      signature_method = (
+        parameters.inject({}) { |h,(k,v)| h[k]=v; h }
+      )['oauth_signature_method']
       case signature_method
       when 'HMAC-SHA1'
         require 'signet/oauth_1/signature_methods/hmac_sha1'
@@ -358,8 +360,9 @@ module Signet #:nodoc:
       parsed_uri = Addressable::URI.parse(authorization_uri)
       query_values = parsed_uri.query_values || {}
       if options[:additional_parameters]
-        query_values =
-          query_values.merge(Hash[options[:additional_parameters]])
+        query_values = query_values.merge(
+          options[:additional_parameters].inject({}) { |h,(k,v)| h[k]=v; h }
+        )
       end
       if temporary_credential_key
         query_values['oauth_token'] = temporary_credential_key

data/lib/signet/oauth_1/client.rb

@@ -870,6 +870,7 @@ module Signet #:nodoc:
           headers = options[:headers] || []
           body = options[:body] || ''
         end
+        headers = headers.to_a if headers.kind_of?(Hash)
         request_components = {
           :method => method,
           :uri => uri,

data/lib/signet/oauth_1/credential.rb

@@ -75,7 +75,7 @@ module Signet #:nodoc:
             args = args.first.to_ary
           end
           if args.all? { |value| value.kind_of?(Array) }
-            parameters = Hash[args]
+            parameters = args.inject({}) { |h,(k,v)| h[k]=v; h }
             @key = key_from_hash.call(parameters)
             @secret = secret_from_hash.call(parameters)
           elsif args.size == 2

data/lib/signet/version.rb

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

data/spec/signet/oauth_1/client_spec.rb

@@ -560,9 +560,9 @@ describe Signet::OAuth1::Client, 'configured' do
       headers.each do |(header, value)|
         authorization_header = value if header == 'Authorization'
       end
-      parameters = Hash[::Signet::OAuth1.parse_authorization_header(
+      parameters = ::Signet::OAuth1.parse_authorization_header(
         authorization_header
-      )]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
       parameters.should_not have_key('oauth_client_credential_key')
       parameters.should_not have_key('oauth_temporary_credential_key')
       parameters.should_not have_key('oauth_token')
@@ -589,9 +589,9 @@ describe Signet::OAuth1::Client, 'configured' do
       headers.each do |(header, value)|
         authorization_header = value if header == 'Authorization'
       end
-      parameters = Hash[::Signet::OAuth1.parse_authorization_header(
+      parameters = ::Signet::OAuth1.parse_authorization_header(
         authorization_header
-      )]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
       parameters.should_not have_key('oauth_client_credential_key')
       parameters.should_not have_key('oauth_temporary_credential_key')
       parameters.should_not have_key('oauth_callback')
@@ -627,9 +627,9 @@ describe Signet::OAuth1::Client, 'configured' do
         authorization_header = value if header == 'Authorization'
       end
       merge_body(body).should == ''
-      parameters = Hash[::Signet::OAuth1.parse_authorization_header(
+      parameters = ::Signet::OAuth1.parse_authorization_header(
         authorization_header
-      )]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
       parameters.should_not have_key('oauth_client_credential_key')
       parameters.should_not have_key('oauth_temporary_credential_key')
       parameters.should_not have_key('oauth_token_credential_key')
@@ -669,9 +669,9 @@ describe Signet::OAuth1::Client, 'configured' do
         authorization_header = value if header == 'Authorization'
       end
       merge_body(body).should == 'file=vacation.jpg&size=original'
-      parameters = Hash[::Signet::OAuth1.parse_authorization_header(
+      parameters = ::Signet::OAuth1.parse_authorization_header(
         authorization_header
-      )]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
       parameters.should_not have_key('oauth_client_credential_key')
       parameters.should_not have_key('oauth_temporary_credential_key')
       parameters.should_not have_key('oauth_token_credential_key')

data/spec/signet/oauth_1/credential_spec.rb

@@ -66,7 +66,7 @@ describe Signet::OAuth1::Credential, 'with a Hash for initialization' do
   it 'should allow parameters to be specified as an implicit Hash' do
     class ParameterHashSet
       def initialize(parameters)
-        @parameters = Hash[parameters]
+        @parameters = parameters.inject({}) { |h,(k,v)| h[k]=v; h }
       end
 
       def to_hash
@@ -156,7 +156,7 @@ describe Signet::OAuth1::Credential, 'with a Hash for initialization' do
     token = Signet::OAuth1::Credential.new(
       "dpf43f3p2l4k3l03", "kd94hf93k423kf44"
     )
-    parameters = Hash[token]
+    parameters = token.to_h
     parameters['oauth_token'].should == "dpf43f3p2l4k3l03"
     parameters['oauth_token_secret'].should == "kd94hf93k423kf44"
   end

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

@@ -197,7 +197,8 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
     )
     status, headers, body = response
     status.should == 200
-    Hash[headers]['Content-Type'].should == 'application/json'
+    headers = headers.inject({}) { |h,(k,v)| h[k]=v; h }
+    headers['Content-Type'].should == 'application/json'
     merge_body(body).should == '{"data":"goes here"}'
   end
 
@@ -229,7 +230,8 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
     )
     status, headers, body = response
     status.should == 200
-    Hash[headers]['Content-Type'].should == 'application/json'
+    headers = headers.inject({}) { |h,(k,v)| h[k]=v; h }
+    headers['Content-Type'].should == 'application/json'
     merge_body(body).should == '{"data":"goes here"}'
   end
 end

data/spec/signet/oauth_1_spec.rb

@@ -330,7 +330,7 @@ describe Signet::OAuth1 do
   end
 
   it 'should correctly parse an authorization header' do
-    parameters = Hash[Signet::OAuth1.parse_authorization_header(
+    parameters = Signet::OAuth1.parse_authorization_header(
       'OAuth realm="http://sp.example.com/", ' +
       'oauth_consumer_key="0685bd9184jfhq22", ' +
       'oauth_token="ad180jjd733klru7", ' +
@@ -339,7 +339,7 @@ describe Signet::OAuth1 do
       'oauth_timestamp="137131200", ' +
       'oauth_nonce="4572616e48616d6d65724c61686176", ' +
       'oauth_version="1.0"'
-    )]
+    ).inject({}) { |h,(k,v)| h[k]=v; h }
     parameters['realm'].should == 'http://sp.example.com/'
     parameters['oauth_consumer_key'].should == '0685bd9184jfhq22'
     parameters['oauth_token'].should == 'ad180jjd733klru7'
@@ -464,14 +464,13 @@ describe Signet::OAuth1, 'when generating temporary credentials parameters' do
     @signature_method = 'HMAC-SHA1'
     @scope = 'http://photos.example.com/full_access'
     @additional_parameters = [['scope', @scope]]
-    @unsigned_parameters = Hash[
+    @unsigned_parameters =
       Signet::OAuth1.unsigned_temporary_credential_parameters(
         :client_credential_key => @client_credential_key,
         :callback => @callback,
         :signature_method => @signature_method,
         :additional_parameters => @additional_parameters
-      )
-    ]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
   end
 
   it 'should raise an error if the client credential key is missing' do
@@ -533,14 +532,13 @@ describe Signet::OAuth1, 'when generating token credential parameters' do
     @temporary_credential_key = 'hh5s93j4hdidpola'
     @verifier = '473f82d3'
     @signature_method = 'HMAC-SHA1'
-    @unsigned_parameters = Hash[
+    @unsigned_parameters =
       Signet::OAuth1.unsigned_token_credential_parameters(
         :client_credential_key => @client_credential_key,
         :temporary_credential_key => @temporary_credential_key,
         :signature_method => @signature_method,
         :verifier => @verifier
-      )
-    ]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
   end
 
   it 'should raise an error if the client credential key is missing' do
@@ -623,13 +621,12 @@ describe Signet::OAuth1, 'when generating protected resource parameters' do
     @client_credential_key = 'dpf43f3p2l4k3l03'
     @token_credential_key = 'nnch734d00sl2jdk'
     @signature_method = 'HMAC-SHA1'
-    @unsigned_parameters = Hash[
+    @unsigned_parameters =
       Signet::OAuth1.unsigned_resource_parameters(
         :client_credential_key => @client_credential_key,
         :token_credential_key => @token_credential_key,
         :signature_method => @signature_method
-      )
-    ]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
   end
 
   it 'should raise an error if the client credential key is missing' do
@@ -700,14 +697,13 @@ describe Signet::OAuth1, 'when generating token credential parameters ' +
     )
     @verifier = '473f82d3'
     @signature_method = 'HMAC-SHA1'
-    @unsigned_parameters = Hash[
+    @unsigned_parameters =
       Signet::OAuth1.unsigned_token_credential_parameters(
         :client_credential => @client_credential,
         :temporary_credential => @temporary_credential,
         :signature_method => @signature_method,
         :verifier => @verifier
-      )
-    ]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
   end
 
   it 'should have the correct client credential key' do
@@ -759,13 +755,12 @@ describe Signet::OAuth1, 'when generating token credential parameters ' +
     )
     @verifier = '473f82d3'
     @signature_method = 'HMAC-SHA1'
-    @unsigned_parameters = Hash[
+    @unsigned_parameters =
       Signet::OAuth1.unsigned_token_credential_parameters(
         :client => @client,
         :signature_method => @signature_method,
         :verifier => @verifier
-      )
-    ]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
   end
 
   it 'should have the correct client credential key' do
@@ -818,14 +813,13 @@ describe Signet::OAuth1, 'when generating token credential parameters ' +
     )
     @verifier = '473f82d3'
     @signature_method = 'HMAC-SHA1'
-    @unsigned_parameters = Hash[
+    @unsigned_parameters =
       Signet::OAuth1.unsigned_token_credential_parameters(
         :client_credential => @client_credential,
         :temporary_credential => @temporary_credential,
         :signature_method => @signature_method,
         :verifier => @verifier
-      )
-    ]
+      ).inject({}) { |h,(k,v)| h[k]=v; h }
   end
 
   it 'should have the correct client credential key' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: signet
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency