alchemy_cms 2.1.12 → 2.2.rc1

data/app/helpers/alchemy/pictures_helper.rb

@@ -0,0 +1,19 @@
+module Alchemy
+  module PicturesHelper
+
+    # This helper returns a path to picture for use inside a image_tag helper.
+    #
+    # Any additional options are passed to the url_helper, so you can add arguments to your url.
+    #
+    # Example:
+    #
+    #   <%= image_tag alchemy_picture_path(picture, :size => '320x200', :format => :png) %>
+    #
+    def alchemy_picture_path(picture, options={})
+      defaults = {:format => Alchemy::Config.get(:image_output_format)}
+      options = defaults.update(options)
+      alchemy.show_picture_path({:id => picture.id, :name => picture.urlname}.merge(options))
+    end
+
+  end
+end

data/app/mailers/alchemy/messages.rb

@@ -1,17 +1,17 @@
 module Alchemy
-	class Messages < ActionMailer::Base
+  class Messages < ActionMailer::Base
 
-		default :from => Alchemy::Config.get(:mailer)[:mail_from]
-  
-		def contact_form_mail(message, mail_to, mail_from, subject)
-			@message = message
-			mail(
-				:from => mail_from,
-				:to => mail_to,
-				:reply_to => message.email,
-				:subject => subject
-			)
-		end
+    default :from => Alchemy::Config.get(:mailer)[:mail_from]
 
-	end
+    def contact_form_mail(message, mail_to, mail_from, subject)
+      @message = message
+      mail(
+        :from => mail_from,
+        :to => mail_to,
+        :reply_to => message.email,
+        :subject => subject
+      )
+    end
+
+  end
 end

data/app/mailers/alchemy/notifications.rb

@@ -1,25 +1,25 @@
 module Alchemy
-	class Notifications < ActionMailer::Base
+  class Notifications < ActionMailer::Base
 
-		default :from => Alchemy::Config.get(:mailer)[:mail_from]
+    default :from => Alchemy::Config.get(:mailer)[:mail_from]
 
-		def registered_user_created(user)
-			@user = user
-			@url = login_url
-			mail(
-				:to => user.email,
-				:subject => Alchemy::I18n.t("alchemy.mailer.new_user_mail.subject")
-			)
-		end
+    def registered_user_created(user)
+      @user = user
+      @url = login_url
+      mail(
+        :to => user.email,
+        :subject => Alchemy::I18n.t("alchemy.mailer.new_user_mail.subject")
+      )
+    end
 
-		def admin_user_created(user)
-			@user = user
-			@url = admin_url
-			mail(
-				:to => user.email,
-				:subject => Alchemy::I18n.t("Your Alchemy Login")
-			)
-		end
+    def admin_user_created(user)
+      @user = user
+      @url = admin_url
+      mail(
+        :to => user.email,
+        :subject => Alchemy::I18n.t("Your Alchemy Login")
+      )
+    end
 
-	end
+  end
 end

data/app/models/alchemy.rb

@@ -1,7 +1,7 @@
 module Alchemy
 
-	def self.table_name_prefix
-		'alchemy_'
-	end
+  def self.table_name_prefix
+    'alchemy_'
+  end
 
 end

data/app/models/alchemy/attachment.rb

@@ -1,87 +1,61 @@
 module Alchemy
-	class Attachment < ActiveRecord::Base
+  class Attachment < ActiveRecord::Base
 
-		stampable
+    stampable
 
-		has_attachment(
-			:storage => :file_system,
-			:file_system_path => 'uploads/attachments',
-			:size => 0.kilobytes..1000.megabytes
-		)
-		validates_as_attachment
+    has_attachment(
+      :storage => :file_system,
+      :file_system_path => 'uploads/attachments',
+      :size => 0.kilobytes..1000.megabytes
+    )
+    validates_as_attachment
 
