alchemy_cms 6.1.5 → 7.0.0.pre.b

data/lib/alchemy/permissions.rb

@@ -37,10 +37,6 @@ module Alchemy
       def alchemy_guest_user_rules
         can([:show, :download], Alchemy::Attachment) { |a| !a.restricted? }
 
-        can :read, Alchemy::Content, Alchemy::Content.available.not_restricted do |c|
-          c.public? && !c.restricted?
-        end
-
         can :read, Alchemy::Element, Alchemy::Element.published.not_restricted do |e|
           e.public? && !e.restricted?
         end
@@ -64,10 +60,6 @@ module Alchemy
         # Resources
         can [:show, :download], Alchemy::Attachment
 
-        can :read, Alchemy::Content, Alchemy::Content.available do |c|
-          c.public?
-        end
-
         can :read, Alchemy::Element, Alchemy::Element.published do |e|
           e.public?
         end
@@ -97,7 +89,7 @@ module Alchemy
           :alchemy_admin_pages,
           :alchemy_admin_pictures,
           :alchemy_admin_tags,
-          :alchemy_admin_users,
+          :alchemy_admin_users
         ]
 
         # Controller actions
@@ -109,12 +101,7 @@ module Alchemy
 
         # Resources
         can [:read, :download], Alchemy::Attachment
-        can :manage, Alchemy::Content
         can :manage, Alchemy::Element
-        can :manage, Alchemy::EssenceAudio
-        can :manage, Alchemy::EssenceFile
-        can :manage, Alchemy::EssencePicture
-        can :manage, Alchemy::EssenceVideo
         can :manage, Alchemy::Ingredient
         can [:crop], Alchemy::Ingredients::Picture
         can :manage, Alchemy::LegacyPageUrl
@@ -140,7 +127,7 @@ module Alchemy
         # Navigation
         can :index, [
           :alchemy_admin_languages,
-          :alchemy_admin_users,
+          :alchemy_admin_users
         ]
 
         # Resources
@@ -149,7 +136,7 @@ module Alchemy
           :copy_language_tree,
           :flush,
           :order,
-          :switch_language,
+          :switch_language
         ], Alchemy::Page
 
         # Resources which may be locked via template permissions
@@ -162,7 +149,7 @@ module Alchemy
         #
         can([
           :create,
-          :destroy,
+          :destroy
         ], Alchemy::Page) { |p| p.editable_by?(@user) }
 
         can(:publish, Alchemy::Page) do |page|
@@ -173,6 +160,7 @@ module Alchemy
         can :manage, Alchemy::Attachment
         can :manage, Alchemy::Tag
         can :index, Alchemy::Language
+        can :switch, Alchemy::Language
       end
     end
 

data/lib/alchemy/resource.rb

@@ -101,8 +101,8 @@ module Alchemy
     attr_accessor :resource_relations, :model_associations
     attr_reader :model
 
-    DEFAULT_SKIPPED_ATTRIBUTES = %w(id created_at creator_id)
-    DEFAULT_SKIPPED_ASSOCIATIONS = %w(creator)
+    DEFAULT_SKIPPED_ATTRIBUTES = %w[id created_at creator_id]
+    DEFAULT_SKIPPED_ASSOCIATIONS = %w[creator]
     SEARCHABLE_COLUMN_TYPES = [:string, :text]
 
     def initialize(controller_path, module_definition = nil, custom_model = nil)
@@ -169,7 +169,7 @@ module Alchemy
           name: col.name,
           type: resource_column_type(col),
           relation: resource_relation(col.name),
-          enum: enum_values_collection_for_select(col.name),
+          enum: enum_values_collection_for_select(col.name)
         }.delete_if { |_k, v| v.blank? }
       end.compact
     end
@@ -183,16 +183,16 @@ module Alchemy
           ::I18n.t(key, scope: [
             :activerecord, :attributes, model.model_name.i18n_key, "#{column_name}_values"
           ], default: key.humanize),
-          key,
+          key
         ]
       end
     end
 
     def sorted_attributes
-      @_sorted_attributes ||= attributes.
-        sort_by  { |attr| attr[:name] == "name" ? 0 : 1 }.
-        sort_by! { |attr| attr[:type] == :boolean ? 1 : 0 }.
-        sort_by! { |attr| attr[:name] == "updated_at" ? 1 : 0 }
+      @_sorted_attributes ||= attributes
+        .sort_by { |attr| (attr[:name] == "name") ? 0 : 1 }
+        .sort_by! { |attr| (attr[:type] == :boolean) ? 1 : 0 }
+        .sort_by! { |attr| (attr[:name] == "updated_at") ? 1 : 0 }
     end
 
     def editable_attributes
