alchemy_cms 3.4.2 → 3.5.0.rc1

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

@@ -1,7 +1,7 @@
 module Alchemy
   module Admin
     module PagesHelper
-      include Alchemy::BaseHelper
+      include Alchemy::Admin::BaseHelper
 
       # Returns options tags for the screen sizes select in page edit view.
       #
@@ -17,17 +17,6 @@ module Alchemy
         ])
       end
 
-      # Returns the translated explanation of the page status.
-      #
-      def combined_page_status(page)
-        page.status.map do |state, _value|
-          next if state == :locked
-          css_class = page.send("#{state}?") ? "page_status #{state}" : "page_status not_#{state}"
-          val = content_tag(:span, '', class: css_class)
-          val + page.status_title(state)
-        end.delete_if(&:blank?).join("<br>").html_safe
-      end
-
       # Renders a label for page's page layout
       #
       # If the page layout definition of the page is missing, it displays a warning.
@@ -35,16 +24,32 @@ module Alchemy
       def page_layout_label(page)
         if page.persisted? && page.definition.blank?
           [
-            content_tag(:span, '',
-              class: 'inline warning icon',
-              title: Alchemy.t(:page_definition_missing)
-            ),
+            page_layout_missing_warning,
             Alchemy.t(:page_type)
           ].join('&nbsp;').html_safe
         else
           Alchemy.t(:page_type)
         end
       end
+
+      def page_status_checkbox(page, attribute)
+        label = page.class.human_attribute_name(attribute)
+
+        if page.attribute_fixed?(attribute)
+          checkbox = check_box(:page, attribute, disabled: true)
+          hint = content_tag(:span, class: 'hint-bubble') do
+            Alchemy.t(:attribute_fixed, attribute: attribute)
+          end
+          content = content_tag(:span, class: 'with-hint') do
+            "#{checkbox}\n#{label}\n#{hint}".html_safe
+          end
+        else
+          checkbox = check_box(:page, attribute)
+          content = "#{checkbox}\n#{label}".html_safe
+        end
+
+        content_tag(:label, class: 'checkbox') { content }
+      end
     end
   end
 end

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

@@ -23,6 +23,15 @@ module Alchemy
           }
         end
       end
+
+      def preview_size(size)
+        case size
+        when 'small' then '80x60'
+        when 'large' then '240x180'
+        else
+          '160x120'
+        end
+      end
     end
   end
 end

data/app/helpers/alchemy/deprecated_pages_helper.rb

@@ -0,0 +1,54 @@
+module Alchemy
+  module DeprecatedPagesHelper
+    # All these helper methods are deprecated.
+    # They are mixed into Alchemy::PagesHelper but will be removed in the future.
+
+    def alchemy_preview_mode_code
+      ActiveSupport::Deprecation.warn('PageHelper `alchemy_preview_mode_code` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/preview_mode_code"` in your layout instead.')
+      render "alchemy/preview_mode_code"
+    end
+
+    def render_meta_data(options = {})
+      ActiveSupport::Deprecation.warn('PageHelper `render_meta_data` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/pages/meta_data"` in your view instead.')
+      render "alchemy/pages/meta_data", options
+    end
+
+    def render_page_title(options = {})
+      ActiveSupport::Deprecation.warn('PageHelper `render_page_title` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/pages/meta_data"` in your view instead.')
+      return "" if @page.title.blank?
+      options = {
+        prefix: "",
+        separator: ""
+      }.update(options)
+      title_parts = [options[:prefix]]
+      if response.status == 200
+        title_parts << @page.title
+      else
+        title_parts << response.status
+      end
+      title_parts.join(options[:separator]).html_safe
+    end
+
+    def render_title_tag(options = {})
+      ActiveSupport::Deprecation.warn('PageHelper `render_title_tag` is deprecated and will be removed with Alchemy v4.0. Please use `render "alchemy/pages/meta_data"` in your view instead.')
+      default_options = {
+        prefix: "",
+        separator: ""
+      }
+      options = default_options.merge(options)
+      content_tag(:title, render_page_title(options))
+    end
+
+    def render_meta_tag(options = {})
+      ActiveSupport::Deprecation.warn('PageHelper `render_meta_tag` is deprecated and will be removed with Alchemy v4.0. Please use `tag()` instead. (http://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-tag)')
+      default_options = {
+        name: "",
+        default_language: "de",
+        content: ""
+      }
+      options = default_options.merge(options)
+      lang = (@page.language.blank? ? options[:default_language] : @page.language.code)
+      tag(:meta, name: options[:name], content: options[:content], lang: lang)
+    end
+  end
+end

