alchemy_cms 4.0.0.beta → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea49a75834c1e4de115b939c2fd04639ca77174
-  data.tar.gz: e4c83f37c9a929cfa9044d8d6a022cf3b0e5947d
+  metadata.gz: 8546e849610240faac00b1a77f937ea2514d97a0
+  data.tar.gz: e81fd54feadee4000618c71b6a3a424695647dc8
 SHA512:
-  metadata.gz: a41485fcb8985472b02ba15ab4e9cadde62d74aa1623f8e4280e13f38fcc6bac2ad88f8d885aefffb8a49f8ffee3aba5264652260cb2496b587df24bec5607ef
-  data.tar.gz: aa3e7483fc33c9ae6bc502958ba65173d3d17df086b1a0eb377627daac908c35bea8e4a65fc2667cfb0a739c0aa74a4228c2f4d2a64504060fcd602d7ed73226
+  metadata.gz: 350b2a2ba22bec1183a4fd76d25d4de7f2e6e564d0cc51a7eb064a5e3f5c572406294e858e5010838760228024623aee4a662dc7778514a49c5c127d050a7637
+  data.tar.gz: 92088cb21c0643a53d87115521ca377d8dd2993dcf25737828fda5397111da952eb5804d9bcd6786973f0be4613058ead98c6cd145b3ff91224d3caeee049d9e

data/.travis.yml

@@ -1,17 +1,14 @@
 language: ruby
+dist: trusty
 sudo: false
 cache:
   bundler: true
   directories:
     - "travis_phantomjs"
 rvm:
-- 2.2.6
-- 2.3.3
-- 2.4.0
-branches:
-  only:
-    - master
-
+- 2.2.7
+- 2.3.4
+- 2.4.1
 before_install:
   - "phantomjs --version"
   - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"

data/CHANGELOG.md

@@ -1,9 +1,32 @@
 # Change Log
 
