fixing #1

NoamB · Jun 3, 2011 · f01d4d1 · f01d4d1
1 parent 3aaf463
commit f01d4d1
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 54 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,9 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.2.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.5.2'
+gem 'activerecord', '3.0.3'
+gem 'actionmailer', '3.0.3'
+gem "sorcery", '0.5.21'
 
 group :development do
   gem "test-unit"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,34 +2,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    addressable (2.2.5)
-    arel (2.0.9)
+    activesupport (3.0.3)
+    addressable (2.2.6)
+    arel (2.0.10)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
     erubis (2.6.6)
@@ -38,16 +35,15 @@ GEM
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
-    i18n (0.5.0)
-    json (1.5.1)
+    i18n (0.6.0)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (1.0.0)
-    multipart-post (1.1.0)
+    multi_json (1.0.3)
+    multipart-post (1.1.2)
     oauth (0.4.4)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
@@ -58,46 +54,31 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
     sinatra (1.2.3)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    sorcery (0.4.2)
+    sorcery (0.5.21)
       bcrypt-ruby (~> 2.1.4)
-      json (>= 1.5.1)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
       oauth2 (>= 0.1.1)
-      rails (>= 3.0.0)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     test-unit (2.3.0)
-    thor (0.14.6)
     tilt (1.2.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionmailer (= 3.0.3)
+  activerecord (= 3.0.3)
   sinatra (>= 1.2.0)
-  sorcery (= 0.4.2)
+  sorcery (= 0.5.21)
   sqlite3-ruby
   test-unit
diff --git a/modular.rb b/modular.rb
@@ -29,14 +29,14 @@
 ActionMailer::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 require File.join(File.dirname(__FILE__),'models','sorcery_mailer')
 
+# models
+autoload :Authentication, File.join(File.dirname(__FILE__),'models','authentication')
+autoload :User, File.join(File.dirname(__FILE__),'models','user')
+
 # sorcery
 require 'sorcery'
 require_relative 'sorcery_config'
 
-# models
-require File.join(File.dirname(__FILE__),'models','authentication')
-require File.join(File.dirname(__FILE__),'models','user')
-
 # helpers
 module MyHelpers
   def current_users_list

diff --git a/myapp.rb b/myapp.rb
@@ -30,14 +30,14 @@
 ActionMailer::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 require File.join(File.dirname(__FILE__),'models','sorcery_mailer')
 
+# models
+autoload :Authentication, File.join(File.dirname(__FILE__),'models','authentication')
+autoload :User, File.join(File.dirname(__FILE__),'models','user')
+
 # sorcery
 require 'sorcery'
 require_relative 'sorcery_config'
 
-# models
-require File.join(File.dirname(__FILE__),'models','authentication')
-require File.join(File.dirname(__FILE__),'models','user')
-
 # filters
 ['/logout'].each do |pattern|
   before pattern do