alchemy_cms 4.0.0.beta → 4.0.0.rc1

data/app/controllers/alchemy/elements_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class ElementsController < Alchemy::BaseController
     load_and_authorize_resource

data/app/controllers/alchemy/messages_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   #
   # == Sending Messages:

data/app/controllers/alchemy/pages_controller.rb

@@ -1,5 +1,14 @@
+# frozen_string_literal: true
+
 module Alchemy
   class PagesController < Alchemy::BaseController
+    SHOW_PAGE_PARAMS_KEYS = [
+      'action',
+      'controller',
+      'urlname',
+      'locale'
+    ]
+
     include OnPageLayout::CallbacksRunner
 
     # Redirecting concerns. Order is important here!
@@ -124,8 +133,8 @@ module Alchemy
     # * locale
     #
     def additional_params
-      params.symbolize_keys.delete_if do |key, _|
-        [:action, :controller, :urlname, :locale].include?(key)
+      params.to_unsafe_hash.delete_if do |key, _|
+        SHOW_PAGE_PARAMS_KEYS.include?(key)
       end
     end
 

data/app/controllers/concerns/alchemy/admin/uploader_responses.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module UploaderResponses

data/app/controllers/concerns/alchemy/legacy_page_redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Handles Legacy page redirects
   #

data/app/controllers/concerns/alchemy/locale_redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Handles locale redirects
   #

data/app/controllers/concerns/alchemy/page_redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Handles page redirect urls
   #

data/app/controllers/concerns/alchemy/site_redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module SiteRedirects
     extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module AttachmentsHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     # This module contains helper methods for rendering dialogs, toolbar buttons and confirmation windows.
@@ -378,34 +380,6 @@ module Alchemy
           method.to_sym, {type: "text", class: type, "data-datepicker-type" => type, value: value}.merge(html_options)
       end
 
-      # Merges the params-hash with the given hash
-      def merge_params(p = {})
-        params.merge(p).delete_if { |_k, v| v.blank? }
-      end
-
-      # Deletes one or several params from the params-hash and merges some new params in
-      def merge_params_without(excludes, p = {})
-        current_params = params.clone.symbolize_keys
-        if excludes.is_a?(Array)
-          excludes.map { |i| current_params.delete(i.to_sym) }
-        else
-          current_params.delete(excludes.to_sym)
-        end
-        current_params.merge(p).delete_if { |_k, v| v.blank? }
-      end
-
-      # Deletes all params from the params-hash except the given ones and merges some new params in
-      def merge_params_only(includes, p = {})
-        current_params = params.clone.symbolize_keys
-        if includes.is_a?(Array)
-          symbolized_includes = includes.map(&:to_sym)
-          current_params.delete_if { |k, _v| !symbolized_includes.include?(k) }
-        else
-          current_params.delete_if { |k, _v| k != includes.to_sym }
-        end
-        current_params.merge(p).delete_if { |_k, v| v.blank? }
-      end
-
       # Render a hint icon with tooltip for given object.
       # The model class needs to include the hints module
       def render_hint_for(element)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module ContentsHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module ElementsHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module EssencesHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module FormHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     # This module contains helper methods for rendering the admin navigation.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module PagesHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module PicturesHelper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     module TagsHelper
@@ -11,102 +13,48 @@ module Alchemy
       #
       def render_tag_list(class_name)
         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)
