Permalink
Browse files

Upgraded dependencies and made sure it still works

  • Loading branch information...
1 parent a7b3650 commit ebb236989dbc84352befad6368d85da056e579d3 @andreasronge committed Dec 16, 2011
Showing with 134 additions and 64 deletions.
  1. +120 −61 Gemfile.lock
  2. +9 −0 app/models/admin.rb
  3. +3 −1 app/models/user.rb
  4. +1 −1 config/environments/development.rb
  5. +1 −1 config/initializers/devise.rb
View
@@ -1,85 +1,144 @@
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.10)
- actionpack (= 3.0.10)
- mail (~> 2.2.19)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
- arel (2.0.10)
- bcrypt-ruby (3.0.1)
- builder (2.1.2)
- devise (1.4.7)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
+ mail (~> 2.3.0)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
+ multi_json (~> 1.0)
+ addressable (2.2.6)
+ arel (2.2.1)
+ bcrypt-ruby (3.0.1-java)
+ builder (3.0.0)
+ devise (1.5.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- i18n (0.5.0)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ warden (~> 1.1)
+ devise-neo4j (1.0.3)
+ devise (~> 1.3)
+ neo4j (~> 1.1)
+ oa-oauth (~> 0.2.0)
+ oa-openid (~> 0.2.0)
+ erubis (2.7.0)
+ faraday (0.6.1)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
+ rack (>= 1.1.0, < 2)
+ hike (1.2.1)
+ i18n (0.6.0)
+ jruby-rack (1.1.1)
+ json (1.6.3-java)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
+ mime-types (1.17.2)
+ multi_json (1.0.4)
+ multi_xml (0.2.2)
+ multipart-post (1.1.4)
+ neo4j (1.3.1-java)
+ activemodel (>= 3.0.0)
+ orm_adapter (>= 0.0.3)
+ railties (>= 3.0.0)
+ will_paginate (= 3.0.pre4)
+ oa-core (0.2.6)
+ oa-oauth (0.2.6)
+ faraday (~> 0.6.1)
+ multi_json (~> 1.0.0)
+ multi_xml (~> 0.2.2)
+ oa-core (= 0.2.6)
+ oauth (~> 0.4.0)
+ oauth2 (~> 0.4.1)
+ oa-openid (0.2.6)
+ oa-core (= 0.2.6)
+ rack-openid (~> 1.3.1)
+ ruby-openid-apps-discovery (~> 1.2.0)
+ oauth (0.4.5)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
orm_adapter (0.0.5)
- polyglot (0.3.2)
- rack (1.2.4)
- rack-mount (0.6.14)
+ polyglot (0.3.3)
+ rack (1.3.5)
+ rack-cache (1.1)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-openid (1.3.1)
+ rack (>= 1.1.0)
+ ruby-openid (>= 2.1.8)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.10)
- actionmailer (= 3.0.10)
- actionpack (= 3.0.10)
- activerecord (= 3.0.10)
- activeresource (= 3.0.10)
- activesupport (= 3.0.10)
+ rails (3.1.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
bundler (~> 1.0)
- railties (= 3.0.10)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
+ railties (= 3.1.3)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.4)
- rake (0.9.2)
- rdoc (3.9.4)
- sqlite3-ruby (1.3.2)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ ruby-openid (2.1.8)
+ ruby-openid-apps-discovery (1.2.0)
+ ruby-openid (>= 2.1.7)
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
+ tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.29)
- warden (1.0.5)
+ trinidad (1.2.3)
+ jruby-rack (>= 1.0.9)
+ trinidad_jars (>= 1.0.1)
+ trinidad_jars (1.0.1)
+ tzinfo (0.3.31)
+ warden (1.1.0)
rack (>= 1.0)
+ will_paginate (3.0.pre4)
PLATFORMS
- ruby
+ java
DEPENDENCIES
devise
- rails (= 3.0.10)
- sqlite3-ruby
+ devise-neo4j
+ neo4j
+ rails
+ trinidad
View
@@ -1,4 +1,13 @@
class Admin < Neo4j::Model
devise :database_authenticatable, :registerable, :timeoutable, :validatable,
:timeout_in => 20.minutes
+
+ property :name
+ property :email
+ property :password
+
+ index :email, :type => :exact
+ index :name
+
+
end
View
@@ -9,6 +9,8 @@ class User < Neo4j::Model
property :email
property :password
- index :email
+ index :email, :type => :exact
index :name
+
+
end
@@ -11,7 +11,7 @@
# Show full error reports and disable caching
config.consider_all_requests_local = true
- config.action_view.debug_rjs = true
+# config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
@@ -13,7 +13,7 @@
# Load and configure the ORM. Supports :active_record (default) and
# :mongoid (bson_ext recommended) by default. Other ORMs may be
# available as additional gems.
- require 'devise/orm/active_record'
+ # require 'devise/orm/active_record'
# ==> Configuration for any authentication mechanism
# Configure which keys are used when authenticating a user. The default is

0 comments on commit ebb2369

Please sign in to comment.