-		def self.find_paginated(params, per_page)
-			cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
-			self.where(cond).page(params[:page] || 1).per(per_page).order(:name)
-		end
+    def self.find_paginated(params, per_page)
+      cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
+      self.where(cond).page(params[:page] || 1).per(per_page).order(:name)
+    end
 
-		def urlname
-			::CGI.escape(read_attribute(:filename).split('.').first)
-		end
+    def urlname
+      ::CGI.escape(read_attribute(:filename).split('.').first)
+    end
 
-		def extension
-			filename.split(".").last
-		end
-		alias_method :suffix, :extension
+    def extension
+      filename.split(".").last
+    end
 
-		def icon_css_class
-			case content_type
-			when "application/x-flash-video"
-				then "video"
-			when "video/x-flv"
-				then "video"
-			when "video/mp4"
-				then "video"
-			when "video/mpeg"
-				then "video"
-			when "video/quicktime"
-				then "video"
-			when "video/x-msvideo"
-				then "video"
-			when "video/x-ms-wmv"
-				then "video"
-			when "application/zip"
-				then "archive"
-			when "application/x-rar"
-				then "archive"
-			when "audio/mpeg"
-				then "audio"
-			when "audio/mp4"
-				then "audio"
-			when "audio/wav"
-				then "audio"
-			when "audio/x-wav"
-				then "audio"
-			when "application/x-shockwave-flash"
-				then "flash"
-			when "image/gif"
-				then "image"
-			when "image/jpeg"
-				then "image"
-			when "image/png"
-				then "image"
-			when "image/tiff"
-				then "image"
-			when "image/x-psd"
-				then "psd"
-			when "text/plain"
-				then "text"
-			when "application/rtf"
-				then "rtf"
-			when "application/pdf"
-				then "pdf"
-			when "application/msword"
-				then "word"
-			when "application/vnd.ms-excel"
-				then "excel"
-			when "text/x-vcard"
-				then "vcard"
-			when "application/vcard"
-				then "vcard"
-			else
-				"file"
-			end
-		end
+    alias_method :suffix, :extension
 
-	end
+    def icon_css_class
+      case content_type
+      when "application/x-flash-video" then "video"
+      when "video/x-flv" then "video"
+      when "video/mp4" then "video"
+      when "video/mpeg" then "video"
+      when "video/quicktime" then "video"
+      when "video/x-msvideo" then "video"
+      when "video/x-ms-wmv" then "video"
+      when "application/zip" then "archive"
+      when "application/x-rar" then "archive"
+      when "audio/mpeg" then "audio"
+      when "audio/mp4" then "audio"
+      when "audio/wav" then "audio"
+      when "audio/x-wav" then "audio"
+      when "application/x-shockwave-flash" then "flash"
+      when "image/gif" then "image"
+      when "image/jpeg" then "image"
+      when "image/png" then "image"
+      when "image/tiff" then "image"
+      when "image/x-psd" then "psd"
+      when "text/plain" then "text"
+      when "application/rtf" then "rtf"
+      when "application/pdf" then "pdf"
+      when "application/msword" then "word"
+      when "application/vnd.ms-excel" then "excel"
+      when "text/x-vcard" then "vcard"
+      when "application/vcard" then "vcard"
+      else "file"
+      end
+    end
+
+  end
 end

data/app/models/alchemy/cell.rb

@@ -11,52 +11,52 @@
 # Views for cells are inside the +app/views/cells+ folder in you project.
 # 
 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
