alchemy_cms 7.0.0.pre.a → 7.0.0.pre.c

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
 
@@ -82,7 +83,11 @@ module Alchemy
       end
 
       def page_yml
-        @_page_yml ||= YAML.load_file(page_seeds_file)
+        @_page_yml ||= YAML.safe_load(
+          page_seeds_file.read,
+          permitted_classes: [Date],
+          aliases: true
+        )
       end
 
       def contentpages
@@ -99,7 +104,9 @@ module Alchemy
 
       def create_page(draft, attributes = {})
         children = draft.delete("children") || []
-        page = Alchemy::Page.create!(draft.merge(attributes))
+        page = Alchemy::Page.new(draft.merge(attributes))
+        page.versions.build
+        page.save!
         log "Created page: #{page.name}"
         children.each do |child|
           create_page(child, parent: page, language: page.language)
@@ -119,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

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -20,7 +20,7 @@ module Alchemy
         within_entire_page do
           page.find(
             "div.select2-result-label",
-            text: /#{Regexp.escape(value)}/i, match: :prefer_exact,
+            text: /#{Regexp.escape(value)}/i, match: :prefer_exact
           ).click
         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

@@ -25,6 +25,10 @@ FactoryBot.define do
       name { "slide" }
     end
 
+    trait :compact do
+      name { "slide" }
+    end
+
     trait :with_ingredients do
       autogenerate_ingredients { true }
     end

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

@@ -36,7 +36,7 @@ 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|
@@ -46,7 +46,7 @@ FactoryBot.define do
               :alchemy_element,
               name: name,
               page_version: page.public_version,
-              autogenerate_ingredients: true,
+              autogenerate_ingredients: true
             )
           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

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -38,7 +38,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
     end
 
     context "with format in the options" do
-      let(:options) { { format: "gif" } }
+      let(:options) { {format: "gif"} }
 
       it "takes this as format." do
         expect(picture_url).to match(/\.gif/)
@@ -53,24 +53,24 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "if cropping is enabled" do
         before do
-          allow(record).to receive(:settings) { { crop: true } }
+          allow(record).to receive(:settings) { {crop: true} }
         end
 
         it "passes these crop values to the picture's url method." do
           expect(picture).to receive(:url).with(
-            hash_including(crop_from: "10x10", crop_size: "200x200"),
+            hash_including(crop_from: "10x10", crop_size: "200x200")
           )
           picture_url
         end
 
         context "but with crop values in the options" do
           let(:options) do
-            { crop_from: "30x30", crop_size: "75x75" }
+            {crop_from: "30x30", crop_size: "75x75"}
           end
 
           it "passes these crop values instead." do
             expect(picture).to receive(:url).with(
-              hash_including(crop_from: "30x30", crop_size: "75x75"),
+              hash_including(crop_from: "30x30", crop_size: "75x75")
             )
             picture_url
           end
@@ -79,7 +79,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
     end
 
     context "with other options" do
-      let(:options) { { foo: "baz" } }
+      let(:options) { {foo: "baz"} }
 
       context "and the image does not need to be processed" do
         before do
@@ -129,7 +129,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with cropping enabled" do
         before do
-          allow(record).to receive(:settings) { { crop: true } }
+          allow(record).to receive(:settings) { {crop: true} }
         end
 
         it "includes these crop values.", :aggregate_failures do
@@ -140,7 +140,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with cropping disabled" do
         before do
-          allow(record).to receive(:settings) { { crop: nil } }
+          allow(record).to receive(:settings) { {crop: nil} }
         end
 
         it "does not include these crop values.", :aggregate_failures do
@@ -165,7 +165,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "having size setting" do
       before do
-        allow(record).to receive(:settings) { { size: "30x70" } }
+        allow(record).to receive(:settings) { {size: "30x70"} }
       end
 
       it "includes this size." do
@@ -175,7 +175,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "having crop setting" do
       before do
