lucy_cms 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/controllers/cms_admin/base_controller.rb

@@ -3,11 +3,8 @@ class CmsAdmin::BaseController < ActionController::Base
   protect_from_forgery
   
     before_filter :fetch_cms_logged_in_user,
-                  :load_admin_cms_site
-  
-  unless CmsSite.count == 0 || CmsUser.find(:all, :conditions => {:admin => true, :disabled => false}).count == 0
-    before_filter :cms_login_required
-  end
+                  :load_admin_cms_site,
+    	          :cms_login_required
   layout 'cms_admin'
     
 protected
@@ -16,13 +13,13 @@ protected
    if CmsSite.count == 0
       flash[:error] = 'To start you must setup your site'
       redirect_to new_cms_admin_site_path
-    else
+   else
       @cms_site = CmsSite.first
       if @cms_site.version <  LucyCms.config.version
         @cms_site.version = LucyCms.config.version
         @cms_site.save
       end
-    end
+   end
   end
   
   def fetch_cms_logged_in_user
@@ -38,6 +35,7 @@ protected
   
   def cms_login_required
     return true if cms_logged_in?
+    return true if CmsSite.count == 0 || CmsUser.find(:all, :conditions => {:admin => true, :disabled => false}).count == 0
     redirect_to new_cms_admin_session_path and return false
   end 
 end

data/app/controllers/cms_admin/sessions_controller.rb

@@ -7,7 +7,7 @@ class CmsAdmin::SessionsController < CmsAdmin::BaseController
   end
 
   def create
-    @cms_current_user = CmsUser.authenticate(params[:login], params[:password])
+    @cms_current_user = CmsUser.authenticate(params[:login], params[:password], @cms_site.authentication, @cms_site.ldap_hostname, @cms_site.ldap_base_DN, @cms_site.ldap_uid)
     if @cms_current_user
       session[:cms_user_id] = @cms_current_user.id
       redirect_to cms_admin_pages_path

data/app/controllers/cms_admin/sites_controller.rb

@@ -37,6 +37,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
     if @cms_site.authentication != 'LDAP'
       @cms_site.ldap_hostname = ''
       @cms_site.ldap_base_DN = ''
+      @cms_site.ldap_uid = ''
     end
     if @cms_site.save
       flash[:notice] = 'Site updated'

data/app/controllers/cms_admin/upload_dirs_controller.rb

@@ -35,23 +35,28 @@ class CmsAdmin::UploadDirsController < CmsAdmin::BaseController
   end
 
   def uploads
+    tempfile = params[:file].tempfile.path
     @cms_upload_dir = @cms_site.cms_upload_dirs.find(params[:id])
     @cms_upload_check = @cms_upload_dir.cms_uploads.find_by_cms_upload_dir_id_and_file_file_name( params[:id], params[:file].original_filename)
     unless @cms_upload_check.nil?
       @cms_upload_check.destroy
     end
     @cms_upload = @cms_upload_dir.cms_uploads.create!(:file => params[:file], :cms_upload_dir_label => @cms_upload_dir.label, :cms_user_id => @cms_current_user.id)
+    if File::exists?(tempfile)
+      File::delete(tempfile)
+    end
     render :partial => 'file', :object => @cms_upload
   rescue ActiveRecord::RecordInvalid
     render :nothing => true, :status => :bad_request
   end
   
   def uploads_destroy
-    @cms_upload = CmsUpload.find( params[:id])
+    @cms_upload = CmsUpload.find(params[:id])
+    @cms_upload_dir = @cms_upload.cms_upload_dir
     @cms_upload.destroy
+    redirect_to :action => :show, :id => @cms_upload_dir.id
   end
 
-
   def destroy
     @cms_upload_dir = @cms_site.cms_upload_dirs.find(params[:id])
     @cms_upload_dir.destroy

data/app/controllers/cms_admin/users_controller.rb

@@ -25,6 +25,12 @@ class CmsAdmin::UsersController < CmsAdmin::BaseController
         render :action => 'new'
         return
       end
