alchemy_cms 2.1.beta6 → 2.1.rc2

data/app/models/alchemy/essence_file.rb

@@ -5,15 +5,8 @@ module Alchemy
 			:ingredient_column => :attachment,
 			:preview_text_method => :name
 		)
-		
+
 		belongs_to :attachment
-		
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.attachment_id = params["attachment_id"].to_s
-			self.save
-		end
 
 	end
 end

data/app/models/alchemy/essence_flash.rb

@@ -5,13 +5,6 @@ module Alchemy
 			:ingredient_column => :attachment,
 			:preview_text_method => :name
 		)
-		
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.attachment_id = params["attachment_id"].to_s
-			self.save
-		end
 
 	end
 end

data/app/models/alchemy/essence_html.rb

@@ -4,18 +4,11 @@ module Alchemy
 		acts_as_essence(
 			:ingredient_column => :source
 		)
-		
+
 		# Returns the first x (default = 30) (HTML escaped) characters from self.source for the Element#preview_text method.
 		def preview_text(maxlength = 30)
 			CGI.escapeHTML(source.to_s)[0..maxlength]
 		end
-		
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.source = params["source"].to_s
-			self.save
-		end
 
 	end
 end

data/app/models/alchemy/essence_picture.rb

@@ -14,16 +14,5 @@ module Alchemy
 			caption.gsub!(/(\r\n|\r|\n)/, "<br/>")
 		end
 
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.link_class_name = params['link_class_name']
-			self.link_target = params['link_target']
-			self.link = params['link']
-			self.link_title = params['link_title']
-			self.picture_id = params['picture_id']
-			self.save
-		end
-
 	end
 end

data/app/models/alchemy/essence_richtext.rb

@@ -4,7 +4,7 @@ module Alchemy
 		acts_as_essence(
 			:preview_text_column => :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 Alchemy::Config.get(:ferret) == true
@@ -17,29 +17,21 @@ module Alchemy
 			)
 			before_save :check_ferret_indexing
 		end
-		
+
 		before_save :strip_content
-		
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.body = params['body'].to_s
-			self.public = options[:public]
-			self.save
-		end
 
 	private
 
 		def strip_content
 			self.stripped_body = strip_tags(self.body)
 		end
-		
+
 		def check_ferret_indexing
 			if self.do_not_index
 				self.disable_ferret(:always)
 			end
 		end
-		
+
 		# Stripping HTML Tags and only returns plain text.
 		def strip_tags(html)
 			return html if html.blank?

data/app/models/alchemy/essence_text.rb

@@ -2,7 +2,7 @@ module Alchemy
 	class EssenceText < ActiveRecord::Base
 
 		acts_as_essence
-		
+
 		# Require acts_as_ferret only if Ferret full text search is enabled (default).
 		# You can disable it in +config/alchemy/config.yml+
 		if Alchemy::Config.get(:ferret) == true
@@ -15,18 +15,6 @@ module Alchemy
 			)
 			before_save :check_ferret_indexing
 		end
-		
-		# Saves the content from params
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.body = params["body"]
-			self.link = params["link"]
-			self.link_title = params["link_title"]
-			self.link_class_name = params["link_class_name"]
-			self.link_target = params["link_target"]
-			self.public = options[:public]
-			self.save
-		end
 
 	private
 

data/app/models/alchemy/essence_video.rb

@@ -5,15 +5,8 @@ module Alchemy
 			:ingredient_column => :attachment,
 			:preview_text_method => :name
 		)
-		
+
 		belongs_to :attachment
-		
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.attachment_id = params["attachment_id"].to_s
-			self.save
-		end
 
 	end
 end

data/app/models/alchemy/page.rb

@@ -2,10 +2,9 @@
 module Alchemy
 	class Page < ActiveRecord::Base
 
-		RESERVED_PAGE_LAYOUTS = %w(rootpage)
 		RESERVED_URLNAMES = %w(admin messages)
 
-		acts_as_nested_set
+		acts_as_nested_set(:dependent => :destroy)
 		stampable
 
 		has_many :folded_pages
