alchemy_cms 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f5711f9a2670decb7dc7b607c684e50cd82f95ee20f37c3995a2afe107a563
-  data.tar.gz: eae8426cc413eeeb78cd206fa0f1e7cedeca5a59cb5f4aca81ea9997c8a408df
+  metadata.gz: 1cee9559837fa4a7f082aaef25d8ad9d0b60f97deeb95abe7c5e02be7e0b1c51
+  data.tar.gz: '0933e0f1400f3518d7092129e532583ea4846da5c20043185a2025dcd4f335b2'
 SHA512:
-  metadata.gz: 37f0485eafe6e0e0e89aadb09dcce775579229f69cc342bfa07d2f0acd5f3d0f0873e6f2a7c7e5e3d9eeb43b8d614832a6247920a53e80011ef89ab995409ed0
-  data.tar.gz: f51d23e388032bd19f1192da181fe997a47e815c4c7937f5601115c55d09a93d21e3f25f2a1554df3e76ca246cc11223d807ea8e3b6e66ba5cda1a27927e7d20
+  metadata.gz: cba619e0c9801e3ad568efaeeea2f1a6d28184da08f53aeeb60481f257c9e3dbe56555720f779e3dbb6def2b036c9584b46d765d241016a4b23d1fe398933d5b
+  data.tar.gz: 64f673911a078cadc30bdeb6cd0be0c7245feac2b2822efab375abe26ef7bcc32b0eea1736199b4ed09cd57b36be080de84621bc85f4c861c277f66a1de2d78c

data/.teatro.yml

