alchemy_cms 4.6.1 → 5.0.0.beta1

data/Rakefile

@@ -39,14 +39,16 @@ namespace :alchemy do
   namespace :spec do
     desc "Prepares database for testing Alchemy"
     task :prepare do
-      system <<-BASH
-cd spec/dummy
-export RAILS_ENV=test
-bin/rake db:create
-bin/rake db:environment:set
-bin/rake db:migrate:reset
-cd -
-BASH
+      result = system <<~BASH
+        cd spec/dummy && \
+        export RAILS_ENV=test && \
+        bin/rake db:create && \
+        bin/rake db:environment:set && \
+        bin/rake db:migrate:reset && \
+        bin/rails g alchemy:install --skip --skip-demo-files && \
+        cd -
+      BASH
+      result || fail
     end
   end
 

data/alchemy_cms.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |gem|
   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                 = ['alchemy@magiclabs.de']
+  gem.email                 = ['hello@alchemy-cms.com']
   gem.homepage              = 'https://alchemy-cms.com'
-  gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails 5'
-  gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails 5 CMS.'
+  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'
@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   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.0.0', '< 6.1']
+  gem.add_runtime_dependency 'rails',                            ['>= 5.2.0', '< 6.1']
   gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 3.0']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
@@ -41,6 +41,7 @@ Gem::Specification.new do |gem|
   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']

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

@@ -15,10 +15,8 @@
 //= require requestAnimationFrame
 //= require select2
 //= require handlebars
-//= require sortable/Sortable.min
 //= require alchemy/templates
 //= require alchemy/alchemy.base
-//= require alchemy/alchemy.utils
 //= require alchemy/alchemy.autocomplete
 //= require alchemy/alchemy.browser
 //= require alchemy/alchemy.buttons
@@ -34,14 +32,12 @@
 //= require alchemy/alchemy.growler
 //= require alchemy/alchemy.gui
 //= require alchemy/alchemy.hotkeys
-//= require alchemy/alchemy.i18n
 //= require alchemy/alchemy.image_cropper
 //= require alchemy/alchemy.image_overlay
 //= require alchemy/alchemy.string_extension
 //= require alchemy/alchemy.link_dialog
 //= require alchemy/alchemy.list_filter
 //= require alchemy/alchemy.initializer
-//= require alchemy/alchemy.node_tree
 //= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.preview_window
@@ -49,6 +45,6 @@
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.tooltips
-//= require alchemy/alchemy.translations
 //= require alchemy/alchemy.trash_window
 //= require alchemy/page_select
+//= require alchemy/node_select

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

@@ -62,9 +62,10 @@ $.extend Alchemy,
   removePicture: (selector) ->
     $form_field = $(selector)
     $element = $form_field.closest(".element-editor")
+    $content = $form_field.closest(".content_editor")
     if $form_field[0]
       $form_field.val ""
-      $element.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
+      $content.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
       Alchemy.setElementDirty $element
     false
 

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

@@ -179,8 +179,6 @@ Alchemy.ElementEditors =
     if data.message == 'Alchemy.focusElementEditor'
       $element = $("#element_#{data.element_id}")
       Alchemy.ElementEditors.focusElement($element)
-    else
-      console.warn 'Unknown message received!', data
 
   onClickBody: (e) ->
     element = $(e.target).parents('.element-editor')[0]

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

@@ -1,24 +1,24 @@
-Alchemy.PageSorter = function() {
-  var $sortables = $('ul#sitemap').find('ul.level_1_children');
+Alchemy.PageSorter = function () {
+  var $sortables = $("ul#sitemap").find("ul.level_0_children")
 
   $sortables.nestedSortable({
-    disableNesting: 'no-nest',
+    disableNesting: "no-nest",
     forcePlaceholderSize: true,
-    handle: '.handle',
-    items: 'li',
-    listType: 'ul',
+    handle: ".handle",
+    items: "li",
+    listType: "ul",
     opacity: 0.5,
-    placeholder: 'placeholder',
+    placeholder: "placeholder",
     tabSize: 16,
-    tolerance: 'pointer',
-    toleranceElement: '> div'
-  });
+    tolerance: "pointer",
+    toleranceElement: "> div"
+  })
 
