alchemy_cms 4.4.4 → 5.0.0.beta2

data/README.md

@@ -18,7 +18,7 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
 
 Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
 
-**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.2-stable).**
+**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.5-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).**
 
 
 ## ✅ Features
@@ -51,8 +51,9 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
 
 ## 🚂 Rails Version
 
-**This version of AlchemyCMS runs with all versions of Rails 5 and Rails 6**
+**This version of AlchemyCMS runs with Rails 5.2 and Rails 6.0**
 
+* For a Rails 5.0 or 5.1 compatible version use the [`4.5-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).
 * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
 * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
 * For a Rails 3.2 compatible version use the [`2.8-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.8-stable).
@@ -78,23 +79,37 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 
 ## ⌨️ Installation
 
-#### 1. Add the Alchemy gem:
+### Stand Alone Installation
 
-Put this into your `Gemfile`:
+If you do not have a Rails project yet or just want to check out Alchemy, then use this Rails template.
 
-```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
+Make sure you have Rails installed first:
+
+```
+$ gem install rails
 ```
 
-**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
+Then create a new Rails project with:
 
-#### 2. Update your bundle:
+```
+$ rails new -m https://raw.githubusercontent.com/AlchemyCMS/rails-templates/master/all.rb <MY-PROJECT-NAME>
+```
 
-```bash
-$ bundle install
+and follow the on screen instructions.
+
+### Manual Installation
+
+If you want to manually install Alchemy into your Rails project follow these steps.
+
+#### Add the Alchemy gem:
+
+Put Alchemy into your `Gemfile` with:
+
+```
+$ bundle add alchemy_cms
 ```
 
-#### 3. Set the authentication user
+#### Set the authentication user
 
 Now you have to decide, if you want to use your own user model or if you want to use
 the Devise based user model that Alchemy provides and was extracted [into its own gem](https://github.com/AlchemyCMS/alchemy-devise).
@@ -103,17 +118,14 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
 
 If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
 
-```ruby
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
+```
+$ bundle add alchemy-devise
 ```
 
-**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
-
-Then run:
+Then run the `alchemy-devise` installer:
 
 ```bash
-$ bundle install
-$ bin/rake alchemy_devise:install:migrations
+$ bin/rails g alchemy_devise:install
 ```
 
 ##### Use your User model
@@ -172,7 +184,7 @@ Alchemy has very flexible ways to organize and manage content. Please be sure to
 
 ### Custom Controllers
 
-Beginning with Alchemy 3.1 we do not patch the `ApplicationController` anymore. If you have controllers that loads Alchemy content or uses Alchemy helpers in the views (i.e. `render_navigation` or `render_elements`) you can either inherit from `Alchemy::BaseController` or you `include Alchemy::ControllerActions` in your controller (**that's the recommended way**).
+Beginning with Alchemy 3.1 we do not patch the `ApplicationController` anymore. If you have controllers that loads Alchemy content or uses Alchemy helpers in the views (i.e. `render_menu` or `render_elements`) you can either inherit from `Alchemy::BaseController` or you `include Alchemy::ControllerActions` in your controller (**that's the recommended way**).
 
 ### Custom admin interface routing
 

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,16 +41,18 @@ 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']
-  gem.add_development_dependency 'factory_bot_rails',            ['~> 5.0']
+  gem.add_development_dependency 'factory_bot_rails',            ['~> 6.0']
   gem.add_development_dependency 'puma',                         ['~> 4.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.17.1']
   gem.add_development_dependency 'webdrivers',                   ['~> 4.0']
+  gem.add_development_dependency 'webmock',                      ['~> 3.3']
   gem.add_development_dependency 'shoulda-matchers',             ['~> 4.0']
 
   gem.post_install_message = <<-MSG

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

@@ -32,7 +32,6 @@
 //= 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
@@ -46,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.link_dialog.js.coffee

@@ -76,16 +76,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
           meta = data.meta
           results:
             data.pages.map (page) ->
-              id: "/#{page.urlname}"
+              id: page.url_path
               name: page.name
-              urlname: page.urlname
+              url_path: page.url_path
               page_id: page.id
           more: meta.page * meta.per_page < meta.total_count
       initSelection: ($element, callback) =>
         urlname = $element.val()
         $.get Alchemy.routes.api_pages_path,
           q:
-            urlname_eq: urlname.replace(/^\//, '')
+            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?/, '')
           page: 1
           per_page: 1,
           (data) =>
@@ -93,9 +93,9 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
             if page
               @initElementSelect(page.id)
               callback
-                id: "/#{page.urlname}"
+                id: page.url_path
                 name: page.name
-                urlname: page.name
+                url_path: page.url_path
                 page_id: page.id
       formatSelection: (page) ->
         page.name

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,2 +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/javascripts/alchemy/templates/node_folder.hbs

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

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

@@ -4,6 +4,6 @@
     {{ page.name }}
   </span>
   <span class="page-select--page-urlname">
-    /{{ page.urlname }}
+    {{ page.url_path }}
   </span>
 </div>

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

@@ -49,9 +49,8 @@
     border-color: $hover-border-color;
   }
 
-  &:active, &:active:focus {
-    border-color: $hover-border-color;
-    box-shadow: none;
+  &:active, &.active {
+    box-shadow: inset $button-box-shadow;
   }
 
   &:focus {

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

@@ -76,7 +76,7 @@ $button-text-shadow: none !default;
 $button-box-shadow: 0px 1px 1px -1px #333 !default;
 $button-focus-box-shadow: 0px 1px 1px 0px $button-focus-border-color !default;
 $button-padding: 0.55em 2em !default;
-$small-button-padding: 0.4em 1.25em !default;
+$small-button-padding: 0.4em 0.8em !default;
 $button-margin: $form-field-margin !default;
 
 $secondary-button-bg-color: transparent !default;
@@ -108,7 +108,7 @@ $form-right-width: 65% !default;
 $sitemap-line-height: 32px !default;
 $sitemap-page-background-color: rgba($white, 0.75) !default;
 $sitemap-page-hover-color: rgba($light_yellow, 0.5) !default;
-$sitemap-info-background-color: rgba($linked-color, 0.5) !default;
+$sitemap-info-background-color: rgba($white, 0.5) !default;
 $sitemap-highlight-color: rgba(#fffba5, 0.5) !default;
 
 $main-menu-width: 150px !default;

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/lists.scss

@@ -13,14 +13,6 @@ ul.list {
   padding: 0;
   list-style-type: none;
 
-  &#layoutpages {
-    margin-top: 16px;
-
-    li {
-      margin-left: 8px;
-    }
-  }
-
   li {
     list-style-type: none;
     display: block;