@@ -15,23 +14,23 @@ module Alchemy
 		belongs_to :language
 
 		validates_presence_of :name, :message => '^'+Alchemy::I18n.t("please enter a name")
-		validates_presence_of :page_layout, :message => '^'+Alchemy::I18n.t("Please choose a page layout.")
-		validates_presence_of :parent_id, :message => '^'+Alchemy::I18n.t("No parent page was given."), :unless => :rootpage?
+		validates_presence_of :page_layout, :message => '^'+Alchemy::I18n.t("Please choose a page layout."), :unless => :systempage?
+		validates_presence_of :parent_id, :message => '^'+Alchemy::I18n.t("No parent page was given."), :if => proc { Page.count > 1 }
 		validates_length_of :urlname, :minimum => 3, :too_short => Alchemy::I18n.t("urlname_to_short"), :if => :urlname_entered?
 		validates_uniqueness_of :urlname, :message => '^'+Alchemy::I18n.t("URL-Name already token"), :scope => 'language_id', :if => :urlname_entered?
-		validates :page_layout, :exclusion => { :in => RESERVED_PAGE_LAYOUTS, :message => '^'+Alchemy::I18n.t("This page_layout name is reserved.") }, :unless => :rootpage?
 		validates :urlname, :exclusion => { :in => RESERVED_URLNAMES, :message => '^'+Alchemy::I18n.t("This urlname is reserved.") }
 
 		attr_accessor :do_not_autogenerate
 		attr_accessor :do_not_sweep
 		attr_accessor :do_not_validate_language
 
-		before_save :set_url_name, :unless => Proc.new { |page| page.redirects_to_external? }
-		before_save :set_title, :unless => Proc.new { |page| page.redirects_to_external? }
-		before_save :set_language_code
-		after_create :autogenerate_elements, :unless => Proc.new { |page| page.do_not_autogenerate }
-		after_create :create_cells
-		after_save :set_restrictions_to_child_pages
+		before_save :set_url_name, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
+		before_save :set_title, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
+		before_save :set_language_code, :unless => :systempage?
+		before_save :set_restrictions_to_child_pages, :if => proc { |page| !page.systempage? && page.restricted_changed? }
+		before_save :inherit_restricted_status, :if => proc { |page| !page.systempage? && page.parent && page.parent.restricted? }
+		after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
+		after_create :create_cells, :unless => :systempage?
 
 		scope :language_roots, where(:language_root => true)
 		scope :layoutpages, where(:layoutpage => true)
@@ -42,6 +41,7 @@ module Alchemy
 		scope :published, where(:public => true)
 		scope :accessable, where(:restricted => false)
 		scope :restricted, where(:restricted => true)
+		scope :not_restricted, where(:restricted => false)
 		scope :public_language_roots, lambda {
 			where(:language_root => true).where("`alchemy_pages`.`language_code` IN ('#{Language.all_codes_for_published.join('\',\'')}')").where(:public => true)
 		}
@@ -52,6 +52,7 @@ module Alchemy
 		# Used for flushing all page caches at once.
 		scope :contentpages, where("`alchemy_pages`.`layoutpage` = 0 AND `alchemy_pages`.`parent_id` IS NOT NULL")
 		scope :flushables, not_locked.published.contentpages
+		scope :searchables, not_restricted.published.contentpages
 
 		# Finds selected elements from page.
 		# 
@@ -305,10 +306,9 @@ module Alchemy
 
 		# Returns the self#page_layout description from config/alchemy/page_layouts.yml file.
 		def layout_description
+			return {} if self.systempage?
 			description = Alchemy::PageLayout.get(self.page_layout)
-			if self.root? || self.layoutpage?
-				return {}
-			elsif description.nil?
+			if description.nil?
 				raise "Description could not be found for page layout named #{self.page_layout}. Please check page_layouts.yml file."
 			else
 				description
@@ -338,13 +338,15 @@ module Alchemy
 		end
 
 		def set_restrictions_to_child_pages
-			return nil if self.restricted_was == self.restricted
 			descendants.each do |child|
