alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -1,7 +1,6 @@
 module Alchemy
   module Admin
     module TagsHelper
-
       # Renders tags list items for given class name
       #
       # @param class_name [String]
@@ -11,7 +10,7 @@ module Alchemy
       #   A HTML string containing <tt><li></tt> tags
       #
       def render_tag_list(class_name, params)
-        raise ArgumentError.new('Please provide a String as class_name') if class_name.nil?
+        raise ArgumentError, 'Please provide a String as class_name' if class_name.nil?
         li_s = []
         class_name.constantize.tag_counts.sort { |x, y| x.name.downcase <=> y.name.downcase }.each do |tag|
           tags = filtered_by_tag?(tag) ? tag_filter(remove: tag) : tag_filter(add: tag)
@@ -19,7 +18,7 @@ module Alchemy
             link_to(
               "#{tag.name} (#{tag.count})",
               url_for(
-                params.delete_if { |k, v| k == "page" }.merge(
+                params.delete_if { |k, _v| k == "page" }.merge(
                   action: 'index',
                   tagged_with: tags
                 )
@@ -84,11 +83,11 @@ module Alchemy
       #   ** :add (ActsAsTaggableOn::Tag) - The tag that should be added to the tag-filter
       #   ** :remove (ActsAsTaggableOn::Tag) - The tag that should be removed from the tag-filter
       #
-      def tag_filter(options={})
+      def tag_filter(options = {})
         case
-          when options[:add]
+        when options[:add]
             taglist = add_to_tag_filter(options[:add]) if options[:add]
-          when options[:remove]
+        when options[:remove]
             taglist = remove_from_tag_filter(options[:remove]) if options[:remove]
           else
             return params[:tagged_with]
@@ -96,7 +95,6 @@ module Alchemy
         return nil if taglist.blank?
         taglist.uniq.join(',')
       end
-
     end
   end
 end

data/app/helpers/alchemy/base_helper.rb

@@ -1,30 +1,22 @@
 module Alchemy
   module BaseHelper
-
     def _t(key, *args)
-      I18n.t(key, *args)
+      ActiveSupport::Deprecation.warn("Alchemys `_t` method is deprecated! Use `Alchemy.t` instead.", caller.unshift)
+      Alchemy.t(key, *args)
     end
 
     # An alias for truncate.
     # Left here for downwards compatibilty.
     def shorten(text, length)
-      text.truncate(:length => length)
-    end
-
-    def parse_sitemap_name(page)
-      if multi_language?
-        pathname = "/#{Language.current.code}/#{page.urlname}"
-      else
-        pathname = "/#{page.urlname}"
-      end
-      pathname
+      text.truncate(length: length)
     end
 
-    # Logs a message in the Rails logger (warn level) and optionally displays an error message to the user.
+    # Logs a message in the Rails logger (warn level)
+    # and optionally displays an error message to the user.
     def warning(message, text = nil)
       Logger.warn(message, caller.first)
       unless text.nil?
-        warning = content_tag('p', :class => 'content_editor_error') do
+        warning = content_tag('p', class: 'content_editor_error') do
           render_icon('warning') + text
         end
         return warning
@@ -33,7 +25,7 @@ module Alchemy
 
     # Returns an icon
     def render_icon(icon_class)
-      content_tag('span', '', :class => "icon #{icon_class}")
+      content_tag('span', '', class: "icon #{icon_class}")
     end
 
     # Returns a div with an icon and the passed content
@@ -48,9 +40,9 @@ module Alchemy
     #
     def render_message(type = :info, msg = nil, &blk)
       if block_given?
-        content_tag :div, render_icon(type) + capture(&blk), :class => "#{type} message"
+        content_tag :div, render_icon(type) + capture(&blk), class: "#{type} message"
       else
-        content_tag :div, render_icon(type) + msg, :class => "#{type} message"
+        content_tag :div, render_icon(type) + msg, class: "#{type} message"
       end
     end
 

data/app/helpers/alchemy/elements_block_helper.rb

@@ -6,22 +6,17 @@ module Alchemy
     # Base class for our block-level helpers.
     #
     class BlockHelper
+      attr_reader :helpers
+      attr_reader :opts
+
       def initialize(helpers, opts = {})
         @helpers = helpers
         @opts = opts
       end
 
-      def opts
-        @opts
-      end
-
       def element
         opts[:element]
       end
-
-      def helpers
-        @helpers
-      end
     end
 
     # Block-level helper class for element views.
@@ -135,6 +130,7 @@ module Alchemy
       # that's it!
       output
     end
+
     # Block-level helper for element editors. Provides a block helper object
     # you can use for concise access to Alchemy's various helpers.
     #
@@ -149,11 +145,7 @@ module Alchemy
     # @param [Alchemy::Element] element
     #   The element to display.
     #
-    def element_editor_for(element, options = {})
-      options = {
-        # nothing here yet.
-      }.merge(options)
-
+    def element_editor_for(element)
       capture do
         yield ElementEditorHelper.new(self, element: element) if block_given?
       end

data/app/helpers/alchemy/elements_helper.rb

@@ -157,14 +157,15 @@ module Alchemy
         return
       end
 
-      element.store_page(@page) if part.to_sym == :view
-
-      render "alchemy/elements/#{element.name}_#{part}", {
+      options = {
         element: element,
         counter: counter,
-        options: options
-      }.merge(options.delete(:locals) || {})
+        options: options,
+        locals: options.delete(:locals) || {}
+      }
 
+      element.store_page(@page) if part.to_sym == :view
+      render "alchemy/elements/#{element.name}_#{part}", options
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element #{part} partial not found for #{element.name}.\n
@@ -294,6 +295,5 @@ module Alchemy
       end
       buff.join(options[:separator]).html_safe
     end
-
   end
 end

data/app/helpers/alchemy/essences_helper.rb

@@ -1,5 +1,4 @@
 module Alchemy
-
   # This helper contains methods to render the +essence+ from an +Element+ +Content+.
   #
   # Essences have two kinds of partials. An +editor+ and a +view+ partial.
@@ -27,7 +26,6 @@ module Alchemy
   # And the +render_essence_editor_by_name+ helper for Alchemy backend views.
   #
   module EssencesHelper
-
     # Renders the +Essence+ view partial from +Element+ by name.
     #
     # Pass the name of the +Content+ from +Element+ as second argument.
@@ -65,9 +63,9 @@ module Alchemy
     def render_essence(content, part = :view, options = {}, html_options = {})
       options = {for_view: {}, for_editor: {}}.update(options)
       if content.nil?
-        return part == :view ? "" : warning('Content is nil', _t(:content_not_found))
+        return part == :view ? "" : warning('Content is nil', Alchemy.t(:content_not_found))
       elsif content.essence.nil?
-        return part == :view ? "" : warning('Essence is nil', _t(:content_essence_not_found))
+        return part == :view ? "" : warning('Essence is nil', Alchemy.t(:content_essence_not_found))
       end
       render partial: "alchemy/essences/#{content.essence_partial_name}_#{part}", locals: {
         content: content,
@@ -86,7 +84,7 @@ module Alchemy
     #   :disable_link => true                          # You can surpress the link of an EssencePicture. Default false
     #
     def render_essence_view(content, options = {}, html_options = {})
-      render_essence(content, :view, {:for_view => options}, html_options)
+      render_essence(content, :view, {for_view: options}, html_options)
     end
 
     # Renders a essence picture
@@ -123,16 +121,5 @@ module Alchemy
         output
       end
     end
-
-    # Fetches value from settings of given content
-    #
-    # @param content [Alchemy::Content] - The content that settings should be taken
-    # @param key [Symbol]               - The hash key you want to fetch the value from
-    # @param options [Hash]             - An optional Hash that can override the settings.
-    #                                     Normally passed as options hash into the content editor view
-    def content_settings_value(content, key, options = {})
-      content.settings.update(options || {}).symbolize_keys[key.to_sym]
-    end
-
   end
 end

data/app/helpers/alchemy/pages_helper.rb

@@ -21,7 +21,7 @@ module Alchemy
     # @option options reverse [Boolean] (false)
     #   Reverses the ordering of the links.
     #
-    def language_links(options={})
+    def language_links(options = {})
       options = {
         linkname: 'name',
         show_title: true,
@@ -196,7 +196,7 @@ module Alchemy
       }
       options = default_options.merge(options)
       if !options[:from_page].nil?
-        while options[:from_page].level > options[:level] do
+        while options[:from_page].level > options[:level]
           options[:from_page] = options[:from_page].parent
         end
         render_navigation(options, html_options)
@@ -227,7 +227,7 @@ module Alchemy
     #   restricted_only: false                              # Pass boolean for displaying restricted pages only.
     #   reverse: false                                      # Pass boolean for displaying breadcrumb in reversed reversed.
     #
-    def render_breadcrumb(options={})
+    def render_breadcrumb(options = {})
       options = {
         separator: ">",
         page: @page,
@@ -283,7 +283,7 @@ module Alchemy
       else
         title_parts << response.status
       end
-      title_parts.join(options[:separator])
+      title_parts.join(options[:separator]).html_safe
     end
 
     # Returns a complete html <title> tag for the <head> part of the html document.
@@ -293,13 +293,13 @@ module Alchemy
     # 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={})
+    def render_title_tag(options = {})
       default_options = {
         prefix: "",
         separator: ""
       }
       options = default_options.merge(options)
-      %(<title>#{render_page_title(options)}</title>).html_safe
+      content_tag(:title, render_page_title(options))
     end
 
     # Renders a html <meta> tag for name: "" and content: ""
@@ -309,7 +309,7 @@ module Alchemy
     # 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={})
+    def render_meta_tag(options = {})
       default_options = {
         name: "",
         default_language: "de",
@@ -317,7 +317,7 @@ module Alchemy
       }
       options = default_options.merge(options)
       lang = (@page.language.blank? ? options[:default_language] : @page.language.code)
-      %(<meta name="#{options[:name]}" content="#{options[:content]}" lang="#{lang}">).html_safe
+      tag(:meta, name: options[:name], content: options[:content], lang: lang)
     end
 
     # This helper takes care of all important meta tags for your page.
@@ -332,14 +332,14 @@ module Alchemy
     #
     # 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">
+    #   <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={}
+    def render_meta_data(options = {})
       if @page.blank?
         warning("No Page found!")
         return nil
@@ -352,31 +352,39 @@ module Alchemy
       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.pages.published.language_roots.try(:meta_description)
+        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.pages.published.language_roots.try(:meta_keywords)
+        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"
+      robot = "#{@page.robot_index? ? '' : 'no'}index, #{@page.robot_follow? ? '' : 'no'}follow"
       meta_string = %(
-        <meta charset="UTF-8">
+        #{tag(:meta, charset: 'utf-8')}
         #{render_title_tag(prefix: options[:title_prefix], separator: options[:title_separator])}
-        #{render_meta_tag(name: "description", content: description)}
-        #{render_meta_tag(name: "keywords", content: keywords)}
-        <meta name="created" content="#{@page.updated_at}">
-        <meta name="robots" content="#{robot}">
+        #{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 += %(
-          <link rel="alternate" type="application/rss+xml" title="RSS" href="#{show_alchemy_page_url(@page, format: :rss)}">
+          #{auto_discovery_link_tag(:rss, show_alchemy_page_url(@page, format: :rss))}
         )
       end
-      return meta_string.html_safe
+      meta_string.html_safe
     end
 
     # Renders the partial for the cell with the given name of the current page.
@@ -387,7 +395,7 @@ module Alchemy
     #   from_page: Alchemy::Page     # Alchemy::Page object from which the elements are rendered from.
     #   locals: Hash                 # Hash of variables that will be available in the partial. Example: {user: var1, product: var2}
     #
-    def render_cell(name, options={})
+    def render_cell(name, options = {})
       default_options = {
         from_page: @page,
         locals: {}
@@ -402,16 +410,15 @@ module Alchemy
     def cell_empty?(name)
       cell = @page.cells.find_by_name(name)
       return true if cell.blank?
-      cell.elements.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
-        output = javascript_tag("Alchemy = { locale: '#{session[:alchemy_locale]}' };")
-        output += javascript_include_tag("alchemy/preview")
+        javascript_tag("Alchemy = { locale: '#{session[:alchemy_locale]}' };") +
+          javascript_include_tag("alchemy/preview")
       end
     end
-
   end
 end

data/app/helpers/alchemy/url_helper.rb

@@ -4,14 +4,13 @@
 #
 module Alchemy
   module UrlHelper
-
     # Returns the path for rendering an alchemy page
-    def show_alchemy_page_path(page, optional_params={})
+    def show_alchemy_page_path(page, optional_params = {})
       alchemy.show_page_path(show_page_path_params(page, optional_params))
     end
 
     # Returns the url for rendering an alchemy page
-    def show_alchemy_page_url(page, optional_params={})
+    def show_alchemy_page_url(page, optional_params = {})
       alchemy.show_page_url(show_page_path_params(page, optional_params))
     end
 
@@ -21,9 +20,9 @@ module Alchemy
     #
     # Example:
     #
-    #   <%= image_tag show_alchemy_picture_path(picture, :size => '320x200', :format => :png) %>
+    #   <%= image_tag show_alchemy_picture_path(picture, size: '320x200', format: :png) %>
     #
-    def show_alchemy_picture_path(picture, optional_params={})
+    def show_alchemy_picture_path(picture, optional_params = {})
       alchemy.show_picture_path(show_picture_path_params(picture, optional_params))
     end
 
@@ -33,28 +32,28 @@ module Alchemy
     #
     # Example:
     #
-    #   <%= image_tag show_alchemy_picture_url(picture, :size => '320x200', :format => :png) %>
+    #   <%= image_tag show_alchemy_picture_url(picture, size: '320x200', format: :png) %>
     #
-    def show_alchemy_picture_url(picture, optional_params={})
+    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={})
+    def show_picture_path_params(picture, optional_params = {})
       url_params = {
-        :id => picture.id,
-        :name => picture.urlname,
-        :format => configuration(:image_output_format),
-        :sh => picture.security_token(optional_params)
+        id: picture.id,
+        name: picture.urlname,
+        format: configuration(:image_output_format),
+        sh: picture.security_token(optional_params)
       }
-      url_params.update(optional_params.update({:crop => optional_params[:crop] ? 'crop' : nil}))
+      url_params.update(optional_params.update(crop: optional_params[:crop] ? 'crop' : nil))
     end
 
     # Returns the correct params-hash for passing to show_page_path
-    def show_page_path_params(page, optional_params={})
+    def show_page_path_params(page, optional_params = {})
       raise ArgumentError, 'Page is nil' if page.nil?
       url_params = {urlname: page.urlname}.update(optional_params)
-      multi_language? ? url_params.update(locale: page.language_code) : url_params
+      prefix_locale? ? url_params.update(locale: page.language_code) : url_params
     end
 
     # Returns the path for downloading an alchemy attachment
@@ -71,6 +70,5 @@ module Alchemy
     def full_url_for_element(element)
       "#{current_server}/#{element.page.urlname}##{element_dom_id(element)}"
     end
-
   end
 end