@@ -281,7 +281,7 @@ module Alchemy
     def searchable_relation_attribute(attribute)
       {
         name: "#{attribute[:relation][:model_association].name}_#{attribute[:relation][:attr_method]}",
-        type: attribute[:relation][:attr_type],
+        type: attribute[:relation][:attr_type]
       }
     end
 
@@ -325,7 +325,7 @@ module Alchemy
         resource_relations[foreign_key] = options.merge(
           model_association: association,
           name: relation_name,
-          collection: collection,
+          collection: collection
         )
       end
     end

data/lib/alchemy/resources_helper.rb

@@ -23,7 +23,7 @@ module Alchemy
 
     def resource_url_proxy
       if resource_handler.in_engine?
-        eval(resource_handler.engine_name)
+        eval(resource_handler.engine_name) # rubocop:disable Security/Eval
       else
         main_app
       end
@@ -80,11 +80,11 @@ module Alchemy
         value = record.present? ? record.send(attribute[:relation][:attr_method]) : Alchemy.t(:not_found)
       elsif attribute_value && attribute[:type].to_s =~ /(date|time)/
         localization_format = if attribute[:type] == :datetime
-          options[:datetime_format] || :'alchemy.default'
+          options[:datetime_format] || :"alchemy.default"
         elsif attribute[:type] == :date
-          options[:date_format] || :'alchemy.default'
+          options[:date_format] || :"alchemy.default"
         else
-          options[:time_format] || :'alchemy.time'
+          options[:time_format] || :"alchemy.time"
         end
         value = l(attribute_value, format: localization_format)
       else
@@ -110,8 +110,8 @@ module Alchemy
         options.merge(
           as: "string",
           input_html: {
-            data: { datepicker_type: input_type },
-          },
+            data: {datepicker_type: input_type}
+          }
         )
       when "text"
         options.merge(as: "text", input_html: {rows: 4})
@@ -135,7 +135,7 @@ module Alchemy
     # If the attribute contains a resource_relation, then the table and column for related model will be returned.
     #
     def sortable_resource_header_column(attribute)
-      if relation = attribute[:relation]
+      if (relation = attribute[:relation])
         "#{relation[:model_association].name}_#{relation[:attr_method]}"
       else
         attribute[:name]

data/lib/alchemy/routing_constraints.rb

@@ -6,7 +6,7 @@ module Alchemy
   # Alchemy has a very strong catch all route.
   # But we don't want to handle all requests.
   #
-  # For instance we only want to handle html and rss requests and
+  # For instance we only want to handle html requests and
   # don't want to swallow the rails/info routes in development mode.
   #
   class RoutingConstraints
@@ -21,20 +21,20 @@ module Alchemy
 
     private
 
-    # We only want html and rss requests to be handled by us.
+    # We only want html requests to be handled by us.
     #
     # If an unknown format is requested we want to handle this,
     # because it could be a legacy route that needs to be redirected.
     #
     def handable_format?
-      @request.format.symbol.nil? || (@request.format.symbol == :html) || (@request.format.symbol == :rss)
+      @request.format.symbol.nil? || (@request.format.symbol == :html)
     end
 
     # We don't want to handle the Rails info routes.
     def no_rails_route?
-      return true if !%w(development test).include?(Rails.env)
+      return true if !%w[development test].include?(Rails.env)
 
-      (@params["urlname"] =~ /\Arails\//).nil?
+      !@params["urlname"].start_with?("rails/")
     end
   end
 end

data/lib/alchemy/searchable_resource.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # Defines the methods that are needed to
+  # make a model searchable in Alchemy's admin search by Ransack.
+  module SearchableResource
+    SEARCHABLE_COLUMN_TYPES = %i[string text]
+
+    # Allow all string and text attributes to be searchable by Ransack.
+    def ransackable_attributes(_auth_object = nil)
+      searchable_alchemy_resource_attributes
+    end
+
+    # Allow all attributes to be sortable by Ransack.
+    def ransortable_attributes(_auth_object = nil)
+      columns.map(&:name)
+    end
+
+    # Allow all associations defined in +alchemy_resource_relations+ to be searchable by Ransack.
+    def ransackable_associations(_auth_object = nil)
+      searchable_alchemy_resource_associations
+    end
+
+    protected
+
+    def searchable_alchemy_resource_attributes
+      columns.select { |c| c.type.in?(SEARCHABLE_COLUMN_TYPES) }.map(&:name)
+    end
+
+    def searchable_alchemy_resource_associations
+      if respond_to?(:alchemy_resource_relations)
+        alchemy_resource_relations.keys.map!(&:to_s)
+      else
+        []
+      end
+    end
+  end
+end

data/lib/alchemy/seeder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/shell"
 
 module Alchemy
@@ -46,7 +47,7 @@ module Alchemy
         contentpages.each do |page|
           create_page(page, {
             language: Alchemy::Language.default,
-            language_root: true,
+            language_root: true
           })
         end
       end
@@ -55,7 +56,7 @@ module Alchemy
         desc "Seeding Alchemy layout pages from #{page_seeds_file}"
         language = Alchemy::Language.default
         layoutpages.each do |page|
-          create_page(page, { language: language })
+          create_page(page, {language: language})
         end
       end
 
@@ -125,7 +126,7 @@ module Alchemy
             page_layout: default_language["page_layout"],
             public: true,
             default: true,
-            site: Alchemy::Site.default,
+            site: Alchemy::Site.default
           )
         else
           raise DefaultLanguageNotFoundError