-  $('#save_page_order').click(function(e) {
-    e.preventDefault();
-    Alchemy.Buttons.disable(this);
+  $("#save_page_order").click(function (e) {
+    e.preventDefault()
+    Alchemy.Buttons.disable(this)
     $.post(Alchemy.routes.order_admin_pages_path, {
-      set: JSON.stringify($sortables.nestedSortable('toHierarchy'))
-    });
-  });
-};
+      set: JSON.stringify($sortables.nestedSortable("toHierarchy"))
+    })
+  })
+}

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

@@ -0,0 +1,39 @@
+$.fn.alchemyNodeSelect = function (options) {
+  var renderNodeTemplate = function (node) {
+    return HandlebarsTemplates.node({ node: node })
+  }
+  var queryParamsFromTerm = function (term) {
+    return {
+      filter: Object.assign(
+        { name_or_page_name_cont: term },
+        options.query_params
+      )
+    }
+  }
+  var resultsFromResponse = function (response) {
+    var meta = response.meta
+    var data = response.data
+    var more = meta.page * meta.per_page < meta.total_count
+    return { results: data, more: more }
+  }
+
+  return this.select2({
+    placeholder: options.placeholder,
+    allowClear: true,
+    minimumInputLength: 3,
+    initSelection: function (_$el, callback) {
+      if (options.initialSelection) {
+        callback(options.initialSelection)
+      }
+    },
+    ajax: {
+      url: options.url,
+      datatype: "json",
+      quietMillis: 300,
+      data: queryParamsFromTerm,
+      results: resultsFromResponse
+    },
+    formatSelection: renderNodeTemplate,
+    formatResult: renderNodeTemplate
+  })
+}

data/app/assets/javascripts/alchemy/templates/index.js

@@ -1,3 +1,4 @@
 //= require alchemy/templates/spinner
 //= require alchemy/templates/page
 //= require alchemy/templates/node_folder
+//= require alchemy/templates/node

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

