caboose-cms 0.2.11 → 0.2.14

data/app/assets/stylesheets/caboose/admin.css

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require colorbox-rails
- *= require modeljs
  *= require caboose/fonts
  *= require caboose/caboose  
  */

data/app/assets/stylesheets/caboose/application.css

@@ -8,8 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  * 
- *= require colorbox-rails
- *= require modeljs 
+ *= require colorbox-rails 
  *= require caboose/fonts
  *= require caboose/page_bar_generator
  *= require caboose/caboose 

data/app/assets/stylesheets/caboose/modal.css

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require colorbox-rails
- *= require modeljs
  *= require caboose/fonts
  *= require caboose/caboose
  */

data/app/controllers/caboose/application_controller.rb

@@ -35,9 +35,8 @@ module Caboose
     
     # Returns whether or not a user is logged in
     def logged_in?
-      #return true if !session["app_user"].nil? && session["app_user"].id != -1
       validate_token
-      return true if !session["app_user"].nil? && session["app_user"].id != -1    
+      return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1    
       return false
     end
     

data/app/controllers/caboose/login_controller.rb

@@ -11,35 +11,34 @@ module Caboose
     
     # POST /login
     def login
+      Caboose.log("PodioConfig.api_key = #{PodioConfig.api_key}")
       
-      @resp = StdClass.new('error' => '', 'redirect' => '')
-      @return_url = params[:return_url].nil? ? "/" : params[:return_url]
+      resp = StdClass.new('error' => '', 'redirect' => '')
+      return_url = params[:return_url].nil? ? "/" : params[:return_url]
       
       if (logged_in?)
-        @resp.error = "Already logged in"
+        resp.redirect = return_url
       else
-        @username = params[:username]
-        @password = params[:password]
+        username = params[:username]
+        password = params[:password]
                            
-        if (@username.nil? || @password.nil? || @password.strip.length == 0)
-          @resp.error = "Invalid credentials"
+        if (username.nil? || password.nil? || password.strip.length == 0)
+          resp.error = "Invalid credentials"
         else
           
-          @password = Digest::SHA1.hexdigest(Caboose::salt + @password)
-          user = User.where(:username => @username, :password => @password).first
-          if (user.nil?)
-            user = User.where(:email => @username, :password => @password).first
-          end
+          bouncer_class = Caboose::authenticator_class.constantize
+          bouncer = bouncer_class.new
+          user = bouncer.authenticate(username, password)
           
-          if (user.nil?)
-            @resp.error = "Invalid credentials"
+          if (user.nil? || user == false)
+            resp.error = "Invalid credentials"
           else
             login_user(user)
-            @resp.redirect = @return_url
+            resp.redirect = return_url
           end
         end
       end
-      render json: @resp
+      render :json => resp
     end
   end
-end
+end

data/app/models/caboose/authenticator.rb

@@ -0,0 +1,14 @@
+
+class Caboose::Authenticator
+
+  def authenticate(username, password)
+    pass = Digest::SHA1.hexdigest(Caboose::salt + password)
+    user = Caboose::User.where(:username => username, :password => pass).first
+    if (user.nil?)
+      user = User.where(:email => username, :password => pass).first
+    end
+    return false if user.nil?
+    return user       
+  end
+  
+end

data/app/views/caboose/login/index.html.erb

@@ -25,12 +25,12 @@ function login()
 		type: 'post',
 		data: $('#login_form').serialize(),
 		success: function(resp) {
-		  //if (resp.error)
-		  //  modal.autosize("<p class='note error'>" + resp.error + "</p>");
-			//else if (resp.redirect != false)
-			//  <%= @modal ? "" : "parent." %>window.location = resp.redirect;
-			//else
-			//  parent.location.reload(true);
+		  if (resp.error)
+		    modal.autosize("<p class='note error'>" + resp.error + "</p>");
+			else if (resp.redirect != false)
+			  <%= @modal ? "" : "parent." %>window.location = resp.redirect;
+			else
+			  parent.location.reload(true);
 		},
 		error: function() {	
 			modal.autosize("<p class='note error'>Error</p>");			

data/app/views/layouts/caboose/_content.html.erb

@@ -0,0 +1,6 @@
+<% if (yield && yield.strip.length > 0) %>
+<%= yield %>
+<% elsif (!@page.nil?) %>
+<h1><%= @page.title %></h1>
+<%= raw @page.content %>  
+<% end %>

data/app/views/layouts/caboose/_station_link.html.erb

@@ -0,0 +1,7 @@
+<%
+if (@user.nil? || @user == Caboose::User.logged_out_user)
+%><a href='/login?return_url=<%= request.fullpath %>' id='caboose_login'><span>Login</span></a><%
+else
+%><a href='/station?page_id=<%= @page.id %>' id='caboose_station'><span>Control Panel</span></a><%
+end 
+%>

data/app/views/layouts/caboose/_top_nav.html.erb

@@ -2,12 +2,6 @@
 <div id='top_nav'>
   <div class='caboose_logo'></div>
   <ul>
-  <% if (@user.nil? || @user == Caboose::User.logged_out_user) %>
-    <li><a href='/login?return_url=#{request.fullpath}' id='caboose_login'><span>Login</span></a></li>
-  <% else %>
-    <li class='cpanel'  ><a href='/station?page_id=<%= @page.id %>' id='caboose_station'><span>Control Panel</span></a></li>
-    <li class='account' ><a href='/admin/users/<%= @user.id %>/edit'><span>Account</span></a></li>
-    <li class='logout'  ><a href='/logout'><span>Logout</span></a></li>
-  <% end %>
+    <li><%= render :partial => 'layouts/caboose/station_link' %></li>  
   </ul>
 </div>

data/lib/caboose.rb

@@ -21,6 +21,9 @@ module Caboose
   # Any modeljs stylesheets
   mattr_accessor :modeljs_css_files
   @@modeljs_css_files = []
+  
+  # The login authenticator
+  mattr_accessor :authenticator_class
+  @@authenticator_class = 'Caboose::Authenticator'
 
 end
-

data/lib/caboose/engine.rb

@@ -1,7 +1,7 @@
 
 require 'tinymce-rails'
 require 'jquery-ui-rails'
-require 'modeljs'
+#require 'modeljs'
 require 'colorbox-rails'
 
 module Caboose

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.11'
+  VERSION = '0.2.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -75,38 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: modeljs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +187,7 @@ files:
 - app/helpers/caboose/permissions_helper.rb
 - app/models/caboose/approval_request.rb
 - app/models/caboose/asset.rb
+- app/models/caboose/authenticator.rb
 - app/models/caboose/caboose_plugin.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/page.rb
@@ -270,7 +239,9 @@ files:
 - app/views/caboose/users/new.html.erb
 - app/views/caboose/users/update_pic.html.erb
 - app/views/layouts/caboose/_admin_top_nav.html.erb
+- app/views/layouts/caboose/_content.html.erb
 - app/views/layouts/caboose/_station.html.erb
+- app/views/layouts/caboose/_station_link.html.erb
 - app/views/layouts/caboose/_top_nav.html.erb
 - app/views/layouts/caboose/admin.html.erb
 - app/views/layouts/caboose/application.html.erb