alchemy_cms 4.2.0.rc1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258008e3dd974388f2361414d385f0b607dae59a2f2f1e425cc409517efc1682
-  data.tar.gz: 99d7b710b6e90b2b71dcd08658767b21ea2f845380aa14889467f73c80c554d3
+  metadata.gz: f0f5711f9a2670decb7dc7b607c684e50cd82f95ee20f37c3995a2afe107a563
+  data.tar.gz: eae8426cc413eeeb78cd206fa0f1e7cedeca5a59cb5f4aca81ea9997c8a408df
 SHA512:
-  metadata.gz: 448bf16870286563145c0d903a2e1ec2b1d4a4951f8122911847088bf941df0d9f00bb8f45dbd87ab1b9a41e2a291e031e4374a0906e59873735b963518f5d20
-  data.tar.gz: e2b0a2887b4121c1606b46710342ad609322997a69cfa0af2263acb78cfb5d3bbba4efb950a06c185326ae0ceb16168469b5985e921629cb788747169b2ce5df
+  metadata.gz: 37f0485eafe6e0e0e89aadb09dcce775579229f69cc342bfa07d2f0acd5f3d0f0873e6f2a7c7e5e3d9eeb43b8d614832a6247920a53e80011ef89ab995409ed0
+  data.tar.gz: f51d23e388032bd19f1192da181fe997a47e815c4c7937f5601115c55d09a93d21e3f25f2a1554df3e76ca246cc11223d807ea8e3b6e66ba5cda1a27927e7d20

data/.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: alchemy_cms
+open_collective: alchemy_cms

data/.rubocop.yml

@@ -41,6 +41,10 @@ Style/GuardClause:
 Style/SymbolArray:
   Enabled: false
 
+Style/SymbolProc:
+  Exclude:
+    - 'lib/alchemy/permissions.rb'
+
 Style/WordArray:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,26 @@