@@ -0,0 +1,16 @@
+<div class="node-select--node">
+  <i class="icon fas fa-list fa-lg"></i>
+  <div class="node-select--node-display_name">
+    <span class="node-select--node-ancestors">
+      {{#each node.ancestors}}
+        {{ this.name }} /&nbsp;
+      {{/each}}
+    </span>
+    <span class="node-select--node-name">
+      {{ node.name }}
+    </span>
+  </div>
+  <div class="node-select--node-url">
+    {{ node.url }}
+  </div>
+</div>

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

@@ -5,8 +5,8 @@
  */
 
 @import "fontawesome/fontawesome";
-@import "fontawesome/fa-regular";
-@import "fontawesome/fa-solid";
+@import "fontawesome/regular";
+@import "fontawesome/solid";
 @import "alchemy/defaults";
 @import "alchemy/archive";
 @import "alchemy/navigation";
@@ -31,6 +31,7 @@
 @import "alchemy/image_library";
 @import "alchemy/labels";
 @import "alchemy/nodes";
+@import "alchemy/node-select";
 @import "alchemy/notices";
 @import "alchemy/page-select";
 @import "alchemy/pagination";

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

@@ -83,7 +83,6 @@ hr {
   max-width: 500px;
   margin: 2em auto;
   padding: 4*$default-padding;
-  border: $default-border;
   background: $medium-gray;
   border-radius: $default-border-radius;
 }

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

@@ -718,7 +718,7 @@ textarea.has_tinymce {
   visibility: hidden;
 }
 
-.essence_html_editor textarea {
+.essence_html textarea {
   font-family: $mono-font-family;
   resize: vertical;
   font-size: $form-field-font-size;

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

@@ -173,6 +173,11 @@ form {
   .input .hint {
     @include form-hint;
     margin-left: $form-left-width;
+
+    a[href] {
+      color: $very-dark-gray;
+      text-decoration: underline;
+    }
   }
 
   .submit {

data/app/assets/stylesheets/alchemy/node-select.scss

@@ -0,0 +1,43 @@
+.node-select--node,
+.node-select--node-url {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.node-select--node {
+  display: flex;
+  align-items: center;
+
+  .icon {
+    margin: 0 8px 0 4px;
+
+    .select2-highlighted & {
+      color: $white
+    }
+  }
+}
+
+.node-select--node-name {
+  font-weight: bold;
+}
+
+.node-select--node-url {
+  margin-left: auto;
+  padding: $default-padding 2*$default-padding;
+  color: $dark-gray;
+  font-size: $small-font-size;
+
+  .select2-highlighted & {
+    color: $white
+  }
+}
+
+// The container of the rendered node is slightly larger than other a line of
+// text, as it would be for the Alchemy::EssencePage. Reducing the padding here from 0.6em
+// to 0.4em centers the content nicely.
+.essence_node {
+  .select2-container.alchemy_selectbox .select2-choice {
+    padding: 0.4em 0.75em;
+  }
+}

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

@@ -64,7 +64,7 @@
     margin: 0;
     padding: 0;
 
-    .folded > li {
+    &.folded > li {
       display: none;
     }
   }

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

@@ -197,6 +197,10 @@ $sitemap-url-xlarge-width: 350px;
 
 .page_status {
   display: inline-block;
+
+  .alchemy-dialog & {
+    display: block;
+  }
 }
 
 #sitemap_heading {
@@ -226,7 +230,7 @@ $sitemap-url-xlarge-width: 350px;
 
   .page_status {
     padding-left: 2 * $default-padding;
-    margin-right: 214px;
+    margin-right: 188px;
     margin-left: auto;
 
     @media screen and (min-width: $large-screen-break-point) {

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

@@ -57,29 +57,6 @@ th {
   vertical-align: top;
   border-bottom: 1px solid $medium-gray;
   font-weight: bold;
-
-  i {
-    font-style: normal;
-    position: absolute;
-    right: 2px;
-    top: 4px;
-    text-shadow: 1px 1px 1px #fff;
-  }
-
-  a {
-
-    &.sortable {
-      display: block;
-      margin: -4px -8px;
-      padding: 4px 18px 4px 8px;
-      text-shadow: 1px 1px 1px #fff;
-    }
-
-    &.sorted {
-      position: relative;
-      background: $medium-gray;
-    }
-  }
 }
 
 tr.even td {
@@ -141,7 +118,7 @@ td {
     width: 80px;
   }
 
-  &.date {
+  &.date, &.datetime {
     width: 150px;
   }
 

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -6,10 +6,11 @@ module Alchemy
       include UploaderResponses
       include ArchiveOverlay
 
-      helper 'alchemy/admin/tags'
+      helper "alchemy/admin/tags"
 
       def index
         @query = Attachment.ransack(search_filter_params[:q])
+        @query.sorts = "name asc" if @query.sorts.empty?
         @attachments = @query.result
 
         if search_filter_params[:tagged_with].present?
@@ -41,13 +42,13 @@ module Alchemy
 
       def update
         @attachment.update(attachment_attributes)
-        if attachment_attributes['file'].present?
+        if attachment_attributes["file"].present?
           handle_uploader_response(status: :accepted)
         else
           render_errors_or_redirect(
             @attachment,
             admin_attachments_path(search_filter_params),
-            Alchemy.t("File successfully updated")
+            Alchemy.t("File successfully updated"),
           )
         end
       end
@@ -56,14 +57,14 @@ module Alchemy
         name = @attachment.name
         @attachment.destroy
         @url = admin_attachments_url(search_filter_params)
-        flash[:notice] = Alchemy.t('File deleted successfully', name: name)
+        flash[:notice] = Alchemy.t("File deleted successfully", name: name)
       end
 
       def download
         @attachment = Attachment.find(params[:id])
         send_file @attachment.file.path, {
           filename: @attachment.file_name,
-          type: @attachment.file_mime_type
+          type: @attachment.file_mime_type,
         }
       end
 
@@ -73,8 +74,8 @@ module Alchemy
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
             :file_type,
-            :content_id
-          ]
+            :content_id,
+          ],
         )
       end
 

data/app/controllers/alchemy/admin/base_controller.rb

@@ -6,11 +6,9 @@ module Alchemy
       include Userstamp
       include Locale
 
-      before_action { enforce_ssl if ssl_required? && !request.ssl? }
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?,
-        :options_from_params
+      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
 
       check_authorization
 
@@ -28,14 +26,14 @@ module Alchemy
 
       def leave
         authorize! :leave, :alchemy_admin
-        render template: '/alchemy/admin/leave', layout: !request.xhr?
+        render template: "/alchemy/admin/leave", layout: !request.xhr?
       end
 
       private
 
       # Disable layout rendering for xhr requests.
       def set_layout
-        request.xhr? ? false : 'alchemy/admin'
+        request.xhr? ? false : "alchemy/admin"
       end
 
       # Handles exceptions
@@ -56,7 +54,7 @@ module Alchemy
         if request.xhr?
           render action: "error_notice"
         else
-          render '500', status: 500
+          render "500", status: 500
         end
       end
 
@@ -90,6 +88,7 @@ module Alchemy
       # Returns true if the current_alchemy_user (The logged-in Alchemy User) has the admin role.
       def is_admin?
         return false if !current_alchemy_user
+
         current_alchemy_user.admin?
       end
 
@@ -105,22 +104,15 @@ module Alchemy
           flash[:notice] = Alchemy.t(flash_notice)
           do_redirect_to redirect_url
         else
-          render action: (params[:action] == 'update' ? 'edit' : 'new')
+          render action: (params[:action] == "update" ? "edit" : "new")
         end
       end
 
-      def per_page_value_for_screen_size
-        Alchemy::Deprecation.warn("#per_page_value_for_screen_size is deprecated, please use #items_per_page instead")
-        return items_per_page if session[:screen_size].blank?
-        screen_height = session[:screen_size].split('x').last.to_i
-        (screen_height / 50) - 12
-      end
-
       # Does redirects for html and js requests
       #
       def do_redirect_to(url_or_path)
         respond_to do |format|
-          format.js   {
+          format.js {
             @redirect_url = url_or_path
             render :redirect
           }
@@ -128,18 +120,6 @@ module Alchemy
         end
       end
 
-      # Extracts options from params and permits all keys
-      #
-      # If no options are present it returns an empty parameters hash.
-      #
-      # @returns [ActionController::Parameters]
-      def options_from_params
-        @_options_from_params ||= begin
-          (params[:options] || ActionController::Parameters.new).permit!
-        end
-      end
-      deprecate :options_from_params, deprecator: Alchemy::Deprecation
-
       # This method decides if we want to raise an exception or not.
       #
       # I.e. in test environment.
@@ -150,7 +130,7 @@ module Alchemy
 
       # Are we currently in the page edit mode page preview.
       def is_page_preview?
-        controller_path == 'alchemy/admin/pages' && action_name == 'show'
+        controller_path == "alchemy/admin/pages" && action_name == "show"
       end
 
       def load_locked_pages
@@ -161,11 +141,11 @@ module Alchemy
       #
       def current_alchemy_site
         @current_alchemy_site ||= begin
-          site_id = params[:site_id] || session[:alchemy_site_id]
-          site = Site.find_by(id: site_id) || super
-          session[:alchemy_site_id] = site.id
-          site
-        end
+            site_id = params[:site_id] || session[:alchemy_site_id]
+            site = Site.find_by(id: site_id) || super
+            session[:alchemy_site_id] = site&.id
+            site
+          end
       end
     end
   end