alchemy_cms 8.0.7 → 8.1.1

data/lib/alchemy/test_support/shared_publishable_examples.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "being publishable" do |factory_name|
+  describe ".draft" do
+    let!(:draft_versions) { create_list(factory_name, 2, public_on: nil) }
+
+    subject { described_class.draft.map(&:public_on) }
+
+    before do
+      create(factory_name, public_on: Time.current)
+      subject.uniq!
+    end
+
+    it "only includes records without public_on date" do
+      expect(subject).to eq [nil]
+    end
+  end
+
+  describe ".scheduled" do
+    subject { described_class.scheduled }
+
+    let!(:public_one) { create(factory_name, public_on: Date.yesterday) }
+    let!(:public_two) { create(factory_name, public_on: Time.current) }
+    let!(:non_public) { create(factory_name, public_on: nil) }
+
+    it "returns currently scheduled records" do
+      # Filter to test records only, as factories may create additional records as side effects
+      scheduled = subject.where(id: [public_one.id, public_two.id, non_public.id])
+      expect(scheduled).to match_array([
+        public_one,
+        public_two
+      ])
+    end
+  end
+
+  describe ".published" do
+    let!(:public_one) { create(factory_name, public_on: Date.yesterday) }
+    let!(:public_two) { create(factory_name, public_on: Date.tomorrow) }
+    let!(:non_public) { create(factory_name, public_on: nil) }
+
+    context "without time given" do
+      subject { described_class.published }
+
+      it "returns records currently public" do
+        # Filter to test records only, as factories may create additional records as side effects
+        published = subject.where(id: [public_one.id, public_two.id, non_public.id])
+        expect(published).to match_array([
+          public_one
+        ])
+      end
+    end
+
+    context "with time given" do
+      subject { described_class.published(at: Date.tomorrow + 1.day) }
+
+      it "returns records public on that time" do
+        # Filter to test records only, as factories may create additional records as side effects
+        published = subject.where(id: [public_one.id, public_two.id, non_public.id])
+        expect(published).to match_array([
+          public_one,
+          public_two
+        ])
+      end
+    end
+  end
+
+  describe "#public?" do
+    subject { page_version.public? }
+
+    context "when public_on is not set" do
+      let(:page_version) { build(factory_name, public_on: nil) }
+
+      it { is_expected.to be(false) }
+    end
+
+    context "when public_on is set to past date" do
+      context "and public_until is set to nil" do
+        let(:page_version) do
+          build(factory_name,
+            public_on: Time.current - 2.days,
+            public_until: nil)
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and public_until is set to future date" do
+        let(:page_version) do
+          build(factory_name,
+            public_on: Time.current - 2.days,
+            public_until: Time.current + 2.days)
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "and public_until is set to past date" do
+        let(:page_version) do
+          build(factory_name,
+            public_on: Time.current - 2.days,
+            public_until: Time.current - 1.days)
+        end
+
+        it { is_expected.to be(false) }
+      end
+    end
+
+    context "when public_on is set to future date" do
+      let(:page_version) { build(factory_name, public_on: Time.current + 2.days) }
+
+      it { is_expected.to be(false) }
+    end
+  end
+end

data/lib/alchemy/upgrader/eight_one.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Upgrader
+    module EightOne
+      def migrate_page_metadata
+        desc "Migrating page metadata to page versions"
+
+        connection = ActiveRecord::Base.connection
+        pages_table = Alchemy::Page.table_name
+        versions_table = Alchemy::PageVersion.table_name
+
+        unmigrated_count = connection.select_value(<<-SQL.strip_heredoc).to_i
+          SELECT COUNT(*) FROM #{versions_table}
+          WHERE title IS NULL
+            AND meta_description IS NULL
+            AND meta_keywords IS NULL
+        SQL
+
+        if unmigrated_count == 0
+          log "All page versions have meta data.", :skip
+          return
+        end
+
+        sql = if connection.adapter_name.downcase.match?(/mysql|trilogy/)
+          <<-SQL.strip_heredoc
+            UPDATE #{versions_table} pv
+            INNER JOIN #{pages_table} p ON pv.page_id = p.id
+            SET pv.title = p.title,
+                pv.meta_description = p.meta_description,
+                pv.meta_keywords = p.meta_keywords
+            WHERE pv.title IS NULL
+              AND pv.meta_description IS NULL
+              AND pv.meta_keywords IS NULL
+          SQL
+        else
+          <<-SQL.strip_heredoc
+            UPDATE #{versions_table}
+            SET title = p.title,
+                meta_description = p.meta_description,
+                meta_keywords = p.meta_keywords
+            FROM #{pages_table} p
+            WHERE #{versions_table}.page_id = p.id
+              AND #{versions_table}.title IS NULL
+              AND #{versions_table}.meta_description IS NULL
+              AND #{versions_table}.meta_keywords IS NULL
+          SQL
+        end
+
+        migrated_count = connection.update(sql)
+
+        log "Migrated metadata for #{migrated_count} page versions."
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader.rb

@@ -12,11 +12,19 @@ module Alchemy
     Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].sort.each { require(_1) }
 
     VERSION_MODULE_MAP = {
-      "8.0" => "Alchemy::Upgrader::EightZero"
+      "8.0" => "Alchemy::Upgrader::EightZero",
+      "8.1" => "Alchemy::Upgrader::EightOne"
     }
 
     source_root Alchemy::Engine.root.join("lib/generators/alchemy/install")
 