-## 4.2.0 (unreleased)
-
+## 4.2.0 (2019-05-30)
+
+- remove unused .teatro.yml [#1585](https://github.com/AlchemyCMS/alchemy_cms/pull/1585) ([kirillshevch](https://github.com/kirillshevch))
+- Use Set to collect callbacks in OnPageLayout [#1583](https://github.com/AlchemyCMS/alchemy_cms/pull/1583) ([mamhoff](https://github.com/mamhoff))
+- Allow Ransack 1.x [#1580](https://github.com/AlchemyCMS/alchemy_cms/pull/1580) ([tvdeyen](https://github.com/tvdeyen))
+- Set a max-width to preview frame [#1578](https://github.com/AlchemyCMS/alchemy_cms/pull/1578) ([tvdeyen](https://github.com/tvdeyen))
+- Rebuild locked pages tabs in flexbox [#1577](https://github.com/AlchemyCMS/alchemy_cms/pull/1577) ([tvdeyen](https://github.com/tvdeyen))
+- Use where.not instead of Arel [#1576](https://github.com/AlchemyCMS/alchemy_cms/pull/1576) ([tvdeyen](https://github.com/tvdeyen))
+- Add missing requires to factories [#1575](https://github.com/AlchemyCMS/alchemy_cms/pull/1575) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade sqlite3 to version 1.4.1 [#1574](https://github.com/AlchemyCMS/alchemy_cms/pull/1574) ([depfu](https://github.com/apps/depfu))
+- Fix elements window ajax errors [#1573](https://github.com/AlchemyCMS/alchemy_cms/pull/1573) ([tvdeyen](https://github.com/tvdeyen))
+- Use SimpleForm field for datepicker in resources form [#1572](https://github.com/AlchemyCMS/alchemy_cms/pull/1572) ([tvdeyen](https://github.com/tvdeyen))
+- Render warning message in warning helper [#1571](https://github.com/AlchemyCMS/alchemy_cms/pull/1571) ([tvdeyen](https://github.com/tvdeyen))
+- Prohibit coffee-rails 5.0 [#1570](https://github.com/AlchemyCMS/alchemy_cms/pull/1570) ([tvdeyen](https://github.com/tvdeyen))
+- Add Date column support to resources [#1567](https://github.com/AlchemyCMS/alchemy_cms/pull/1567) ([tvdeyen](https://github.com/tvdeyen))
+- Fix pluralization of resource table header [#1566](https://github.com/AlchemyCMS/alchemy_cms/pull/1566) ([tvdeyen](https://github.com/tvdeyen))
+- Fix compact elements style [#1565](https://github.com/AlchemyCMS/alchemy_cms/pull/1565) ([tvdeyen](https://github.com/tvdeyen))
+- Show Ruby and Rails versions in info dialog [#1564](https://github.com/AlchemyCMS/alchemy_cms/pull/1564) ([tvdeyen](https://github.com/tvdeyen))
+- Set spinner color to current text color [#1563](https://github.com/AlchemyCMS/alchemy_cms/pull/1563) ([tvdeyen](https://github.com/tvdeyen))
+- Update links in post install message [#1562](https://github.com/AlchemyCMS/alchemy_cms/pull/1562) ([tvdeyen](https://github.com/tvdeyen))
+- Allow cancancan 3 [#1561](https://github.com/AlchemyCMS/alchemy_cms/pull/1561) ([tvdeyen](https://github.com/tvdeyen))
+- Fix Member Page permissions syntax [#1560](https://github.com/AlchemyCMS/alchemy_cms/pull/1560) ([tvdeyen](https://github.com/tvdeyen))
+- Update upgrader [#1558](https://github.com/AlchemyCMS/alchemy_cms/pull/1558) ([tvdeyen](https://github.com/tvdeyen))
 - Use element name local in generators [#1556](https://github.com/AlchemyCMS/alchemy_cms/pull/1556) ([tvdeyen](https://github.com/tvdeyen))
 - Remove invalid bytecode handler [#1555](https://github.com/AlchemyCMS/alchemy_cms/pull/1555) ([tvdeyen](https://github.com/tvdeyen))
 - Separate render element calls [#1554](https://github.com/AlchemyCMS/alchemy_cms/pull/1554) ([tvdeyen](https://github.com/tvdeyen))
@@ -11,7 +32,7 @@
 - Upgrade shoulda-matchers to version 4.0.0 [#1542](https://github.com/AlchemyCMS/alchemy_cms/pull/1542) ([depfu](https://github.com/apps/depfu))
 - Upgrade factory_bot_rails to version 5.0.1 [#1540](https://github.com/AlchemyCMS/alchemy_cms/pull/1540) ([depfu](https://github.com/apps/depfu))
 - Use Flatpickr as Datepicker [#1533](https://github.com/AlchemyCMS/alchemy_cms/pull/1533) ([mamhoff](https://github.com/mamhoff))
--  Use system tests over feature specs [#1528](https://github.com/AlchemyCMS/alchemy_cms/pull/1528) ([tvdeyen](https://github.com/tvdeyen))
+- Use system tests over feature specs [#1528](https://github.com/AlchemyCMS/alchemy_cms/pull/1528) ([tvdeyen](https://github.com/tvdeyen))
 - Flexible width for admin navigation entry labels [#1527](https://github.com/AlchemyCMS/alchemy_cms/pull/1527) ([tvdeyen](https://github.com/tvdeyen))
 - Responsive elements window and sidebar [#1519](https://github.com/AlchemyCMS/alchemy_cms/pull/1519) ([tvdeyen](https://github.com/tvdeyen))
 - Change element eye icon on public state [#1517](https://github.com/AlchemyCMS/alchemy_cms/pull/1517) ([oniram88](https://github.com/oniram88))
@@ -479,3 +500,7 @@ No changes
 ## 3.0.0 (2014-07-03)
 
 [Release Notes](https://github.com/AlchemyCMS/alchemy_cms/releases/tag/v3.0.0)
+
+
+
+

data/Gemfile

@@ -7,7 +7,7 @@ gem 'rails', '~> 5.2.0'
 # Profiling
 gem 'rack-mini-profiler', group: :development, require: false
 
-gem 'sqlite3', '~> 1.3.6' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+gem 'sqlite3', '~> 1.4.1' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
 gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
 gem 'pg',     '~> 1.0'   if ENV['DB'] == 'postgresql'
 gem 'sassc-rails'

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.1-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.1-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.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.2-stable).**
 
 
 ## ✅ Features

data/alchemy_cms.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.10.0']
   gem.add_runtime_dependency 'acts_as_list',                     ['~> 0.3']
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
-  gem.add_runtime_dependency 'cancancan',                        ['~> 2.1']
-  gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
+  gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
+  gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0', '< 5.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']
@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   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', '< 6.0']
-  gem.add_runtime_dependency 'ransack',                          ['~> 2.0']
+  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 3.0']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['~> 2.0']
   gem.add_runtime_dependency 'select2-rails',                    ['>= 3.5.9.1', '< 4.0']
@@ -57,9 +57,8 @@ and follow the onscreen instructions.
 
 Need help? Try:
 
-* http://stackoverflow.com/questions/tagged/alchemy-cms
-* http://groups.google.com/group/alchemy-cms
-* irc://irc.freenode.net#alchemy_cms
+* https://stackoverflow.com/questions/tagged/alchemy-cms
+* https://slackin.alchemy-cms.com
 -------------------------------------------------------------
 
 MSG

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

@@ -122,7 +122,7 @@ class window.Alchemy.Dialog
         @show_error(xhr, status)
 
   # Displays an error message
-  show_error: (xhr, status_message) ->
+  show_error: (xhr, status_message, $container = @dialog_body) ->
     error_type = "warning"
     switch xhr.status
       when 0
@@ -135,7 +135,7 @@ class window.Alchemy.Dialog
         error_type = "error"
         if status_message
           error_header = status_message
-          console.error eval(xhr.responseText)
+          console.error(xhr.responseText)
         else
           error_header = "#{xhr.statusText} (#{xhr.status})"
         error_body = "Please check log and try again."
@@ -143,7 +143,7 @@ class window.Alchemy.Dialog
     $errorDiv.append Alchemy.messageIcon(error_type)
     $errorDiv.append "<h1>#{error_header}</h1>"
     $errorDiv.append "<p>#{error_body}</p>"
-    @dialog_body.html $errorDiv
+    $container.html $errorDiv
 
   # Binds close events on:
   # - Close button

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

@@ -53,7 +53,7 @@ Alchemy.ElementsWindow =
       if @callback
         @callback.call()
     .fail (xhr, status, error) =>
-      Alchemy.AjaxErrorHandler @element_area, xhr.status, status, error
+      Alchemy.Dialog::show_error(xhr, error, @element_area)
 
   hide: ->
     @$body.removeClass('elements-window-visible');

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

@@ -33,6 +33,14 @@ button, input[type="submit"], a.button, input.button {
     margin-right: 2 * $default-margin;
     color: inherit;
   }
+
+  &[disabled] {
+    cursor: not-allowed;
+
+    & + label {
+      display: none;
+    }
+  }
 }
 
 .icon_button {
@@ -79,13 +87,18 @@ button, input[type="submit"], a.button, input.button {
     }
   }
 
-  &.disabled {
+  &.disabled,
+  &[disabled] {
 
     span {
       opacity: 0.3;
       cursor: not-allowed;
     }
 
+    i {
+      opacity: 0.3;
+    }
+
     &:hover {
       cursor: not-allowed;
     }
@@ -121,7 +134,7 @@ button.icon_button {
   margin: 0 2*$default-margin;
 
   &.active, &:active, &:hover {
-   .icon_button {
+   .icon_button:not([disabled]) {
       background-color: $default-border-color;
       cursor: pointer;
     }

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

@@ -43,7 +43,9 @@
 }
 
 #update_check {
+  position: relative;
   height: 16px;
+  margin-bottom: 2em;
 
   img#load_info {
     width: 16px;

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

@@ -43,6 +43,10 @@
       height: 140px !important;
     }
   }
+
+  > .message {
+    margin: 2*$default-margin
+  }
 }
 
 #main-content-elements,
@@ -115,6 +119,7 @@
 }
 
 .element-editor {
+  position: relative;
   border: 1px solid $default-border-color;
   border-radius: $default-border-radius;
   background-color: $light-gray;
@@ -133,7 +138,7 @@
   &.dirty {
     border-color: #d0c83d;
 
-    > .element-header {
+    >.element-header {
       background-color: #fff8df;
     }
   }
@@ -160,7 +165,8 @@
     }
   }
 
-  &.with-contents, &.without-contents.not-nestable {
+  &.with-contents,
+  &.without-contents.not-nestable {
 
     .element-content {
       padding: 2*$default-padding 2*$default-padding 0;
@@ -168,6 +174,85 @@
     }
   }
 
+  &.compact {
+    .element-toolbar {
+      visibility: hidden;
+      position: absolute;
+      height: 35px;
+      padding: 2px 0;
+      opacity: 0;
+      z-index: 1;
+      border-bottom: $default-border;
+      background-color: $light-gray;
+      transition: all $transition-duration;
+    }
+
+    .element-header:hover+.element-toolbar,
+    .element-toolbar:hover {
+      visibility: visible;
+      opacity: 1;
+    }
+
+    .element-footer {
+      margin-top: 0;
+      padding-top: 0;
+      border-top: 0;
+
+      .button {
+        padding: $small-button-padding;
+      }
+    }
+
+    .element-title {
+      max-width: 75%;
+    }
+
+    &:not(.folded) .ajax-folder {
+      pointer-events: none;
+
+      i:before {
+        content: fa-content($fa-var-ellipsis-v);
+      }
+    }
+
+    .element_tools {
+      display: flex;
+      width: 100%;
+      justify-content: space-between;
+      margin-left: 0;
+    }
+
+    .element-content {
+      padding: 4px 8px;
+    }
+
+    .button_with_label {
+      margin: 0 4px;
+    }
+
+    .content_editor,
+    .picture_thumbnail {
+      width: 100%;
+    }
+
+    .picture_thumbnail {
+      margin: 0;
+    }
+
+    .thumbnail_background {
+      height: 115px;
+    }
+
+    textarea,
+    input[type="url"],
+    input[type="text"],
+    input[type="email"],
+    input[type="password"] {
+      padding: 0.5em;
+      height: auto;
+    }
+  }
+
   form {
     margin: 0;
   }
@@ -188,22 +273,6 @@
     margin-bottom: 1em;
   }
 
-  .content_editor_error {
-    border: 1px solid #f5b04e;
-    padding: 4px 8px;
-    line-height: 21px;
-    background-color: #f5dea9;
-    margin-top: 4px;
-    border-radius: $default-border-radius;
-
-    .icon.warning {
-      position: relative;
-      top: 2px;
-      margin-right: 8px;
-      vertical-align: top;
-    }
-  }
-
   .autocomplete_tag_list {
     padding: $default-padding 0;
 
@@ -240,7 +309,7 @@
   cursor: pointer;
   @include border-top-radius($default-border-radius);
 
-  > .hint-with-icon {
+  >.hint-with-icon {
     position: absolute;
     right: 32px;
     top: 10px;
@@ -304,8 +373,7 @@
   right: 0;
 
   .icon_button {
-    @include button-defaults(
-      $background-color: $medium-gray,
+    @include button-defaults($background-color: $medium-gray,
       $hover-color: darken($medium-gray, 5%),
       $border: 1px solid #c0c0c0,
       $box-shadow: none,
@@ -319,27 +387,26 @@
     width: 29px;
     height: $form-field-height;
 
-    &.disabled, &.disabled:hover {
+    &.disabled,
+    &.disabled:hover {
       background-color: $form-field-disabled-bg-color;
     }
 
     &.linked.link-essence {
-      @include linked-button(
-        $border-radius: 0,
+      @include linked-button($border-radius: 0,
         $line-height: 30px,
-        $padding: 0
-      );
+        $padding: 0);
+
       &:focus {
         border-radius: 0;
       }
     }
 
     &.linked.unlink-essence {
-      @include linked-button(
-        $border-radius: 0 $default-border-radius $default-border-radius 0,
+      @include linked-button($border-radius: 0 $default-border-radius $default-border-radius 0,
         $line-height: 30px,
-        $padding: 0
-      );
+        $padding: 0);
+
       &:focus {
         border-radius: 0 $default-border-radius $default-border-radius 0;
       }
@@ -507,7 +574,8 @@ select.long {
   padding: $default-padding 0;
   position: relative;
 
-  .thin_border, input[type="text"] {
+  .thin_border,
+  input[type="text"] {
     width: 100%;
   }
 
@@ -536,15 +604,22 @@ select.long {
     margin-right: 4px;
     vertical-align: top;
 
-    .thin_border, input[type="text"] {
+    .thin_border,
+    input[type="text"] {
       width: 170px;
     }
   }
 
   &.validation_failed {
 
-    label { color: $error_text_color }
-    input { @extend %field-with-error }
+    label {
+      color: $error_text_color
+    }
+
+    input {
+      @extend %field-with-error
+    }
+
     .tinymce_container {
       outline: 1px solid $error_border_color;
     }
@@ -572,7 +647,9 @@ select.long {
 
   &.essence_select {
 
-    label { margin-bottom: 2*$default-margin }
+    label {
+      margin-bottom: 2*$default-margin
+    }
 
     .select2-container {
       width: 100%;
@@ -615,7 +692,7 @@ select.long {
     padding-left: 1px; // Compensate the box shadow
     padding-right: $default-padding;
 
-    + .essence_picture {
+    +.essence_picture {
       padding-left: $default-padding;
       padding-right: 1px; // Compensate the box shadow
     }
@@ -670,7 +747,7 @@ textarea.has_tinymce {
 .element-handle .hint-with-icon {
   margin: 0;
 
-  > .hint-bubble {
+  >.hint-bubble {
     left: -7px;
     transform: none;
 
@@ -688,7 +765,7 @@ textarea.has_tinymce {
   box-shadow: inset 0 4px 8px -2px darken($medium-gray, 15%);
   background-color: $medium-gray;
 
-  .expanded.element-editor > & {
+  .expanded.element-editor>& {
     padding: 8px 4px 4px;
   }
 
@@ -701,113 +778,38 @@ textarea.has_tinymce {
 
 .is-fixed {
   &.with-contents {
-    > .element-footer {
+    >.element-footer {
       border-top: 0;
       border-bottom: 1px solid $medium-gray;
     }
   }
 
-  > .nestable-elements .add-nestable-element-button {
+  >.nestable-elements .add-nestable-element-button {
     width: 100%;
     text-align: center;
   }
 }
 
-.not-fixed .nested-elements {
-  display: flex;
-  flex-wrap: wrap;
+.element-editor,
+.droppable_element_placeholder {
+  width: 100%;
 
-  .element-editor,
-  .droppable_element_placeholder {
+  .not-fixed & {
     width: calc(100% - 8px);
     margin: 4px;
+  }
 
-    &.compact {
-      width: calc(50% - 8px);
-    }
+  &.compact {
+    width: calc(50% - 8px);
   }
+}
+
+.nested-elements {
+  display: flex;
+  flex-wrap: wrap;
 
   .element-editor {
     position: relative;
-
-    &.compact {
-      .element-toolbar {
-        visibility: hidden;
-        position: absolute;
-        height: 35px;
-        padding: 2px 0;
-        opacity: 0;
-        z-index: 1;
-        border-bottom: $default-border;
-        background-color: $light-gray;
-        transition: all $transition-duration;
-      }
-
-      .element-header:hover + .element-toolbar,
-      .element-toolbar:hover {
-        visibility: visible;
-        opacity: 1;
-      }
-
-      .element-footer {
-        margin-top: 0;
-        padding-top: 0;
-        border-top: 0;
-
-        .button {
-          padding: $small-button-padding;
-        }
-      }
-
-      .element-title {
-        max-width: 75%;
-      }
-
-      &:not(.folded) .ajax-folder {
-        pointer-events: none;
-
-        i:before {
-          content: fa-content($fa-var-ellipsis-v);
-        }
-      }
-
-      .element_tools {
-        display: flex;
-        width: 100%;
-        justify-content: space-between;
-        margin-left: 0;
-      }
-
-      .element-content {
-        padding: 4px 8px;
-      }
-
-      .button_with_label {
-        margin: 0 4px;
-      }
-
-      .content_editor,
-      .picture_thumbnail {
-        width: 100%;
-      }
-
-      .picture_thumbnail {
-        margin: 0;
-      }
-
-      .thumbnail_background {
-        height: 115px;
-      }
-
-      textarea,
-      input[type="url"],
-      input[type="text"],
-      input[type="email"],
-      input[type="password"] {
-        padding: 0.5em;
-        height: auto;
-      }
-    }
   }
 
   .element-header {