Updating Oauth2 due to issues using sorcery with gems that require hi…

…gher version of faraday.

Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.4.1"
+gem 'oauth2', "~> 0.5.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

Gemfile.lock

@@ -40,10 +40,10 @@ GEM
     columnize (0.3.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
@@ -68,11 +68,11 @@ GEM
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
+    oauth2 (0.5.0)
+      faraday (>= 0.6.1, < 0.8)
+      multi_json (~> 1.0.0)
     polyglot (0.3.2)
-    rack (1.3.2)
+    rack (1.3.3)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -150,7 +150,7 @@ DEPENDENCIES
   json (>= 1.5.1)
   mongoid (~> 2.0)
   oauth (~> 0.4.4)
-  oauth2 (~> 0.4.1)
+  oauth2 (~> 0.5.0)
   rails (>= 3.0.0)
   rspec (~> 2.5.0)
   rspec-rails (~> 2.5.0)

sorcery.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "sorcery"
+  s.name = %q{sorcery}
   s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = "2011-09-02"
-  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
-  s.email = "[email protected]"
+  s.date = %q{2011-09-26}
+  s.description = %q{Provides common authentication needs such as signing in/out, activating by email and resetting password.}
+  s.email = %q{[email protected]}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -39,9 +39,11 @@ Gem::Specification.new do |s|
     "lib/sorcery/controller/submodules/activity_logging.rb",
     "lib/sorcery/controller/submodules/brute_force_protection.rb",
     "lib/sorcery/controller/submodules/external.rb",
+    "lib/sorcery/controller/submodules/external/protocols/certs/ca-bundle.crt",
     "lib/sorcery/controller/submodules/external/protocols/oauth1.rb",
     "lib/sorcery/controller/submodules/external/protocols/oauth2.rb",
     "lib/sorcery/controller/submodules/external/providers/facebook.rb",
+    "lib/sorcery/controller/submodules/external/providers/github.rb",
     "lib/sorcery/controller/submodules/external/providers/twitter.rb",
     "lib/sorcery/controller/submodules/http_basic_auth.rb",
     "lib/sorcery/controller/submodules/remember_me.rb",
@@ -77,6 +79,7 @@ Gem::Specification.new do |s|
     "sorcery.gemspec",
     "spec/Gemfile",
     "spec/Gemfile.lock",
+    "spec/README.md",
     "spec/Rakefile",
     "spec/rails3/.gitignore",
     "spec/rails3/.rspec",
@@ -90,6 +93,7 @@ Gem::Specification.new do |s|
     "spec/rails3/app/mailers/sorcery_mailer.rb",
     "spec/rails3/app/models/authentication.rb",
     "spec/rails3/app/models/user.rb",
+    "spec/rails3/app/views/application/index.html.erb",
     "spec/rails3/app/views/layouts/application.html.erb",
     "spec/rails3/app/views/sorcery_mailer/activation_email.html.erb",
     "spec/rails3/app/views/sorcery_mailer/activation_email.text.erb",
@@ -128,7 +132,6 @@ Gem::Specification.new do |s|
     "spec/rails3/public/500.html",
     "spec/rails3/public/favicon.ico",
     "spec/rails3/public/images/rails.png",
-    "spec/rails3/public/index.html",
     "spec/rails3/public/javascripts/application.js",
     "spec/rails3/public/javascripts/controls.js",
     "spec/rails3/public/javascripts/dragdrop.js",
@@ -146,6 +149,7 @@ Gem::Specification.new do |s|
     "spec/rails3/spec/controller_remember_me_spec.rb",
     "spec/rails3/spec/controller_session_timeout_spec.rb",
     "spec/rails3/spec/controller_spec.rb",
+    "spec/rails3/spec/integration_spec.rb",
     "spec/rails3/spec/spec.opts",
     "spec/rails3/spec/spec_helper.orig.rb",
     "spec/rails3/spec/spec_helper.rb",
@@ -207,6 +211,7 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/public/robots.txt",
     "spec/rails3_mongoid/public/stylesheets/.gitkeep",
     "spec/rails3_mongoid/script/rails",
+    "spec/rails3_mongoid/spec/controller_spec.rb",
     "spec/rails3_mongoid/spec/spec.opts",
     "spec/rails3_mongoid/spec/spec_helper.orig.rb",
     "spec/rails3_mongoid/spec/spec_helper.rb",
@@ -285,11 +290,11 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/NoamB/sorcery"
+  s.homepage = %q{http://github.com/NoamB/sorcery}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Magical authentication for Rails 3 applications"
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Magical authentication for Rails 3 applications}
   s.test_files = [
     "spec/rails3/app/controllers/application_controller.rb",
     "spec/rails3/app/helpers/application_helper.rb",
@@ -326,6 +331,7 @@ Gem::Specification.new do |s|
     "spec/rails3/spec/controller_remember_me_spec.rb",
     "spec/rails3/spec/controller_session_timeout_spec.rb",
     "spec/rails3/spec/controller_spec.rb",
+    "spec/rails3/spec/integration_spec.rb",
     "spec/rails3/spec/spec_helper.orig.rb",
     "spec/rails3/spec/spec_helper.rb",
     "spec/rails3/spec/user_activation_spec.rb",
@@ -355,6 +361,7 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/config/routes.rb",
     "spec/rails3_mongoid/db/schema.rb",
     "spec/rails3_mongoid/db/seeds.rb",
+    "spec/rails3_mongoid/spec/controller_spec.rb",
     "spec/rails3_mongoid/spec/spec_helper.orig.rb",
     "spec/rails3_mongoid/spec/spec_helper.rb",
     "spec/rails3_mongoid/spec/user_activation_spec.rb",
@@ -422,11 +429,12 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<json>, [">= 1.5.1"])
       s.add_development_dependency(%q<mongoid>, ["~> 2.0"])
@@ -445,7 +453,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
     else
       s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
+      s.add_dependency(%q<oauth2>, ["~> 0.5.0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
       s.add_dependency(%q<mongoid>, ["~> 2.0"])
@@ -465,7 +473,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
+    s.add_dependency(%q<oauth2>, ["~> 0.5.0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<json>, [">= 1.5.1"])
     s.add_dependency(%q<mongoid>, ["~> 2.0"])