alchemy_cms 2.1.beta6 → 2.1.rc2

data/app/controllers/alchemy/pages_controller.rb

@@ -1,6 +1,12 @@
 module Alchemy
 	class PagesController < Alchemy::BaseController
 
+		# 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.
+		# Anyone with a better idea please provide a patch.
+		include Alchemy::BaseHelper
+
 		before_filter :render_page_or_redirect, :only => [:show, :sitemap]
 		before_filter :perform_search, :only => :show, :if => proc { configuration(:ferret) }
 
@@ -9,7 +15,7 @@ module Alchemy
 		caches_action(
 			:show,
 			:cache_path => proc { show_page_url(:urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
-			:if => proc do
+			:if => proc {
 				if Alchemy::Config.get(:cache_pages)
 					page = Page.find_by_urlname_and_language_id_and_public(
 						params[:urlname],
@@ -24,20 +30,20 @@ module Alchemy
 				else
 					false
 				end
-			end
+			},
+			:layout => false
 		)
 
+		layout :layout_for_page
+
 		# Showing page from params[:urlname]
 		# @page is fetched via before filter
 		# @root_page is fetched via before filter
 		# @language fetched via before_filter in alchemy_controller
 		# querying for search results if any query is present via before_filter
-		# rendering page
 		def show
 			respond_to do |format|
-				format.html {
-					render :layout => layout_for_page
-				}
+				format.html { render }
 				format.rss {
 					if @page.contains_feed?
 						render :action => "show.rss.builder", :layout => false
@@ -79,7 +85,7 @@ module Alchemy
 			if User.admins.count == 0 && @page.nil?
 				redirect_to signup_path
 			elsif @page.blank?
-				render(:file => "#{Rails.root}/public/404.html", :status => 404, :layout => false)
+				render_404
 			elsif multi_language? && params[:lang].blank?
 				redirect_page(:lang => session[:language_code])
 			elsif multi_language? && params[:urlname].blank? && !params[:lang].blank? && configuration(:redirect_index)
@@ -90,8 +96,14 @@ module Alchemy
 				redirect_page
 			elsif !multi_language? && !params[:lang].blank?
 				redirect_page
+			elsif configuration(:url_nesting) && url_levels.any? && !levels_are_in_page_branch?
+				render_404
+			elsif configuration(:url_nesting) && should_be_nested? && !url_levels.any?
+				redirect_page(params_for_nested_url)
+			elsif !configuration(:url_nesting) && url_levels.any?
+				redirect_page
 			elsif @page.has_controller?
-				redirect_to(@page.controller_and_action)
+				redirect_to main_app.url_for(@page.controller_and_action)
 			else
 				# setting the language to page.language to be sure it's correct
 				set_language_from(@page.language_id)
@@ -113,28 +125,29 @@ module Alchemy
 			if searchresult_page_layouts.any?
 				@search_result_page = Page.find_by_page_layout_and_public_and_language_id(searchresult_page_layouts.first["name"], true, session[:language_id])
 				if !params[:query].blank? && @search_result_page
-					@rtf_search_results = EssenceRichtext.find_with_ferret(
-						"*#{params[:query]}*",
-						{:limit => :all},
-						{:conditions => ["public = ?", true]}
-					)
-					@text_search_results = EssenceText.find_with_ferret(
-						"*#{params[:query]}*",
-						{:limit => :all},
-						{:conditions => ["public = ?", true]}
-					)
-					@search_results = (@text_search_results + @rtf_search_results).sort{ |y, x| x.ferret_score <=> y.ferret_score }
+					@search_results = []
+					%w(Alchemy::EssenceText Alchemy::EssenceRichtext).each do |e|
+						@search_results += e.constantize.includes(:contents => {:element => :page}).find_with_ferret(
+							"*#{params[:query]}*",
+							{:limit => :all},
+							{:conditions => [
+								'alchemy_pages.public = ? AND alchemy_pages.layoutpage = ? AND alchemy_pages.restricted = ?',
+								true, false, false
+							]}
+						)
+					end
+					return @search_results.sort{ |y, x| x.ferret_score <=> y.ferret_score } if @search_results.any?
 				end
 			end
 		end
 
 		def find_first_public(page)
-			if(page.public == true)
+			if page.public == true
 				return page
 			end
 			page.children.each do |child|
 				result = find_first_public(child)
-				if(result!=nil)
+				if result != nil
 					return result
 				end
 			end
@@ -161,20 +174,26 @@ module Alchemy
 
 		def additional_params
 			params.clone.delete_if do |key, value|
-				["action", "controller", "urlname", "lang"].include?(key)
+				["action", "controller", "urlname", "lang", "level1", "level2", "level3"].include?(key)
 			end
 		end
 
-		def layout_for_page
-			if params[:layout] == 'none'
-				false
-			elsif not params[:layout].blank?
-				params[:layout]
-			elsif File.exist?(Rails.root.join('app/views/layouts', 'application.html.erb'))
-				'application'
-			else
-				'alchemy/pages'
-			end
+		def render_404
+			render(:file => "#{Rails.root}/public/404.html", :status => 404, :layout => false)
+		end
+
+		def url_levels
+			params.keys.grep(/^level[1-3]$/)
+		end
+
+		def levels_are_in_page_branch?
+			nested_urlnames = breadcrumb(@page).collect(&:urlname)
+			level_names = params.select { |k, v| url_levels.include?(k) }.map(&:second)
+			level_names & nested_urlnames == level_names
+		end
+
+		def should_be_nested?
+			!params_for_nested_url.blank?
 		end
 
 	end

data/app/controllers/alchemy/pictures_controller.rb

@@ -44,9 +44,6 @@ module Alchemy
 
 		def zoom
 			@picture = Picture.find(params[:id])
-			respond_to do |format|
-				format.png
-			end
 		end
 
 	private

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -24,7 +24,7 @@ module Alchemy
 
 		def login
 			if current_user
-				redirect_to admin_dashboard_path, :notice => t('You are already logged in.')
+				redirect_to admin_dashboard_path, :notice => t('You are already logged in')
 			else
 				if request.get?
 					@user_session = UserSession.new()

data/app/helpers/alchemy/admin/base_helper.rb

@@ -341,10 +341,12 @@ module Alchemy
 				options.symbolize_keys!
 				defaults = {
 					:overlay => true,
-					:skip_permission_check => false
+					:skip_permission_check => false,
+					:active => false,
+					:link_options => {}
 				}
 				options = defaults.merge(options)
-				button = content_tag('div', :class => 'button_with_label') do
+				button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
 					link = if options[:overlay]
 						link_to_overlay_window(
 							render_icon(options[:icon]),
@@ -392,8 +394,8 @@ module Alchemy
 				options = defaults.merge(options)
 				content_for(:toolbar) do
 					content = <<-CONTENT
-					#{options[:buttons].map { |button_options| toolbar_button(button_options) }.join()}
-					#{render('alchemy/admin/partials/search_form', :url => options[:search_url]) if options[:search]}
+						#{options[:buttons].map { |button_options| toolbar_button(button_options) }.join()}
+						#{render('alchemy/admin/partials/search_form', :url => options[:search_url]) if options[:search]}
 					CONTENT
 					content.html_safe
 				end

data/app/helpers/alchemy/base_helper.rb

@@ -53,5 +53,31 @@ module Alchemy
 			content_tag('span', '', :class => "icon #{icon_class}")
 		end
 
+		# Returns an array of all pages in the same branch from current.
+		# I.e. used to find the active page in navigation.
+		def breadcrumb(current)
+			return [] if current.nil?
+			result = Array.new
+			result << current
+			while current = current.parent
+				result << current
+			end
+			return result.reverse
+		end
+
+		# Returns a hash with urlname for each url level.
+		# I.e.: +{:level1 => 'company', :level2 => 'history'}+
+		def params_for_nested_url(page = nil)
+			page ||= @page
+			raise ArgumentError if page.nil?
+			nested_urL_params = {}
+			page_bread_crumb = breadcrumb(page)
+			urlnames = page_bread_crumb[2..page_bread_crumb.length-2].collect(&:urlname)
+			urlnames.each_with_index do |urlname, i|
+				nested_urL_params["level#{i+1}"] = urlname
+			end
+			nested_urL_params.symbolize_keys
+		end
+
 	end
 end

data/app/helpers/alchemy/pages_helper.rb

@@ -310,18 +310,6 @@ module Alchemy
 			bc.join(options[:seperator]).html_safe
 		end
 
-		# Returns an array of all pages in the same branch from current.
-		# I.e. used to find the active page in navigation.
-		def breadcrumb(current)
-			return [] if current.nil?
-			result = Array.new
-			result << current
-			while current = current.parent
-				result << current
-			end
-			return result.reverse
-		end
-
 		# Returns @page.title
 		#
 		# The options are:
@@ -427,17 +415,16 @@ module Alchemy
 			end
 			robot = "#{@page.robot_index? ? "" : "no"}index, #{@page.robot_follow? ? "" : "no"}follow"
 			meta_string = %(
-				<meta charset=UTF-8">
+				<meta charset="UTF-8">
 				#{render_title_tag(:prefix => options[:title_prefix], :seperator => options[:title_seperator])}
 				#{render_meta_tag(:name => "description", :content => description)}
 				#{render_meta_tag(:name => "keywords", :content => keywords)}
-				<meta name="generator" content="Alchemy #{Alchemy::VERSION}">
-				<meta name="date" content="#{@page.updated_at}">
+				<meta name="created" content="#{@page.updated_at}">
 				<meta name="robots" content="#{robot}">
 			)
 			if @page.contains_feed?
 			meta_string += %(
-				<link rel="alternate" type="application/rss+xml" title="RSS" href="#{multi_language? ? alchemy.show_page_url(:protocol => 'feed', :urlname => @page.urlname, :lang => @page.language_code, :format => :rss) : show_page_url(:protocol => 'feed', :urlname => @page.urlname, :format => :rss)}">
+				<link rel="alternate" type="application/rss+xml" title="RSS" href="#{show_alchemy_page_url(@page, :protocol => 'feed', :format => :rss)}">
 			)
 			end
 			return meta_string.html_safe
@@ -456,7 +443,10 @@ module Alchemy
 			return warning("No page_layout, or urlname given. I got #{options.inspect} ") if options[:page_layout].blank? && options[:urlname].blank?
 			if options[:urlname].blank?
 				page = Page.find_by_page_layout(options[:page_layout])
-				return warning("No page found for #{options.inspect} ") if page.blank?
+				if page.blank?
+					warning("No page found for #{options.inspect} ")
+					return
+				end
 				urlname = page.urlname
 			else
 				urlname = options[:urlname]
@@ -491,7 +481,10 @@ module Alchemy
 				:html5 => false
 			}
 			options = default_options.merge(options)
-			return warning(t("No page found for #{options[:page].inspect}")) if options[:page].class.name != "Alchemy::Page"
+			if options[:page].class.name != "Alchemy::Page"
+				warning("No page found for #{options[:page].inspect}")
+				return
+			end
 			form_tag(show_alchemy_page_path(options[:page]), :method => :get, :class => 'fulltext_search') do
 				if options[:html5]
 					search_field_tag(:query, params[:query])
@@ -510,7 +503,7 @@ module Alchemy
 				:show_heading => true
 			}
 			options = default_options.merge(options)
-			return content_tag :h2, t('search.no_results') if @search_results.blank?
+			return content_tag :h2, t('search_result_page.no_results'), :class => 'no_search_results' if @search_results.blank?
 			results = ""
 			@search_results.each do |essence|
 				result = essence.highlight(
@@ -520,19 +513,20 @@ module Alchemy
 				results << render(:partial => options[:partial], :locals => {:result => result, :options => options, :page => essence.page}) if essence.page
 			end
 			output = ""
-			output << content_tag(:h1, t("search.result_heading", :query => h(params[:query])), :class => 'search_results_heading') if options[:show_heading]
-			output << content_tag(:h2, t("search.result_count", :result_count => @search_results.length), :class => 'search_result_count') if options[:show_result_count]
+			output << content_tag(:h1, t("search_result_page.result_heading", :query => h(params[:query])), :class => 'search_results_heading') if options[:show_heading]
+			output << content_tag(:h2, t("search_result_page.result_count", :count => @search_results.length), :class => 'search_result_count') if options[:show_result_count]
 			output << content_tag(:ul, results.html_safe, :class => 'search_result_list')
 			content_tag :div, :class => 'search_results' do
 				output.html_safe
 			end
 		end
-		
+
 		# Returns the correct params-hash for passing to show_page_path
 		def show_page_path_params(page=nil, optional_params={})
 			return nil if page.class.name != "Alchemy::Page"
 			url_params = {:urlname => page.urlname}
 			url_params.update(optional_params) if optional_params.class.name == "Hash"
+			url_params.update(params_for_nested_url(page)) if configuration(:url_nesting)
 			return multi_language? ? url_params.update(:lang => page.language_code) : url_params
 		end
 
@@ -546,5 +540,31 @@ module Alchemy
 			alchemy.show_page_url(show_page_path_params(page, optional_params))
 		end
 
+		# Renders a menubar for logged in users that are visiting a page.
+		def alchemy_menu_bar
+			return if @preview_mode
+			if permitted_to?(:edit, :alchemy_admin_pages)
+				menu_bar_string = ""
+				menu_bar_string += stylesheet_link_tag("alchemy/menubar")
+				menu_bar_string += javascript_include_tag('alchemy/menubar')
+				menu_bar_string += <<-STR
+					<script type="text/javascript">
+						try {
+							Alchemy.loadAlchemyMenuBar({
+								page_id: #{@page.id},
+								route: '#{Alchemy.mount_point}',
+								locale: '#{current_user.language}'
+							});
+						} catch(e) {
+							if(console){console.log(e)}
+						}
+					</script>
+				STR
+				content_for(:layout) { menu_bar_string.html_safe }
+			else
+				nil
+			end
+		end
+
 	end
 end

data/app/models/alchemy/attachment.rb

@@ -10,8 +10,16 @@ module Alchemy
 		)
 		validates_as_attachment
 
-		def name
-			read_attribute(:name).split('.').first
+		def self.find_paginated(params, per_page)
+			cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
+			self.where(cond).paginate(
+				:page => (params[:page] || 1),
+				:per_page => per_page
+			).order(:name)
+		end
+
+		def urlname
+			CGI.escape(read_attribute(:filename).split('.').first)
 		end
 
 		def extension

data/app/models/alchemy/cell.rb

@@ -14,6 +14,7 @@ module Alchemy
 	class Cell < ActiveRecord::Base
 
 		belongs_to :page
+		validates_uniqueness_of :name, :scope => :page_id
 		has_many :elements, :dependent => :destroy, :order => :position
 
 		def self.definitions

data/app/models/alchemy/content.rb

@@ -12,6 +12,7 @@ module Alchemy
 			"element_id = '#{element_id}' AND essence_type = '#{essence_type}'"
 		end
 
+		validates_uniqueness_of :name, :scope => :element_id
 		validates_uniqueness_of :position, :scope => [:element_id, :essence_type]
 
 		scope :essence_pictures, where(:essence_type => "Alchemy::EssencePicture")
@@ -96,19 +97,20 @@ module Alchemy
 			self.essence.ingredient
 		end
 
-		# Calls essence.save_ingredient. Called from ElementController#update for each content in element.
-		# Adding errors if essence validation fails.
-		def save_essence(params, options = {})
-			if essence.save_ingredient(params, options)
+		# Calls essence.update_attributes. Called from +Alchemy::Element#save_contents+
+		# Ads errors to self.base if essence validation fails.
+		def update_essence(params={})
+			raise "Essence not found" if essence.nil?
+			if essence.update_attributes(params)
 				return true
 			else
-				errors.add(:base, :essence_validation_failed)
+				errors.add(:essence, :validation_failed)
 				return false
 			end
 		end
 
 		def essence_validation_failed?
-			!essence.essence_errors.blank?
+			essence.errors.any?
 		end
 
 		def has_validations?

data/app/models/alchemy/element.rb

@@ -321,7 +321,7 @@ module Alchemy
 
 		def save_contents(params)
 			contents.each do |content|
-				unless content.save_essence(params[:contents]["content_#{content.id}"], :public => !params["public"].nil?)
+				unless content.update_essence(params[:contents]["content_#{content.id}"])
 					errors.add(:base, :essence_validation_failed)
 				end
 			end

data/app/models/alchemy/essence_audio.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_date.rb

@@ -4,18 +4,11 @@ module Alchemy
 		acts_as_essence(
 			:ingredient_column => :date
 		)
-		
+
 		# Returns self.date for the Element#preview_text method.
 		def preview_text(foo=nil)
 			return "" if date.blank?
-			::I18n.l(date)
-		end
-		
-		# Saves the ingredient
-		def save_ingredient(params, options = {})
-			return true if params.blank?
-			self.date = DateTime.parse(params['date'].values.join('-'))
-			self.save
+			::I18n.l(date, :format => :date)
 		end
 
 	end