+## 4.0.0.rc1 (2017-0817)
+
+* Removed `merge_params` from `Alchemy::Admin::BaseHelper`
+  Use `ActionController::Parameters#merge` instead
+* Removed `merge_params_only` from `Alchemy::Admin::BaseHelper`
+  Use methods from `ActionController::Parameters` instead
+* Removed `merge_params_without` from `Alchemy::Admin::BaseHelper`
+  Use `ActionController::Parameters#delete_if` instead
+* Removed `tag_list_tag_active?` from `Alchemy::Admin::TagsHelper`
+  Use `filtered_by_tag?` instead
+* Removed `add_to_tag_filter` and `remove_from_tag_filter` from `Alchemy::Admin::TagsHelper`
+  Use `tags_for_filter` and pass the `current` tag instead
+* Removes the possibility to pass options param as JSON string. [#1291](https://github.com/AlchemyCMS/alchemy_cms/pull/1291) by [tvdeyen](https://github.com/tvdeyen)
+  Pass normal params instead.
+* Removed `redirect_back_or_to_default` from `Alchemy::Admin::BaseController`
+  Use Rails' `redirect_back` with a `fallback_location` instead
+* Deprecated controller requests test helpers [#1284](https://github.com/AlchemyCMS/alchemy_cms/pull/1284) by [tvdeyen](https://github.com/tvdeyen)
+
 ## 4.0.0.beta (2017-06-20)
 
 * Rails 5
 
+## 3.6.1 (2017-08-16)
+
+* Do not ask `systempage?` everytime we load the page definition [#1239](https://github.com/AlchemyCMS/alchemy_cms/pull/1283) by [tvdeyen](https://github.com/tvdeyen)
+  This speeds up rendering large sitemaps by about 6 times.
+
 ## 3.6.0 (2017-06-20)
 
 __Notable Changes__

data/README.md

@@ -188,7 +188,7 @@ something like S3.
 
 Please follow the guidelines about picture caching on the Dragonfly homepage for further instructions:
 
-http://markevans.github.io/dragonfly/cache/
+http://markevans.github.io/dragonfly/cache
 
 
 ## Upgrading

data/alchemy_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.9.0']
   gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
-  gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 4.0']
+  gem.add_runtime_dependency 'acts-as-taggable-on',              ['~> 5.0']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'bourbon',                          ['~> 4.2']
   gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']

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

@@ -79,14 +79,14 @@ $.extend Alchemy,
 
   SortableContents: (selector, token) ->
     $(selector).sortable
-      items: "div.dragable_picture"
+      items: "div.draggable_picture"
       handle: "div.picture_handle"
       opacity: 0.5
       cursor: "move"
       tolerance: "pointer"
       containment: "parent"
       update: (event, ui) ->
-        ids = $.map $(this).children("div.dragable_picture"), (child) ->
+        ids = $.map $(this).children("div.draggable_picture"), (child) ->
           child.id.replace /essence_picture_/, ""
         $(event.originalTarget).css "cursor", "progress"
         $.ajax

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

@@ -48,11 +48,9 @@
   font-size: 12px;
   line-height: 12px;
   height: $default-form-field-height;
-  @include transition(
-    box-shadow 0.25s ease-in-out,
-    background-color 0.25s ease-in-out,
-    border 0.25s ease-in-out
-  );
+  transition-property: box-shadow, background-color, border;
+  transition-duration: 0.25s;
+  transition-timing-function: ease-in-out;
 
   &:focus {
     @extend %blue-focus-style;

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

@@ -27,7 +27,7 @@
   color: $text-color;
   text-shadow: $button-text-shadow;
   margin: $margin;
-  @include appearance(none);
+  -webkit-appearance: none;
 
   &:hover {
     text-decoration: none;

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

@@ -157,7 +157,7 @@ kbd {
 }
 
 .disable-user-select {
-  @include user-select(none);
+  user-select: none;
 }
 
 .border-box-sizing {
@@ -516,7 +516,7 @@ div.browse {
   border: 0 none;
   background: #fff;
   border-right: $default-border;
-  @include transition(200ms ease-in-out);
+  transition: 200ms ease-in-out;
 
   .collapsed-menu & {
     left: $collapsed-main-menu-width;

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

@@ -28,7 +28,7 @@ button, input[type="submit"], a.button, input.button {
     padding: 0;
     border: 0 none;
     box-shadow: none;
-    @include background(none);
+    background: none;
     border-radius: 0;
 
     .icon {
@@ -92,7 +92,7 @@ button, input[type="submit"], a.button, input.button {
       position: absolute;
       top: 50%;
       height: 8px;
-      @include transform(translateX(-50%) translateY(-50%));
+      transform: translateX(-50%) translateY(-50%);
 
       &:before {
         line-height: 10px;

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

@@ -10,7 +10,7 @@
   text-align: center;
   white-space: nowrap;
   opacity: 0;
-  @include transition(opacity 200ms linear);
+  transition: opacity 200ms linear;
 
   // vertical aligment
   &:before {
@@ -36,7 +36,7 @@
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.0);
-  @include transition(background-color 200ms linear);
+  transition: background-color 200ms linear;
 
   &.closable {
     cursor: pointer;
@@ -65,7 +65,7 @@
   margin: 2*$default-margin;
   @include border-top-radius($default-border-radius);
   box-shadow: 0 0 2px rgba(#000,0.8);
-  @include transition(min-height 200ms ease-in-out);
+  transition: min-height 200ms ease-in-out;
 
   &.modal {
     box-shadow: 0 0 4px #666;

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

@@ -6,7 +6,7 @@
   width: 400px;
   height: auto;
   border-left: $default-border;
-  @include transition(200ms ease-in-out);
+  transition: 200ms ease-in-out;
 }
 
 #element_area {
@@ -484,7 +484,7 @@
   }
 }
 
-.dragable_picture {
+.draggable_picture {
   float: left;
 
   .picture_handle {

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

@@ -42,7 +42,7 @@ $image-overlay-transition-easing: ease-in;
       right: 0;
 
       .icon-angle-double-right {
-        @include transform(rotate(180deg) translate(50%, 50%));
+        transform: rotate(180deg) translate(50%, 50%);
       }
     }
   }
@@ -64,13 +64,13 @@ $image-overlay-transition-easing: ease-in;
   top: 2*$default-padding;
   right: 2*$default-padding + $picture-overlay-handle-width + $image-overlay-form-width;
   cursor: pointer;
-  @include transition(right $image-overlay-transition-duration $image-overlay-transition-easing);
+  transition: right $image-overlay-transition-duration $image-overlay-transition-easing;
 
   .icon.close.small {
     font-size: 32px;
     color: $medium-gray;
     text-shadow: 0 0 $default-padding $text-color;
-    @include transition(color $image-overlay-transition-duration linear);
+    transition: color $image-overlay-transition-duration linear;
 
     &:hover {
       color: $white;
@@ -84,7 +84,7 @@ $image-overlay-transition-easing: ease-in;
   top: 0;
   background-color: $medium-gray;
   box-shadow: -2px 0 $default-padding -2px $text-color;
-  @include transition(right $image-overlay-transition-duration $image-overlay-transition-easing);
+  transition: right $image-overlay-transition-duration $image-overlay-transition-easing;
 }
 
 .picture-details-overlay {
@@ -126,10 +126,10 @@ $image-overlay-transition-easing: ease-in;
     position: absolute;
     top: 50%;
     left: 50%;
-    @include transform(translate(-50%, -50%));
+    transform: translate(-50%, -50%);
     font-size: 14px;
     color: $text-color;
-    @include transition(transform $image-overlay-transition-duration $image-overlay-transition-easing);
+    transition: transform $image-overlay-transition-duration $image-overlay-transition-easing;
   }
 
   &:hover {
@@ -148,7 +148,7 @@ $image-overlay-transition-easing: ease-in;
   margin: 0 auto;
   text-align: center;
   cursor: pointer;
-  @include transition(padding-right $image-overlay-transition-duration $image-overlay-transition-easing);
+  transition: padding-right $image-overlay-transition-duration $image-overlay-transition-easing;
 
   &:before {
     content: '';
@@ -222,7 +222,7 @@ $image-overlay-transition-easing: ease-in;
     cursor: pointer;
     text-align: center;
     text-decoration: none;
-    @include transition(background-color $image-overlay-transition-duration linear);
+    transition: background-color $image-overlay-transition-duration linear;
 
     &:hover {
       background-color: rgba(0,0,0, 0.3);
@@ -240,7 +240,7 @@ $image-overlay-transition-easing: ease-in;
     font-size: 48px;
     color: $medium-gray;
     text-shadow: 0 0 $default-padding $text-color;
-    @include transition(all $image-overlay-transition-duration linear);
+    transition: all $image-overlay-transition-duration linear;
   }
 
   .previous-picture {
@@ -251,6 +251,6 @@ $image-overlay-transition-easing: ease-in;
   .next-picture {
     right: $image-overlay-form-width + $picture-overlay-handle-width;
     @include border-left-radius($default-border-radius);
-    @include transition(right $image-overlay-transition-duration $image-overlay-transition-easing);
+    transition: right $image-overlay-transition-duration $image-overlay-transition-easing;
   }
 }

data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss

@@ -498,10 +498,10 @@ $datepicker_day_color: $text-color !default;
   position: relative;
   padding: 4px 17px 4px 33px;
   border: 1px solid #d7d8da;
-  @include background(linear-gradient(top, #fff 0%, #f4f8fa 73%));
+  background: linear-gradient(#fff, #f4f8fa 73%);
 }
 
 .xdsoft_datetimepicker .blue-gradient-button:hover, .xdsoft_datetimepicker .blue-gradient-button:focus, .xdsoft_datetimepicker .blue-gradient-button:hover span, .xdsoft_datetimepicker .blue-gradient-button:focus span {
   color: #454551;
-  @include background(linear-gradient(top, #f4f8fa 0%, #FFF 73%));
+  background: linear-gradient(#f4f8fa, #fff 73%);
 }

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

@@ -20,7 +20,8 @@ ul.list {
     display: block;
     margin-bottom: 0;
 
-    &.legend, &.list-header {
+    &.list-header {
+      overflow: hidden;
       background-color: transparent;
       font-weight: bold;
       padding: $default-padding;

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

@@ -29,7 +29,7 @@
   display: block;
   padding: 0 3*$default-padding;
   text-decoration: none;
-  @include transition(background-color, 400ms);
+  transition: background-color, 400ms;
 
   &.inactive {
     color: #656565;
@@ -142,21 +142,6 @@
 }
 
 ul#sitemap {
-
-  li.legend {
-
-    span.right {
-      margin-right: 52px;
-
-      span.page_move {
-        display: inline-block;
-        vertical-align: middle;
-        width: 74px;
-        text-align: center;
-      }
-    }
-  }
-
   .page_folder {
     @extend .icon;
     position: absolute;

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

@@ -39,7 +39,7 @@ table {
     left: 0;
     width: 100%;
     height: 4px;
-    @include background(linear-gradient(top, $light-gray 0%, rgba($light-gray, .0) 100%));
+    background: linear-gradient($light-gray, rgba($light-gray, .0));
     content: '';
   }
 }

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -33,7 +33,7 @@
 }
 
 .mce-container *[unselectable] {
-  @include user-select(none);
+  user-select: none;
 }
 
 .mce-container::-webkit-scrollbar {
@@ -630,15 +630,15 @@ body .mce-abs-layout-item {
   *display: inline;
   *zoom: 1;
   box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
-  @include background(linear-gradient($button-gradient-first-color, $button-gradient-second-color));
+  background: linear-gradient($button-gradient-first-color, $button-gradient-second-color);
 
   &:focus,
   &:hover {
     color: #333;
-    @include background(linear-gradient( darken($button-gradient-first-color, 5%), darken($button-gradient-second-color, 5%) ));
+    background: linear-gradient(darken($button-gradient-first-color, 5%), darken($button-gradient-second-color, 5%));
 
     button {
-      @include background(inherit);
+      background: inherit;
     }
   }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     class AttachmentsController < ResourcesController
@@ -21,7 +23,6 @@ module Alchemy
           .page(params[:page] || 1)
           .per(15)
 
-        @options = options_from_params
         if in_overlay?
           archive_overlay
         end
@@ -44,7 +45,7 @@ module Alchemy
         else
           render_errors_or_redirect(
             @attachment,
-            admin_attachments_path(search_params),
+            admin_attachments_path(search_filter_params),
             Alchemy.t("File successfully updated")
           )
         end
@@ -53,7 +54,7 @@ module Alchemy
       def destroy
         name = @attachment.name
         @attachment.destroy
-        @url = admin_attachments_url(search_params)
+        @url = admin_attachments_url(search_filter_params)
         flash[:notice] = Alchemy.t('File deleted successfully', name: name)
       end
 
@@ -67,12 +68,12 @@ module Alchemy
 
       private
 
-      def search_params
-        params.except(:attachment, :id).permit(
-          :file_type,
-          :page,
-          {q: resource_handler.search_field_name},
-          :tagged_with
+      def search_filter_params
+        params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
+          *common_search_filter_includes + [
+            :file_type,
+            :content_id
+          ]
         )
       end
 
@@ -90,7 +91,6 @@ module Alchemy
 
       def archive_overlay
         @content = Content.find_by(id: params[:content_id])
-        @options = options_from_params
         respond_to do |format|
           format.html { render partial: 'archive_overlay' }
           format.js   { render action:  'archive_overlay' }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Admin
     class BaseController < Alchemy::BaseController
@@ -7,7 +9,8 @@ module Alchemy
       before_action { enforce_ssl if ssl_required? && !request.ssl? }
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
+      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?,
+        :options_from_params
 
       check_authorization
 
@@ -57,14 +60,6 @@ module Alchemy
         end
       end
 
-      def redirect_back_or_to_default(default_path = admin_dashboard_path)
-        if request.referer.present?
-          redirect_to :back
-        else
-          redirect_to default_path
-        end
-      end
-
       # Returns clipboard items for given category
       def get_clipboard(category)
         session[:alchemy_clipboard] ||= {}
@@ -132,19 +127,15 @@ module Alchemy
         end
       end
 
-      # Extracts options from params.
+      # Extracts options from params and permits all keys
       #
-      # Helps to parse JSONified options into Hash or Array
+      # If no options are present it returns an empty parameters hash.
       #
+      # @returns [ActionController::Parameters]
       def options_from_params
-        case params[:options]
-        when '', nil
-          {}
-        when String
-          JSON.parse(params[:options])
-        else
-          params[:options].permit!.to_h
-        end.deep_symbolize_keys
+        @_options_from_params ||= begin
+          (params[:options] || ActionController::Parameters.new).permit!
+        end
       end
 
       # This method decides if we want to raise an exception or not.