+    else
+      if @cms_user.password.nil? || @cms_user.password.empty?
+        flash[:error] = 'Password can not be blank'
+        render :action => 'new'
+        return
+      end
     end
     if CmsUser.find_by_admin_and_disabled(true,false).nil? 
       if @cms_user.admin == false || @cms_user.disabled == true
@@ -69,6 +75,12 @@ class CmsAdmin::UsersController < CmsAdmin::BaseController
         render :action => 'edit'
         return
       end
+    else
+      if @cms_user.password.nil? || @cms_user.password.empty?
+        flash[:error] = 'Password can not be blank'
+        render :action => 'new'
+        return
+      end
     end
     if @cms_user.disabled == true && CmsUser.find(:all, :conditions => {:admin => true, :disabled => false}).count == 1 &&  CmsUser.find(:all, :conditions => {:admin => true, :disabled => false}).first.id == @cms_user.id
       flash[:error] = "You can not disable the only Admin"

data/app/models/cms_user.rb

@@ -1,3 +1,4 @@
+require 'net/ldap'
 class CmsUser < ActiveRecord::Base
 
   validates :login,
@@ -10,17 +11,9 @@ class CmsUser < ActiveRecord::Base
   validates :last_name,
     :presence   => true
 
-  @cms_site = CmsSite.first
-  
-  unless @cms_site.nil?
-  if @cms_site.authentication != 'LDAP'
     attr_accessor :password_confirmation
     validates_confirmation_of :password
 
-    validates :password,
-      :presence => true,
-      :on       =>  :create
-
     # 'password' is a virtual attribute
     def password
       @password
@@ -32,24 +25,22 @@ class CmsUser < ActiveRecord::Base
       create_new_salt
       self.hashed_password = CmsUser.encrypted_password(self.password, self.salt)
     end
-  end
-  end
  
   def full_name
     [first_name, last_name].join(' ')
   end
 
-  def self.authenticate(login, password)
+  def self.authenticate(login, password, authentication, ldap_hostname, ldap_base_DN, ldap_uid)
 
-    if @cms_site.authentication == 'LDAP'
+    if authentication == 'LDAP'
       username = login
 
       if (password.empty?) then
         return nil
       end
 
-      ldap = Net::LDAP.new(:host => @cms_site.ldap_hostname, :base => @cms_site.ldap_base_DN)
-      filter = Net::LDAP::Filter.eq(@cms_site.ldap_uid, login)
+      ldap = Net::LDAP.new(:host => ldap_hostname, :base => ldap_base_DN)
+      filter = Net::LDAP::Filter.eq(ldap_uid, login)
       ldap.search(:filter => filter) {|entry| login = entry.dn}
       ldap.auth(login, password)
 
@@ -76,7 +67,6 @@ class CmsUser < ActiveRecord::Base
       user
     end
 
-rescue Net::LDAP::LdapError
   end
  
   private

data/app/views/cms_admin/upload_dirs/_file.html.erb

@@ -2,7 +2,7 @@
   <div class='item'>
     <div class='icon'></div>
     <div class='action_links'>
-      <%= link_to 'Delete', uploads_destroy_cms_admin_upload_dir_path(file), :method => :delete, :remote => true, :confirm => 'Are you sure?' %>
+      <%= link_to 'Delete', uploads_destroy_cms_admin_upload_dir_path(file), :method => :post, :confirm => 'Are you sure?' %>
     </div>
     <div class='label'>
       <%= link_to file.file_file_name, file.file.url, :target => '_blank', :class => 'filename' %>

data/app/views/cms_admin/upload_dirs/show.html.erb

@@ -11,7 +11,7 @@
       <div class='item'> 
         <div class='icon'></div>
         <div class='action_links'>
-          <%= link_to 'Delete', uploads_destroy_cms_admin_upload_dir_path(cms_upload), :method => :delete, :remote => true, :confirm => 'Are you sure?' %>
+          <%= link_to 'Delete', uploads_destroy_cms_admin_upload_dir_path(cms_upload), :method => :post, :confirm => 'Are you sure?' %>
         </div>
         <div class='label'>
           <%= link_to cms_upload.file_file_name, cms_upload.file.url, :target => '_blank', :class => 'filename' %>

data/config/routes.rb

