alchemy_cms 2.2.rc3 → 2.2.rc6

data/alchemy_cms.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{An extremly flexbile CMS for Rails 3.2}
   s.description = %q{Alchemy is a Rails 3 CMS with a flexible content storing architecture.}
   s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
+  s.required_ruby_version = '>= 1.8.7'
   s.license = 'BSD New'
 
   s.files         = `git ls-files`.split("\n")

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -393,7 +393,7 @@ ul#layoutpages.list li {
 }
 
 ul#sitemap.list {
-  padding: 0;
+  padding: 0 0 104px 0;
 }
 
 ul.list li {

data/app/assets/stylesheets/alchemy/sitemap.css.scss

@@ -41,6 +41,9 @@ div#bottom_buttons {
   padding-right: 4px;
   font-size: 10px;
   padding-left: 4px;
+  max-width: 45%;
+  white-space: nowrap;
+  overflow: hidden;
 }
 
 .sitemap_pagename_link.odd {

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -50,7 +50,7 @@ module Alchemy
       def update
         @attachment = Attachment.find(params[:id])
         oldname = @attachment.name
-        if @attachment.update_attributes(params[:attachment], :as => current_user.role.to_sym)
+        if @attachment.update_attributes(params[:attachment])
           flash[:notice] = t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
         else
           render :action => "edit"

data/app/controllers/alchemy/admin/contents_controller.rb

@@ -37,7 +37,7 @@ module Alchemy
 
       def update
         content = Content.find(params[:id])
-        content.essence.update_attributes(params[:content], :as => current_user.role.to_sym)
+        content.essence.update_attributes(params[:content])
       end
 
       def order

data/app/controllers/alchemy/admin/dashboard_controller.rb

@@ -7,7 +7,7 @@ module Alchemy
         @clipboard_items = session[:clipboard]
         @last_edited_pages = Page.all_last_edited_from(current_user)
         @locked_pages = Page.all_locked
-        @online_users = User.all_online.to_a.delete_if { |u| u == current_user }
+        @online_users = User.logged_in.to_a - [current_user]
         @first_time = current_user.login_count == 1 && current_user.last_login_at.nil?
       end
 

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -54,7 +54,7 @@ module Alchemy
         if @element.save
           render :action => :create
         else
-          render_remote_errors(@element, 'form#new_element button.button')
+          render_remote_errors(@element, 'form#new_alchemy_element button.button')
         end
       end
 

data/app/controllers/alchemy/admin/essence_audios_controller.rb

@@ -4,7 +4,7 @@ module Alchemy
 
       def update
         @essence_audio = EssenceAudio.find(params[:id])
-        @essence_audio.update_attributes(params[:essence_audio], :as => current_user.role.to_sym)
+        @essence_audio.update_attributes(params[:essence_audio])
       end
 
     end

data/app/controllers/alchemy/admin/essence_files_controller.rb

@@ -12,7 +12,7 @@ module Alchemy
 
       def update
         @essence_file = EssenceFile.find(params[:id])
-        @essence_file.update_attributes(params[:essence_file], :as => current_user.role.to_sym)
+        @essence_file.update_attributes(params[:essence_file])
       end
 
       def assign

data/app/controllers/alchemy/admin/essence_flashes_controller.rb

@@ -4,7 +4,7 @@ module Alchemy
 
       def update
         @essence_flash = EssenceFlash.find(params[:id])
-        @essence_flash.update_attributes(params[:essence_flash], :as => current_user.role.to_sym)
+        @essence_flash.update_attributes(params[:essence_flash])
       end
 
     end

data/app/controllers/alchemy/admin/essence_pictures_controller.rb

@@ -47,7 +47,7 @@ module Alchemy
 
       def update
         @essence_picture = EssencePicture.find(params[:id])
-        @essence_picture.update_attributes(params[:essence_picture], :as => current_user.role.to_sym)
+        @essence_picture.update_attributes(params[:essence_picture])
         @content = Content.find(params[:content_id])
       end
 

data/app/controllers/alchemy/admin/essence_videos_controller.rb

@@ -4,7 +4,7 @@ module Alchemy
 
       def update
         @essence_video = EssenceVideo.find(params[:id])
-        @essence_video.update_attributes(params[:essence_video], :as => current_user.role.to_sym)
+        @essence_video.update_attributes(params[:essence_video])
       end
 
     end

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -57,9 +57,9 @@ module Alchemy
           })
           source_page.copy_children_to(page) unless source_page.children.blank?
         else
-          page = Page.create(params[:page], :as => current_user.role.to_sym)
+          page = Page.create(params[:page])
         end
-        render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, t("Page created", :name => page.name), 'form#new_page_form button.button')
+        render_errors_or_redirect(page, parent.layoutpage? ? admin_layoutpages_path : admin_pages_path, t("Page created", :name => page.name), '#alchemyOverlay button.button')
       end
 
       # Edit the content of the page and all its elements and contents.
