alchemy_cms 6.0.0.b1 → 6.0.0.b2

data/lib/alchemy/forms/builder.rb

@@ -18,11 +18,31 @@ module Alchemy
         super
       end
 
+      # Renders a simple_form input that displays a datepicker
+      #
+      def datepicker(attribute_name, options = {})
+        options[:wrapper] = :alchemy
+
+        type = options[:as] || :date
+        value = options.fetch(:input_html, {}).delete(:value)
+        date = value || object.send(attribute_name.to_sym).presence
+        date = Time.zone.parse(date) if date.is_a?(String)
+
+        input_options = {
+          type: :text,
+          class: type,
+          data: { datepicker_type: type },
+          value: date&.iso8601,
+        }.merge(options[:input_html] || {})
+
+        input attribute_name, as: :string, input_html: input_options
+      end
+
       # Renders a button tag wrapped in a div with 'submit' class.
       #
       def submit(label, options = {})
         options = {
-          wrapper_html: {class: "submit"},
+          wrapper_html: { class: "submit" },
         }.update(options)
         template.content_tag("div", options.delete(:wrapper_html)) do
           template.content_tag("button", label, options.delete(:input_html))

data/lib/alchemy/resource_filter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class ResourceFilter
+    attr_reader :name
+
+    def initialize(filter, resource_name)
+      @filter = filter
+      @name = filter[:name]
+      @resource_name = resource_name
+      @values = filter[:values].presence || []
+    end
+
+    def options_for_select
+      translated_values.zip(values)
+    end
+
+    def values
+      if translated?
+        @values.map { |v| v[1] }
+      else
+        @values
+      end
+    end
+
+    private
+
+    def translated?
+      @values.first.is_a?(Array)
+    end
+
+    def translated_values
+      if translated?
+        @values.map { |a| a[0] }
+      else
+        @values.map { |v| Alchemy.t(v.to_sym, scope: ["filters", @resource_name, @name, "values"]) }
+      end
+    end
+  end
+end

data/lib/alchemy/resources_helper.rb

@@ -107,12 +107,10 @@ module Alchemy
       when "boolean"
         options
       when "date", "time", "datetime"
-        date = resource_instance_variable.send(attribute[:name]) || Time.current
         options.merge(
           as: "string",
           input_html: {
-            "data-datepicker-type" => input_type,
-            value: date ? date.iso8601 : nil,
+            data: { datepicker_type: input_type },
           },
         )
       when "text"
@@ -171,18 +169,5 @@ module Alchemy
     def resource_has_tags
       resource_model.respond_to?(:tag_counts) && resource_model.tag_counts.any?
     end
-
-    def resource_has_filters
-      resource_model.respond_to?(:alchemy_resource_filters)
-    end
-
-    def resource_filter_select
-      resource_model.alchemy_resource_filters.map do |filter_scope|
-        [
-          Alchemy.t(filter_scope.to_sym, scope: ["resources", resource_name, "filters"]),
-          filter_scope,
-        ]
-      end
-    end
   end
 end

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -28,6 +28,16 @@ RSpec.shared_examples_for "an alchemy ingredient" do
     end
 
     context "with element" do
+      before do
+        expect(element).to receive(:ingredient_definition_for) do
+          {
+            settings: {
+              linkable: true,
+            },
+          }.with_indifferent_access
+        end
+      end
+
       it { is_expected.to eq({ linkable: true }.with_indifferent_access) }
     end
   end
@@ -42,15 +52,23 @@ RSpec.shared_examples_for "an alchemy ingredient" do
     end
 
     context "with element" do
-      it do
-        is_expected.to eq({
+      let(:definition) do
+        {
           role: "headline",
           type: "Text",
           default: "Hello World",
           settings: {
             linkable: true,
           },
-        }.with_indifferent_access)
+        }.with_indifferent_access
+      end
+
+      before do
+        expect(element).to receive(:ingredient_definition_for) { definition }
+      end
+
+      it "returns ingredient definition" do
+        is_expected.to eq(definition)
       end
     end
   end

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -10,6 +10,9 @@ module Alchemy::Upgrader::Tasks
       def create_ingredients
         Alchemy::Deprecation.silence do
           elements_with_ingredients = Alchemy::ElementDefinition.all.select { |d| d.key?(:ingredients) }