-			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)
-			return nil if cellname.blank?
-			definitions.detect { |c| c['name'] == cellname }
-		end
-
-		def self.all_definitions_for(cellnames)
-			definitions.select { |c| cellnames.include? c['name'] }
-		end
-
-		def self.all_element_definitions_for(cellnames)
-			element_names = []
-			all_definitions_for(cellnames).each do |cell|
-				element_names += cell['elements']
-			end
-			Element.all_definitions_for(element_names.uniq)
-		end
-
-		def self.definitions_for_element(element_name)
-			return [] if definitions.blank?
-			definitions.select { |d| d['elements'].include?(element_name) }
-		end
-
-		def self.names_for_element(element_name)
-			definitions = definitions_for_element(element_name)
-			return nil if definitions.blank?
-			definitions.collect { |d| d['name'] }
-		end
-
-		def name_for_label
-			self.class.translated_label_for(self.name)
-		end
-
-		def self.translated_label_for(cell_name)
-			I18n.t(cell_name, :scope => :cell_names)
-		end
-  
-	end
+  class Cell < ActiveRecord::Base
+
+    belongs_to :page
+    validates_uniqueness_of :name, :scope => :page_id
+    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)
+    end
+
+    def self.definition_for(cellname)
+      return nil if cellname.blank?
+      definitions.detect { |c| c['name'] == cellname }
+    end
+
+    def self.all_definitions_for(cellnames)
+      definitions.select { |c| cellnames.include? c['name'] }
+    end
+
+    def self.all_element_definitions_for(cellnames)
+      element_names = []
+      all_definitions_for(cellnames).each do |cell|
+        element_names += cell['elements']
+      end
+      Element.all_definitions_for(element_names.uniq)
+    end
+
+    def self.definitions_for_element(element_name)
+      return [] if definitions.blank?
+      definitions.select { |d| d['elements'].include?(element_name) }
+    end
+
+    def self.names_for_element(element_name)
+      definitions = definitions_for_element(element_name)
+      return nil if definitions.blank?
+      definitions.collect { |d| d['name'] }
+    end
+
+    def name_for_label
+      self.class.translated_label_for(self.name)
+    end
+
+    def self.translated_label_for(cell_name)
+      I18n.t(cell_name, :scope => :cell_names)
+    end
+
+  end
 end

data/app/models/alchemy/content.rb

@@ -1,198 +1,198 @@
 module Alchemy