@@ -31,7 +31,7 @@ Rails.application.routes.draw do
       end
       member do
         post :uploads
-        delete :uploads_destroy
+        post :uploads_destroy
       end
     end
   end

data/lib/LucyCMS/cms_tag.rb

@@ -68,7 +68,7 @@ module CmsTag
     # as a default.
     def render
       # cleaning content from possible irb stuff. Partial and Helper tags are OK.
-      if ComfortableMexicanSofa.config.disable_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
+      if LucyCms.config.disable_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
         content.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
       else
         content.to_s
@@ -116,4 +116,4 @@ private
   def self.tag_classes
     @@tag_classes ||= []
   end
-end
+end

data/lib/LucyCMS/configuration.rb

@@ -24,7 +24,7 @@ class LucyCms::Configuration
   
   # Configuration defaults
   def initialize
-    @version              = '0.0.5'
+    @version              = '0.0.6'
     @admin_route_prefix   = 'cms-admin'
     @admin_route_redirect = "/#{@admin_route_prefix}/pages"
     @seed_data_path       = nil

data/lib/LucyCMS/view_hooks.rb

@@ -16,7 +16,7 @@ module LucyCms::ViewHooks
   
   # Will declare a partial that will be rendered for this hook
   # Example:
-  # ComfortableMexicanSofa::ViewHooks.add(:navigation, 'shared/navigation')
+  # LucyCMS::ViewHooks.add(:navigation, 'shared/navigation')
   def self.add(name, partial_path)
     self.hooks[name.to_sym] ||= []
     self.hooks[name.to_sym] << partial_path

data/lib/lucy_cms.rb

@@ -28,14 +28,14 @@ module LucyCms
     
     # Modify CMS configuration
     # Example:
-    #   ComfortableMexicanSofa.configure do |config|
-    #     config.cms_title = 'Comfortable Mexican Sofa'
+    #   LucyCMS.configure do |config|
+    #     config.config.cms_upload_directory = 'shared'
     #   end
     def configure
       yield configuration
     end
     
-    # Accessor for ComfortableMexicanSofa::Configuration
+    # Accessor for LucyCMS::Configuration
     def configuration
       @configuration ||= Configuration.new
     end

data/lucy_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lucy_cms}
-  s.version = "0.0.4"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lucy"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-03-11}
   s.description = %q{}
   s.email = %q{lucy@lucysoft.com}
   s.extra_rdoc_files = [
@@ -69,7 +69,6 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/upload_dirs/index.html.erb",
     "app/views/cms_admin/upload_dirs/new.html.erb",
     "app/views/cms_admin/upload_dirs/show.html.erb",
-    "app/views/cms_admin/upload_dirs/uploads_destroy.js.erb",
     "app/views/cms_admin/users/_form.html.erb",
     "app/views/cms_admin/users/_index_branch.html.erb",
     "app/views/cms_admin/users/change_password.html.erb",

data/test/unit/view_methods_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ViewMethodsTest < ActiveSupport::TestCase
   
-  include LucyCMS::ViewMethods
+  include LucyCms::ViewMethods
   
   def test_cms_snippet_content
     assert_equal 'default_snippet_content', cms_snippet_content('default')

metadata

@@ -2,7 +2,7 @@
 name: lucy_cms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Lucy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -06:00
+date: 2011-03-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +141,6 @@ files:
 - app/views/cms_admin/upload_dirs/index.html.erb
 - app/views/cms_admin/upload_dirs/new.html.erb
 - app/views/cms_admin/upload_dirs/show.html.erb
-- app/views/cms_admin/upload_dirs/uploads_destroy.js.erb
 - app/views/cms_admin/users/_form.html.erb
 - app/views/cms_admin/users/_index_branch.html.erb
 - app/views/cms_admin/users/change_password.html.erb
@@ -347,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2604923462945760949
+      hash: 4497317104056704982
       segments: 
       - 0
       version: "0"

data/app/views/cms_admin/upload_dirs/uploads_destroy.js.erb

@@ -1,3 +0,0 @@
-$("#<%= dom_id(@cms_upload) %>").fadeOut('slow', function(){
-  $(this).remove()
-})