fixing bugs in oauth submodule: need to require oauth libs, and authe…

…ntications_class not passed in time to controller, moved to be exclusively in model, and always accessed through it.
NoamB · Mar 14, 2011 · f7e5d3d · f7e5d3d
1 parent 8c5886d
commit f7e5d3d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
     faraday (0.5.5)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.2)

diff --git a/sorcery.gemspec b/sorcery.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]

diff --git a/spec/Gemfile b/spec/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
-gem "sorcery", '0.2.0', :path => '../../../'
+gem "sorcery", '0.2.1', :path => '../../../'
 gem 'oauth', ">= 0.4.4"
 gem 'oauth2', ">= 0.1.1"
 group :development do

diff --git a/spec/Gemfile.lock b/spec/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.2.0)
+    sorcery (0.2.1)
 
 GEM
   remote: http://rubygems.org/
@@ -118,4 +118,4 @@ DEPENDENCIES
   rspec
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.2.0)!
+  sorcery (= 0.2.1)!
diff --git a/spec/rails3/app_root/Gemfile b/spec/rails3/app_root/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.2.0', :path => '../../../'
+gem "sorcery", '0.2.1', :path => '../../../'
 gem 'bcrypt-ruby', '~> 2.1.4', :require => 'bcrypt'
 gem 'oauth', ">= 0.4.4"
 gem 'oauth2', ">= 0.1.1"

diff --git a/spec/rails3/app_root/Gemfile.lock b/spec/rails3/app_root/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.2.0)
+    sorcery (0.2.1)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -134,6 +134,6 @@ DEPENDENCIES
   rspec-rails
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.2.0)!
+  sorcery (= 0.2.1)!
   spork (~> 0.9.0.rc)
   sqlite3-ruby