alchemy_cms 4.4.3 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9af617bbf653eb9e5c293217f9dfc90060aaa22da0b306f0320c4da5858fbb9c
-  data.tar.gz: 405d140847ff533931bc8e759fc2cd1ae934ca0c856fe4e27cf346426f950867
+  metadata.gz: d09503d403038880c93066f8ff4606496ab8023f406c2fdb7fd36dd62749b3d4
+  data.tar.gz: 97518f445dadcb7fe00626ba6cd5aa78c9e04ef596abdf7229828ebf6dd9644b
 SHA512:
-  metadata.gz: af4468b1a30d64e3ddbaad1aaeacd20f65b417651a23768ee6196348d9a9f0bb34734a9800fc5d236dc88e6ab4e6f50ba0e40c7baea490de5d97383b501bfdca
-  data.tar.gz: 88f2e7796ef2bd46b9cde670f0acd6f14e664bea97bc0170c607258c62cfd114aa8474754e7f5223e86b86cd58c09b1a9c9fc27da3aa118b90b60fb85d3a8cf4
+  metadata.gz: 8030842fd29540fa6a7e20e5ad4b5866cb5b8d214911e11a8370c37ae71542c81f65173addcde23ffd3e7c7c01c8f77c15f3934c555c49f03d5b37da7384fd46
+  data.tar.gz: 200eb39b0a8b6517896e0b799053a1e1d179dab67933b991ac3508370e7e664c7b0eba8bcfc6dbabdaaab4301ba3f6b6e28d84aa34dcdefbf3e9e2513fe8c32b

data/.github/workflows/ci.yml

@@ -19,9 +19,9 @@ jobs:
           - postgresql
     env:
       DB: ${{ matrix.database }}
-      MYSQL_PASSWORD: root
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: password
+      DB_USER: alchemy_user
+      DB_PASSWORD: password
+      DB_HOST: '127.0.0.1'
       RAILS_ENV: test
       RAILS_VERSION: ${{ matrix.rails }}
       CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
@@ -29,11 +29,20 @@ jobs:
       postgres:
         image: postgres:11
         env:
-          POSTGRES_USER: postgres
+          POSTGRES_USER: alchemy_user
           POSTGRES_PASSWORD: password
           POSTGRES_DB: alchemy_cms_dummy_test
         ports: ['5432:5432']
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mysql:
+        image: mysql:latest
+        ports: ['3306:3306']
+        env:
+          MYSQL_USER: alchemy_user
+          MYSQL_PASSWORD: password
+          MYSQL_DATABASE: alchemy_cms_dummy_test
+          MYSQL_ROOT_PASSWORD: password
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby
@@ -52,15 +61,15 @@ jobs:
         if: matrix.database == 'postgresql'
         run: |
           mkdir -p /home/runner/apt/cache
-          sudo apt-get update -qq
-          sudo apt-get install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
+          sudo apt update -qq
+          sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
       - name: Install MySQL headers
         if: matrix.database == 'mysql'
         run: |
           mkdir -p /home/runner/apt/cache
-          sudo apt-get update -qq
-          sudo apt-get install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
+          sudo apt update -qq
+          sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
       - name: Install bundler
         run: |
@@ -80,15 +89,12 @@ jobs:
       - name: Prepare database
         run: |
           bundle exec rake alchemy:spec:prepare
-      - name: Install code climate test reporter
-        run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
-      - name: Test with RSpec
-        run: |
-          bundle exec rspec
-          ./cc-test-reporter after-build --exit-code $?
+      - name: Run tests & publish code coverage
+        uses: paambaati/codeclimate-action@v2.5.7
+        env:
+          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
+        with:
+          coverageCommand: bundle exec rspec
       - uses: actions/upload-artifact@master
         if: failure()
         with:

data/.rubocop.yml

@@ -9,17 +9,12 @@ AllCops:
     - 'alchemy_cms.gemspec'
     - 'Rakefile'
 
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 
 # Really, rubocop?
 Bundler/OrderedGems:
   Enabled: false
 
-# Sometimes I believe this reads better
-# This also causes spacing issues on multi-line fixes
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 Style/EmptyLiteral:
   Enabled: false
 
@@ -55,13 +50,10 @@ Style/MixinUsage:
   Exclude:
     - spec/**/*
 
-Performance/Count:
-  Enabled: false
-
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
 Layout/ClosingParenthesisIndentation:
@@ -77,13 +69,13 @@ Layout/ElseAlignment:
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Enabled: false
 
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   EnforcedStyle: active_support
 
 Layout/IndentationWidth:
