shield-contrib 0.0.1 → 0.0.2

data/lib/shield/contrib.rb

@@ -1,8 +1,8 @@
 module Shield
   module Contrib
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 
   autoload :Ohm,     "shield/contrib/ohm"
   autoload :Sinatra, "shield/contrib/sinatra"
-end
+end

data/lib/shield/contrib/ohm/email_password.rb

@@ -14,7 +14,9 @@ module Shield
 
       module Fetch
         def fetch(email)
-          find(:email => email).first
+          return if email.to_s.empty?
+
+          find(:email => email.downcase.strip).first
         end
       end
 
@@ -33,6 +35,10 @@ module Shield
         end
       end
 
+      def email
+        read_local(:email).to_s.downcase.strip
+      end
+
       def password=(password)
         unless password.to_s.empty?
           self.crypted_password = Shield::Password.encrypt(password)

data/lib/shield/contrib/sinatra/default.rb

@@ -6,8 +6,6 @@ module Shield
         m.set :shield_redirect_after_logout, "/"
         m.set :shield_auth_failure, "Wrong Username and/or Password combination."
 
-        m.enable :sessions
-
         m.helpers Shield::Helpers
         m.helpers do
           def current_user
@@ -22,8 +20,8 @@ module Shield
             super
           end
 
-          def logout(model = User)
-            super
+          def authenticated?(model = User)
+            authenticated(model)
           end
         end
 
@@ -33,15 +31,15 @@ module Shield
 
         m.post "/login" do
           if login(User, params[:username], params[:password])
-            redirect settings.shield_redirect_after_login
+            redirect_to_stored(settings.shield_redirect_after_login)
           else
             session[:error] = settings.shield_auth_failure
-            redirect "/login"
+            redirect_to_login
           end
         end
 
         m.get "/logout" do
-          logout
+          logout(User)
           redirect settings.shield_redirect_after_logout
         end
       end

data/test/helper.rb

@@ -1,8 +1,6 @@
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 
-puts "!! REMOVE THIS IN LINE: #{__LINE__} of #{__FILE__}"
-$:.unshift("/Users/cyx/Labs/shield/lib")
-
+require "shield"
 require "shield/contrib"
 require "spawn"
 require "ohm"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michel Martens
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +08:00
+date: 2010-12-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency