Update to faraday 0.9

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'addressable', '>= 2.3.1'
-gem 'faraday', '~> 0.8.1'
+gem 'faraday', '>= 0.9.0.rc5'
 gem 'multi_json', '>= 1.0.0'
 gem 'jwt', '>= 0.1.5'
 gem 'extlib', '>= 0.9.15'
@@ -15,6 +15,7 @@ end
 
 
 group :test, :development do
+  gem 'json', '~> 1.7.7'
   gem 'rake', '>= 0.9.0'
   gem 'rspec', '>= 2.11.0'
   gem 'rcov', '>= 0.9.9', :platform => :mri_18

lib/signet/oauth_1/client.rb

@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-gem 'faraday', '~> 0.8.1'
 require 'faraday'
 #require 'faraday/utils'
 

lib/signet/oauth_2/client.rb

@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-gem 'faraday', '~> 0.8.1'
 require 'faraday'
 #require 'faraday/utils'
 
@@ -22,7 +21,6 @@
 require 'signet/errors'
 require 'signet/oauth_2'
 
-gem 'jwt', '~> 0.1.4'
 require 'jwt'
 
 module Signet

lib/signet/version.rb

@@ -17,8 +17,8 @@
   module Signet
     module VERSION
       MAJOR = 0
-      MINOR = 4
-      TINY  = 5
+      MINOR = 5
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

signet.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "signet"
-  s.version = "0.4.5"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Aman"]
-  s.date = "2013-01-18"
+  s.date = "2013-05-31"
   s.description = "Signet is an OAuth 1.0 / OAuth 2.0 implementation.\n"
   s.email = "bobaman@google.com"
   s.extra_rdoc_files = ["README.md"]
-  s.files = ["lib/compat", "lib/compat/digest", "lib/compat/digest/hmac.rb", "lib/compat/multi_json.rb", "lib/compat/securerandom.rb", "lib/signet", "lib/signet.rb", "lib/signet/errors.rb", "lib/signet/oauth_1", "lib/signet/oauth_1.rb", "lib/signet/oauth_1/client.rb", "lib/signet/oauth_1/credential.rb", "lib/signet/oauth_1/server.rb", "lib/signet/oauth_1/signature_methods", "lib/signet/oauth_1/signature_methods/hmac_sha1.rb", "lib/signet/oauth_2", "lib/signet/oauth_2.rb", "lib/signet/oauth_2/client.rb", "lib/signet/ssl_config.rb", "lib/signet/version.rb", "spec/force_compat", "spec/force_compat/digest", "spec/force_compat/digest/hmac.rb", "spec/force_compat/securerandom.rb", "spec/signet", "spec/signet/oauth_1", "spec/signet/oauth_1/client_spec.rb", "spec/signet/oauth_1/credential_spec.rb", "spec/signet/oauth_1/server_spec.rb", "spec/signet/oauth_1/services", "spec/signet/oauth_1/services/google_spec.rb", "spec/signet/oauth_1/signature_methods", "spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb", "spec/signet/oauth_1_spec.rb", "spec/signet/oauth_2", "spec/signet/oauth_2/client_spec.rb", "spec/signet/oauth_2_spec.rb", "spec/signet_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/clobber.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/spec.rake", "tasks/wiki.rake", "tasks/yard.rake", "website/index.html", "CHANGELOG.md", "Gemfile", "LICENSE", "README.md", "Rakefile"]
+  s.files = ["lib/compat", "lib/compat/digest", "lib/compat/digest/hmac.rb", "lib/compat/multi_json.rb", "lib/compat/securerandom.rb", "lib/signet", "lib/signet.rb", "lib/signet/errors.rb", "lib/signet/oauth_1", "lib/signet/oauth_1.rb", "lib/signet/oauth_1/client.rb", "lib/signet/oauth_1/credential.rb", "lib/signet/oauth_1/server.rb", "lib/signet/oauth_1/signature_methods", "lib/signet/oauth_1/signature_methods/hmac_sha1.rb", "lib/signet/oauth_2", "lib/signet/oauth_2.rb", "lib/signet/oauth_2/client.rb", "lib/signet/ssl_config.rb", "lib/signet/version.rb", "spec/force_compat", "spec/force_compat/digest", "spec/force_compat/digest/hmac.rb", "spec/force_compat/securerandom.rb", "spec/signet", "spec/signet/oauth_1", "spec/signet/oauth_1/client_spec.rb", "spec/signet/oauth_1/credential_spec.rb", "spec/signet/oauth_1/server_spec.rb", "spec/signet/oauth_1/services", "spec/signet/oauth_1/services/google_spec.rb", "spec/signet/oauth_1/signature_methods", "spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb", "spec/signet/oauth_1_spec.rb", "spec/signet/oauth_2", "spec/signet/oauth_2/client_spec.rb", "spec/signet/oauth_2_spec.rb", "spec/signet_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/clobber.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/spec.rake", "tasks/wiki.rake", "tasks/yard.rake", "website/index.html", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "Rakefile"]
   s.homepage = "http://code.google.com/p/oauth-signet/"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
