alchemy_cms 7.4.16 → 8.0.0.a

data/lib/alchemy/permissions.rb

@@ -44,11 +44,6 @@ module Alchemy
         can :read, Alchemy::Page, Alchemy::Page.published.not_restricted.from_current_site do |p|
           p.public? && !p.restricted? && p.site == Alchemy::Current.site
         end
-
-        can :read, Alchemy::Node, Alchemy::Node.available_to_guests do |node|
-          node.language.public? && node.language.site_id == Alchemy::Current.site&.id &&
-            (node.page.nil? || (node.page.public? && !node.page.restricted?))
-        end
       end
     end
 
@@ -72,11 +67,6 @@ module Alchemy
         can :read, Alchemy::Page, Alchemy::Page.published.from_current_site do |p|
           p.public? && p.site == Alchemy::Current.site
         end
-
-        can :read, Alchemy::Node, Alchemy::Node.available_to_members do |node|
-          node.language.public? && node.language.site_id == Alchemy::Current.site&.id &&
-            (node.page.nil? || node.page.public?)
-        end
       end
     end
 

data/lib/alchemy/propshaft/tinymce_asset.rb

@@ -0,0 +1,15 @@
+require "propshaft/asset"
+
+module Alchemy
+  module Propshaft
+    module TinymceAsset
+      # Allow TinyMCE assets to be accessed (in development mode) without a digest
+      def fresh?(digest)
+        super ||
+          (digest.blank? && logical_path.to_s.starts_with?("tinymce/"))
+      end
+    end
+  end
+end
+
+Propshaft::Asset.prepend Alchemy::Propshaft::TinymceAsset

data/lib/alchemy/seeder.rb

@@ -68,7 +68,7 @@ module Alchemy
               "Please use `rake db:reset' if you want to rebuild your database.", :skip
           false
         else
-          users = load_yaml_file(user_seeds_file)
+          users = YAML.load_file(user_seeds_file)
           users.each do |draft|
             user = Alchemy.user_class.create!(draft)
             log "Created user: #{user.try(:email) || user.try(:login) || user.id}"
@@ -83,15 +83,9 @@ module Alchemy
       end
 
       def page_yml
