Skip to content
Browse files

upgrade to devise 1.2

  • Loading branch information...
1 parent 24b9ac6 commit 17b1babafd5c9b69ff60d70f25d4ae6d9344e0b5 Holden Thomas committed
Showing with 92 additions and 96 deletions.
  1. +4 −8 Gemfile
  2. +82 −84 Gemfile.lock
  3. +5 −3 README.rdoc
  4. +1 −1 config/database.yml
View
12 Gemfile
@@ -1,15 +1,11 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.0'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
+gem 'rails', '3.0.5'
gem 'pg'
#gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'devise', :git => 'git://github.com/plataformatec/devise', :branch => 'omniauth'
-#gem 'devise'
-gem 'omniauth'
+
+gem 'devise', '~> 1.2.1'
+gem 'omniauth', '0.2.0'
# Use unicorn as the web server
# gem 'unicorn'
View
166 Gemfile.lock
@@ -1,123 +1,121 @@
-GIT
- remote: git://github.com/plataformatec/devise
- revision: ab033ea986897c600658fc6f2245e1e7d7bfa514
- branch: omniauth
- specs:
- devise (1.2.rc)
- bcrypt-ruby (~> 2.1.2)
- orm_adapter (~> 0.0.2)
- warden (~> 1.0.0)
-
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.0)
- actionpack (= 3.0.0)
- mail (~> 2.2.5)
- actionpack (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ actionmailer (3.0.5)
+ actionpack (= 3.0.5)
+ mail (~> 2.2.15)
+ actionpack (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4.1)
+ i18n (~> 0.4)
rack (~> 1.2.1)
- rack-mount (~> 0.6.12)
- rack-test (~> 0.5.4)
+ rack-mount (~> 0.6.13)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.0)
- activesupport (= 3.0.0)
+ activemodel (3.0.5)
+ activesupport (= 3.0.5)
builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- arel (~> 1.0.0)
+ i18n (~> 0.4)
+ activerecord (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
+ arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- activesupport (3.0.0)
- addressable (2.2.2)
- arel (1.0.1)
- activesupport (~> 3.0.0)
- bcrypt-ruby (2.1.2)
+ activeresource (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
+ activesupport (3.0.5)
+ addressable (2.2.5)
+ arel (2.0.9)
+ bcrypt-ruby (2.1.4)
builder (2.1.2)
+ devise (1.2.1)
+ bcrypt-ruby (~> 2.1.2)
+ orm_adapter (~> 0.0.3)
+ warden (~> 1.0.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- faraday (0.5.2)
- addressable (~> 2.2.2)
- multipart-post (~> 1.0.1)
- rack (>= 1.1.0, < 2)
- i18n (0.4.2)
- mail (2.2.9)
+ faraday (0.5.7)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
+ rack (< 2, >= 1.1.0)
+ i18n (0.5.0)
+ mail (2.2.15)
activesupport (>= 2.3.6)
- i18n (~> 0.4.1)
+ i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
multi_json (0.0.5)
- multipart-post (1.0.1)
+ multipart-post (1.1.0)
net-ldap (0.1.1)
- nokogiri (1.4.3.1)
- oa-basic (0.1.6)
+ nokogiri (1.4.4)
+ oa-basic (0.2.0)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
- oa-core (= 0.1.6)
+ oa-core (= 0.2.0)
rest-client (~> 1.6.0)
- oa-core (0.1.6)
+ oa-core (0.2.0)
rack (~> 1.1)
- oa-enterprise (0.1.6)
+ oa-enterprise (0.2.0)
net-ldap (~> 0.1.1)
nokogiri (~> 1.4.2)
- oa-core (= 0.1.6)
+ oa-core (= 0.2.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
- oa-oauth (0.1.6)
+ oa-more (0.2.0)
+ multi_json (~> 0.0.2)
+ oa-core (= 0.2.0)
+ rest-client (~> 1.6.0)
+ oa-oauth (0.2.0)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
- oa-core (= 0.1.6)
+ oa-core (= 0.2.0)
oauth (~> 0.4.0)
- oauth2 (~> 0.1.0)
- oa-openid (0.1.6)
- oa-core (= 0.1.6)
+ oauth2 (~> 0.1.1)
+ oa-openid (0.2.0)
+ oa-core (= 0.2.0)
rack-openid (~> 1.2.0)
ruby-openid-apps-discovery
oauth (0.4.4)
- oauth2 (0.1.0)
+ oauth2 (0.1.1)
faraday (~> 0.5.0)
multi_json (~> 0.0.4)
- omniauth (0.1.6)
- oa-basic (= 0.1.6)
- oa-core (= 0.1.6)
- oa-enterprise (= 0.1.6)
- oa-oauth (= 0.1.6)
- oa-openid (= 0.1.6)
- orm_adapter (0.0.3)
+ omniauth (0.2.0)
+ oa-basic (= 0.2.0)
+ oa-core (= 0.2.0)
+ oa-enterprise (= 0.2.0)
+ oa-more (= 0.2.0)
+ oa-oauth (= 0.2.0)
+ oa-openid (= 0.2.0)
+ orm_adapter (0.0.4)
pg (0.9.0)
polyglot (0.3.1)
pyu-ruby-sasl (0.0.3.2)
- rack (1.2.1)
- rack-mount (0.6.13)
+ rack (1.2.2)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
rack-openid (1.2.0)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
- rack-test (0.5.6)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.0)
- actionmailer (= 3.0.0)
- actionpack (= 3.0.0)
- activerecord (= 3.0.0)
- activeresource (= 3.0.0)
- activesupport (= 3.0.0)
- bundler (~> 1.0.0)
- railties (= 3.0.0)
- railties (3.0.0)
- actionpack (= 3.0.0)
- activesupport (= 3.0.0)
- rake (>= 0.8.4)
- thor (~> 0.14.0)
+ rails (3.0.5)
+ actionmailer (= 3.0.5)
+ actionpack (= 3.0.5)
+ activerecord (= 3.0.5)
+ activeresource (= 3.0.5)
+ activesupport (= 3.0.5)
+ bundler (~> 1.0)
+ railties (= 3.0.5)
+ railties (3.0.5)
+ actionpack (= 3.0.5)
+ activesupport (= 3.0.5)
+ rake (>= 0.8.7)
+ thor (~> 0.14.4)
rake (0.8.7)
rest-client (1.6.1)
mime-types (>= 1.16)
@@ -125,18 +123,18 @@ GEM
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
- thor (0.14.4)
- treetop (1.4.8)
+ thor (0.14.6)
+ treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
- warden (1.0.1)
+ tzinfo (0.3.26)
+ warden (1.0.3)
rack (>= 1.0.0)
PLATFORMS
ruby
DEPENDENCIES
- devise!
- omniauth
+ devise (~> 1.2.1)
+ omniauth (= 0.2.0)
pg
- rails (= 3.0.0)
+ rails (= 3.0.5)
View
8 README.rdoc
@@ -2,10 +2,12 @@
As bare as you could get devise-omniauth combo
-I wasn't sure why all the provider callbacks were separated as they can all be handled in the same fashion.
+for a full featured example with tests! See Parker Thompson's branch:
-The Wiki also didn't mention how we should be keeping track of the user tokens in the case we want to allow the user to validate multiple providers.
+https://github.com/pt/devise-omniauth-example
-So I created a basic model storing the user_id, provider, & uid.
+
+
+Basic model storing the user_id, provider, & uid.
https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview
View
2 config/database.yml
@@ -3,7 +3,7 @@
development:
adapter: postgresql
encoding: unicode
- database: omniauth
+ database: devise_omniauth_example
pool: 5
username: holden
password: postgres

0 comments on commit 17b1bab

Please sign in to comment.
Something went wrong with that request. Please try again.