+          if ENV["ONLY"]
+            elements_with_ingredients = elements_with_ingredients.select { |d| d[:name].in? ENV["ONLY"].split(",") }
+          end
           # eager load all elements that have ingredients defined but no ingredient records yet.
           all_elements = Alchemy::Element
             .named(elements_with_ingredients.map { |d| d[:name] })
@@ -22,21 +25,26 @@ module Alchemy::Upgrader::Tasks
               puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)"
               elements.each do |element|
                 Alchemy::Element.transaction do
-                  element.ingredients = element_definition[:ingredients].map do |ingredient_definition|
+                  element_definition[:ingredients].each do |ingredient_definition|
                     content = element.content_by_name(ingredient_definition[:role])
                     next unless content
 
+                    essence = content.essence
                     ingredient = Alchemy::Ingredient.build(role: ingredient_definition[:role], element: element)
-                    belongs_to_associations = content.essence.class.reflect_on_all_associations(:belongs_to)
+                    belongs_to_associations = essence.class.reflect_on_all_associations(:belongs_to)
                     if belongs_to_associations.any?
-                      ingredient.related_object = content.essence.public_send(belongs_to_associations.first.name)
+                      ingredient.related_object = essence.public_send(belongs_to_associations.first.name)
                     else
                       ingredient.value = content.ingredient
                     end
-                    content.destroy!
+                    data = ingredient.class.stored_attributes.fetch(:data, []).each_with_object({}) do |attr, d|
+                      d[attr] = essence.public_send(attr)
+                    end
+                    ingredient.data = data
                     print "."
-                    ingredient
-                  end.compact
+                    ingredient.save!
+                    content.destroy!
+                  end
                 end
               end
               puts "\n"

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0.b1"
+  VERSION = "6.0.0.b2"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -54,6 +54,7 @@ require_relative "alchemy/permissions"
 require_relative "alchemy/resource"
 require_relative "alchemy/tinymce"
 require_relative "alchemy/taggable"
+require_relative "alchemy/version"
 
 # Require hacks
 require_relative "kaminari/scoped_pagination_url_helper"

data/lib/generators/alchemy/menus/templates/node.html.erb

@@ -1,4 +1,4 @@
-<%% cache node do %>
+<%% cache [node, @page, @preview_mode] do %>
   <%%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
     <%%= link_to_if node.url,
       node.name,

data/lib/generators/alchemy/menus/templates/node.html.haml

@@ -1,4 +1,4 @@
-- cache node do
+- cache [node, @page, @preview_mode] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,

data/lib/generators/alchemy/menus/templates/node.html.slim

@@ -1,4 +1,4 @@
-- cache node do
+- cache [node, @page, @preview_mode] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,

data/lib/generators/alchemy/menus/templates/wrapper.html.erb

@@ -1,4 +1,4 @@
-<%% cache menu do %>
+<%% cache [menu, @page, @preview_mode] do %>
   <ul class="nav">
     <%%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/generators/alchemy/menus/templates/wrapper.html.haml

@@ -1,4 +1,4 @@
-- cache menu do
+- cache [menu, @page, @preview_mode] do
   %ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/generators/alchemy/menus/templates/wrapper.html.slim

@@ -1,4 +1,4 @@
-- cache menu do
+- cache [menu, @page, @preview_mode] do
   ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "0.2.0",
+  "version": "6.0.0-b2",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.b1
+  version: 6.0.0.b2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -689,14 +689,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -1013,7 +1013,6 @@ files:
 - app/views/alchemy/admin/attachments/_attachment.html.erb
 - app/views/alchemy/admin/attachments/_file_to_assign.html.erb
 - app/views/alchemy/admin/attachments/_files_list.html.erb
