alchemy_cms 5.2.1 → 6.0.0.pre.b4

data/alchemy_cms.gemspec

@@ -1,80 +1,93 @@
-# coding: utf-8
-lib = File.expand_path('lib', __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'alchemy/version'
+require "alchemy/version"
 
 Gem::Specification.new do |gem|
-  gem.name                  = 'alchemy_cms'
-  gem.version               = Alchemy::VERSION
-  gem.platform              = Gem::Platform::RUBY
-  gem.authors               = ['Thomas von Deyen', 'Robin Boening', 'Marc Schettke', 'Hendrik Mans', 'Carsten Fregin', 'Martin Meyerhoff']
-  gem.email                 = ['hello@alchemy-cms.com']
-  gem.homepage              = 'https://alchemy-cms.com'
-  gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails'
-  gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails CMS.'
-  gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  gem.required_ruby_version = '>= 2.3.0'
-  gem.license               = 'BSD New'
-  gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
-  gem.require_paths         = ['lib']
+  gem.name = "alchemy_cms"
+  gem.version = Alchemy::VERSION
+  gem.platform = Gem::Platform::RUBY
+  gem.authors = ["Thomas von Deyen", "Robin Boening", "Marc Schettke", "Hendrik Mans", "Carsten Fregin", "Martin Meyerhoff"]
+  gem.email = ["hello@alchemy-cms.com"]
+  gem.homepage = "https://alchemy-cms.com"
+  gem.summary = "A powerful, userfriendly and flexible CMS for Rails"
+  gem.description = "Alchemy is a powerful, userfriendly and flexible Rails CMS."
+  gem.requirements << "ImageMagick (libmagick), v6.6 or greater."
+  gem.required_ruby_version = ">= 2.5.0"
+  gem.license = "BSD New"
+  gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  gem.require_paths = ["lib"]
+
+  %w[
+    actionmailer
+    actionpack
+    actionview
+    activejob
+    activemodel
+    activerecord
+    activesupport
+    railties
+  ].each do |rails_gem|
+    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 6.1"]
+  end
 
-  gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.10.0']
-  gem.add_runtime_dependency 'acts_as_list',                     ['>= 0.3', '< 2']
-  gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
-  gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
-  gem.add_runtime_dependency 'coffee-rails',                     ['>= 4.0', '< 6.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
-  gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
-  gem.add_runtime_dependency 'gutentag',                         ['~> 2.2', '>= 2.2.1']
-  gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
-  gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0', '>= 4.0.4']
-  gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 6.0']
-  gem.add_runtime_dependency 'kaminari',                         ['~> 1.1']
-  gem.add_runtime_dependency 'originator',                       ['~> 3.1']
-  gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
-  gem.add_runtime_dependency 'rails',                            ['>= 5.2.0', '< 6.1']
-  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 2.4.2'] # 2.4.2 dropped Ruby 2.5 support in a patch level release
-  gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
-  gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
-  gem.add_runtime_dependency 'sassc-rails',                      ['~> 2.1']
-  gem.add_runtime_dependency 'simple_form',                      ['>= 4.0', '< 6']
-  gem.add_runtime_dependency 'sprockets',                        ['>= 3.0', '< 5']
-  gem.add_runtime_dependency 'turbolinks',                       ['>= 2.5']
-  gem.add_runtime_dependency 'webpacker',                        ['>= 4.0', '< 6']
+  gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
+  gem.add_runtime_dependency "acts_as_list", [">= 0.3", "< 2"]
+  gem.add_runtime_dependency "awesome_nested_set", ["~> 3.1"]
+  gem.add_runtime_dependency "cancancan", [">= 2.1", "< 4.0"]
+  gem.add_runtime_dependency "coffee-rails", [">= 4.0", "< 6.0"]
+  gem.add_runtime_dependency "dragonfly", ["~> 1.4"]
+  gem.add_runtime_dependency "dragonfly_svg", ["~> 0.0.4"]
+  gem.add_runtime_dependency "gutentag", ["~> 2.2", ">= 2.2.1"]
+  gem.add_runtime_dependency "handlebars_assets", ["~> 0.23"]
+  gem.add_runtime_dependency "jquery-rails", ["~> 4.0", ">= 4.0.4"]
+  gem.add_runtime_dependency "jquery-ui-rails", ["~> 6.0"]
+  gem.add_runtime_dependency "kaminari", ["~> 1.1"]
+  gem.add_runtime_dependency "originator", ["~> 3.1"]
+  gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
+  gem.add_runtime_dependency "ransack", [">= 1.8", "< 2.4.2"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency "request_store", ["~> 1.2"]
+  gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
+  gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
+  gem.add_runtime_dependency "simple_form", [">= 4.0", "< 6"]
+  gem.add_runtime_dependency "sprockets", [">= 3.0", "< 5"]
+  gem.add_runtime_dependency "turbolinks", [">= 2.5"]
+  gem.add_runtime_dependency "webpacker", [">= 4.0", "< 6"]
 
-  gem.add_development_dependency 'capybara',                     ['~> 3.0']
-  gem.add_development_dependency 'capybara-screenshot',          ['~> 1.0']
-  gem.add_development_dependency 'factory_bot_rails',            ['~> 6.0']
-  gem.add_development_dependency 'puma',                         ['~> 5.0']
-  gem.add_development_dependency 'rails-controller-testing',     ['~> 1.0']
-  gem.add_development_dependency 'rspec-activemodel-mocks',      ['~> 1.0']
-  gem.add_development_dependency 'rspec-rails',                  ['>= 4.0.0.beta2']
-  gem.add_development_dependency 'simplecov',                    ['~> 0.20']
-  gem.add_development_dependency 'webdrivers',                   ['~> 4.0']
-  gem.add_development_dependency 'webmock',                      ['~> 3.3']
-  gem.add_development_dependency 'shoulda-matchers',             ['~> 4.0']
-  gem.add_development_dependency 'timecop',                      ['~> 0.9']
+  gem.add_development_dependency "capybara", ["~> 3.0"]
+  gem.add_development_dependency "capybara-screenshot", ["~> 1.0"]
+  gem.add_development_dependency "factory_bot_rails", ["~> 6.0"]
+  gem.add_development_dependency "puma", ["~> 5.0"]
+  gem.add_development_dependency "rails-controller-testing", ["~> 1.0"]
+  gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
+  gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]
+  gem.add_development_dependency "simplecov", ["~> 0.20"]
+  gem.add_development_dependency "webdrivers", ["~> 4.0"]
+  gem.add_development_dependency "webmock", ["~> 3.3"]
+  gem.add_development_dependency "shoulda-matchers", ["~> 5.0"]
+  gem.add_development_dependency "timecop", ["~> 0.9"]
 
-  gem.post_install_message = <<-MSG
--------------------------------------------------------------
-            Thank you for installing Alchemy CMS
--------------------------------------------------------------
+  gem.post_install_message = <<~MSG
+    -------------------------------------------------------------
+                Thank you for installing Alchemy CMS
+    -------------------------------------------------------------
 
-- Complete the installation in an existing Rails application:
+    - Complete the installation in an existing Rails application:
 
-  $ bin/rake alchemy:install
+      $ bin/rake alchemy:install
 
-- Complete the upgrade of an existing Alchemy installation:
+    - Complete the upgrade of an existing Alchemy installation:
 
-  $ bin/rake alchemy:upgrade
+      $ bin/rake alchemy:upgrade
 
-and follow the onscreen instructions.
+    and follow the onscreen instructions.
 
-Need help? Try:
+    Need help? Try:
 
-* https://stackoverflow.com/questions/tagged/alchemy-cms
-* https://slackin.alchemy-cms.com
--------------------------------------------------------------
+    * https://stackoverflow.com/questions/tagged/alchemy-cms
+    * https://slackin.alchemy-cms.com
+    -------------------------------------------------------------
 
-MSG
+  MSG
 end

data/app/assets/javascripts/alchemy/admin.js

@@ -31,7 +31,6 @@
 //= require alchemy/alchemy.growler
 //= require alchemy/alchemy.gui
 //= require alchemy/alchemy.hotkeys
-//= require alchemy/alchemy.image_cropper
 //= require alchemy/alchemy.image_overlay
 //= require alchemy/alchemy.string_extension
 //= require alchemy/alchemy.link_dialog
@@ -44,6 +43,5 @@
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.tooltips
-//= require alchemy/alchemy.trash_window
 //= require alchemy/page_select
 //= require alchemy/node_select

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -42,33 +42,6 @@ $.extend Alchemy,
       $overlay.hide()
     return
 
-  # Shows spinner while loading images and
-  # fades the image after its been loaded
-  ImageLoader: (scope = document, options = {fill: '#fff'}) ->
-    $('img', scope).each ->
-      if !this.complete
-        image = $(this).hide()
-        $parent = image.parent()
-        spinner = new Alchemy.Spinner('small', options)
-        spinner.spin $parent[0]
-        image.on 'load', ->
-          spinner.stop()
-          image.fadeIn 400
-        image.on 'error', ->
-          spinner.stop()
-          $parent.html('<span class="icon warn"/>')
-
-  # Removes the picture from essence picture thumbnail
-  removePicture: (selector) ->
-    $form_field = $(selector)
-    $element = $form_field.closest(".element-editor")
-    $content = $form_field.closest(".content_editor")
-    if $form_field[0]
-      $form_field.val ""
-      $content.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
-      Alchemy.setElementDirty $element
-    false
-
   # Initializes all select tag with .alchemy_selectbox class as select2 instance
   # Pass a jQuery scope to only init a subset of selectboxes.
   SelectBox: (scope) ->

data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee

@@ -78,8 +78,9 @@ window.Alchemy.confirmToDeleteDialog = (url, opts) ->
         type: "DELETE"
         error: (xhr, status, error) ->
           type = if xhr.status == 403 then 'warning' else 'error'
-          Alchemy.pleaseWaitOverlay(false)
           Alchemy.growl(xhr.responseText || error, type)
+        complete: () ->
+          Alchemy.pleaseWaitOverlay(false)
 
   $.extend(options, opts)
   Alchemy.openConfirmDialog options.message, options

data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee

@@ -251,7 +251,7 @@ window.Alchemy.openDialog = (url, options) ->
 # See Alchemy.Dialog for further options you can add to the data attribute
 #
 window.Alchemy.watchForDialogs = (scope = '#alchemy') ->
-  $(scope).on 'click', '[data-alchemy-dialog]', (event) ->
+  $(scope).on 'click', '[data-alchemy-dialog]:not(.disabled)', (event) ->
     $this = $(this)
     url = $this.attr('href')
     options = $this.data('alchemy-dialog')

data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee

@@ -50,7 +50,6 @@ $.extend Alchemy,
           complete: ->
             Alchemy.initializedSortableElements = false
             $(event.target).css("cursor", "")
-            Alchemy.TrashWindow.refresh(page_id)
             return
       start: (event, ui) ->
         $this = $(this)
@@ -78,27 +77,3 @@ $.extend Alchemy,
     $sortable_area.sortable(sortable_options)
     $sortable_area.find('.nested-elements').sortable(sortable_options)
     return
-
-  DraggableTrashItems: ->
-    $("#trash_items div.draggable").each ->
-      $this = $(this)
-      name = $this.data('element-name')
-      $dropzone = $("[data-droppable-elements~='#{name}']")
-      $this.draggable
-        helper: "clone"
-        iframeFix: "iframe#alchemy_preview_window"
-        connectToSortable: $dropzone
-        revert: "invalid"
-        revertDuration: 200
-        start: (event, ui) ->
-          $dropzone.css('minHeight', 36)
-          $(this).addClass "dragged"
-          ui.helper.css('width', 345)
-          return
-        stop: (event, ui) ->
-          $(this).removeClass "dragged"
-          $dropzone.css('minHeight', '')
-          ui.helper.css('width', '')
-          return
-      return
-    return

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -237,7 +237,7 @@ Alchemy.ElementEditors =
   # private
 
   _shouldUpdateTitle: (element, event) ->
-    editors = element.find('> .element-content .element-content-editors').children()
+    editors = element.find('> .element-content .element-content-editors, > .element-content .element-ingredient-editors').children()
     if @_hasParents(element)
       editors.length != 0
     else if @_isParent(element) && @_isFirstChild $(event.target)

data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee

@@ -50,6 +50,8 @@ Alchemy.ElementsWindow =
     $.get @url, (data) =>
       @element_area.html data
       Alchemy.GUI.init(@element_area)
+      Alchemy.fileEditors(@element_area.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
+      Alchemy.pictureEditors(@element_area.find(".essence_picture, .ingredient-editor.picture").selector)
       if @callback
         @callback.call()
     .fail (xhr, status, error) =>

data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js

@@ -10,7 +10,7 @@ Alchemy.FixedElements = {
         $tabs = $(this.TABS.replace(/{{label}}/, label));
 
     $('#main-content-elements').wrap($wrapper);
-    $('#fixed-elements').prepend($tabs).tabs('paging', {
+    $('#fixed-elements').prepend($tabs).tabs().tabs('paging', {
       follow: true,
       followOnSelect: true
     });

data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee

@@ -22,4 +22,6 @@ Alchemy.GUI =
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)
     Alchemy.GUI.init($el)
-    Alchemy.ImageLoader($el)
+    Alchemy.ImageLoader($el[0])
+    Alchemy.fileEditors($el.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
+    Alchemy.pictureEditors($el.find(".essence_picture, .ingredient-editor.picture").selector)

data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee

@@ -7,7 +7,7 @@ class window.Alchemy.ImageOverlay extends Alchemy.Dialog
     return
 
   init: ->
-    Alchemy.ImageLoader(@dialog_body)
+    Alchemy.ImageLoader(@dialog_body[0])
     $('.zoomed-picture-background').click (e) =>
       e.stopPropagation()
       return if e.target.nodeName == 'IMG'

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -4,6 +4,12 @@
 class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   constructor: (@link_object) ->
+    parent_selector = @link_object.dataset.parentSelector
+    parent = document.querySelector(parent_selector)
+    @link_value_field = parent.querySelector("[data-link-value]")
+    @link_title_field = parent.querySelector("[data-link-title]")
+    @link_target_field = parent.querySelector("[data-link-target]")
+    @link_class_field = parent.querySelector("[data-link-class]")
     @url = Alchemy.routes.link_admin_pages_path
     @$link_object = $(@link_object)
     @options =
@@ -136,7 +142,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     if @link_object.editor
       @setTinyMCELink(url, title, target)
     else
-      @setEssenceLink(url, title, target)
+      @setLinkFields(url, title, target)
 
   # Sets a link in TinyMCE editor.
   setTinyMCELink: (url, title, target) ->
@@ -151,14 +157,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     true
 
   # Sets a link on an Essence (e.g. EssencePicture).
-  setEssenceLink: (url, title, target) ->
-    content_id = @$link_object.data('content-id')
-    $("#contents_#{content_id}_link").val(url).change()
-    $("#contents_#{content_id}_link_title").val(title)
-    $("#contents_#{content_id}_link_class_name").val(@link_type)
-    $("#contents_#{content_id}_link_target").val(target)
-    @$link_object.addClass('linked')
-    @$link_object.next().addClass('linked').removeClass('disabled').removeAttr('tabindex')
+  setLinkFields: (url, title, target) ->
+    @link_value_field.value = url
+    @link_value_field.dispatchEvent(new Event("change"))
+    @link_title_field.value = title
+    @link_class_field.value = @link_type
+    @link_target_field.value = target
+    @link_object.classList.add("linked")
+    @link_object.nextElementSibling.classList.replace("disabled", "linked")
+    @link_object.nextElementSibling.removeAttribute("tabindex")
+    return
 
   # Selects the correct tab for link type and fills all fields.
   selectTab: ->
@@ -205,12 +213,11 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   # Creates a temporay $('a') object that holds all values on it.
   createTempLink: ->
     @$tmp_link = $('<a/>')
-    content_id = @$link_object.data('content-id')
-    @$tmp_link.attr 'href', $("#contents_#{content_id}_link").val()
-    @$tmp_link.attr 'title', $("#contents_#{content_id}_link_title").val()
-    @$tmp_link.attr 'data-link-target', $("#contents_#{content_id}_link_target").val()
-    @$tmp_link.attr 'target', if $("#contents_#{content_id}_link_target").val() == 'blank' then '_blank' else null
-    @$tmp_link.addClass $("#contents_#{content_id}_link_class_name").val()
+    @$tmp_link.attr('href', @link_value_field.value)
+    @$tmp_link.attr('title', @link_title_field.value)
+    @$tmp_link.attr('data-link-target', @link_target_field.value)
+    @$tmp_link.attr('target', if @link_target_field.value == 'blank' then '_blank' else null)
+    @$tmp_link.addClass(@link_class_field.value)
     @$tmp_link
 
   # Validates url for beginning with an protocol.
@@ -228,7 +235,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   # Populates the internal anchors select
   initAnchorLinks: ->
     frame = document.getElementById('alchemy_preview_window')
-    elements = frame.contentDocument.getElementsByTagName('*')
+    elements = frame.contentDocument?.getElementsByTagName('*') || []
     if elements.length > 0
       for element in elements
         if element.id
@@ -240,15 +247,21 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   # Public class methods
 
   # Removes link from Essence.
-  @removeLink = (link, content_id) ->
-    $link = $(link)
-    $("#contents_#{content_id}_link").val('').change()
-    $("#contents_#{content_id}_link_title").val('')
-    $("#contents_#{content_id}_link_class_name").val('')
-    $("#contents_#{content_id}_link_target").val('')
-    if $link.hasClass('linked')
-      Alchemy.setElementDirty $(link).closest('.element-editor')
-      $link.removeClass('linked').addClass('disabled').attr('tabindex', '-1')
-      $link.blur()
-    $('#edit_link_' + content_id).removeClass('linked')
+  @removeLink = (link, parent_selector) ->
+    parent = document.querySelector(parent_selector)
+    link_value_field = parent.querySelector("[data-link-value]")
+    link_title_field = parent.querySelector("[data-link-title]")
+    link_target_field = parent.querySelector("[data-link-target]")
+    link_class_field = parent.querySelector("[data-link-class]")
+    link_value_field.value = ""
+    link_value_field.dispatchEvent(new Event("change"))
+    link_title_field.value = ""
+    link_class_field.value = ""
+    link_target_field.value = ""
+    if link.classList.contains('linked')
+      Alchemy.setElementDirty link.closest('.element-editor')
+      link.classList.replace('linked', 'disabled')
+      link.setAttribute('tabindex', '-1')
+      link.blur()
+    link.previousElementSibling.classList.remove("linked")
     false

data/app/assets/javascripts/alchemy/templates/node_folder.hbs

@@ -1,3 +1,3 @@
-<a class="node_folder" data-node-id="{{ node.id }}">
+<a class="node_folder" data-record-id="{{ node.id }}" data-record-type="{{ node.type }}">
   <i class="far fa-{{#if node.folded }}plus{{else}}minus{{/if}}-square fa-fw"></i>
 </a>

data/app/assets/stylesheets/alchemy/_extends.scss

@@ -31,15 +31,28 @@
   line-height: $form-field-line-height;
   transition: $transition-duration;
 
-  &:focus {
+  &:focus:not(.readonly) {
     @include default-focus-style($box-shadow: 0 0 0 1px $focus-color);
   }
 
-  &[disabled], .disabled {
+  &[disabled],
+  &.disabled,
+  &[readonly],
+  &.readonly {
     color: $form-field-disabled-text-color;
     background-color: $form-field-disabled-bg-color;
+    cursor: default;
+  }
+
+  &[disabled],
+  &.disabled {
     cursor: not-allowed;
   }
+
+  &[readonly],
+  &.readonly {
+    pointer-events: none;
+  }
 }
 
 %gradiated-toolbar {