-	class Content < ActiveRecord::Base
-
-		belongs_to :essence, :polymorphic => true, :dependent => :destroy
-		belongs_to :element
-
-		stampable :stamper_class_name => :user
-
-		acts_as_list
-
-		def scope_condition
-			"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")
-		scope :essence_texts, where(:essence_type => "Alchemy::EssenceText")
-		scope :essence_richtexts, where(:essence_type => "Alchemy::EssenceRichtext")
-
-		# Creates a new Content as descriped in the elements.yml file
-		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 => Content.normalize_essence_type(essences_hash[:essence_type])
-				)
-				description = {
-					'type' => essences_hash[:essence_type],
-					'name' => "#{essences_hash[:essence_type].classify.demodulize.underscore}_#{essences_of_same_type.count + 1}"
-				}
-			else
-				description = element.content_description_for(essences_hash[:name])
-				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 = 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?)
-			else
-				essence = essence_class.create
-			end
-			if essence
-				content.essence = essence
-				content.save!
-			else
-				content = nil
-			end
-			return content
-		end
-
-		# Settings from the elements.yml definition
-		def settings
-			return {} if description.blank?
-			settings = description['settings']
-			return {} if settings.blank?
-			settings.symbolize_keys
-		end
-
-		def siblings
-			return [] if !element
-			self.element.contents
-		end
-
-		# Makes a copy of source and also copies the associated essence.
-		# 
-		# You can pass a differences hash to update the attributes of the copy.
-		# 
-		# === Example
-		# 
-		#   @copy = Alchemy::Content.copy(@content, {:element_id => 3})
-		#   @copy.element_id # => 3
-		# 
-		def self.copy(source, differences = {})
-			differences[:position] = nil
-			differences[:id] = nil
-			attributes = source.attributes.except("id").merge(differences)
-			content = self.create!(attributes)
-			new_essence = content.essence.class.new(content.essence.attributes.except('id'))
-			new_essence.save!
-			raise "Essence not cloned" if new_essence.id == content.essence_id
-			content.update_attribute(:essence_id, new_essence.id)
-			content
-		end
-
-		# Returns my description hash from elements.yml
-		# Returns the description from available_contents if my own description is blank
-		def description
-			if self.element.blank?
-				logger.warn("\n+++++++++++ Warning: Content with id #{self.id} is missing its Element\n")
-				return nil
-			else
-				desc = self.element.content_description_for(self.name)
-				if desc.blank?
-					desc = self.element.available_content_description_for(self.name)
-				else
-					return desc
-				end
-			end
-		end
-
-		# Gets the ingredient from essence
-		def ingredient
-			return nil if self.essence.nil?
-			self.essence.ingredient
-		end
-
-		# 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(:essence, :validation_failed)
-				return false
-			end
-		end
-
-		def essence_validation_failed?
-			essence.errors.any?
-		end
-
-		def has_validations?
-			return false if description.blank?
-			!description['validate'].blank?
-		end
-
-		# Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
-		# 
-		# === Example:
-		# 
-		#   <%= text_field_tag content.form_field_name, content.ingredient %>
-		# 
-		# === Options:
-		# 
-		# You can pass an Essence column_name. Default is self.essence.ingredient_column
-		# 
-		# ==== Example:
-		# 
-		#   <%= text_field_tag content.form_field_name(:link), content.ingredient %>
-		# 
-		def form_field_name(essence_column = self.essence.ingredient_column)
-			"contents[content_#{self.id}][#{essence_column}]"
-		end
-
-		def form_field_id(essence_column = self.essence.ingredient_column)
-			"contents_content_#{self.id}_#{essence_column}"
-		end
-
-		# Returns the translated name for displaying in labels, etc.
-		def name_for_label
-			self.class.translated_label_for(self.name, self.element.name)
-		end
-
-		# Returns the translated label for a content name.
-		# 
-		# Translate it in your locale yml file:
-		# 
-		#   alchemy:
-		#     content_names:
-		#      foo: Bar
-		# 
-		# Optionally you can scope your content name to an element:
-		# 
-		#   alchemy:
-		#     content_names:
-		#      article:
-		#       foo: Baz
-		# 
-		def self.translated_label_for(content_name, element_name = nil)
-			Alchemy::I18n.t("content_names.#{element_name}.#{content_name}", :default => ["content_names.#{content_name}".to_sym, content_name.capitalize])
-		end
-
-		def linked?
-			essence && !essence.link.blank?
-		end
-
-		def essence_partial_name
-			essence.partial_name
-		end
-
-		def normalized_essence_type
-			self.class.normalize_essence_type(self.essence_type)
-		end
-
-		def self.normalize_essence_type(essence_type)
-			essence_type = essence_type.classify
-			if not essence_type.match(/^Alchemy::/)
-				essence_type.gsub!(/^Essence/, 'Alchemy::Essence')
-			else
-				essence_type
-			end
-		end
-
-	end
+  class Content < ActiveRecord::Base
+
+    belongs_to :essence, :polymorphic => true, :dependent => :destroy
+    belongs_to :element
+
+    stampable :stamper_class_name => :user
+
+    acts_as_list
+
+    def scope_condition
+      "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")
+    scope :essence_texts, where(:essence_type => "Alchemy::EssenceText")
+    scope :essence_richtexts, where(:essence_type => "Alchemy::EssenceRichtext")
+
+    # Creates a new Content as descriped in the elements.yml file
+    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 => Content.normalize_essence_type(essences_hash[:essence_type])
+        )
+        description = {
+          'type' => essences_hash[:essence_type],
+          'name' => "#{essences_hash[:essence_type].classify.demodulize.underscore}_#{essences_of_same_type.count + 1}"
+        }
+      else
+        description = element.content_description_for(essences_hash[:name])
+        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 = 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?)
+      else
+        essence = essence_class.create
+      end
+      if essence
+        content.essence = essence
+        content.save!
+      else
+        content = nil
+      end
+      return content
+    end
+
+    # Settings from the elements.yml definition
+    def settings
+      return {} if description.blank?
+      settings = description['settings']
+      return {} if settings.blank?
+      settings.symbolize_keys
+    end
+
+    def siblings
+      return [] if !element
+      self.element.contents
+    end
+
+    # Makes a copy of source and also copies the associated essence.
+    #
+    # You can pass a differences hash to update the attributes of the copy.
+    #
+    # === Example
+    #
+    #   @copy = Alchemy::Content.copy(@content, {:element_id => 3})
+    #   @copy.element_id # => 3
+    #
+    def self.copy(source, differences = {})
+      differences[:position] = nil
+      differences[:id] = nil
+      attributes = source.attributes.except("id").merge(differences)
+      content = self.create!(attributes)
+      new_essence = content.essence.class.new(content.essence.attributes.except('id'))
+      new_essence.save!
+      raise "Essence not cloned" if new_essence.id == content.essence_id
+      content.update_attribute(:essence_id, new_essence.id)
+      content
+    end
+
+    # Returns my description hash from elements.yml
+    # Returns the description from available_contents if my own description is blank
+    def description
+      if self.element.blank?
+        logger.warn("\n+++++++++++ Warning: Content with id #{self.id} is missing its Element\n")
+        return nil
+      else
+        desc = self.element.content_description_for(self.name)
+        if desc.blank?
+          desc = self.element.available_content_description_for(self.name)
+        else
+          return desc
+        end
+      end
+    end
+
+    # Gets the ingredient from essence
+    def ingredient
+      return nil if self.essence.nil?
+      self.essence.ingredient
+    end
+
+    # 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(:essence, :validation_failed)
+        return false
+      end
+    end
+
+    def essence_validation_failed?
+      essence.errors.any?
+    end
+
+    def has_validations?
+      return false if description.blank?
+      !description['validate'].blank?
+    end
+
+    # Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
+    #
+    # === Example:
+    #
+    #   <%= text_field_tag content.form_field_name, content.ingredient %>
+    #
+    # === Options:
+    #
+    # You can pass an Essence column_name. Default is self.essence.ingredient_column
+    #
+    # ==== Example:
+    #
+    #   <%= text_field_tag content.form_field_name(:link), content.ingredient %>
+    #
+    def form_field_name(essence_column = self.essence.ingredient_column)
+      "contents[content_#{self.id}][#{essence_column}]"
+    end
+
+    def form_field_id(essence_column = self.essence.ingredient_column)
+      "contents_content_#{self.id}_#{essence_column}"
+    end
+
+    # Returns the translated name for displaying in labels, etc.
+    def name_for_label
+      self.class.translated_label_for(self.name, self.element.name)
+    end
+
+    # Returns the translated label for a content name.
+    #
+    # Translate it in your locale yml file:
+    #
+    #   alchemy:
+    #     content_names:
+    #      foo: Bar
+    #
+    # Optionally you can scope your content name to an element:
+    #
+    #   alchemy:
+    #     content_names:
+    #      article:
+    #       foo: Baz
+    #
+    def self.translated_label_for(content_name, element_name = nil)
+      Alchemy::I18n.t("content_names.#{element_name}.#{content_name}", :default => ["content_names.#{content_name}".to_sym, content_name.capitalize])
+    end
+
+    def linked?
+      essence && !essence.link.blank?
+    end
+
+    def essence_partial_name
+      essence.partial_name
+    end
+
+    def normalized_essence_type
+      self.class.normalize_essence_type(self.essence_type)
+    end
+
+    def self.normalize_essence_type(essence_type)
+      essence_type = essence_type.classify
+      if not essence_type.match(/^Alchemy::/)
+        essence_type.gsub!(/^Essence/, 'Alchemy::Essence')
+      else
+        essence_type
+      end
+    end
+
+  end
 end