-        allow(record).to receive(:settings) { { crop: true } }
+        allow(record).to receive(:settings) { {crop: true} }
       end
 
       it "includes this setting" do
@@ -214,7 +214,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when crop is enabled in the settings" do
       let(:settings) do
-        { crop: true }
+        {crop: true}
       end
 
       context "and crop sizes are present" do
@@ -228,8 +228,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: "10x10",
               crop_size: "200x200",
-              crop: true,
-            ),
+              crop: true
+            )
           )
           thumbnail_url
         end
@@ -241,8 +241,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: nil,
               crop_size: nil,
-              crop: true,
-            ),
+              crop: true
+            )
           )
           thumbnail_url
         end
@@ -251,7 +251,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when cropping is disabled in the settings" do
       let(:settings) do
-        { crop: false }
+        {crop: false}
       end
 
       context "but crop sizes are present" do
@@ -265,8 +265,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_size: nil,
               crop_from: nil,
-              crop: false,
-            ),
+              crop: false
+            )
           )
           thumbnail_url
         end
@@ -316,7 +316,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when cropping is enabled in settings" do
       let(:settings) do
-        { crop: true }
+        {crop: true}
       end
 
       context "and crop values are present" do
@@ -330,7 +330,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: "10x10",
               crop_size: "200x200",
-              crop: true,
+              crop: true
             )
           )
         end
@@ -342,7 +342,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: nil,
               crop_size: nil,
-              crop: true,
+              crop: true
             )
           )
         end
@@ -351,7 +351,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when cropping is disabled in settings" do
       let(:settings) do
-        { crop: false }
+        {crop: false}
       end
 
       context "but crop values are present" do
@@ -365,7 +365,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: nil,
               crop_size: nil,
-              crop: false,
+              crop: false
             )
           )
         end
@@ -382,7 +382,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
           crop_size: nil,
           flatten: true,
           format: "jpg",
-          size: "160x120",
+          size: "160x120"
         )
       end
     end
@@ -405,7 +405,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
           0,
           0,
           300,
-          250,
+          250
         ]
       end
 
@@ -424,7 +424,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
         context "with sizes in  settings" do
           let(:settings) do
-            { size: "300x250" }
+            {size: "300x250"}
           end
 
           it "sets sizes to given values" do
@@ -453,7 +453,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
           context "and aspect ratio set" 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
@@ -466,7 +466,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
         context "when width or height is not fixed and an aspect ratio is given" do
           context "and aspect ratio set" 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
@@ -503,7 +503,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with fixed_ratio set to false" do
         let(:settings) do
-          { fixed_ratio: false }
+          {fixed_ratio: false}
         end
 
         it "sets ratio to false" do
@@ -513,7 +513,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       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 an error" do
@@ -523,7 +523,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with no fixed_ratio set" do
         let(:settings) do
-          { size: "80x60" }
+          {size: "80x60"}
         end
 
         it "sets a fixed ratio from sizes" do
@@ -532,7 +532,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
       end
 
       context "with size set to different values" do
-        let(:settings) { { crop: true, size: size } }
+        let(:settings) { {crop: true, size: size} }
 
         before do
           picture.image_file_width = 200
@@ -623,7 +623,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
         context "with crop set to true" do
           before do
-            allow(record).to receive(:settings) { { crop: true } }
+            allow(record).to receive(:settings) { {crop: true} }
           end
 
           context "if picture.image_file is nil" do

data/lib/alchemy/test_support/integration_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   module TestSupport
     # Helpers for integration specs
@@ -11,11 +12,11 @@ module Alchemy
       # Pass either a user object or a symbol in the format of ':as_admin'.
       #
       def authorize_user(user_or_role = nil)
-        case user_or_role
+        user = case user_or_role
         when Symbol, String
-          user = build(:alchemy_dummy_user, user_or_role)
+          build(:alchemy_dummy_user, user_or_role)
         else
-          user = user_or_role
+          user_or_role
         end
         allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
       end