-				child.restricted = restricted
-				child.save
+				child.update_attribute(:restricted, self.restricted?)
 			end
 		end
 
+		def inherit_restricted_status
+			self.restricted = parent.restricted?
+		end
+
 		def contains_feed?
 			definition["feed"]
 		end
@@ -449,7 +451,7 @@ module Alchemy
 					:language_id => new_parent.language_id,
 					:language_code => new_parent.language_code,
 					:name => child.name + ' (' + Alchemy::I18n.t('Copy') + ')',
-					:urlname => '',
+					:urlname => child.redirects_to_external? ? child.urlname : '',
 					:title => ''
 				})
 				new_child.move_to_child_of(new_parent)
@@ -482,15 +484,19 @@ module Alchemy
 			self.locker.name
 		end
 
-		# is the curent object the main rootpage?
 		def rootpage?
-			(self.page_layout == "rootpage") && self.parent_id.blank?
+			!self.new_record? && self.parent_id.blank?
+		end
+
+		def systempage?
+			return true if Page.root.nil?
+			rootpage? || (self.parent_id == Page.root.id && !self.language_root?)
 		end
 
 		def self.rootpage
-			where(:page_layout => 'rootpage').where(:parent_id => nil).first
+			self.root
 		end
-  
+
 	private
 
 		def find_next_or_previous_page(direction = "next", options = {})

data/app/models/alchemy/picture.rb

@@ -19,6 +19,13 @@ module Alchemy
 
 		stampable
 
+		def self.find_paginated(params, per_page)
+			Picture.where("name LIKE '%#{params[:query]}%'").paginate(
+				:page => params[:page] || 1,
+				:per_page => per_page
+			).order(:name)
+		end
+
 		# Returning the filepath relative to Rails.root public folder.
 		def public_file_path
 			self.file_path.gsub("#{Rails.root}/public", '')
@@ -32,6 +39,18 @@ module Alchemy
 			end
 		end
 