data/app/helpers/alchemy/essences_helper.rb

@@ -78,7 +78,7 @@ module Alchemy
     #
     # == Options:
     #
-    #   :image_size => "111x93"                        # Used by EssencePicture to render the image via RMagick to that size. [Default nil]
+    #   :size => "111x93"                              # Used by EssencePicture to resize the image to that size. [Default nil]
     #   :date_format => "Am %d. %m. %Y, um %H:%Mh"     # Especially for EssenceDate. See Rubys Date.strftime for date formatting options. [Default nil]
     #   :show_caption => false                         # Pass Boolean to show/hide the caption of an EssencePicture. [Default true]
     #   :disable_link => true                          # You can surpress the link of an EssencePicture. Default false

data/app/helpers/alchemy/pages_helper.rb

@@ -2,6 +2,7 @@ module Alchemy
   module PagesHelper
     include Alchemy::BaseHelper
     include Alchemy::ElementsHelper
+    include Alchemy::DeprecatedPagesHelper
 
     def picture_essence_caption(content)
       content.try(:essence).try(:caption)
@@ -266,12 +267,7 @@ module Alchemy
     #   prefix: ""                 # Prefix
     #   separator: ""              # Separating prefix and title
     #
-    # === Webdevelopers
-    #
-    # Please use the render_meta_data() helper instead. There all important meta information gets rendered in one helper.
-    # So you dont have to worry about anything.
-    #
-    def render_page_title(options = {})
+    def page_title(options = {})
       return "" if @page.title.blank?
       options = {
         prefix: "",
@@ -286,105 +282,16 @@ module Alchemy
       title_parts.join(options[:separator]).html_safe
     end
 
-    # Returns a complete html <title> tag for the <head> part of the html document.
-    #
-    # === Webdevelopers:
-    #
-    # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
-    # So you dont have to worry about anything.
-    #
-    def render_title_tag(options = {})
-      default_options = {
-        prefix: "",
-        separator: ""
-      }
-      options = default_options.merge(options)
-      content_tag(:title, render_page_title(options))
+    def meta_description
+      @page.meta_description.presence || Language.current_root_page.try(:meta_description)
     end
 
-    # Renders a html <meta> tag for name: "" and content: ""
-    #
-    # === Webdevelopers:
-    #
-    # Please use the render_meta_data() helper. There all important meta information gets rendered in one helper.
-    # So you dont have to worry about anything.
-    #
-    def render_meta_tag(options = {})
-      default_options = {
-        name: "",
-        default_language: "de",
-        content: ""
-      }
-      options = default_options.merge(options)
-      lang = (@page.language.blank? ? options[:default_language] : @page.language.code)
-      tag(:meta, name: options[:name], content: options[:content], lang: lang)
+    def meta_keywords
+      @page.meta_keywords.presence || Language.current_root_page.try(:meta_keywords)
     end
 
-    # This helper takes care of all important meta tags for your page.
-    #
-    # The meta data is been taken from the @page.title, @page.meta_description, @page.meta_keywords, @page.updated_at and @page.language database entries managed by the Alchemy user via the Alchemy cockpit.
-    #
-    # Assume that the user has entered following data into the Alchemy cockpit of the Page "home" and that the user wants that the searchengine (aka. google) robot should index the page and should follow all links on this page:
-    #
-    # Title = Homepage
-    # Description = Your page description
-    # Keywords: cms, ruby, rubyonrails, rails, software, development, html, javascript, ajax
-    #
-    # Then placing +render_meta_data(title_prefix: "Company", title_separator: "-")+ into the <head> part of the +pages.html.erb+ layout produces:
-    #
-    #   <meta charset="utf-8">
-    #   <title>Company - #{@page.title}</title>
-    #   <meta name="description" content="Your page description">
-    #   <meta name="keywords" content="cms, ruby, rubyonrails, rails, software, development, html, javascript, ajax">
-    #   <meta name="created" content="Tue Dec 16 10:21:26 +0100 2008">
-    #   <meta name="robots" content="index, follow">
-    #
-    def render_meta_data(options = {})
-      if @page.blank?
-        warning("No Page found!")
-        return nil
-      end
-      default_options = {
-        title_prefix: "",
-        title_separator: "",
-        default_lang: "de"
-      }
-      options = default_options.merge(options)
-      # render meta description of the root page from language if the current meta description is empty
-      if @page.meta_description.blank?
-        description = Language.current_root_page.try(:meta_description)
-      else
-        description = @page.meta_description
-      end
-      # render meta keywords of the root page from language if the current meta keywords is empty
-      if @page.meta_keywords.blank?
-        keywords = Language.current_root_page.try(:meta_keywords)
-      else
-        keywords = @page.meta_keywords
-      end
-      robot = "#{@page.robot_index? ? '' : 'no'}index, #{@page.robot_follow? ? '' : 'no'}follow"
-      meta_string = %(
-        #{tag(:meta, charset: 'utf-8')}
-        #{render_title_tag(prefix: options[:title_prefix], separator: options[:title_separator])}
-        #{render_meta_tag(name: 'created', content: @page.updated_at)}
-        #{render_meta_tag(name: 'robots', content: robot)}
-      )
-      if description.present?
-        meta_string += %(
-          #{render_meta_tag(name: 'description', content: description.html_safe)}
-        )
-      end
-      if keywords.present?
-        meta_string += %(
-          #{render_meta_tag(name: 'keywords', content: keywords.html_safe)}
-        )
-      end
-      if @page.contains_feed?
-        meta_string += %(
-          #{auto_discovery_link_tag(:rss, show_alchemy_page_url(@page, format: :rss))}
-        )
-      end
-      meta_string.html_safe
+    def meta_robots
+      "#{@page.robot_index? ? '' : 'no'}index, #{@page.robot_follow? ? '' : 'no'}follow"
     end
 
     # Renders the partial for the cell with the given name of the current page.
@@ -412,13 +319,5 @@ module Alchemy
       return true if cell.blank?
       cell.elements.not_trashed.empty?
     end
-
-    # Include this in your layout file to have element selection magic in the page edit preview window.
-    def alchemy_preview_mode_code
-      if @preview_mode
-        javascript_tag("Alchemy = { locale: '#{session[:alchemy_locale]}' };") +
-          javascript_include_tag("alchemy/preview")
-      end
-    end
   end
 end

data/app/helpers/alchemy/url_helper.rb

@@ -22,8 +22,11 @@ module Alchemy
     #
     #   <%= image_tag show_alchemy_picture_path(picture, size: '320x200', format: :png) %>
     #
+    # @deprecated Use Alchemy::Picture#url instead
+    #
     def show_alchemy_picture_path(picture, optional_params = {})
-      alchemy.show_picture_path(show_picture_path_params(picture, optional_params))
+      ActiveSupport::Deprecation.warn("`show_alchemy_picture_path` helper is deprecated and will be removed in Alchemy 4.0. Please use the `picture.url` method instead.")
+      picture.url(optional_params)
     end
 
     # This helper returns an url to picture for use inside a image_tag helper.
@@ -34,19 +37,11 @@ module Alchemy
     #
     #   <%= image_tag show_alchemy_picture_url(picture, size: '320x200', format: :png) %>
     #
+    # @deprecated Use Alchemy::Picture#url instead
+    #
     def show_alchemy_picture_url(picture, optional_params = {})
-      alchemy.show_picture_url(show_picture_path_params(picture, optional_params))
-    end
-
-    # Returns the correct params hash for passing to show_picture_path
-    def show_picture_path_params(picture, optional_params = {})
-      url_params = {
-        id: picture.id,
-        name: picture.urlname,
-        format: picture.default_render_format,
-        sh: picture.security_token(optional_params)
-      }
-      url_params.update(optional_params.update(crop: optional_params[:crop] ? 'crop' : nil))
+      ActiveSupport::Deprecation.warn("`show_alchemy_picture_url` helper is deprecated and will be removed in Alchemy 4.0. Please use the `picture.url` method instead.")
+      picture.url(optional_params)
     end
 
     # Returns the correct params-hash for passing to show_page_path

data/app/models/alchemy/attachment.rb

@@ -49,7 +49,6 @@ module Alchemy
     end
 
     validates_presence_of :file
-    validates_format_of :file_name, with: /\A[A-Za-z0-9\. \-_äÄöÖüÜß]+\z/, on: :update
     validates_size_of :file, maximum: Config.get(:uploader)['file_size_limit'].megabytes
     validates_property :ext, of: :file,
       in: allowed_filetypes,
@@ -57,9 +56,7 @@ module Alchemy
       message: Alchemy.t("not a valid file"),
       unless: -> { self.class.allowed_filetypes.include?('*') }
 
-    before_create do
-      write_attribute(:name, convert_to_humanized_name(file_name, file.ext))
-    end
+    before_save :set_name, if: :file_name_changed?
 
     after_update :touch_contents
 
@@ -123,5 +120,11 @@ module Alchemy
         "file"
       end
     end
+
+    private
+
+    def set_name
+      self.name = convert_to_humanized_name(file_name, file.ext)
+    end
   end
 end

data/app/models/alchemy/cell.rb

@@ -15,7 +15,7 @@
 # Elements are displayed in tabs inside the elements window in page edit view.
 # Every cell is a list of elements with the position scoped to +cell_id+ and +page_id+.
 #
-# Define cells inside a +cells.yml+ file located in the +config/alchermy+ folder of your project.
+# Define cells inside a +cells.yml+ file located in the +config/alchemy+ folder of your project.
 #
 # Render cells with the +render_cell+ helper
 #
@@ -25,7 +25,7 @@ module Alchemy
   class Cell < ActiveRecord::Base
     include Alchemy::Logger
 
-    belongs_to :page
+    belongs_to :page, required: true
     validates_uniqueness_of :name, scope: 'page_id'
     validates_format_of :name, with: /\A[a-z0-9_-]+\z/
     has_many :elements, -> { where(parent_element_id: nil).order(:position) }, dependent: :destroy

data/app/models/alchemy/content.rb

@@ -23,8 +23,8 @@ module Alchemy
     # Concerns
     include Alchemy::Content::Factory
 
-    belongs_to :essence, polymorphic: true, dependent: :destroy
-    belongs_to :element, touch: true
+    belongs_to :essence, required: true, polymorphic: true, dependent: :destroy
+    belongs_to :element, required: true, touch: true
     has_one :page, through: :element
 
     stampable stamper_class_name: Alchemy.user_class_name

data/app/models/alchemy/content/factory.rb

@@ -38,23 +38,26 @@ module Alchemy
         content
       end
 
-      # Makes a copy of source and also copies the associated essence.
+      # Creates 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 = Alchemy::Content.copy(@content, {element_id: 3})
       #   @copy.element_id # => 3
       #
       def copy(source, differences = {})
-        attributes = source.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY).merge(differences.stringify_keys)
-        content = create!(attributes)
-        new_essence = content.essence.class.new(content.essence.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY))
-        new_essence.save!
-        raise "Essence not cloned" if new_essence.id == content.essence_id
-        content.update_attributes(essence_id: new_essence.id)
-        content
+        new_content = Content.new(
+          source.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY).merge(differences.stringify_keys)
+        )
+
+        new_essence = new_content.essence.class.create!(
+          new_content.essence.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY)
+        )
+
+        new_content.update!(essence_id: new_essence.id)
+        new_content
       end
 
       # Returns the content definition for building a content.

data/app/models/alchemy/element.rb

@@ -68,11 +68,14 @@ module Alchemy
       foreign_key: :parent_element_id,
       dependent: :destroy
 
-    belongs_to :cell
-    belongs_to :page
+    belongs_to :cell, required: false
+    belongs_to :page, required: true
 
     # A nested element belongs to a parent element.
-    belongs_to :parent_element, class_name: 'Alchemy::Element', touch: true
+    belongs_to :parent_element,
+      class_name: 'Alchemy::Element',
+      required: false,
+      touch: true
 
     has_and_belongs_to_many :touchable_pages, -> { uniq },
       class_name: 'Alchemy::Page',

data/app/models/alchemy/essence_file.rb

@@ -15,7 +15,7 @@
 
 module Alchemy
   class EssenceFile < ActiveRecord::Base
-    belongs_to :attachment
+    belongs_to :attachment, required: false
     acts_as_essence ingredient_column: 'attachment'
 
     def attachment_url