@@ -115,7 +107,7 @@ Layout/SpaceInsideParens:
 Layout/EndAlignment:
   Enabled: false
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'config/initializers/mini_profiler.rb'
 

data/CHANGELOG.md

@@ -1,4 +1,38 @@
-## 5.0.0 (unreleased)
+## 4.6.2 (2020-09-07)
+
+- Fix tri-Boolean check in PageNaming Module [#1931](https://github.com/AlchemyCMS/alchemy_cms/pull/1931) ([mamhoff](https://github.com/mamhoff))
+
+## 4.6.1 (2020-06-04)
+
+- Fix 4.6 upgrader
+
+## 4.6.0 (2020-06-04)
+
+- Use apt update instead of apt-get in GH action [#1865](https://github.com/AlchemyCMS/alchemy_cms/pull/1865) ([tvdeyen](https://github.com/tvdeyen))
+- Use depth for page tree serializer root_or_leaf [#1864](https://github.com/AlchemyCMS/alchemy_cms/pull/1864) ([tvdeyen](https://github.com/tvdeyen))
+- Fix sitemap wrapper height [#1861](https://github.com/AlchemyCMS/alchemy_cms/pull/1861) ([tvdeyen](https://github.com/tvdeyen))
+- Do not return the root page with API responses. [#1860](https://github.com/AlchemyCMS/alchemy_cms/pull/1860) ([tvdeyen](https://github.com/tvdeyen))
+- Introduce page.url_path and use it for alchemyPageSelect [#1859](https://github.com/AlchemyCMS/alchemy_cms/pull/1859) ([tvdeyen](https://github.com/tvdeyen))
+- Update Urlname translation [#1857](https://github.com/AlchemyCMS/alchemy_cms/pull/1857) ([tvdeyen](https://github.com/tvdeyen))
+- Show url name in Page tree [#1856](https://github.com/AlchemyCMS/alchemy_cms/pull/1856) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate Page#visible attribute [#1855](https://github.com/AlchemyCMS/alchemy_cms/pull/1855) ([tvdeyen](https://github.com/tvdeyen))
+- 4.6: Re-add `auto_logout_time` configuration option [#1852](https://github.com/AlchemyCMS/alchemy_cms/pull/1852) ([mamhoff](https://github.com/mamhoff))
+- Backport ContentEditor to 4.6, deprecate removed methods on `Alchemy::Content` [#1847](https://github.com/AlchemyCMS/alchemy_cms/pull/1847) ([mamhoff](https://github.com/mamhoff))
+- Deprecate auto_logout_time (4.6) [#1843](https://github.com/AlchemyCMS/alchemy_cms/pull/1843) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate require_ssl (4.6) [#1842](https://github.com/AlchemyCMS/alchemy_cms/pull/1842) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate url_nesting configuration (4.6) [#1841](https://github.com/AlchemyCMS/alchemy_cms/pull/1841) ([tvdeyen](https://github.com/tvdeyen))
+- Allow page visible toggle (4.6) [#1838](https://github.com/AlchemyCMS/alchemy_cms/pull/1838) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.5.0 (2020-03-30)
+
+- Sortable menus [#1758](https://github.com/AlchemyCMS/alchemy_cms/pull/1758) ([mamhoff](https://github.com/mamhoff))
+- Programmatic menus [#1756](https://github.com/AlchemyCMS/alchemy_cms/pull/1756) ([mamhoff](https://github.com/mamhoff))
+- Fix syntax in non-erb Menu templates [#1751]((https://github.com/AlchemyCMS/alchemy_cms/pull/1751)) ([Alexander ADAM](https://github.com/alexanderadam))
+- Fix `render_menu` for custom controllers [#1746]((https://github.com/AlchemyCMS/alchemy_cms/pull/1746)) ([Alexander ADAM](https://github.com/alexanderadam))
+
+## 4.4.4 (2020-02-28)
+
+- Fix new menu form [#1740](https://github.com/AlchemyCMS/alchemy_cms/pull/1740) ([tvdeyen](https://github.com/tvdeyen))
 
 ## 4.4.3 (2020-02-26)
 

data/alchemy_cms.gemspec

@@ -51,6 +51,7 @@ Gem::Specification.new do |gem|
   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

@@ -15,8 +15,10 @@
 //= 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
@@ -39,6 +41,7 @@
 //= 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

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.node_tree.js

@@ -0,0 +1,66 @@
+Alchemy.NodeTree = {
+  onFinishDragging: function (evt) {
+    var url = Alchemy.routes.move_api_node_path(evt.item.dataset.id)
+    var data = {
+      target_parent_id: evt.to.dataset.nodeId,
+      new_position: evt.newIndex
+    };
+    var ajax = Alchemy.ajax('PATCH', url, data)
+
+    ajax.then(function(response) {
+      Alchemy.growl('Successfully moved menu item.')
+      Alchemy.NodeTree.displayNodeFolders()
+    }).catch(function() {
+      Alchemy.growl(error.message || error);
+    })
+  },
+
+  displayNodeFolders: function () {
+    document.querySelectorAll('li.menu-item').forEach(function (el) {
+      var leftIconArea = el.querySelector('.nodes_tree-left_images')
+      var list = el.querySelector('ul')
+      var node = { folded: el.dataset.folded === 'true', id: el.dataset.id }
+
+      if (list.children.length > 0 || node.folded ) {
+        leftIconArea.innerHTML = HandlebarsTemplates.node_folder({ node: node })
+      } else {
+        leftIconArea.innerHTML = ' '
+      }
+    });
+  },
+
+  handleNodeFolders: function() {
+    Alchemy.on('click', '.nodes_tree', '.node_folder', function(evt) {
+      var nodeId = this.dataset.nodeId
+      var menu_item = this.closest('li.menu-item')
+      var url = Alchemy.routes.toggle_folded_api_node_path(nodeId)
+      var list = menu_item.querySelector('.children')
+      var ajax = Alchemy.ajax('PATCH', url)
+
+      ajax.then(function() {
+        list.classList.toggle('folded')
+        menu_item.dataset.folded = menu_item.dataset.folded == 'true' ? 'false' : 'true'
+        Alchemy.NodeTree.displayNodeFolders();
+      }).catch(function(error){
+        Alchemy.growl(error.message || error);
+      });
+    });
+  },
+
+  init: function() {
+    this.handleNodeFolders()
+    this.displayNodeFolders()
+
+    document.querySelectorAll('.nodes_tree ul.children').forEach(function (el) {
+      new Sortable(el, {
+        group: 'nodes',
+        animation: 150,
+        fallbackOnBody: true,
+        swapThreshold: 0.65,
+        handle: '.node_name',
+        invertSwap: true,
+        onEnd: Alchemy.NodeTree.onFinishDragging
+      });
+    });
+  }
+}

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

@@ -0,0 +1,45 @@
+Alchemy.on = function (eventName, baseSelector, targetSelector, callback) {
+  var baseNode = document.querySelector(baseSelector)
+  baseNode.addEventListener(eventName, function (evt) {
+    var targets = Array.from(baseNode.querySelectorAll(targetSelector))
+    var currentNode = evt.target
+    while (currentNode !== baseNode) {
+      if (targets.includes(currentNode)) {
+        callback.call(currentNode, evt)
+        return
+      }
+      currentNode = currentNode.parentElement
+    }
+  });
+}
+
+Alchemy.ajax = function(method, url, data) {
+  var xhr = new XMLHttpRequest()
+  var token = document.querySelector('meta[name="csrf-token"]').attributes.content.textContent
+  var promise = new Promise(function (resolve, reject) {
+    xhr.onload = function() {
+      try {
+        resolve({
+          data: JSON.parse(xhr.responseText),
+          status: xhr.status
+        })
+      } catch (error) {
+        reject(new Error(JSON.parse(xhr.responseText).error))
+      }
+    };
+    xhr.onerror = function() {
+      reject(new Error(xhr.statusText))
+    }
+  });
+  xhr.open(method, url);
+  xhr.setRequestHeader('Content-type', 'application/json; charset=utf-8');
+  xhr.setRequestHeader('Accept', 'application/json');
+  xhr.setRequestHeader('X-CSRF-Token', token)
+  if (data) {
+    xhr.send(JSON.stringify(data))
+  } else {
+    xhr.send()
+  }
+
+  return promise
+}

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

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

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/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;

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

@@ -18,7 +18,7 @@
 
   .node_page,
   .node_url {
-    width: 200px;
+    width: 250px;
     max-width: 45%;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -63,6 +63,10 @@
   ul {
     margin: 0;
     padding: 0;
+
+    .folded > li {
+      display: none;
+    }
   }
 
   li {
@@ -106,6 +110,7 @@
     text-decoration: none;
     overflow: hidden;
     background-color: $sitemap-page-background-color;
+    cursor: move;
 
     &.without-status {
       @include border-right-radius($default-border-radius);