data/lib/alchemy/test_support/shared_contexts.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 RSpec.shared_context "with invalid file" do
   let(:invalid_file) do
     fixture_file_upload(
       File.expand_path("../../../spec/fixtures/users.yml", __dir__),
-      "text/x-yaml",
+      "text/x-yaml"
     )
   end
 

data/lib/alchemy/test_support/shared_dom_ids_examples.rb

@@ -6,7 +6,7 @@ RSpec.shared_examples_for "having dom ids" do
   let(:ingredient) do
     described_class.new(
       element: element,
-      role: "headline",
+      role: "headline"
     )
   end
 
@@ -31,7 +31,7 @@ RSpec.shared_examples_for "having dom ids" do
 
     context "with anchor setting set to true" do
       let(:settings) do
-        { anchor: true }
+        {anchor: true}
       end
 
       it "parameterizes dom_id" do
@@ -42,7 +42,7 @@ RSpec.shared_examples_for "having dom ids" do
 
     context "with anchor setting set to from_value" do
       let(:settings) do
-        { anchor: "from_value" }
+        {anchor: "from_value"}
       end
 
       context "with a value present" do
@@ -50,7 +50,7 @@ RSpec.shared_examples_for "having dom ids" do
           described_class.new(
             element: element,
             role: "headline",
-            value: "Hello World",
+            value: "Hello World"
           )
         end
 
@@ -64,7 +64,7 @@ RSpec.shared_examples_for "having dom ids" do
           described_class.new(
             element: element,
             role: "headline",
-            value: "",
+            value: ""
           )
         end
 
@@ -77,7 +77,7 @@ RSpec.shared_examples_for "having dom ids" do
     context "with anchor setting set to fixed value" do
       context "that is false" do
         let(:settings) do
-          { anchor: false }
+          {anchor: false}
         end
 
         it "sets no dom_id" do
@@ -87,7 +87,7 @@ RSpec.shared_examples_for "having dom ids" do
 
       context "that is true" do
         let(:settings) do
-          { anchor: true }
+          {anchor: true}
         end
 
         it "sets no dom_id" do
@@ -97,7 +97,7 @@ RSpec.shared_examples_for "having dom ids" do
 
       context "that is from_value" do
         let(:settings) do
-          { anchor: true }
+          {anchor: true}
         end
 
         it "sets no dom_id" do
@@ -107,7 +107,7 @@ RSpec.shared_examples_for "having dom ids" do
 
       context "that is a non reserved value" do
         let(:settings) do
-          { anchor: "FixED VALUE" }
+          {anchor: "FixED VALUE"}
         end
 
         it "sets the dom_id to fixed value" do

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -8,7 +8,7 @@ RSpec.shared_examples_for "an alchemy ingredient" do
   subject(:ingredient) do
     described_class.new(
       element: element,
-      role: "headline",
+      role: "headline"
     )
   end
 
@@ -31,13 +31,13 @@ RSpec.shared_examples_for "an alchemy ingredient" do
         expect(element).to receive(:ingredient_definition_for).at_least(:once) do
           {
             settings: {
-              linkable: true,
-            },
+              linkable: true
+            }
           }.with_indifferent_access
         end
       end
 
-      it { is_expected.to eq({ linkable: true }.with_indifferent_access) }
+      it { is_expected.to eq({linkable: true}.with_indifferent_access) }
     end
   end
 
@@ -57,8 +57,8 @@ RSpec.shared_examples_for "an alchemy ingredient" do
           type: "Text",
           default: "Hello World",
           settings: {
-            linkable: true,
-          },
+            linkable: true
+          }
         }.with_indifferent_access
       end
 
@@ -73,4 +73,10 @@ RSpec.shared_examples_for "an alchemy ingredient" do
       end
     end
   end
+
+  describe "#as_view_component" do
+    subject { ingredient.as_view_component }
+
+    it { is_expected.to be_a("#{described_class}View".constantize) }
+  end
 end

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.shared_examples_for "having a json uploader error message" do
   it "renders json response with error message" do
     subject