-- app/views/alchemy/admin/attachments/_filter_bar.html.erb
 - app/views/alchemy/admin/attachments/_overlay_file_list.html.erb
 - app/views/alchemy/admin/attachments/_replace_button.html.erb
 - app/views/alchemy/admin/attachments/_tag_list.html.erb
@@ -1131,7 +1130,6 @@ files:
 - app/views/alchemy/admin/pictures/_archive.html.erb
 - app/views/alchemy/admin/pictures/_archive_overlay.html.erb
 - app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb
-- app/views/alchemy/admin/pictures/_filter_bar.html.erb
 - app/views/alchemy/admin/pictures/_form.html.erb
 - app/views/alchemy/admin/pictures/_infos.html.erb
 - app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb
@@ -1145,6 +1143,7 @@ files:
 - app/views/alchemy/admin/pictures/index.js.erb
 - app/views/alchemy/admin/pictures/show.html.erb
 - app/views/alchemy/admin/pictures/update.js.erb
+- app/views/alchemy/admin/resources/_filter.html.erb
 - app/views/alchemy/admin/resources/_filter_bar.html.erb
 - app/views/alchemy/admin/resources/_form.html.erb
 - app/views/alchemy/admin/resources/_per_page_select.html.erb
@@ -1323,6 +1322,7 @@ files:
 - lib/alchemy/paths.rb
 - lib/alchemy/permissions.rb
 - lib/alchemy/resource.rb
+- lib/alchemy/resource_filter.rb
 - lib/alchemy/resources_helper.rb
 - lib/alchemy/routing_constraints.rb
 - lib/alchemy/seeder.rb
@@ -1516,8 +1516,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []
+...

data/app/views/alchemy/admin/attachments/_filter_bar.html.erb

@@ -1,29 +0,0 @@
-<div id="filter_bar">
-  <h3><%= Alchemy.t('Filter') %></h3>
-  <%= select_tag(
-    'file_type_filter',
-    options_for_select(
-      Alchemy::Attachment.file_types_for_select,
-      search_filter_params[:file_type]
-    ),
-    include_blank: Alchemy.t('Show all files'),
-    data: { remote: !!request.xhr? },
-    class: 'alchemy_selectbox'
-  ) %>
-</div>
-
-<script type="text/javascript">
-  $(function() {
-    $('#file_type_filter').on('change', function(e) {
-      var $this = $(this);
-      var url = '<%= alchemy.admin_attachments_path(search_filter_params.except(:file_type).to_h) %>';
-      if ($this.data('remote') === true) {
-        $.get(url, {file_type: $this.val()}, null, 'script');
-      } else {
-        delimiter = url.match(/\?/) ? '&' : '?';
-        Turbolinks.visit(url + delimiter + 'file_type=' + encodeURIComponent($this.val()));
-      }
-      return false;
-    });
-  });
-</script>

data/app/views/alchemy/admin/pictures/_filter_bar.html.erb

@@ -1,30 +0,0 @@
-<div id="filter_bar">
-  <h3><%= Alchemy.t('Filter') %></h3>
-  <%= select_tag(
-    'picture_filter',
-    options_for_select([
-      [Alchemy.t(:all_pictures), ''],
-      [Alchemy.t(:last_upload_only), 'last_upload'],
-      [Alchemy.t(:recently_uploaded_only), 'recent'],
-      [Alchemy.t(:without_tag), 'without_tag']
-    ], search_filter_params[:filter]),
-    :data => { :remote => !!request.xhr? },
-    :class => 'alchemy_selectbox'
-  ) %>
-</div>
-
-<script type="text/javascript">
-  $(function() {
-    $('#picture_filter').on('change', function(e) {
-      var $this = $(this);
-      var url = '<%= alchemy.admin_pictures_path(search_filter_params.except(:filter).to_h) %>';
-      if ($this.data('remote') === true) {
-        $.get(url, {filter: $this.val()}, null, 'script');
-      } else {
-        delimiter = url.match(/\?/) ? '&' : '?';
-        Turbolinks.visit(url + delimiter + 'filter=' + $this.val());
-      }
-      return false;
-    });
-  });
-</script>