data/lib/alchemy/shell.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "thor/shell/color"
 
 module Alchemy
@@ -10,7 +11,7 @@ module Alchemy
       clear: Thor::Shell::Color::CLEAR,
       green: Thor::Shell::Color::GREEN,
       red: Thor::Shell::Color::RED,
-      yellow: Thor::Shell::Color::YELLOW,
+      yellow: Thor::Shell::Color::YELLOW
     }.freeze
 
     def self.silence!

data/lib/alchemy/taggable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   # ActsAsTaggableOn to Gutentag interface compatibility module
   # Include this module to add tagging support to your model.
@@ -28,11 +29,11 @@ module Alchemy
         end
 
         unless args[:match]
-          args.merge!(match: :all)
+          args[:match] = :all
         end
 
         if names.any?
-          args.merge!(names: names)
+          args[:names] = names
         end
 
         super(args)

data/lib/alchemy/tasks/tidy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/shell"
 
 module Alchemy
@@ -25,25 +26,6 @@ module Alchemy
         end
       end
 
-      def update_content_positions
-        Alchemy::Element.all.each do |element|
-          if element.contents.any?
-            puts "\n## Updating content positions of element `#{element.name}`"
-          end
-          element.contents.group_by(&:element_id).each do |_, contents|
-            contents.each_with_index do |content, idx|
-              position = idx + 1
-              if content.position != position
-                log "Updating position for content ##{content.id} to #{position}"
-                content.update_column(:position, position)
-              else
-                log "Position for content ##{content.id} is already correct (#{position})", :skip
-              end
-            end
-          end
-        end
-      end
-
       def remove_orphaned_elements
         puts "\n## Removing orphaned elements"
         elements = Alchemy::Element.unscoped.not_nested
@@ -79,25 +61,6 @@ module Alchemy
         end
       end
 
