alchemy_cms 2.1.4 → 2.1.5

data/app/models/alchemy/cell.rb

@@ -18,8 +18,8 @@ module Alchemy
 		has_many :elements, :dependent => :destroy, :order => :position
 
 		def self.definitions
-			cell_yml = File.join(Rails.root, 'config', 'alchemy', 'cells.yml')
-			YAML.load_file(cell_yml) if File.exist?(cell_yml)
+			cell_yml = ::File.join(::Rails.root, 'config', 'alchemy', 'cells.yml')
+			::YAML.load_file(cell_yml) if ::File.exist?(cell_yml)
 		end
 
 		def self.definition_for(cellname)
@@ -55,7 +55,7 @@ module Alchemy
 		end
 
 		def self.translated_label_for(cell_name)
-			Alchemy::I18n.t("alchemy.cell_names.#{cell_name}", :default => cell_name.camelcase)
+			I18n.t(cell_name, :scope => :cell_names)
 		end
   
 	end

data/app/models/alchemy/content.rb

@@ -12,7 +12,7 @@ module Alchemy
 			"element_id = '#{element_id}' AND essence_type = '#{essence_type}'"
 		end
 
-		validates_uniqueness_of :name, :scope => :element_id
+		#validates_uniqueness_of :name, :scope => :element_id
 		validates_uniqueness_of :position, :scope => [:element_id, :essence_type]
 
 		scope :essence_pictures, where(:essence_type => "Alchemy::EssencePicture")
