alchemy_cms 4.2.4 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53f4b619e0d5c6090cbe19e18fc7108f1c4ee916b891ca4bf12762573b657c2
-  data.tar.gz: 79a71c230f19a2a0f4dfbc1a8c6138df87b511c03cec399f5b799e66993349e2
+  metadata.gz: 6793e9729b0c34e11be7a3e2d3f7ff0349487160e4475dd996f7f9f7fcb934e2
+  data.tar.gz: ce5abeb95c686969111f5416119044f48e4b14567a06c304c273834b23bf7ebb
 SHA512:
-  metadata.gz: fd8d1d279516f5f748561e2621bd46bccc76a00ec8eac8278fbf1ef4c96756fc7e1ef56fe8a27a6eafaa0861fe1927d545c545b765462e62f715af95fca915b9
-  data.tar.gz: 98f044f59aac0211139da48ca5fc3dc646a82319ccfa305e03161797175a2be318ac7f8232a63eacb1a59a62d8acdd5188f005ac0225cadc625c66f45e082953
+  metadata.gz: 3b491617ba28d0076d0a9dfbfac6eccc4dcd6d10e10d50a3491b5b5c24c3a46e0ede45ce7541e59fc6be118a6833ba89c73db39c885e454892d0e5509215c134
+  data.tar.gz: 2707ac47411012a25a279fdd9fefeffdaffa1109f17870468d9995d5291c35e96ed4103f457986ba3dbccf23f6f8aba34ebe5476ca9d166ca5c4dd357b6c1065

data/.github/FUNDING.yml

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

data/.travis.yml

@@ -1,16 +1,18 @@
 language: ruby
-dist: trusty
+dist: bionic
 sudo: false
+services:
+  - mysql
 addons:
+  postgresql: "10"
   apt:
     packages:
       - chromium-chromedriver
 cache:
   bundler: true
 rvm:
-- 2.4.5
-- 2.5.3
-- 2.6.0
+  - 2.5.5
+  - 2.6.3
 before_install:
   - gem install bundler
 before_script:
@@ -19,8 +21,8 @@ before_script:
 script: bundle exec rspec
 after_success: bundle exec codeclimate-test-reporter
 env:
-- DB=mysql
-- DB=postgresql
+  - DB=mysql
+  - DB=postgresql
 notifications:
   slack:
     secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=

data/CHANGELOG.md

