Merge branch 'dev'

maxjustus · Aug 29, 2011 · c6f3dc5 · c6f3dc5
2 parents ea3e613 + 88cf335
commit c6f3dc5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/lib/models/abstract_user.rb b/lib/models/abstract_user.rb
@@ -14,11 +14,11 @@
   require Pathname(__FILE__).dirname.expand_path.to_s + "/sequel_user.rb"
   require Pathname(__FILE__).dirname.expand_path.to_s + "/sequel_adapter.rb"
 elsif Object.const_defined?("Mongoid")
-  require Pathname(__FILE__).dirname.expand_path.to_s + "mongoid_user.rb"
-  require Pathname(__FILE__).dirname.expand_path.to_s + "mongoid_adapter.rb"
+  require Pathname(__FILE__).dirname.expand_path.to_s + "/mongoid_user.rb"
+  require Pathname(__FILE__).dirname.expand_path.to_s + "/mongoid_adapter.rb"
 elsif Object.const_defined?("ActiveRecord")
-  require Pathname(__FILE__).dirname.expand_path.to_s + "activerecord_user.rb"
-  require Pathname(__FILE__).dirname.expand_path.to_s + "ar_adapter.rb"
+  require Pathname(__FILE__).dirname.expand_path.to_s + "/activerecord_user.rb"
+  require Pathname(__FILE__).dirname.expand_path.to_s + "/ar_adapter.rb"
 end
 
 class User

diff --git a/lib/sinatra-authentication.rb b/lib/sinatra-authentication.rb
@@ -66,7 +66,7 @@ def self.registered(app)
           end
         else
           if Rack.const_defined?('Flash')
-            flash[:notice] = "The email or password you entered is incorrect."
+            flash[:error] = "The email or password you entered is incorrect."
           end
           redirect '/login'
         end
@@ -98,7 +98,7 @@ def self.registered(app)
           redirect '/'
         else
           if Rack.const_defined?('Flash')
-            flash[:notice] = "There were some problems creating your account: #{@user.errors}."
+            flash[:error] = "There were some problems creating your account: #{@user.errors}."
           end
           redirect '/signup?' + hash_to_query_string(params['user'])
         end
@@ -129,7 +129,7 @@ def self.registered(app)
           redirect '/'
         else
           if Rack.const_defined?('Flash')
-            flash[:notice] = "Whoops, looks like there were some problems with your updates: #{user.errors}."
+            flash[:error] = "Whoops, looks like there were some problems with your updates: #{user.errors}."
           end
           redirect "/users/#{user.id}/edit?" + hash_to_query_string(user_attributes)
         end
@@ -145,7 +145,7 @@ def self.registered(app)
           end
         else
           if Rack.const_defined?('Flash')
-            flash[:notice] = "Deletion failed."
+            flash[:error] = "Deletion failed."
           end
         end
         redirect '/'

diff --git a/lib/views/edit.haml b/lib/views/edit.haml
@@ -1,6 +1,8 @@
 #sinatra_authentication
   - if Rack.const_defined?('Flash') && flash[:notice]
     #sinatra_authentication_flash= flash[:notice]
+  - if Rack.const_defined?('Flash') && flash[:error]
+    #sinatra_authentication_flash= flash[:error]
   %h1
     Edit
     - if @user.id == current_user.id

diff --git a/lib/views/login.haml b/lib/views/login.haml
@@ -1,6 +1,8 @@
 #sinatra_authentication
   - if Rack.const_defined?('Flash') && flash[:notice]
     #sinatra_authentication_flash= flash[:notice]
+  - if Rack.const_defined?('Flash') && flash[:error]
+    #sinatra_authentication_flash= flash[:error]
   %h1.page_title Login
   %form{:action => "/login", :method => "post"}
     .field

diff --git a/lib/views/signup.haml b/lib/views/signup.haml
@@ -1,6 +1,8 @@
 #sinatra_authentication
   - if Rack.const_defined?('Flash') && flash[:notice]
     #sinatra_authentication_flash= flash[:notice]
+  - if Rack.const_defined?('Flash') && flash[:error]
+    #sinatra_authentication_flash= flash[:error]
   %h1.page_title Sign Up
   %form{:action => "/signup", :method => "post"}
     .field

diff --git a/readme.markdown b/readme.markdown
@@ -56,10 +56,11 @@ Flash messages are implemented using rack-flash. To set them up add this to your
     #be sure and do this after after 'use Rack:Session:Cookie...'
     use Rack::Flash
 
-And then sinatra-authentication related flash messages will be made available through flash[:notice]
+And then sinatra-authentication related flash messages will be made available through flash[:notice] (successes) and flash[:error] (failures)
 
     -# somewhere in a haml view:
     = flash[:notice]
+    = flash[:error]
 
 ## HELPER METHODS:
 

diff --git a/spec/unit/mongoid_model_spec.rb b/spec/unit/mongoid_model_spec.rb
@@ -1,3 +1,3 @@
 require File.join(File.dirname(__FILE__), '../../test/lib/mongoid_app')
 require File.join(File.dirname(__FILE__), '../../test/lib/helper')
-require File.join(File.dirname(__FILE__), 'user_specs')
+require File.join(File.dirname(__FILE__), '/user_specs')