-      def remove_orphaned_contents
-        puts "\n## Removing orphaned contents"
-        contents = Alchemy::Content.unscoped.all
-        if contents.any?
-          orphaned_contents = contents.select do |content|
-            content.essence.nil? && content.essence_id.present? ||
-              content.element.nil? && content.element_id.present?
-          end
-          if orphaned_contents.any?
-            log "Found #{orphaned_contents.size} orphaned contents"
-            destroy_orphaned_records(orphaned_contents, "content")
-          else
-            log "No orphaned contents found", :skip
-          end
-        else
-          log "No contents found", :skip
-        end
-      end
-
       def remove_duplicate_legacy_urls
         puts "\n## Removing duplicate legacy URLs"
         sql = <<~SQL

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module TestSupport
+    module CapybaraHelpers
+      # Select2 capybara helper
+      def select2(value, options)
+        label = find_label_by_text(options[:from])
+
+        select2_anchor_selector = ".select2-container a"
+
+        if label.has_css?(select2_anchor_selector)
+          label.find(select2_anchor_selector).click
+        else
+          within label.find(:xpath, "..") do
+            find(select2_anchor_selector).click
+          end
+        end
+
+        within_entire_page do
+          page.find(
+            "div.select2-result-label",
+            text: /#{Regexp.escape(value)}/i, match: :prefer_exact
+          ).click
+        end
+      end
+
+      def select2_search(value, options)
+        if options[:from]
+          label = find_label_by_text(options[:from])
+          within label.first(:xpath, ".//..") do
+            options[:from] = "##{find(".select2-container")["id"]}"
+          end
+        elsif options[:element_id] && options[:ingredient_role]
+          container_id = find("#element_#{options[:element_id]} [data-ingredient-role='#{options[:ingredient_role]}'] .select2-container")["id"]
+          options[:from] = "##{container_id}"
+        end
+
+        find("#{options[:from]}:not(.select2-container-disabled):not(.select2-offscreen)").click
+
+        within_entire_page do
+          find("input.select2-input.select2-focused").set(value)
+          expect(page).to have_selector(".select2-result-label", visible: true)
+          find("div.select2-result-label", text: /#{Regexp.escape(value)}/i, match: :prefer_exact).click
+          expect(page).not_to have_selector(".select2-result-label")
+        end
+      end
+
+      def click_button_with_label(label)
+        label = find("label", text: label)
+        within label.first(:xpath, ".//..") do
+          first("button").click
+        end
+      end
+
+      private
+
+      def within_entire_page(&block)
+        within(:xpath, "//body", &block)
+      end
+
+      def find_label_by_text(text)
+        find "label:not(.select2-offscreen)",
+          text: /#{Regexp.escape(text)}/i,
+          match: :one
+      end
+    end
+  end
+end

data/lib/alchemy/test_support/config_stubbing.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   module TestSupport
     # Allows you to stub the Alchemy configuration in your specs

data/lib/alchemy/test_support/factories/element_factory.rb

@@ -3,7 +3,6 @@
 FactoryBot.define do
   factory :alchemy_element, class: "Alchemy::Element" do
     name { "article" }
-    autogenerate_contents { false }
     autogenerate_ingredients { false }
     association :page_version, factory: :alchemy_page_version
 
@@ -26,12 +25,11 @@ FactoryBot.define do
       name { "slide" }
     end
 
-    trait :with_contents do
-      autogenerate_contents { true }
+    trait :compact do
+      name { "slide" }
     end
 
     trait :with_ingredients do
-      name { "element_with_ingredients" }
       autogenerate_ingredients { true }
     end
   end

data/lib/alchemy/test_support/factories/ingredient_factory.rb

@@ -19,7 +19,7 @@ FactoryBot.define do
     factory :"alchemy_ingredient_#{ingredient}", class: "Alchemy::Ingredients::#{ingredient.classify}" do
       role { ingredient }
       type { "Alchemy::Ingredients::#{ingredient.classify}" }
-      association :element, name: "all_you_can_eat_ingredients", factory: :alchemy_element
+      association :element, name: "all_you_can_eat", factory: :alchemy_element
     end
   end
 end

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -36,16 +36,18 @@ FactoryBot.define do
       after(:build) do |page, evaluator|
         page.build_public_version(
           public_on: evaluator.public_on,
-          public_until: evaluator.public_until,
+          public_until: evaluator.public_until
         )
       end
       after(:create) do |page|
         if page.autogenerate_elements
           page.definition["autogenerate"].each do |name|
-            create(:alchemy_element,
+            create(
+              :alchemy_element,
               name: name,
               page_version: page.public_version,
-              autogenerate_contents: true)
+              autogenerate_ingredients: true
+            )
           end
         end
       end

data/lib/alchemy/test_support/having_crop_action_examples.rb

@@ -10,20 +10,20 @@ RSpec.shared_examples_for "having crop action" do |args|
 
     context "with no picture assigned" do
       it "renders error message" do
-        get :crop, params: { id: 1 }
+        get :crop, params: {id: 1}
         expect(assigns(:no_image_notice)).to eq(Alchemy.t(:no_image_for_cropper_found))
       end
     end
 
     context "with picture assigned" do
-      subject { get :crop, params: { id: 1, picture_id: picture.id } }
+      subject { get :crop, params: {id: 1, picture_id: picture.id} }
 
       let(:default_mask) do
         [
           0,
           0,
           300,
-          250,
+          250
         ]
       end
 
@@ -43,7 +43,7 @@ RSpec.shared_examples_for "having crop action" do |args|
 
         context "with sizes in settings" do
           let(:settings) do
-            { size: "300x250" }
+            {size: "300x250"}
           end
 
           it "sets sizes to given values" do
@@ -78,7 +78,7 @@ RSpec.shared_examples_for "having crop action" do |args|
 
           context "and aspect ratio set on the settings" do
             let(:settings) do
-              { fixed_ratio: "2" }
+              {fixed_ratio: "2"}
             end
 
             it "does not infer the height from the image file preserving the aspect ratio" do
@@ -93,7 +93,7 @@ RSpec.shared_examples_for "having crop action" do |args|
         context "when width or height is not fixed and an aspect ratio is given" do
           context "and aspect ratio set on the settings" do
             let(:settings) do
-              { fixed_ratio: "0.5" }
+              {fixed_ratio: "0.5"}
             end
 
             it "width is given, it infers the height from width and ratio" do
@@ -136,7 +136,7 @@ RSpec.shared_examples_for "having crop action" do |args|
 
       context "with fixed_ratio set to false" do
         let(:settings) do
-          { fixed_ratio: false }
+          {fixed_ratio: false}
         end
 
         it "sets ratio to false" do
@@ -147,7 +147,7 @@ RSpec.shared_examples_for "having crop action" do |args|
 
       context "with fixed_ratio set to a non float string" do
         let(:settings) do
-          { fixed_ratio: "123,45" }
+          {fixed_ratio: "123,45"}
         end
 
         it "raises error" do
@@ -157,7 +157,7 @@ RSpec.shared_examples_for "having crop action" do |args|
 
       context "with no fixed_ratio set" do
         let(:settings) do
-          { size: "80x60" }
+          {size: "80x60"}
         end
 
         it "sets a fixed ratio from sizes" do