-          li_s << content_tag('li', name: tag.name, class: tag_list_tag_active?(tag) ? 'active' : nil) do
+        sorted_tags_from(class_name: class_name).map do |tag|
+          content_tag('li', name: tag.name, class: filtered_by_tag?(tag) ? 'active' : nil) do
             link_to(
               "#{tag.name} (#{tag.count})",
               url_for(
-                tag_list_params.reject { |k, _v| k == "page" }.merge(
-                  action: 'index',
-                  tagged_with: tags
+                search_filter_params.except(:page, :tagged_with).merge(
+                  tagged_with: tags_for_filter(current: tag).presence
                 )
               ),
               remote: request.xhr?,
               class: 'please_wait'
             )
           end
-        end
-        li_s.join.html_safe
+        end.join.html_safe
       end
 
-      # Returns true if the given tag is in +params[:tag_list]+
-      #
-      # @param tag [ActsAsTaggableOn::Tag]
-      #   the tag
-      # @param params [Hash]
-      #   url params
-      # @return [Boolean]
+      # Returns true if the given tag is in +params[:tagged_with]+
       #
-      def tag_list_tag_active?(tag)
-        tag_list_params[:tagged_with].to_s.split(',').include?(tag.name)
-      end
-
-      # Checks if the tagged_with param contains the given tag
       def filtered_by_tag?(tag)
-        if tag_list_params[:tagged_with].present?
-          tags = tag_list_params[:tagged_with].split(',')
-          tags.include?(tag.name)
-        else
-          false
-        end
+        tags_from_params.include?(tag.name)
       end
 
-      # Adds the given tag to the tag filter.
-      def add_to_tag_filter(tag)
-        if tag_list_params[:tagged_with].present?
-          tags = tag_list_params[:tagged_with].split(',')
-          tags << tag.name
-        else
-          [tag.name]
-        end
-      end
-
-      # Removes the given tag from the tag filter.
-      def remove_from_tag_filter(tag)
-        if tag_list_params[:tagged_with].present?
-          tags = tag_list_params[:tagged_with].split(',')
-          tags.delete_if { |t| t == tag.name }
+      # Returns the tags from params suitable for the tags filter.
+      #
+      # @param current [ActsAsTaggableOn::Tag] - The current tag that will be added or removed if already present
+      # @returns [String]
+      def tags_for_filter(current:)
+        if filtered_by_tag?(current)
+          tags_from_params - Array(current.name)
         else
-          []
-        end
+          tags_from_params.push(current.name)
+        end.uniq.join(',')
       end
 
-      # Returns the tag filter from params.
-      #
-      # A tag can be added to the filter.
-      # A tag can also be removed.
-      #
-      # Options are:
-      #   * options (Hash):
-      #   ** :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 = {})
-        if options[:add]
-          taglist = add_to_tag_filter(options[:add])
-        elsif options[:remove]
-          taglist = remove_from_tag_filter(options[:remove])
-        else
-          return tag_list_params[:tagged_with]
-        end
-        return nil if taglist.blank?
-        taglist.uniq.join(',')
+      # Returns tags from params
+      # @returns [Array]
+      def tags_from_params
+        search_filter_params[:tagged_with].to_s.split(',')
       end
 
-      def tag_list_params
-        params.permit(
-          :controller,
-          :content_id,
-          :element_id,
-          :options,
-          :swap,
-          :use_route,
-          :tagged_with,
-          :filter,
-          q: params.fetch(:q, {}).keys
-        )
+      def sorted_tags_from(class_name:)
+        class_name.constantize.tag_counts.sort { |x, y| x.name.downcase <=> y.name.downcase }
       end
     end
   end

data/app/helpers/alchemy/base_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module BaseHelper
     def _t(key, *args)

data/app/helpers/alchemy/deprecated_pages_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module DeprecatedPagesHelper
     # All these helper methods are deprecated.

data/app/helpers/alchemy/elements_block_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Provides a collection of block-level helpers, allowing for a much more
   # concise way of writing element view/editor partials.

data/app/helpers/alchemy/elements_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # This helpers are useful to render elements from pages.
   #

data/app/helpers/alchemy/essences_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # This helper contains methods to render the +essence+ from an +Element+ +Content+.
   #

data/app/helpers/alchemy/pages_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module PagesHelper
     include Alchemy::BaseHelper

data/app/helpers/alchemy/url_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Alchemy url helpers
 #
 # This helper is included within alchemy/pages_helper

data/app/mailers/alchemy/base_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   begin
     base_class = Object.const_get('::ApplicationMailer')

data/app/mailers/alchemy/messages_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class MessagesMailer < BaseMailer
     def contact_form_mail(message, mail_to, mail_from, subject)

data/app/models/alchemy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   def self.table_name_prefix
     'alchemy_'

data/app/models/alchemy/attachment.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_attachments
 #
 #  id              :integer          not null, primary key
-#  name            :string(255)
-#  file_name       :string(255)
-#  file_mime_type  :string(255)
+#  name            :string
+#  file_name       :string
+#  file_mime_type  :string
 #  file_size       :integer
 #  creator_id      :integer
 #  updater_id      :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  cached_tag_list :text
-#  file_uid        :string(255)
+#  file_uid        :string
 #
 
 module Alchemy

data/app/models/alchemy/cell.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_cells
 #
 #  id         :integer          not null, primary key
-#  page_id    :integer
-#  name       :string(255)
+#  page_id    :integer          not null
+#  name       :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #

data/app/models/alchemy/content.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_contents
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)
-#  essence_type :string(255)
-#  essence_id   :integer
-#  element_id   :integer
+#  name         :string
+#  essence_type :string           not null
+#  essence_id   :integer          not null
+#  element_id   :integer          not null
 #  position     :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
@@ -105,7 +107,7 @@ module Alchemy
     # Settings from the elements.yml definition
     def settings
       return {} if definition.blank?
-      @settings ||= definition.fetch('settings', {}).symbolize_keys
+      @settings ||= definition.fetch(:settings, {})
     end
 
     # Fetches value from settings

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Holds everything concerning the building and creating of contents and the related essence object.
   #
@@ -31,9 +33,8 @@ module Alchemy
       # @return [Alchemy::Content]
       #
       def create_from_scratch(element, essence_hash)
-        essence_hash.stringify_keys!
         if content = build(element, essence_hash)
-          content.create_essence!(essence_hash['essence_type'])
+          content.create_essence!(essence_hash[:essence_type])
         end
         content
       end
@@ -49,7 +50,7 @@ module Alchemy
       #
       def copy(source, differences = {})
         new_content = Content.new(
-          source.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY).merge(differences.stringify_keys)
+          source.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY).merge(differences)
         )
 
         new_essence = new_content.essence.class.create!(
@@ -66,12 +67,11 @@ module Alchemy
       # 2. It builds a definition hash from essence type, if the the name key is not present
       #
       def content_definition(element, essence_hash)
-        essence_hash.stringify_keys!
         # No name given. We build the content from essence type.
-        if essence_hash['name'].blank? && essence_hash['essence_type'].present?
-          content_definition_from_essence_type(element, essence_hash['essence_type'])
+        if essence_hash[:name].blank? && essence_hash[:essence_type].present?
+          content_definition_from_essence_type(element, essence_hash[:essence_type])
         else
-          element.content_definition_for(essence_hash['name'])
+          element.content_definition_for(essence_hash[:name])
         end
       end