@@ -0,0 +1,8 @@
+project:
+  after:
+    - apt-get -y install imagemagick
+stage:
+  before: cd spec/dummy
+  database: bin/rake db:setup RAILS_ENV=production
+  assets: bin/rake assets:precompile RAILS_ENV=production
+  run: bin/rails server -e production

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.2.1 (2019-08-08)
+
+- Use strings as JSON root keys in API controllers [#1602](https://github.com/AlchemyCMS/alchemy_cms/pull/1602) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 4.2.0 (2019-05-30)
 
 - remove unused .teatro.yml [#1585](https://github.com/AlchemyCMS/alchemy_cms/pull/1585) ([kirillshevch](https://github.com/kirillshevch))
@@ -500,7 +504,3 @@ 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.4.1' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+gem 'sqlite3', '~> 1.3.6' 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

@@ -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=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=4.2-stable)](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,9 +18,6 @@ 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
@@ -83,11 +80,9 @@ 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: 'master'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '4.2-stable'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
-
 #### 2. Update your bundle:
 
 ```bash
@@ -104,11 +99,9 @@ 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'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.2-stable'
 ```
 
-**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
-
 Then run:
 
 ```bash

data/alchemy_cms.gemspec

@@ -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',                          ['>= 1.8', '< 3.0']
+  gem.add_runtime_dependency 'ransack',                          ['~> 2.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']

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, $container = @dialog_body) ->
+  show_error: (xhr, status_message) ->
     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(xhr.responseText)
+          console.error eval(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>"
-    $container.html $errorDiv
+    @dialog_body.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.Dialog::show_error(xhr, error, @element_area)
+      Alchemy.AjaxErrorHandler @element_area, xhr.status, status, error
 
   hide: ->
     @$body.removeClass('elements-window-visible');

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

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

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

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

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

@@ -42,15 +42,18 @@ div#overlay_text_box {
 }
 
 #header {
-  display: flex;
   height: $header-height;
   line-height: $header-height;
   background: $header-background;
   border-bottom: $default-border;
   position: relative;
 
-  a:hover {
-    text-decoration: none;
+  a {
+    display: inline-block;
+
+    &:hover {
+      text-decoration: none;
+    }
   }
 
   .page_status_and_name {
@@ -73,13 +76,8 @@ 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;
   }
 }
 
@@ -98,10 +96,12 @@ 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,3 +126,23 @@ 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,42 +209,19 @@
   }
 }
 
-#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 {
-  display: flex;
-  flex-wrap: nowrap;
+  position: relative;
+  float: left;
   line-height: $header-height - 1;
   color: #444;
   border-right: $default-border;
   border-bottom: $default-border;
+  padding-right: 24px;
 
   form {
-    align-self: center;
-    justify-self: flex-end;
-    margin-right: $default-padding;
+    position: absolute;
+    right: $default-padding;
+    top: 7px;
     line-height: 1;
   }
 
@@ -254,7 +231,6 @@
   }
 
   > a {
-    display: flex;
     cursor: pointer;
     padding: 0px 8px;
 

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

@@ -16,9 +16,5 @@
 
   .collapsed-menu.elements-window-visible & {
     width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width});
-
-    @media screen and (min-width: $large-screen-break-point) {
-      max-width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width});
-    }
   }
 }

data/app/controllers/alchemy/api/contents_controller.rb

@@ -16,7 +16,7 @@ module Alchemy
       if params[:element_id].present?
         @contents = @contents.where(element_id: params[:element_id])
       end
-      render json: @contents, adapter: :json, root: :contents
+      render json: @contents, adapter: :json, root: 'contents'
     end
 
     # Returns a json object for content

data/app/controllers/alchemy/api/elements_controller.rb

@@ -20,7 +20,7 @@ module Alchemy
       if params[:named].present?
         @elements = @elements.named(params[:named])
       end
-      render json: @elements, adapter: :json, root: :elements
+      render json: @elements, adapter: :json, root: 'elements'
     end
 
     # Returns a json object for element

data/app/controllers/alchemy/api/pages_controller.rb

@@ -16,7 +16,7 @@ module Alchemy
       if params[:page_layout].present?
         @pages = @pages.where(page_layout: params[:page_layout])
       end
-      render json: @pages, adapter: :json, root: :pages
+      render json: @pages, adapter: :json, root: 'pages'
     end
 
     # Returns all pages as nested json object for tree views

data/app/controllers/alchemy/pages_controller.rb

@@ -155,10 +155,10 @@ module Alchemy
     end
 
     def set_expiration_headers
-      if must_not_cache?
-        expires_now
-      else
+      if @page.cache_page?
         expires_in @page.expiration_time, public: !@page.restricted, must_revalidate: true
+      else
+        expires_now
       end
     end
 
@@ -190,17 +190,12 @@ module Alchemy
     # or the cache is stale, because it's been republished by the user.
     #
     def render_fresh_page?
-      must_not_cache? || stale?(etag: page_etag,
+      !@page.cache_page? || stale?(etag: page_etag,
         last_modified: @page.published_at,
         public: !@page.restricted,
         template: 'pages/show')
     end
 
-    # don't cache pages if we have flash message to display or the page has caching disabled
-    def must_not_cache?
-      flash.present? || !@page.cache_page?
-    end
-
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end

data/app/models/alchemy/element.rb

@@ -98,7 +98,7 @@ module Alchemy
     scope :not_restricted,    -> { joins(:page).merge(Page.not_restricted) }
     scope :available,         -> { published.not_trashed }
     scope :named,             ->(names) { where(name: names) }
-    scope :excluded,          ->(names) { where.not(name: names) }
+    scope :excluded,          ->(names) { where(arel_table[:name].not_in(names)) }
     scope :fixed,             -> { where(fixed: true) }
     scope :unfixed,           -> { where(fixed: false) }
     scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') }

data/app/models/alchemy/page/page_scopes.rb

@@ -66,7 +66,7 @@ module Alchemy
       # Returns all content pages.
       #
       scope :contentpages, -> {
-        where(layoutpage: [false, nil]).where.not(parent_id: nil)
+        where(layoutpage: [false, nil]).where(Page.arel_table[:parent_id].not_eq(nil))
       }
 
       # Returns all public contentpages that are not locked.

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -13,6 +13,16 @@
     <% end %>
   </div>
   <div class="toolbar_spacer"></div>
+  <% unless @page.layoutpage? %>
+  <div class="button_with_label">
+    <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
+      <button class="icon_button" title="<%= Alchemy.t('Visit page') %>">
+        <%= render_icon('external-link-alt') %>
+      </button>
+      <label><%= Alchemy.t("Visit page") %></label>
+    <% end %>
+  </div>
+  <% end %>
   <div class="button_with_label">
     <%= link_to_dialog(
       render_icon('info-circle'),
@@ -66,16 +76,6 @@
       <% end %>
     </div>
   <% end %>
-  <% unless @page.layoutpage? %>
-    <div class="button_with_label">
-      <%= form_tag alchemy.visit_admin_page_path(@page), id: 'visit_page_form' do %>
-        <%= button_tag class: 'icon_button', disabled: !@page.public? do %>
-          <%= render_icon('external-link-alt') %>
-        <% end %>
-        <label><%= Alchemy.t("Visit page") %></label>
-      <% end %>
-    </div>
-  <% end %>
   <% if @page.has_hint? %>
     <div class="toolbar_spacer"></div>
     <%= render_hint_for(@page) %>

data/lib/alchemy/on_page_layout.rb

@@ -47,7 +47,7 @@ module Alchemy
     # Registers a callback for given page layout
     def self.register_callback(page_layout, callback)
       @callbacks ||= {}
-      @callbacks[page_layout] ||= Set.new
+      @callbacks[page_layout] ||= []
       @callbacks[page_layout] << callback
     end
 

data/lib/alchemy/test_support/factories.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
-Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each do |file|
+Dir[File.dirname(__FILE__) + '/factories/*.rb'].each do |file|
   require file
 end

data/lib/alchemy/test_support/factories/attachment_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/content_factory.rb

@@ -1,9 +1,4 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
-require 'alchemy/test_support/factories/element_factory'
-require 'alchemy/test_support/factories/essence_file_factory'
-require 'alchemy/test_support/factories/essence_picture_factory'
 require 'alchemy/test_support/factories/essence_text_factory'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/dummy_user_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/element_factory.rb

@@ -1,7 +1,4 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
-require 'alchemy/test_support/factories/page_factory'
 
 FactoryBot.define do
   factory :alchemy_element, class: 'Alchemy::Element' do

data/lib/alchemy/test_support/factories/essence_file_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 require 'alchemy/test_support/factories/attachment_factory'
 

data/lib/alchemy/test_support/factories/essence_picture_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 require 'alchemy/test_support/factories/picture_factory'
 

data/lib/alchemy/test_support/factories/essence_text_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 require 'alchemy/test_support/factories/site_factory'
 

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 require 'alchemy/test_support/factories/language_factory'
 

data/lib/alchemy/test_support/factories/picture_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/test_support/factories/site_factory.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'factory_bot'
 
 FactoryBot.define do

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -265,22 +265,16 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -366,7 +360,6 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".editorconfig"
-- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".gitignore"
@@ -374,6 +367,7 @@ files:
 - ".localeapp/config.rb"
 - ".rspec"
 - ".rubocop.yml"
+- ".teatro.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md

data/.github/FUNDING.yml

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