@@ -23,7 +23,7 @@ module Alchemy
 		def self.create_from_scratch(element, essences_hash)
 			if essences_hash[:name].blank? && !essences_hash[:essence_type].blank?
 				essences_of_same_type = element.contents.where(
-					:essence_type => Alchemy::Content.normalize_essence_type(essences_hash[:essence_type])
+					:essence_type => Content.normalize_essence_type(essences_hash[:essence_type])
 				)
 				description = {
 					'type' => essences_hash[:essence_type],
@@ -34,7 +34,7 @@ module Alchemy
 				description = element.available_content_description_for(essences_hash[:name]) if description.blank?
 			end
 			raise "No description found in elements.yml for #{essences_hash.inspect} and #{element.inspect}" if description.blank?
-			essence_class = Alchemy::Content.normalize_essence_type(description['type']).constantize
+			essence_class = Content.normalize_essence_type(description['type']).constantize
 			content = self.new(:name => description['name'], :element_id => element.id)
 			if description['type'] == "EssenceRichtext" || description['type'] == "EssenceText"
 				essence = essence_class.create(:do_not_index => !description['do_not_index'].nil?)
@@ -43,7 +43,7 @@ module Alchemy
 			end
 			if essence
 				content.essence = essence
-				content.save
+				content.save!
 			else
 				content = nil
 			end

data/app/models/alchemy/element.rb

@@ -11,7 +11,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 => '^'+Alchemy::I18n.t(:choose_element)
+		validates_presence_of :name, :on => :create, :message => '^' + I18n.t(:choose_element)
 
 		attr_accessor :create_contents_after_create
 
@@ -152,12 +152,12 @@ module Alchemy
 		# Place a elements.yml file inside your apps config/alchemy folder to define
 		# your own set of elements
 		def self.descriptions
-			if File.exists? "#{Rails.root}/config/alchemy/elements.yml"
-				element_definitions = YAML.load_file( "#{Rails.root}/config/alchemy/elements.yml" )
+			if ::File.exists? "#{::Rails.root}/config/alchemy/elements.yml"
+				element_definitions = ::YAML.load_file( "#{::Rails.root}/config/alchemy/elements.yml" )
 			end
 			if !element_definitions
-				if File.exists?(File.join(File.dirname(__FILE__), "../../../config/alchemy/elements.yml"))
-					element_definitions = YAML.load_file( File.join(File.dirname(__FILE__), "../../../config/alchemy/elements.yml") )
+				if ::File.exists?(::File.join(::File.dirname(__FILE__), "../../../config/alchemy/elements.yml"))
+					element_definitions = ::YAML.load_file( ::File.join(::File.dirname(__FILE__), "../../../config/alchemy/elements.yml") )
 				end
 			end
 			if !element_definitions
@@ -170,7 +170,7 @@ module Alchemy
 		def self.all_for_page(page)
 			raise TypeError if page.class.name != "Alchemy::Page"
 			# if page_layout has cells, collect elements from cells and group them by cellname
-			page_layout = Alchemy::PageLayout.get(page.page_layout)
+			page_layout = PageLayout.get(page.page_layout)
 			if page_layout.blank?
 				logger.warn "\n++++++\nWARNING! Could not find page_layout description for page: #{page.name}\n++++++++\n"
 				return []
@@ -273,7 +273,7 @@ module Alchemy
 		# 
 		def display_name
 			return name.capitalize if description.blank?
-			Alchemy::I18n.t(description['name'], :scope => :element_names)
+			I18n.t(description['name'], :scope => :element_names)
 		end
 
 		# Gets the preview text from the first Content found in the +elements.yml+ Element description file.
@@ -435,7 +435,7 @@ module Alchemy
 			messages = []
 			essence_errors.each do |content_name, errors|
 				errors.each do |error|
-					messages << Alchemy::I18n.t(
+					messages << I18n.t(
 						"content_validations.#{self.name}.#{content_name}.#{error}",
 						:default => [
 							"content_validations.fields.#{content_name}.#{error}".to_sym,

data/app/models/alchemy/essence_html.rb

@@ -7,7 +7,7 @@ module Alchemy
 
 		# 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]
+			::CGI.escapeHTML(source.to_s)[0..maxlength]
 		end
 
 	end

data/app/models/alchemy/essence_richtext.rb

@@ -7,7 +7,7 @@ module Alchemy
 
 		# 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
+		if Config.get(:ferret) == true
 			require 'acts_as_ferret'
 			acts_as_ferret(
 				:fields => {
@@ -37,11 +37,11 @@ module Alchemy
 			return html if html.blank?
 			if html.index("<")
 				text = ""
-				tokenizer = HTML::Tokenizer.new(html)
+				tokenizer = ::HTML::Tokenizer.new(html)
 				while token = tokenizer.next
-					node = HTML::Node.parse(nil, 0, 0, token, false)
+					node = ::HTML::Node.parse(nil, 0, 0, token, false)
 					# result is only the content of any Text nodes
-					text << node.to_s if node.class == HTML::Text
+					text << node.to_s if node.class == ::HTML::Text
 				end
 				# strip any comments, and if they have a newline at the end (ie. line with
 				# only a comment) strip that too

data/app/models/alchemy/essence_text.rb

@@ -5,7 +5,7 @@ module Alchemy
 
 		# 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
+		if Config.get(:ferret) == true
 			require 'acts_as_ferret'
 			acts_as_ferret(
 				:fields => {

data/app/models/alchemy/language.rb

@@ -2,17 +2,18 @@ module Alchemy
 	class Language < ActiveRecord::Base
 
 		validates_presence_of :name
-		validates_presence_of :code
+		validates_presence_of :language_code
 		validates_presence_of :page_layout
 		validates_presence_of :frontpage_name
-		validates_uniqueness_of :code
+		validates_uniqueness_of :language_code, :scope => :country_code
 		validate :presence_of_default_language
 		validate :publicity_of_default_language
 		has_many :pages
 		after_destroy :delete_language_root_page
-		validates_format_of :code, :with => /^[a-z]{2}$/
+		validates_format_of :language_code, :with => /^[a-z]{2}$/, :if => proc { language_code.present? }
+		validates_format_of :country_code, :with => /^[a-z]{2}$/, :if => proc { country_code.present? }
 		before_destroy :check_for_default
-		after_update :set_pages_language, :if => proc { |m| m.code_changed? }
+		after_update :set_pages_language, :if => proc { |m| m.language_code_changed? }
 		after_update :unpublish_pages, :if => proc { changes[:public] == [true, false] }
 		before_save :remove_old_default, :if => proc { |m| m.default_changed? && m != Language.get_default }
 
@@ -36,15 +37,17 @@ module Alchemy
 			if attrib.to_sym == :code
 				self.code
 			else
-				Alchemy::I18n.t(self.code, :default => self.name)
+				I18n.t(self.code, :default => self.name)
 			end
 		end
 
+		include Code
+
 	private
 
 		def publicity_of_default_language
 			if self.default? && !self.public?
-				errors.add(:base, Alchemy::I18n.t("Default language has to be public"))
+				errors.add(:base, I18n.t("Default language has to be public"))
 				return false
 			else
 				return true
@@ -53,7 +56,7 @@ module Alchemy
 
 		def presence_of_default_language
 			if Language.get_default == self && self.default_changed?
-				errors.add(:base, Alchemy::I18n.t("We need at least one default."))
+				errors.add(:base, I18n.t("We need at least one default."))
 				return false
 			else
 				return true

data/app/models/alchemy/language/code.rb

@@ -0,0 +1,19 @@
+module Alchemy::Language::Code
+	extend ActiveSupport::Concern
+
+	def code
+		[language_code, country_code].select(&:present?).join('-')
+	end
+
+	def code=(code)
+		self.language_code = code
+	end
+
+	module ClassMethods
+		def find_by_code(code)
+			codes = code.split('-')
+			codes << nil if codes.length == 1
+			find_by_language_code_and_country_code *codes
+		end
+	end
+end

data/app/models/alchemy/message.rb

@@ -33,11 +33,11 @@
 module Alchemy
 	class Message
 
-		@@config = Alchemy::Config.get(:mailer)
+		@@config = Config.get(:mailer)
 		
-		extend ActiveModel::Naming
-		include ActiveModel::Validations
-		include ActiveModel::Conversion
+		extend ::ActiveModel::Naming
+		include ::ActiveModel::Validations
+		include ::ActiveModel::Conversion
 		
 		attr_accessor :contact_form_id, :ip
 		@@config[:fields].each do |field|
@@ -45,9 +45,9 @@ module Alchemy
 		end
 		
 		@@config[:validate_fields].each do |field|
-			validates_presence_of field[0], :message => '^' + Alchemy::I18n.t(field[1][:message].to_s, :scope => "contactform.validations")
+			validates_presence_of field[0], :message => '^' + I18n.t(field[1][:message].to_s, :scope => "contactform.validations")
 			if field[0].to_s.include?('email')
-				validates_format_of field[0], :with => Authlogic::Regex.email, :message => '^' + Alchemy::I18n.t('alchemy.contactform.validations.wrong_email_format'), :if => :email_is_filled
+				validates_format_of field[0], :with => ::Authlogic::Regex.email, :message => '^' + I18n.t('alchemy.contactform.validations.wrong_email_format'), :if => :email_is_filled
 			end
 		end
 		

data/app/models/alchemy/page.rb

@@ -13,12 +13,12 @@ module Alchemy
 		has_and_belongs_to_many :to_be_sweeped_elements, :class_name => 'Alchemy::Element', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
 		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."), :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 :urlname, :exclusion => { :in => RESERVED_URLNAMES, :message => '^'+Alchemy::I18n.t("This urlname is reserved.") }
+		validates_presence_of :name, :message => '^' + I18n.t("please enter a name")
+		validates_presence_of :page_layout, :message => '^' + I18n.t("Please choose a page layout."), :unless => :systempage?
+		validates_presence_of :parent_id, :message => '^' + I18n.t("No parent page was given."), :if => proc { Page.count > 1 }
+		validates_length_of :urlname, :minimum => 3, :too_short => I18n.t("urlname_to_short"), :if => :urlname_entered?
+		validates_uniqueness_of :urlname, :message => '^' + I18n.t("URL-Name already token"), :scope => 'language_id', :if => :urlname_entered?
+		validates :urlname, :exclusion => { :in => RESERVED_URLNAMES, :message => '^' + I18n.t("This urlname is reserved.") }
 
 		attr_accessor :do_not_autogenerate
 		attr_accessor :do_not_sweep
@@ -110,7 +110,7 @@ module Alchemy
 		end
 
 		def elements_grouped_by_cells
-			group = ActiveSupport::OrderedHash.new
+			group = ::ActiveSupport::OrderedHash.new
 			self.cells.each { |cell| group[cell] = cell.elements.not_trashed }
 			if element_names_not_in_cell.any?
 				group[Cell.new({:name => 'for_other_elements'})] = elements.not_trashed.not_in_cell
@@ -208,21 +208,21 @@ module Alchemy
 		# Returns the name of the creator of this page.
 		def creator
 			@page_creator ||= User.find_by_id(creator_id)
-			return Alchemy::I18n.t('unknown') if @page_creator.nil?
+			return I18n.t('unknown') if @page_creator.nil?
 			@page_creator.name
 		end
 
 		# Returns the name of the last updater of this page.
 		def updater
 			@page_updater = User.find_by_id(updater_id)
-			return Alchemy::I18n.t('unknown') if @page_updater.nil?
+			return I18n.t('unknown') if @page_updater.nil?
 			@page_updater.name
 		end
 
 		# Returns the name of the user currently editing this page.
 		def current_editor
 			@current_editor = User.find_by_id(locked_by)
-			return Alchemy::I18n.t('unknown') if @current_editor.nil?
+			return I18n.t('unknown') if @current_editor.nil?
 			@current_editor.name
 		end
 
@@ -251,21 +251,21 @@ module Alchemy
 		def humanized_status
 			case self.status
 			when 0
-				return Alchemy::I18n.t('page_status_visible_public_locked')
+				return I18n.t('page_status_visible_public_locked')
 			when 1
-				return Alchemy::I18n.t('page_status_visible_unpublic_locked')
+				return I18n.t('page_status_visible_unpublic_locked')
 			when 2
-				return Alchemy::I18n.t('page_status_invisible_public_locked')
+				return I18n.t('page_status_invisible_public_locked')
 			when 3
-				return Alchemy::I18n.t('page_status_invisible_unpublic_locked')
+				return I18n.t('page_status_invisible_unpublic_locked')
 			when 4
-				return Alchemy::I18n.t('page_status_visible_public')
+				return I18n.t('page_status_visible_public')
 			when 5
-				return Alchemy::I18n.t('page_status_visible_unpublic')
+				return I18n.t('page_status_visible_unpublic')
 			when 6
-				return Alchemy::I18n.t('page_status_invisible_public')
+				return I18n.t('page_status_invisible_public')
 			when 7
-				return Alchemy::I18n.t('page_status_invisible_unpublic')
+				return I18n.t('page_status_invisible_unpublic')
 			end
 		end
 
@@ -295,7 +295,7 @@ module Alchemy
 		end
 
 		def has_controller?
-			!Alchemy::PageLayout.get(self.page_layout).nil? && !Alchemy::PageLayout.get(self.page_layout)["controller"].blank?
+			!PageLayout.get(self.page_layout).nil? && !PageLayout.get(self.page_layout)["controller"].blank?
 		end
 
 		def controller_and_action
@@ -307,7 +307,7 @@ 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)
+			description = PageLayout.get(self.page_layout)
 			if description.nil?
 				raise "Description could not be found for page layout named #{self.page_layout}. Please check page_layouts.yml file."
 			else
@@ -326,7 +326,7 @@ module Alchemy
 		# Page layout names are defined inside the config/alchemy/page_layouts.yml file.
 		# Translate the name in your config/locales language yml file.
 		def layout_display_name
-			Alchemy::I18n.t("alchemy.page_layout_names.#{page_layout}", :default => page_layout.camelize)
+			I18n.t("alchemy.page_layout_names.#{page_layout}", :default => page_layout.camelize)
 		end
 
 		def renamed?
@@ -450,7 +450,7 @@ module Alchemy
 				new_child = Page.copy(child, {
 					:language_id => new_parent.language_id,
 					:language_code => new_parent.language_code,
-					:name => child.name + ' (' + Alchemy::I18n.t('Copy') + ')',
+					:name => child.name + ' (' + I18n.t('Copy') + ')',
 					:urlname => child.redirects_to_external? ? child.urlname : '',
 					:title => ''
 				})
@@ -470,17 +470,17 @@ module Alchemy
 
 		def self.link_target_options
 			options = [
-				[Alchemy::I18n.t('default', :scope => :link_target_options), '']
+				[I18n.t('default', :scope => :link_target_options), '']
 			]
-			link_target_options = Alchemy::Config.get(:link_target_options)
+			link_target_options = Config.get(:link_target_options)
 			link_target_options.each do |option|
-				options << [Alchemy::I18n.t(option, :scope => :link_target_options), option]
+				options << [I18n.t(option, :scope => :link_target_options), option]
 			end
 			options
 		end
 
 		def locker_name
-			return Alchemy::I18n.t('unknown') if self.locker.nil?
+			return I18n.t('unknown') if self.locker.nil?
 			self.locker.name
 		end
 

data/app/models/alchemy/picture.rb

@@ -2,17 +2,15 @@ module Alchemy
 	class Picture < ActiveRecord::Base
 
 		acts_as_fleximage do
-			image_directory						'uploads/pictures'
-			image_storage_format			Alchemy::Config.get(:image_store_format).to_sym
-			require_image							true
-			missing_image_message			Alchemy::I18n.t("missing_image")
-			invalid_image_message			Alchemy::I18n.t("not a valid image")
-			if Alchemy::Config.get(:image_output_format) == "jpg"
-				output_image_jpg_quality  Alchemy::Config.get(:output_image_jpg_quality)
-			end
-			unless Alchemy::Config.get(:preprocess_image_resize).blank?
+			image_directory					'uploads/pictures'
+			image_storage_format			Config.get(:image_store_format).to_sym
+			require_image					true
+			missing_image_message			I18n.t("missing_image")
+			invalid_image_message			I18n.t("not a valid image")
+			output_image_jpg_quality  		Config.get(:output_image_jpg_quality) if Config.get(:image_output_format) == "jpg"
+			unless Config.get(:preprocess_image_resize).blank?
 				preprocess_image do |image|
-					image.resize Alchemy::Config.get(:preprocess_image_resize)
+					image.resize Config.get(:preprocess_image_resize)
 				end
 			end
 		end
@@ -28,14 +26,14 @@ module Alchemy
 
 		# Returning the filepath relative to Rails.root public folder.
 		def public_file_path
-			self.file_path.gsub("#{Rails.root}/public", '')
+			self.file_path.gsub("#{::Rails.root}/public", '')
 		end
 
 		def urlname
 			if self.name.blank?
 				"image_#{self.id}"
 			else
-				CGI.escape(self.name.gsub(/\.(gif|png|jpe?g|tiff?)/i, '').gsub(/\./, ' '))
+				::CGI.escape(self.name.gsub(/\.(gif|png|jpe?g|tiff?)/i, '').gsub(/\./, ' '))
 			end
 		end
 
@@ -48,7 +46,7 @@ module Alchemy
 		end
 
 		def humanized_name
-			(image_filename.to_s.downcase.gsub(/\.#{Regexp.quote(suffix)}$/, '')).humanize
+			(image_filename.to_s.downcase.gsub(/\.#{::Regexp.quote(suffix)}$/, '')).humanize
 		end
 
 		# Returning true if picture's width is greater than it's height

data/app/models/alchemy/user.rb

@@ -5,7 +5,7 @@ module Alchemy
 		stampable
 		acts_as_authentic do |c|
 			c.transition_from_restful_authentication = true
-			c.logged_in_timeout = Alchemy::Config.get(:auto_logout_time).minutes
+			c.logged_in_timeout = Config.get(:auto_logout_time).minutes
 		end
 		
 		has_many :folded_pages
@@ -14,7 +14,7 @@ module Alchemy
 		
 		scope :admins, where(:role => 'admin')
 		
-		ROLES = Alchemy::Config.get(:user_roles)
+		ROLES = Config.get(:user_roles)
 		
 		def role_symbols
 			[role.to_sym]
@@ -54,13 +54,13 @@ module Alchemy
 		end
 
 		def self.human_rolename(role)
-			Alchemy::I18n.t("user_roles.#{role}")
+			I18n.t("user_roles.#{role}")
 		end
 		
 		def self.genders_for_select
 			[
-				[Alchemy::I18n.t('male'), 'male'],
-				[Alchemy::I18n.t('female'), 'female']
+				[I18n.t('male'), 'male'],
+				[I18n.t('female'), 'female']
 			]
 		end