+    # Returns a memoized upgrader instance for the given version.
+    # This ensures todos are accumulated across rake tasks.
+    def self.[](version)
+      @instances ||= {}
+      @instances[version.to_s] ||= new(version)
+    end
+
     def initialize(version)
       super()
       self.class.include VERSION_MODULE_MAP[version.to_s].constantize

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "8.0.7"
+  VERSION = "8.1.1"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -21,10 +21,7 @@ module Alchemy
     def config
       @_config ||= Alchemy::Configurations::Main.new
     end
-
-    def configure(&blk)
-      yield config
-    end
+    delegate :configure, to: :config
 
     enable_searchable_deprecation_msg = "Use `Alchemy.config.show_page_searchable_checkbox` instead."
     def enable_searchable = config.show_page_searchable_checkbox

data/lib/alchemy_cms.rb

@@ -42,7 +42,6 @@ require_relative "alchemy/name_conversions"
 require_relative "alchemy/on_page_layout"
 require_relative "alchemy/on_page_layout/callbacks_runner"
 require_relative "alchemy/paths"
-require_relative "alchemy/permissions"
 require_relative "alchemy/tinymce"
 require_relative "alchemy/taggable"
 require_relative "alchemy/version"

data/lib/generators/alchemy/elements/templates/view.html.erb

@@ -1,4 +1,4 @@
-<%%- cache(<%= @element_name %>) do -%>
+<%% cache(<%= @element_name %>) do -%>
   <%%= element_view_for(<%= @element_name %>) do |el| -%>
   <%- @ingredients.each do |ingredient| -%>
     <%- if @ingredients.length > 1 -%>
@@ -12,5 +12,5 @@
   <%- if @element['nestable_elements'].present? -%>
     <%%= render <%= @element_name %>.nested_elements.published %>
   <%- end -%>
-  <%%- end -%>
-<%%- end -%>
+  <%% end -%>
+<%% end -%>

data/lib/generators/alchemy/ingredient/ingredient_generator.rb

@@ -11,20 +11,18 @@ module Alchemy
 
       def init
         @class_name = class_name.classify
-        @ingredients_view_path = "app/views/alchemy/ingredients"
-      end
-
-      def create_view_component
-        template "view_component.rb.tt", "app/components/alchemy/ingredients/#{file_name}_view.rb"
       end
 
       def create_model
         template "model.rb.tt", "app/models/alchemy/ingredients/#{file_name}.rb"
       end
 
-      def copy_templates
-        @ingredient_editor_local = "#{file_name}_editor"
-        template "editor.html.erb", "#{@ingredients_view_path}/_#{file_name}_editor.html.erb"
+      def create_view_component
+        template "view_component.rb.tt", "app/components/alchemy/ingredients/#{file_name}_view.rb"
+      end
+
+      def create_editor_component
+        template "editor_component.rb.tt", "app/components/alchemy/ingredients/#{file_name}_editor.rb"
       end
 
       def show_todo

data/lib/generators/alchemy/ingredient/templates/editor_component.rb.tt

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class <%= @class_name %>Editor < BaseEditor
+      # Override the input_field method to customize the editor input.
+      # The base implementation renders a text field.
+      #
+      # def input_field
+      #   tag.div(class: "input-field") do
+      #     text_field_tag(form_field_name,
+      #       value,
+      #       id: form_field_id,
+      #       minlength: length_validation&.fetch(:minimum, nil),
+      #       maxlength: length_validation&.fetch(:maximum, nil),
+      #       required: presence_validation?,
+      #       pattern: format_validation)
+      #   end
+      # end
+    end
+  end
+end

data/lib/generators/alchemy/page_layouts/templates/layout.html.erb

@@ -1 +1 @@
-<%%= render_elements %>
+<%%= render_elements %>

data/lib/generators/alchemy/site_layouts/templates/layout.html.erb

@@ -1 +1 @@
-<%%= yield %>
+<%%= yield %>

data/lib/tasks/alchemy/upgrade.rake

@@ -3,16 +3,15 @@
 require "alchemy/upgrader"
 require "alchemy/version"
 
-Upgrader = Alchemy::Upgrader.new("8.0")
-
 namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
     "alchemy:upgrade:prepare",
-    "alchemy:upgrade:8.0:run"
+    "alchemy:upgrade:8.0:run",
+    "alchemy:upgrade:8.1:run"
   ] do
-    Upgrader.run_migrations
-    Upgrader.display_todos
+    Alchemy::Upgrader["8.1"].run_migrations
+    Alchemy::Upgrader["8.1"].display_todos
   end
 
   namespace :upgrade do
@@ -29,7 +28,7 @@ namespace :alchemy do
 
     desc "Alchemy Upgrader: Update configuration file."
     task config: [:environment] do
-      Upgrader.update_config
+      Alchemy::Upgrader["8.0"].update_config
     end
 
     namespace "8.0" do
@@ -38,7 +37,22 @@ namespace :alchemy do
       ]
 
       task :mention_alchemy_config_initializer do
-        Upgrader.mention_alchemy_config_initializer
+        Alchemy::Upgrader["8.0"].mention_alchemy_config_initializer
+      end
+    end
+
+    namespace "8.1" do
+      task "run" => [
+        "alchemy:upgrade:8.1:migrate_page_metadata"
+      ]
+
+      desc "Migrate page metadata to page versions"
+      task migrate_page_metadata: [
+        "alchemy:install:migrations",
+        "environment"
+      ] do
+        Alchemy::Upgrader["8.1"].run_migrations
+        Alchemy::Upgrader["8.1"].migrate_page_metadata
       end
     end
   end