+		def suffix
+			if image_filename =~ /\./
+				image_filename.split('.').last.downcase
+			else
+				""
+			end
+		end
+
+		def humanized_name
+			(image_filename.downcase.gsub(/\.#{Regexp.quote(suffix)}$/, '')).humanize
+		end
+
 		# Returning true if picture's width is greater than it's height
 		def landscape_format?
 			return (self.image_width > self.image_height) ? true : false

data/app/sweepers/alchemy/pages_sweeper.rb

@@ -37,12 +37,23 @@ module Alchemy
 
 		def expire_page(page)
 			return if page.do_not_sweep
-			expire_action(
-				:controller => '/alchemy/pages',
-				:action => :show,
-				:urlname => page.urlname_was,
-				:lang => multi_language? ? page.language_code : nil
-			)
+			# TODO: We should change this back to expire_action after Rails 3.2 was released.
+			# expire_action(
+			# 	alchemy.show_page_url(
+			# 		:urlname => page.urlname_was,
+			# 		:lang => multi_language? ? page.language_code : nil
+			# 	)
+			# )
+			# Temporarily fix for Rails 3 bug
+      return if alchemy.nil?
+			expire_fragment(ActionController::Caching::Actions::ActionCachePath.new(
+				self,
+				alchemy.show_page_url(
+					:urlname => page.urlname_was,
+					:lang => multi_language? ? page.language_code : nil
+				),
+				false
+			).path)
 		end
 
 	end

data/app/sweepers/alchemy/pictures_sweeper.rb

@@ -14,9 +14,7 @@ module Alchemy
 
 		def expire_cache_for(picture)
 			# Removing all variants of the picture with FileUtils.
-			FileUtils.rm_rf("#{Rails.root}/public/pictures/show/#{picture.id}")
-			FileUtils.rm_rf("#{Rails.root}/public/pictures/thumbnails/#{picture.id}")
-			expire_page(zoom_picture_path(picture, :format => 'png'))
+			FileUtils.rm_rf(Rails.root.join('public', Alchemy.mount_point, 'pictures', picture.id.to_s))
 		end
 
 	end

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -19,7 +19,7 @@
 		</div>
 		<%= js_filter_field(:onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>
 	</div>
-	<div id="assign_file_list" class="with_padding">
+	<ul id="assign_file_list" class="with_padding">
 		<%= render :partial => 'file_to_assign', :collection => @attachments %>
-	</div>
+	</ul>
 </div>

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -48,7 +48,7 @@
 			alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
 			{
 				:title => t('rename_file'),
-				:size => '380x45'
+				:size => '380x100'
 			},
 			:class => 'icon file_edit',
 			:title => t('rename_file')

data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb

@@ -3,7 +3,7 @@
 	suffix = "</div><div class=\"assign_file_file_name\">#{file_to_assign.filename}</div>"
 -%>
 <%- img_tag = "#{prefix}#{render_icon(file_to_assign.icon_css_class)}#{suffix}".html_safe -%>
-<div class="assign_file_file" name="<%= file_to_assign.filename %>">
+<li class="assign_file_file <%= cycle('even', 'odd') %>" name="<%= file_to_assign.filename %>">
 	<%= link_to(
 		img_tag,
 		{
@@ -17,4 +17,4 @@
 		:method => 'put',
 		:title => file_to_assign.filename
 	) %>
-</div>
+</li>

data/app/views/alchemy/admin/attachments/_files_list.html.erb

@@ -1,21 +1,23 @@
 <%- if @attachments.blank? && params[:query].nil? -%>
-	<p class="padding_left_right" id="no_files_notice">
-		<%= t("no_files_in_archive") %>
-	</p>
+<div class="info" id="no_files_notice">
+	<%= render_icon('info') %>
+	<%= t("no_files_in_archive") %>
+</div>
 <%- elsif @attachments.blank? -%>
-	<p class="padding_left_right">
-		<%= t("no_search_results") %>
-	</p>
+<div class="info">
+	<%= render_icon('info') %>
+	<%= t("no_search_results") %>
+</div>
 <%- end -%>
 <table id="all_files" class="list">
 	<%- unless @attachments.blank? -%>
 	<tr>
 		<th class="icon"></th>
-		<th class="name"><%= t('Attachment|Name') %></th>
-		<th class="file_name"><%= t('Attachment|Filename') %></th>
-		<th class="file_type"><%= t('Attachment|Content type') %></th>
-		<th class="file_size"><%= t('Attachment|Size') %></th>
-		<th class="date"><%= t('Attachment|Created at') %></th>
+		<th class="name"><%= Alchemy::Attachment.human_attribute_name('name') %></th>
+		<th class="file_name"><%= Alchemy::Attachment.human_attribute_name('filename') %></th>
+		<th class="file_type"><%= Alchemy::Attachment.human_attribute_name('content_type') %></th>
+		<th class="file_size"><%= Alchemy::Attachment.human_attribute_name('size') %></th>
+		<th class="date"><%= Alchemy::Attachment.human_attribute_name('created_at') %></th>
 		<th class="tools"></th>
 	</tr>
 	<%- end -%>

data/app/views/alchemy/admin/attachments/create.js.erb

@@ -2,7 +2,7 @@
 <%- if @while_assigning -%>
 	$('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay.html.erb")) -%>');
 <%- else -%>
-  $('#archive_all').html('<%= escape_javascript(render(:partial => 'files_list')) %>');
+  $('#archive_all').html('<%= escape_javascript(render(:partial => "files_list")) %>');
   Alchemy.growl('<%= @message %>');
 <%- end -%>  
 })(jQuery);

data/app/views/alchemy/admin/attachments/edit.html.erb

@@ -1,8 +1,8 @@
 <%= form_for([:admin, @attachment], :url => {:action => :update, :query => params[:query], :page => params[:page]}) do |f| -%>
 	<table>
 		<tr>
-			<td class="label"><%= f.label 'name', :class => "short") %></td>
-			<td class="input"><%= f.text_field( 'name', :class => 'thin_border very_long') %></td>
+			<td class="label"><%= f.label 'name', :class => "short" %></td>
+			<td class="input"><%= f.text_field 'name', :class => 'thin_border very_long' %></td>
 		</tr>
 		<tr>
 			<td></td>