Browse files

DG MS; updated BSON gems, added devise-mongomapper gem fix, using unf…

…orked devise 1.1.2
  • Loading branch information...
1 parent c75a2eb commit 2e73104d6f67afa717d68fc98b68d0e0d60f869d @danielgrippi danielgrippi committed Oct 7, 2010
Showing with 50 additions and 46 deletions.
  1. +4 −3 Gemfile
  2. +39 −38 Gemfile.lock
  3. +1 −0 app/models/user.rb
  4. +1 −1 config/initializers/secret_token.rb
  5. +5 −4 config/routes.rb
View
7 Gemfile
@@ -4,12 +4,13 @@ gem 'rails', '3.0.0'
gem 'bundler', '>= 1.0.0'
#Security
-gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
+gem 'devise', '1.1.2'
+gem 'devise-mongo_mapper', :git => 'git://github.com/collectiveidea/devise-mongo_mapper'
#Mongo
gem 'mongo_mapper', :branch => 'rails3', :git => 'http://github.com/jnunemaker/mongomapper.git'
-gem 'bson_ext', '1.0.7'
-gem 'bson', '1.0.7'
+gem 'bson_ext', '1.1'
+gem 'bson', '1.1'
#Views
gem 'haml'
View
77 Gemfile.lock
@@ -7,10 +7,17 @@ GIT
nokogiri (>= 1.3.3)
GIT
+ remote: git://github.com/collectiveidea/devise-mongo_mapper
+ revision: fa2f20310e0988295adc192255d3b1cedee1b412
+ specs:
+ devise-mongo_mapper (0.0.1)
+ devise (~> 1.1.0)
+
+GIT
remote: git://github.com/igrigorik/em-http-request.git
- revision: 6f66010cda90991863669ca52fd4c320dd931a06
+ revision: f069bb9b68335496c8f32475b79e448847befdae
specs:
- em-http-request (0.2.12)
+ em-http-request (0.2.14)
addressable (>= 2.0.0)
eventmachine (>= 0.12.9)
@@ -23,7 +30,7 @@ GIT
GIT
remote: git://github.com/rsofaer/redfinger.git
- revision: 605edbb2b3b4bd0e7befb6963a3ada3f5d3ca76c
+ revision: 07721f46d02b9d3aa04880788fecb0b4c1b284d7
specs:
redfinger (0.0.6)
hashie
@@ -40,14 +47,6 @@ GIT
highline (>= 1.4.0)
GIT
- remote: http://github.com/BadMinus/devise.git
- revision: 88ab2fe14e88dc45d5b969328a5e52e9011a1d7b
- specs:
- devise (1.1.rc1)
- bcrypt-ruby (~> 2.1.2)
- warden (~> 0.10.7)
-
-GIT
remote: http://github.com/dcu/magent.git
revision: 06513f3dac812469a55f2e365c349af4d2abc92a
specs:
@@ -57,7 +56,7 @@ GIT
GIT
remote: http://github.com/jnunemaker/mongomapper.git
- revision: b0eac421ef5b3bee782e15d391eca372a189d414
+ revision: 5a3328244b641fa4f6a3743e9e0b4dd6a1ac2700
branch: rails3
specs:
mongo_mapper (0.8.4)
@@ -103,8 +102,8 @@ GEM
uuidtools
xml-simple
bcrypt-ruby (2.1.2)
- bson (1.0.7)
- bson_ext (1.0.7)
+ bson (1.1)
+ bson_ext (1.1)
builder (2.1.2)
capistrano (2.5.19)
highline
@@ -121,17 +120,20 @@ GEM
selenium-webdriver (>= 0.0.3)
columnize (0.3.1)
crack (0.1.8)
- cucumber (0.9.0)
+ cucumber (0.9.2)
builder (~> 2.1.2)
diff-lcs (~> 1.1.2)
- gherkin (~> 2.2.2)
+ gherkin (~> 2.2.5)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.12)
daemons (1.1.0)
database_cleaner (0.5.2)
+ devise (1.1.2)
+ bcrypt-ruby (~> 2.1.2)
+ warden (~> 0.10.7)
diff-lcs (1.1.2)
em-websocket (0.1.4)
addressable (>= 2.1.1)
@@ -145,19 +147,18 @@ GEM
rails (>= 3.0.0.beta4)
ffi (0.6.3)
rake (>= 0.8.7)
- gherkin (2.2.4)
+ gherkin (2.2.8)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
- trollop (~> 1.16.2)
- haml (3.0.18)
+ haml (3.0.21)
hashie (0.4.0)
highline (1.6.1)
http_connection (1.3.1)
i18n (0.4.1)
json (1.4.6)
json_pure (1.4.6)
linecache (0.43)
- mail (2.2.6.1)
+ mail (2.2.7)
activesupport (>= 2.3.6)
mime-types
treetop (>= 1.4.5)
@@ -169,9 +170,9 @@ GEM
subexec (~> 0.0.4)
mocha (0.9.8)
rake
- mongo (1.0.8)
+ mongo (1.0.9)
bson (>= 1.0.5)
- net-scp (1.0.3)
+ net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
@@ -188,7 +189,7 @@ GEM
rack (1.2.1)
rack-mount (0.6.13)
rack (>= 1.0.0)
- rack-test (0.5.4)
+ rack-test (0.5.6)
rack (>= 1.0)
rails (3.0.0)
actionmailer (= 3.0.0)
@@ -206,16 +207,16 @@ GEM
rake (0.8.7)
rest-client (1.6.1)
mime-types (>= 1.16)
- rspec (2.0.0.beta.22)
- rspec-core (= 2.0.0.beta.22)
- rspec-expectations (= 2.0.0.beta.22)
- rspec-mocks (= 2.0.0.beta.22)
- rspec-core (2.0.0.beta.22)
- rspec-expectations (2.0.0.beta.22)
+ rspec (2.0.0.rc)
+ rspec-core (= 2.0.0.rc)
+ rspec-expectations (= 2.0.0.rc)
+ rspec-mocks (= 2.0.0.rc)
+ rspec-core (2.0.0.rc)
+ rspec-expectations (2.0.0.rc)
diff-lcs (>= 1.1.2)
- rspec-mocks (2.0.0.beta.22)
- rspec-core (= 2.0.0.beta.22)
- rspec-expectations (= 2.0.0.beta.22)
+ rspec-mocks (2.0.0.rc)
+ rspec-core (= 2.0.0.rc)
+ rspec-expectations (= 2.0.0.rc)
rspec-rails (2.0.0.beta.17)
rspec (>= 2.0.0.beta.14)
webrat (>= 0.7.0)
@@ -235,18 +236,17 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.14.0)
+ thor (0.14.3)
treetop (1.4.8)
polyglot (>= 0.3.1)
- trollop (1.16.2)
tzinfo (0.3.23)
uuidtools (2.1.1)
warden (0.10.7)
rack (>= 1.0.0)
webmock (1.3.5)
addressable (>= 2.1.1)
crack (>= 0.1.7)
- webrat (0.7.2.beta.1)
+ webrat (0.7.1)
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
@@ -259,14 +259,15 @@ PLATFORMS
DEPENDENCIES
addressable
aws
- bson (= 1.0.7)
- bson_ext (= 1.0.7)
+ bson (= 1.1)
+ bson_ext (= 1.1)
bundler (>= 1.0.0)
capybara (~> 0.3.9)
carrierwave!
cucumber-rails (= 0.3.2)
database_cleaner
- devise!
+ devise (= 1.1.2)
+ devise-mongo_mapper!
em-http-request!
em-websocket
factory_girl_rails
View
1 app/models/user.rb
@@ -9,6 +9,7 @@
class User
include MongoMapper::Document
+ plugin MongoMapper::Devise
include Diaspora::UserModules::Friending
include Diaspora::UserModules::Querying
include Diaspora::UserModules::Receiving
View
2 config/initializers/secret_token.rb
@@ -8,4 +8,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Rails.application.config.secret_token = '3484b78b0f9d88f40cd44a20cf647140e5900632d0c9b85e1fd91dc539811d243f2f0756f791019c'
+Rails.application.config.secret_token = 'b1347247976a6c5fba55f3f81faba1c8b6777e556015824405f06b4dbcea65b433535f7ad747ce36'
View
9 config/routes.rb
@@ -33,13 +33,14 @@
match 'zombiefriendaccept', :to => "dev_utilities#zombiefriendaccept"
match 'set_backer_number', :to => "dev_utilities#set_backer_number"
match 'set_profile_photo', :to => "dev_utilities#set_profile_photo"
+
#routes for devise, not really sure you will need to mess with this in the future, lets put default,
#non mutable stuff in anohter file
- match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
- match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
- match 'signup', :to => 'registrations#new', :as => "new_user_registration"
+ #match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
+ #match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
+ #match 'signup', :to => 'registrations#new', :as => "new_user_registration"
- match 'get_to_the_choppa', :to => redirect("/signup")
+ #match 'get_to_the_choppa', :to => redirect("/signup")
#public routes
#

0 comments on commit 2e73104

Please sign in to comment.