@@ -22,15 +22,15 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 2.2.3"])
-      s.add_runtime_dependency(%q<faraday>, ["~> 0.8.1"])
+      s.add_runtime_dependency(%q<faraday>, [">= 0.9.0.rc5"])
       s.add_runtime_dependency(%q<multi_json>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<jwt>, [">= 0.1.5"])
       s.add_development_dependency(%q<rake>, [">= 0.9.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_development_dependency(%q<launchy>, [">= 2.1.1"])
     else
       s.add_dependency(%q<addressable>, [">= 2.2.3"])
-      s.add_dependency(%q<faraday>, ["~> 0.8.1"])
+      s.add_dependency(%q<faraday>, [">= 0.9.0.rc5"])
       s.add_dependency(%q<multi_json>, [">= 1.0.0"])
       s.add_dependency(%q<jwt>, [">= 0.1.5"])
       s.add_dependency(%q<rake>, [">= 0.9.0"])
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<addressable>, [">= 2.2.3"])
-    s.add_dependency(%q<faraday>, ["~> 0.8.1"])
+    s.add_dependency(%q<faraday>, [">= 0.9.0.rc5"])
     s.add_dependency(%q<multi_json>, [">= 1.0.0"])
     s.add_dependency(%q<jwt>, [">= 0.1.5"])
     s.add_dependency(%q<rake>, [">= 0.9.0"])

spec/signet/oauth_2/client_spec.rb

@@ -20,8 +20,6 @@
 
 require 'signet/oauth_2/client'
 require 'openssl'
-
-gem 'jwt', '~> 0.1.4'
 require 'jwt'
 
 conn = Faraday.default_connection
@@ -353,7 +351,7 @@
   end
 
   it 'should allow the expires_at time to be updated' do
-    expires_at = Time.now.round
+    expires_at = Time.now.round - 100
     @client.update_token!(
       :expires_at => expires_at.to_i,
       :expires_in => nil

spec/spec_helper.rb

@@ -10,4 +10,7 @@
 
 require 'rubygems'
 require 'signet'
-require 'rspec'
+require 'rspec'
+
+require 'faraday'
+Faraday::Adapter.load_middleware(:test)

tasks/gem.rake

@@ -22,7 +22,7 @@ namespace :gem do
     s.rdoc_options.concat ["--main",  "README.md"]
 
     s.add_runtime_dependency("addressable", ">= 2.2.3")
-    s.add_runtime_dependency("faraday", "~> 0.8.1")
+    s.add_runtime_dependency("faraday", ">= 0.9.0.rc5")
     s.add_runtime_dependency("multi_json", ">= 1.0.0")
     s.add_runtime_dependency("jwt", ">= 0.1.5")