-        @_page_yml ||= load_yaml_file(
-          page_seeds_file
-        )
-      end
-
-      def load_yaml_file(file)
-        YAML.safe_load_file(
-          file,
-          permitted_classes: [Date, Symbol],
+        @_page_yml ||= YAML.safe_load(
+          page_seeds_file.read,
+          permitted_classes: [Date],
           aliases: true
         )
       end
@@ -122,7 +116,7 @@ module Alchemy
       # If no languages are present, create a default language based
       # on the host app's Alchemy configuration.
       def create_default_language!
-        default_language = Alchemy::Config.get(:default_language)
+        default_language = Alchemy.config.default_language
         if default_language
           Alchemy::Language.create!(
             name: default_language["name"],
@@ -140,7 +134,7 @@ module Alchemy
       end
 
       def create_default_site!
-        default_site = Alchemy::Config.get(:default_site)
+        default_site = Alchemy.config.default_site
         if default_site
           Alchemy::Site.create!(name: default_site["name"], host: default_site["host"])
         else

data/lib/alchemy/tasks/usage.rb

@@ -11,8 +11,8 @@ module Alchemy
           .group(:name)
           .order("count DESC, name ASC")
           .map { |e| {"name" => e.name, "count" => e.count} }
-        Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.sort_by { |d| d["name"] }.each do |definition|
-          res << {"name" => definition["name"], "count" => 0}
+        Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include?(definition.name) }.sort_by(&:name).each do |definition|
+          res << {"name" => definition.name, "count" => 0}
         end
         res
       end
@@ -23,8 +23,8 @@ module Alchemy
           .group(:page_layout)
           .order("count DESC, page_layout ASC")
           .map { |p| {"page_layout" => p.page_layout, "count" => p.count} }
-        Alchemy::PageLayout.all.reject { |page_layout| res.map { |p| p["page_layout"] }.include? page_layout["name"] }.sort_by { |d| d["name"] }.each do |page_layout|
-          res << {"page_layout" => page_layout["name"], "count" => 0}
+        Alchemy::PageDefinition.all.reject { |page_layout| res.map { |p| p["page_layout"] }.include?(page_layout.name) }.sort_by(&:name).each do |page_layout|
+          res << {"page_layout" => page_layout.name, "count" => 0}
         end
         res
       end

data/lib/alchemy/test_support/config_stubbing.rb

@@ -17,13 +17,7 @@ module Alchemy
       # @param value [Object] The value you want to return instead of the original one
       #
       def stub_alchemy_config(key, value)
-        allow(Alchemy::Config).to receive(:get) do |arg|
-          if arg == key
-            value
-          else
-            Alchemy::Config.show[arg.to_s]
-          end
-        end
+        allow(Alchemy.config).to receive(key).and_return(value)
       end
     end
   end

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

@@ -2,9 +2,20 @@
 
 FactoryBot.define do
   factory :alchemy_attachment, class: "Alchemy::Attachment" do
-    file do
-      File.new(Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png"))
+    transient do
+      file do
+        Rack::Test::UploadedFile.new(
+          Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png")
+        )
+      end
     end
+
+    after(:build) do |attachment, acc|
+      if acc.file
+        attachment.file = acc.file
+      end
+    end
+
     name { "image" }
     file_name { "image.png" }
   end

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

@@ -3,11 +3,10 @@
 FactoryBot.define do
   factory :alchemy_language, class: "Alchemy::Language" do
     name { "Your Language" }
-    language_code { "en" }
-    locale { ::I18n.default_locale }
+    code { ::I18n.available_locales.first.to_s }
     default { true }
     frontpage_name { "Intro" }
-    page_layout { Alchemy::Config.get(:default_language)["page_layout"] }
+    page_layout { Alchemy.config.default_language.page_layout }
 
     public { true }
 
@@ -15,23 +14,20 @@ FactoryBot.define do
 
     trait :klingon do
       name { "Klingon" }
-      language_code { "kl" }
-      locale { :kl }
+      code { "kl" }
       frontpage_name { "Tuq" }
       default { false }
     end
 
     trait :english do
       name { "English" }
-      language_code { "en" }
-      locale { :en }
+      code { "en" }
       default { false }
     end
 
     trait :german do
       name { "Deutsch" }
-      language_code { "de" }
-      locale { :de }
+      code { "de" }
       default { false }
     end
   end

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

@@ -12,7 +12,7 @@ FactoryBot.define do
 
     parent do
       Alchemy::Page.find_by(language_root: true, language: language) ||
-        FactoryBot.create(:alchemy_page, :language_root, language: language)
+        FactoryBot.create(:alchemy_page, :public, :language_root, language: language)
     end
 
     # This speeds up creating of pages dramatically.
@@ -23,7 +23,6 @@ FactoryBot.define do
       name { language&.frontpage_name || "Intro" }
       page_layout { language&.page_layout || "index" }
       language_root { true }
-      public_on { Time.current }
       parent { nil }
     end
 
@@ -33,7 +32,6 @@ FactoryBot.define do
         public_on { Time.current }
         public_until { nil }
       end
-      published_at { Time.current }
       after(:build) do |page, evaluator|
         page.build_public_version(
           public_on: evaluator.public_on,
@@ -42,7 +40,7 @@ FactoryBot.define do
       end
       after(:create) do |page|
         if page.autogenerate_elements
-          page.definition["autogenerate"].each do |name|
+          page.definition.autogenerate.each do |name|
             create(
               :alchemy_element,
               name: name,

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

@@ -2,9 +2,37 @@
 
 FactoryBot.define do
   factory :alchemy_picture, class: "Alchemy::Picture" do
-    image_file do
-      File.new(Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png"))
+    transient do
+      image_file do
+        Rack::Test::UploadedFile.new(
+          Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png")
+        )
+      end
     end
+
+    after(:build) do |picture, acc|
+      if acc.image_file
+        case Alchemy.storage_adapter.name
+        when :active_storage
+          filename = acc.image_file.original_filename
+          content_type = Marcel::MimeType.for(extension: File.extname(filename))
+          picture.image_file.attach(
+            io: acc.image_file.open,
+            filename:,
+            content_type:,
+            identify: false,
+            metadata: {
+              width: 1,
+              height: 1
+            }
+          )
+        when :dragonfly
+          picture.image_file = acc.image_file
+          picture.image_file_size = acc.image_file.size
+        end
+      end
+    end
+
     name { "image" }
     upload_hash { Time.current.hash }
   end

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

@@ -8,8 +8,8 @@ FactoryBot.define do
     trait :default do
       public { true }
 
-      name { Alchemy::Config.get(:default_site)["name"] }
-      host { Alchemy::Config.get(:default_site)["host"] }
+      name { Alchemy.config.default_site.name }
+      host { Alchemy.config.default_site.host }
     end
 
     trait :public do

data/lib/alchemy/test_support/having_crop_action_examples.rb

@@ -30,8 +30,8 @@ RSpec.shared_examples_for "having crop action" do |args|
       let(:settings) { {} }
 
       before do
-        picture.image_file_width = 300
-        picture.image_file_height = 250
+        allow(picture).to receive(:image_file_width) { 300 }
+        allow(picture).to receive(:image_file_height) { 250 }
         allow(croppable_resource).to receive(:settings) { settings }
         expect(Alchemy::Picture).to receive(:find_by) { picture }
       end

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -86,8 +86,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
           allow(record).to receive(:settings) { {} }
         end
 
-        it "adds them to the url" do
-          expect(picture_url).to match(/\?foo=baz/)
+        it "does not add them to the url" do
+          expect(picture_url).to_not match(/\?foo=baz/)
         end
       end
     end
@@ -112,7 +112,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
   describe "#picture_url_options" do
     subject(:picture_url_options) { record.picture_url_options }
 
-    let(:picture) { build_stubbed(:alchemy_picture) }
+    let(:picture) { build(:alchemy_picture) }
 
     it { is_expected.to be_a(HashWithIndifferentAccess) }
 
@@ -418,7 +418,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
     end
 
     context "with picture assigned" do
-      let(:picture) { build_stubbed(:alchemy_picture) }
+      let(:picture) { build(:alchemy_picture) }
 
       let(:default_mask) do
         [
@@ -432,8 +432,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
       let(:settings) { {} }
 
       before do
-        picture.image_file_width = 300
-        picture.image_file_height = 250
+        allow(picture).to receive(:image_file_width) { 300 }
+        allow(picture).to receive(:image_file_height) { 250 }
         allow(record).to receive(:settings) { settings }
       end
 
@@ -555,8 +555,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
         let(:settings) { {crop: true, size: size} }
 
         before do
-          picture.image_file_width = 200
-          picture.image_file_height = 100
+          allow(picture).to receive(:image_file_width) { 200 }
+          allow(picture).to receive(:image_file_height) { 100 }
         end
 
         context "size 200x50" do
@@ -619,45 +619,99 @@ RSpec.shared_examples_for "having picture thumbnails" do
   end
 
   describe "#allow_image_cropping?" do
-    let(:picture) do
-      stub_model(Alchemy::Picture, image_file_width: 400, image_file_height: 300)
+    let(:picture) { Alchemy::Picture.new }
+    let(:image_file_width) { 400 }
+    let(:image_file_height) { 300 }
+    let(:crop) { false }
+    let(:size) { "400x300" }
+    let(:upsample) { false }
+
+    before do
+      allow(picture).to receive(:image_file_width) { image_file_width }
+      allow(picture).to receive(:image_file_height) { image_file_height }
+      allow(record).to receive(:settings) { {crop:, size:, upsample:} }
     end
 
     subject { record.allow_image_cropping? }
 
-    it { is_expected.to be_falsy }
+    shared_context "with image file" do
+      before do
+        if Alchemy.storage_adapter.dragonfly?
+          expect(picture).to receive(:image_file) { fixture_file_upload("image.png") }
+        elsif Alchemy.storage_adapter.active_storage?
+          expect(picture.image_file).to receive(:attached?) { true }
+        end
+      end
+    end
 
-    context "with picture assigned" do
+    shared_context "without image file" do
       before do
-        allow(record).to receive(:picture) { picture }
+        if Alchemy.storage_adapter.dragonfly?
+          expect(picture).to receive(:image_file) { nil }
+        elsif Alchemy.storage_adapter.active_storage?
+          expect(picture.image_file).to receive(:attached?) { false }
+        end
       end
+    end
+
+    context "with crop set to false" do
+      let(:crop) { false }
 
       it { is_expected.to be_falsy }
+    end
+
+    context "with crop set to true" do
+      let(:crop) { true }
 
-      context "and with image larger than crop size" do
+      context "with picture assigned" do
         before do
-          allow(picture).to receive(:can_be_cropped_to?) { true }
+          allow(record).to receive(:picture) { picture }
         end
 
-        it { is_expected.to be_falsy }
+        context "and image smaller or equal to crop size" do
+          context "if picture.image_file is nil" do
+            include_context "without image file"
 
-        context "with crop set to true" do
-          before do
-            allow(record).to receive(:settings) { {crop: true} }
+            it { is_expected.to be_falsy }
           end
 
-          context "if picture.image_file is nil" do
-            before do
-              expect(picture).to receive(:image_file) { nil }
-            end
+          context "if picture.image_file is present" do
+            include_context "with image file"
 
             it { is_expected.to be_falsy }
+
+            context "but with upsample set to true" do
+              let(:upsample) { true }
+
+              it { is_expected.to be(true) }
+            end
           end
+        end
 
-          context "if picture.image_file is present" do
-            let(:picture) { build_stubbed(:alchemy_picture) }
+        context "and with image larger than crop size" do
+          let(:image_file_width) { 1201 }
+          let(:image_file_height) { 481 }
+
+          it { is_expected.to be_falsy }
 
-            it { is_expected.to be(true) }
+          context "with crop set to true" do
+            context "if picture.image_file is nil" do
+              include_context "without image file"
+
+              it { is_expected.to be_falsy }
+            end
+
+            context "if picture.image_file is present" do
+              include_context "with image file"
+
+              it { is_expected.to be(true) }
+
+              context "with size setting being nil" do
+                let(:size) { nil }
+
+                it { is_expected.to be_falsey }
+              end
+            end
           end
         end
       end

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -29,11 +29,11 @@ RSpec.shared_examples_for "an alchemy ingredient" do
     context "with element" do
       before do
         expect(element).to receive(:ingredient_definition_for).at_least(:once) do
-          {
+          Alchemy::IngredientDefinition.new(
             settings: {
               linkable: true
             }
-          }.with_indifferent_access
+          )
         end
       end
 
@@ -47,19 +47,19 @@ RSpec.shared_examples_for "an alchemy ingredient" do
     context "without element" do
       let(:element) { nil }
 
-      it { is_expected.to eq({}) }
+      it { is_expected.to be_a(Alchemy::IngredientDefinition) }
     end
 
     context "with element" do
       let(:definition) do
-        {
+        Alchemy::IngredientDefinition.new(
           role: "headline",
           type: "Text",
           default: "Hello World",
           settings: {
             linkable: true
           }
-        }.with_indifferent_access
+        )
       end
 
       before do

data/lib/alchemy/upgrader/eight_zero.rb

@@ -0,0 +1,14 @@
+module Alchemy
+  class Upgrader
+    module EightZero
+      def mention_alchemy_config_initializer
+        todo <<~TEXT, "Configuration has changed to initializer"
+          Check the new configuration file `./config/initializers/alchemy.rb` and
+          update values from your `config/alchemy/config.yml` file.
+
+          Then you can safely remove the `config/alchemy/config.yml` file.
+        TEXT
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader.rb

@@ -1,29 +1,42 @@
 # frozen_string_literal: true
 
 require "alchemy/shell"
+require "thor"
 
 module Alchemy
   class Upgrader
-    extend Alchemy::Shell
-
-    Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].sort.each { |f| require f }
-
-    class << self
-      def copy_new_config_file
-        desc "Copy configuration file."
-        config_file = Rails.root.join("config/alchemy/config.yml")
-        default_config = File.join(File.dirname(__FILE__), "../../config/alchemy/config.yml")
-        if !File.exist? config_file
-          log "No configuration file found. Creating it."
-          FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml")
-        elsif FileUtils.identical? default_config, config_file
-          log "Configuration file already present.", :skip
-        else
-          log "Custom configuration file found."
-          FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml.defaults")
-          log "Copied new default configuration file."
-          todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", "Configuration has changed"
-        end
+    include Alchemy::Shell
+    include Thor::Base
+    include Thor::Actions
+
+    Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].sort.each { require(_1) }
+
+    VERSION_MODULE_MAP = {
+      "8.0" => "Alchemy::Upgrader::EightZero"
+    }
+
+    source_root Alchemy::Engine.root.join("lib/generators/alchemy/install")
+
+    def initialize(version)
+      super()
+      self.class.include VERSION_MODULE_MAP[version.to_s].constantize
+    end
+
+    def update_config
+      desc "Copy configuration file."
+      @default_config = Alchemy::Configurations::Main.new
+      template("templates/alchemy.rb.tt", "config/initializers/alchemy.rb")
+    end
+
+    def run_migrations
+      ActiveRecord::Migration.check_all_pending!
+    rescue ActiveRecord::PendingMigrationError
+      desc "Pending Database migrations."
+      if yes?("Run database migrations now? (y/N)")
+        log "Migrating Database..."
+        Rake::Task["db:migrate"].invoke
+      else
+        log "Don't forget to run database migrations later with rake `db:migrate`.", :skip
       end
     end
   end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.4.16"
+  VERSION = "8.0.0.a"
 
   def self.version
     VERSION