@@ -1,13 +1,15 @@
-## 4.2.4 (2019-09-27)
-
-- Allow Ransack 1.8 (again) [#1628](https://github.com/AlchemyCMS/alchemy_cms/pull/1628) ([tvdeyen](https://github.com/tvdeyen))
-
-## 4.2.3 (2019-09-27)
-
-- Fix Cell Migration to maintain positions [#1625](https://github.com/AlchemyCMS/alchemy_cms/pull/1625) ([mamhoff](https://github.com/mamhoff))
-- Cell Upgrader: Match quotation marks in cell name string [#1624](https://github.com/AlchemyCMS/alchemy_cms/pull/1624) ([mamhoff](https://github.com/mamhoff))
-- Cell Migrator: Maintain element order in fixed elements [#1623](https://github.com/AlchemyCMS/alchemy_cms/pull/1623) ([mamhoff](https://github.com/mamhoff))
-- Enhance cells upgrader to deal with render_elements from_page: x [#1622](https://github.com/AlchemyCMS/alchemy_cms/pull/1622) ([mamhoff](https://github.com/mamhoff))
+# 4.3.0 (2019-08-23)
+
+- Add Rails 6 support [#1616](https://github.com/AlchemyCMS/alchemy_cms/pull/1616) ([tvdeyen](https://github.com/tvdeyen))
+- Use media_type over content_type in specs [#1615](https://github.com/AlchemyCMS/alchemy_cms/pull/1615) ([tvdeyen](https://github.com/tvdeyen))
+- Remove unused Picture#security_token method [#1614](https://github.com/AlchemyCMS/alchemy_cms/pull/1614) ([tvdeyen](https://github.com/tvdeyen))
+- rspec-rails 4 [#1613](https://github.com/AlchemyCMS/alchemy_cms/pull/1613) ([tvdeyen](https://github.com/tvdeyen))
+- Update Dummy test app to Rails 5.2 [#1612](https://github.com/AlchemyCMS/alchemy_cms/pull/1612) ([tvdeyen](https://github.com/tvdeyen))
+- add default styling for number inputs [#1598](https://github.com/AlchemyCMS/alchemy_cms/pull/1598) ([alexanderadam](https://github.com/alexanderadam))
+- Upgrade responders to version 3.0.0 [#1593](https://github.com/AlchemyCMS/alchemy_cms/pull/1593) ([depfu](https://github.com/apps/depfu))
+- Update jquery fileupload plugin [#1592](https://github.com/AlchemyCMS/alchemy_cms/pull/1592) ([tvdeyen](https://github.com/tvdeyen))
+- Only return visible elements from Pages elements relations [#1590](https://github.com/AlchemyCMS/alchemy_cms/pull/1590) ([tvdeyen](https://github.com/tvdeyen))
+- Only return visible elements from Elements nested_elements relation [#1589](https://github.com/AlchemyCMS/alchemy_cms/pull/1589) ([tvdeyen](https://github.com/tvdeyen))
 
 ## 4.2.2 (2019-08-13)
 
@@ -53,6 +55,7 @@
 - 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))
 - Flexible width for admin navigation entry labels [#1527](https://github.com/AlchemyCMS/alchemy_cms/pull/1527) ([tvdeyen](https://github.com/tvdeyen))
+- Render new page when there is a flash message [#1525](https://github.com/AlchemyCMS/alchemy_cms/pull/1525) ([jedrekdomanski](https://github.com/jedrekdomanski))
 - 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))
 - Maximize element window if Tinymce is fullscreen [#1515](https://github.com/AlchemyCMS/alchemy_cms/pull/1515) ([tvdeyen](https://github.com/tvdeyen))
@@ -60,6 +63,7 @@
 - Feature: Autogenerate nestable elements [#1513](https://github.com/AlchemyCMS/alchemy_cms/pull/1513) ([tvdeyen](https://github.com/tvdeyen))
 - Allow "data" key for module navigations [#1512](https://github.com/AlchemyCMS/alchemy_cms/pull/1512) ([mamhoff](https://github.com/mamhoff))
 - Allow to define layout for page previews [#1500](https://github.com/AlchemyCMS/alchemy_cms/pull/1500) ([westonganger](https://github.com/westonganger))
+- Disable page publish/view page buttons according to published_at [#1498](https://github.com/AlchemyCMS/alchemy_cms/pull/1498) ([westonganger](https://github.com/westonganger))
 - Fix capitalization for login/logout/leave [#1497](https://github.com/AlchemyCMS/alchemy_cms/pull/1497) ([westonganger](https://github.com/westonganger))
 - Verify controller keys within `register_module` [#1495](https://github.com/AlchemyCMS/alchemy_cms/pull/1495) ([westonganger](https://github.com/westonganger))
 - Update bundled Tinymce to 4.8.3 [#1491](https://github.com/AlchemyCMS/alchemy_cms/pull/1491) ([tvdeyen](https://github.com/tvdeyen))
@@ -519,3 +523,4 @@ No changes
 ## 3.0.0 (2014-07-03)
 
 [Release Notes](https://github.com/AlchemyCMS/alchemy_cms/releases/tag/v3.0.0)
+

data/Gemfile

@@ -2,12 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 5.2.0'
+gem 'rails', '~> 6.0.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'
@@ -31,14 +31,6 @@ group :development, :test do
     gem 'dotenv', '~> 2.2'
     gem 'github_fast_changelog', require: false
   end
-  gem 'capybara', '~> 3.0'
-  gem 'capybara-screenshot', '~> 1.0'
-  gem 'factory_bot_rails', '~> 5.0'
-  gem 'selenium-webdriver', '~> 3.8'
-  gem 'rspec-activemodel-mocks', '~> 1.0'
-  gem 'rspec-rails', '~> 3.7'
-  gem 'shoulda-matchers', '~> 4.0'
-  gem 'rails-controller-testing', '~> 1.0'
 end
 
 # We need this if we want to start the dummy app in production, ie on Teatro.io

data/README.md

@@ -1,7 +1,7 @@
 # AlchemyCMS
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=4.2-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
 [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
@@ -18,6 +18,9 @@ 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).**
+
+
 ## ✅ Features
 
 - Flexible templating that separates content from markup
@@ -48,7 +51,7 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
 
 ## 🚂 Rails Version
 
-**This version of Alchemy CMS runs with Rails 5 only**
+**This version of AlchemyCMS runs with all versions of Rails 5 and Rails 6**
 
 * 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).
@@ -80,9 +83,11 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '4.2-stable'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
+
 #### 2. Update your bundle:
 
 ```bash
@@ -99,9 +104,11 @@ 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: '4.2-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
+
 Then run:
 
 ```bash

data/Rakefile

@@ -42,6 +42,7 @@ namespace :alchemy 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 -
@@ -50,12 +51,12 @@ BASH
   end
 
   namespace :changelog do
-    desc "Update changelog"
+    desc "Update CHANGELOG from GitHub (Set GITHUB_ACCESS_TOKEN and PREVIOUS_VERSION to a version you want to write changelog changes for)"
     task :update do
       original_file = './CHANGELOG.md'
       new_file = original_file + '.new'
       backup = original_file + '.old'
-      changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}...master | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`
+      changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`
       File.open(new_file, 'w') do |fo|
         fo.puts changes
         File.foreach(original_file) do |li|

data/alchemy_cms.gemspec

@@ -32,14 +32,23 @@ 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', '< 6.0']
+  gem.add_runtime_dependency 'rails',                            ['>= 5.0.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']
+  gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
   gem.add_runtime_dependency 'select2-rails',                    ['>= 3.5.9.1', '< 4.0']
   gem.add_runtime_dependency 'simple_form',                      ['~> 4.0']
   gem.add_runtime_dependency 'turbolinks',                       ['>= 2.5']
 
+  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 '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 'selenium-webdriver',           ['~> 3.8']
+  gem.add_development_dependency 'shoulda-matchers',             ['~> 4.0']
+
   gem.post_install_message = <<-MSG
 -------------------------------------------------------------
             Thank you for installing Alchemy CMS

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

@@ -43,6 +43,10 @@
       height: 140px !important;
     }
   }
+
+  > .message {
+    margin: 2*$default-margin
+  }
 }
 
 #main-content-elements,

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

@@ -1,5 +1,6 @@
 textarea,
 input[type="url"],
+input[type="number"],
 input[type="text"],
 input[type="email"],
 input[type="password"],

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

@@ -25,6 +25,7 @@ form {
     @include clearfix;
 
     > input[type="url"],
+    > input[type="number"],
     > input[type="text"],
     > input[type="email"],
     > input[type="password"],

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

@@ -42,18 +42,15 @@ div#overlay_text_box {
 }
 
 #header {
+  display: flex;
   height: $header-height;
   line-height: $header-height;
   background: $header-background;
   border-bottom: $default-border;
   position: relative;
 
-  a {
-    display: inline-block;
-
-    &:hover {
-      text-decoration: none;
-    }
+  a:hover {
+    text-decoration: none;
   }
 
   .page_status_and_name {
@@ -76,8 +73,13 @@ div#overlay_text_box {
   }
 
   .page_name {
+    display: inline-block;
+    max-width: 100px;
     margin-right: $default-margin;
     line-height: $header-height;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 
@@ -96,12 +98,10 @@ div#overlay_text_box {
 }
 
 #user_info {
-  position: absolute;
-  top: 0;
-  right: 0;
   height: $header-height;
   font-size: $small-font-size;
   padding-left: 2*$default-padding;
+  margin-left: auto;
   border-bottom: $default-border;
   background-color: $header-background;
 
@@ -126,23 +126,3 @@ div#overlay_text_box {
     padding-right: 2*$default-padding;
   }
 }
-
-#locked_pages {
-
-  label {
-    float: left;
-    font-size: $small-font-size;
-    line-height: 27px;
-    height: 27px;
-    margin-left: 8px;
-    margin-right: 4px;
-  }
-
-  img {
-    float: left;
-  }
-
-  .subnavi_tab > a {
-    padding-right: 0;
-  }
-}

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

@@ -209,19 +209,42 @@
   }
 }
 
+#locked_pages {
+  display: flex;
+  flex-grow: 1;
+  flex-wrap: nowrap;
+  height: $header-height;
+
+  label {
+    float: left;
+    font-size: $small-font-size;
+    line-height: 27px;
+    height: 27px;
+    margin-left: 8px;
+    margin-right: 4px;
+  }
+
+  img {
+    float: left;
+  }
+
+  .subnavi_tab > a {
+    padding-right: 0;
+  }
+}
+
 .locked_page {
-  position: relative;
-  float: left;
+  display: flex;
+  flex-wrap: nowrap;
   line-height: $header-height - 1;
   color: #444;
   border-right: $default-border;
   border-bottom: $default-border;
-  padding-right: 24px;
 
   form {
-    position: absolute;
-    right: $default-padding;
-    top: 7px;
+    align-self: center;
+    justify-self: flex-end;
+    margin-right: $default-padding;
     line-height: 1;
   }
 
@@ -231,6 +254,7 @@
   }
 
   > a {
+    display: flex;
     cursor: pointer;
     padding: 0px 8px;