@@ -87,11 +87,11 @@ module Alchemy
 
       def update
         # fetching page via before filter
-        if @page.update_attributes(params[:page], :as => current_user.role.to_sym)
+        if @page.update_attributes(params[:page])
           @notice = t("Page saved", :name => @page.name)
           @while_page_edit = request.referer.include?('edit')
         else
-          render_remote_errors(@page, "form#edit_page_#{@page.id} button.button")
+          render_remote_errors(@page, "#alchemyOverlay button.button")
         end
       end
 

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -10,7 +10,6 @@ module Alchemy
 
       before_filter :load_resource, :only => [:show, :edit, :update, :destroy]
 
-
       def index
         if params[:query].blank?
           items = resource_handler.model
@@ -37,7 +36,7 @@ module Alchemy
       end
 
       def create
-        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.new(params[resource_handler.namespaced_model_name.to_sym], :as => current_user.role.to_sym))
+        instance_variable_set("@#{resource_handler.model_name}", resource_handler.model.new(params[resource_handler.namespaced_model_name.to_sym]))
         resource_instance_variable.save
         render_errors_or_redirect(
           resource_instance_variable,
@@ -47,7 +46,7 @@ module Alchemy
       end
 
       def update
-        resource_instance_variable.update_attributes(params[resource_handler.namespaced_model_name.to_sym], :as => current_user.role.to_sym)
+        resource_instance_variable.update_attributes(params[resource_handler.namespaced_model_name.to_sym])
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path,

data/app/controllers/alchemy/admin/users_controller.rb

@@ -28,7 +28,7 @@ module Alchemy
       end
 
       def create
-        @user = User.new(params[:user], :as => current_user.role.to_sym)
+        @user = User.new(params[:user])
         if @user.save
           if @user.role == "registered" && params[:send_credentials]
             Notifications.registered_user_created(@user).deliver
@@ -51,7 +51,7 @@ module Alchemy
 
       def update
         # User is fetched via before filter
-        @user.update_attributes(params[:user], :as => current_user.role.to_sym)
+        @user.update_attributes(params[:user])
         Notifications.admin_user_created(@user).deliver if params[:send_credentials]
         render_errors_or_redirect(
           @user,

data/app/controllers/alchemy/base_controller.rb

@@ -124,6 +124,13 @@ module Alchemy
       end
     end
 
+    def render_404(exception = nil)
+      if exception
+        logger.info "Rendering 404: #{exception.message}"
+      end
+      render :file => "#{Rails.root}/public/404", :status => 404
+    end
+
     protected
 
     def permission_denied
@@ -132,7 +139,7 @@ module Alchemy
           redirect_to alchemy.root_path
         else
           if request.referer == alchemy.login_url
-            render :file => File.join(Rails.root.to_s, 'public', '422.html'), :status => 422, :layout => false
+            render :file => Rails.root.join('public/422'), :status => 422
           elsif request.xhr?
             respond_to do |format|
               format.js {

data/app/controllers/alchemy/pages_controller.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class PagesController < Alchemy::BaseController
 
+    rescue_from ActionController::RoutingError, :with => :render_404
+
     # We need to include this helper because we need the breadcrumb method.
     # And we cannot define the breadcrump method as helper_method, because rspec does not see helper_methods.
     # Not the best solution, but's working.

data/app/models/alchemy/attachment.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class Attachment < ActiveRecord::Base
 
+    attr_accessible :uploaded_data, :name
+
     stampable
 
     has_attachment(

data/app/models/alchemy/cell.rb

@@ -13,6 +13,8 @@
 module Alchemy
   class Cell < ActiveRecord::Base
 
+    attr_accessible :page_id, :name
+
     belongs_to :page
     validates_uniqueness_of :name, :scope => :page_id
     has_many :elements, :dependent => :destroy, :order => :position

data/app/models/alchemy/content.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class Content < ActiveRecord::Base
 
+    attr_accessible :name, :element_id, :do_not_index, :essence_type, :essence_id
+
     belongs_to :essence, :polymorphic => true, :dependent => :destroy
     belongs_to :element
 
@@ -73,11 +75,22 @@ module Alchemy
     #   @copy.element_id # => 3
     #
     def self.copy(source, differences = {})
-      differences[:position] = nil
-      differences[:id] = nil
-      attributes = source.attributes.except("id").merge(differences)
+      attributes = source.attributes.except(
+        "position",
+        "created_at",
+        "updated_at",
+        "creator_id",
+        "updater_id",
+        "id"
+      ).merge(differences.stringify_keys)
       content = self.create!(attributes)
-      new_essence = content.essence.class.new(content.essence.attributes.except('id'))
+      new_essence = content.essence.class.new(content.essence.attributes.except(
+        "id",
+        "creator_id",
+        "updater_id",
+        "created_at",
+        "updated_at"
+      ))
       new_essence.save!
       raise "Essence not cloned" if new_essence.id == content.essence_id
       content.update_attribute(:essence_id, new_essence.id)

data/app/models/alchemy/element.rb

@@ -1,6 +1,16 @@
 module Alchemy
   class Element < ActiveRecord::Base
 
+    attr_accessible(
+      :name,
+      :unique,
+      :page_id,
+      :public,
+      :cell_id,
+      :folded,
+      :create_contents_after_create
+    )
+
     # All Elements inside a cell are a list. All Elements not in cell are in the cell_id.nil list.
     acts_as_list :scope => [:page_id, :cell_id]
     stampable :stamper_class_name => :user
@@ -11,7 +21,7 @@ module Alchemy
     has_and_belongs_to_many :to_be_sweeped_pages, :class_name => 'Alchemy::Page', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
 
     validates_uniqueness_of :position, :scope => [:page_id, :cell_id]
-    validates_presence_of :name, :on => :create, :message => '^' + I18n.t(:choose_element)
+    validates_presence_of :name, :on => :create
 
     attr_accessor :create_contents_after_create
 
@@ -218,8 +228,17 @@ module Alchemy
     #   @copy.public? # => false
     #
     def self.copy(source, differences = {})
-      attributes = source.attributes.except("id").merge(differences)
-      element = self.create!(attributes.merge(:create_contents_after_create => false, :id => nil, :position => nil))
+      attributes = source.attributes.except(
+        "id",
+        "position",
+        "folded",
+        "created_at",
+        "updated_at",
+        "creator_id",
+        "updater_id",
+        "cell_id"
+      ).merge(differences.stringify_keys)
+      element = self.create!(attributes.merge(:create_contents_after_create => false))
       source.contents.each do |content|
         new_content = Content.copy(content, :element_id => element.id)
         new_content.move_to_bottom

data/app/models/alchemy/essence_audio.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class EssenceAudio < ActiveRecord::Base
 
+    attr_accessible :width, :height, :show_eq, :show_navigation
+
     acts_as_essence(
       :ingredient_column => :attachment,
       :preview_text_method => :name

data/app/models/alchemy/essence_date.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class EssenceDate < ActiveRecord::Base
 
+    attr_accessible :date
+
     acts_as_essence(
       :ingredient_column => :date
     )

data/app/models/alchemy/essence_file.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class EssenceFile < ActiveRecord::Base
 
+    attr_accessible :title, :css_class
+
     acts_as_essence(
       :ingredient_column => :attachment,
       :preview_text_method => :name

data/app/models/alchemy/essence_flash.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class EssenceFlash < ActiveRecord::Base
 
+    attr_accessible :width, :height, :player_version
+
     acts_as_essence(
       :ingredient_column => :attachment,
       :preview_text_method => :name

data/app/models/alchemy/essence_html.rb

@@ -1,6 +1,8 @@
 module Alchemy
   class EssenceHtml < ActiveRecord::Base
 
+    attr_accessible :source
+
     acts_as_essence(
       :ingredient_column => :source
     )

data/app/models/alchemy/essence_picture.rb

@@ -1,6 +1,21 @@
 module Alchemy
   class EssencePicture < ActiveRecord::Base
 
+    attr_accessible(
+      :caption,
+      :title,
+      :alt_tag,
+      :link,
+      :link_class_name,
+      :link_title,
+      :css_class,
+      :link_target,
+      :crop_from,
+      :crop_size,
+      :render_size,
+      :picture_id
+    )
+
     acts_as_essence(
       :ingredient_column => :picture,
       :preview_text_method => :name

data/app/models/alchemy/essence_richtext.rb

@@ -5,6 +5,8 @@ module Alchemy
       :preview_text_column => :stripped_body
     )
 
+    attr_accessible :do_not_index, :body, :public, :stripped_body
+
     # Require acts_as_ferret only if Ferret full text search is enabled (default).
     # You can disable it in +config/alchemy/config.yml+
     if Config.get(:ferret) == true

data/app/models/alchemy/essence_text.rb

@@ -3,6 +3,16 @@ module Alchemy
 
     acts_as_essence
 
+    attr_accessible(
+      :do_not_index,
+      :body,
+      :public,
+      :link,
+      :link_title,
+      :link_class_name,
+      :link_target
+    )
+
     # Require acts_as_ferret only if Ferret full text search is enabled (default).
     # You can disable it in +config/alchemy/config.yml+
     if Config.get(:ferret) == true

data/app/models/alchemy/essence_video.rb

@@ -1,6 +1,14 @@
 module Alchemy
   class EssenceVideo < ActiveRecord::Base
 
+    attr_accessible(
+      :width,
+      :height,
+      :allow_fullscreen,
+      :auto_play,
+      :show_navigation
+    )
+
     acts_as_essence(
       :ingredient_column => :attachment,
       :preview_text_method => :name