caboose-cms 0.3.34 → 0.3.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjY4YWI0NWIwZDg0NTI4OWNlMmViNWM0ZmQ5MmM3OTFhY2RlOWE5NA==
+    NTFmOTRhYmFjNWE2YjA4N2Y3ZWM2MTlmMmZlNmI4MGU1ODE2OTJhNQ==
   data.tar.gz: !binary |-
-    YmYyNGExZGM3N2YzMjg2NjdiYzk0MzRjOWQ2M2VlZDRiZDFhYjE4OA==
+    YTdkZDFkZTgxYzk3ZWQzZGQzN2ZmNjcwM2UxMjg0OTcxZjgyNmNlMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2M3OGM3MmE5NTc2MTY0YjIxNjMzY2IyZTRhMzdjMmU0MDExM2ZjMzgxZmU5
-    NjcwOWEwZjI1NTIxYTNhYjg4NDZlY2EyNGNiODU0NWQwMWIyMjdjZTkwODU0
-    NDg0YzI0MTM5NWE5MWM4MjY0OTIzZjgxY2QwMmJiNjAzMjA0OTY=
+    Mzc4MjAyYmY3ZjljYzE3OGI3ZWM4NTVlNTkwODY5ZjQ4N2Q4MTI1YzhmODNj
+    NTk0Njg4MDE4NWE4YWY1YzZlZjk3YmUwOWEyYzJiNTVmMDg1MTI0OGJlZTdj
+    YWRiMjU3MmI3YWYwZTg3M2M4MDFiY2IyMDkxZmRjNDQ0Y2RkZmY=
   data.tar.gz: !binary |-
-    ZWVhOTRiMjgyODJkYzM4OWZhMTVhZTU1ZWNiOTExYmJmMGJmYmE1Njg3OGU3
-    OTgzYzRiZDEyZjdkYzU5ZDc5NzVjOWVlNmIzOGFkYzViNGU2ZWY4OTc5ZTA5
-    MGE3NjRiMmM2OGU1NDhjYTg4Y2VmNzI5MzE3MDkyNDYyMWUxZTU=
+    MjU0OWE4MTc1MjNhMjgwYTNkMzg5NzIwZmM0MzMzZmQzOTk4NmZjMTA2NWUz
+    YTZmMGEwYTk4ZGI2NDk2MWY5NzllNGU4YTE4NDNmODRhODc0NDI4Mzk5Yzk3
+    YzdhMDJlYjExOGNiMzYxMjUzNzgwZTFhMTA5MzBlZmIyZjg4ZWU=

data/app/controllers/caboose/login_controller.rb

@@ -26,13 +26,13 @@ module Caboose
           
           bouncer_class = Caboose::authenticator_class.constantize
           bouncer = bouncer_class.new
-          user = bouncer.authenticate(username, password)
+          login_resp = bouncer.authenticate(username, password)
           
-          if (user.nil? || user == false)
-            resp.error = "Invalid credentials"
+          if login_resp.error
+            resp.error = login_resp.error
           else
             remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")
-            login_user(user, remember)
+            login_user(login_resp.user, remember)
             resp.redirect = return_url
           end
         end

data/app/models/caboose/authenticator.rb

@@ -2,13 +2,17 @@
 class Caboose::Authenticator
 
   def authenticate(username, password)
+    resp = Caboose::StdClass.new(
+      'error' => nil,
+      'user' => nil 
+    )
     pass = Digest::SHA1.hexdigest(Caboose::salt + password)
-    user = Caboose::User.where(:username => username, :password => pass).first
-    if (user.nil?)
-      user = Caboose::User.where(:email => username, :password => pass).first
+    resp.user = Caboose::User.where(:username => username, :password => pass).first
+    if (resp.user.nil?)
+      resp.user = Caboose::User.where(:email => username, :password => pass).first
     end
-    return false if user.nil?
-    return user       
+    resp.error = "Invalid credentials" if resp.user.nil?      
+    return resp
   end
   
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.34'
+  VERSION = '0.3.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.34
+  version: 0.3.35
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails