alchemy_cms 3.6.2 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa89fac8ccee2fe3971a90fa2674a8f6e25f81df
-  data.tar.gz: a8179705ad6aedbaafb0910ddb22cfee157025c7
+SHA256:
+  metadata.gz: 9a490428d0bd7ad0bc938fa1390975de5764e222fc4a6cde1cfccdaf13901d3f
+  data.tar.gz: e2297acd723cbef927d578306de473f3b20125801757c569a09774234d3ba128
 SHA512:
-  metadata.gz: df863653927ec799671903857aea93c53ab3ebd2194eebf1f0cc045c4c64a1acb64715339c6a5e8a416bad84af6f4e3328fb097265737975a4c9d00bac5e6209
-  data.tar.gz: 04b9ec7edeafae429eeb55c40059870e84f36e711e5fbe9d3470875b21374f1c65135ec82ccb25be9b2680ebe366bda5c039df758d58494ff397695472e813a3
+  metadata.gz: b364510cd94a41a52fdbbbc8543c99a478be43d90bda1d506ca87f11dbd8a93a069293b042b0a4774e314971a7b9c1823217d874deb9208582ab7a02f8750e56
+  data.tar.gz: a96c75c5bbc4a44daa3ad82ec26b005cbcf11920c695793935cd1a40683cb98497cd2bd255054687c554a1ff37d6abeb691f819fb90b375eefad78d1e4ed265a

data/.travis.yml

@@ -1,13 +1,15 @@
 language: ruby
 sudo: false
+services:
+  - mysql
+  - postgresql
 cache:
   bundler: true
   directories:
     - "travis_phantomjs"
 rvm:
-- 2.1
-- 2.2
-- 2.3.0
+- 2.3
+- 2.4
 branches:
   only:
     - 3.6-stable
@@ -20,7 +22,7 @@ before_install:
   - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
   - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
   - "phantomjs --version"
-  - gem install bundler
+  - gem install bundler -v "< 2"
 before_script: bundle exec rake alchemy:spec:prepare
 script: bundle exec rspec
 after_success: bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 3.6.7 (2021-04-13)
+
+- Allow "data" key for module navigations
+
+## 3.6.6 (2020-10-08)
+
+- Allow AwesomeNestedSet >= 3.0 [#1619](https://github.com/AlchemyCMS/alchemy_cms/pull/1619) by [tvdeyen](https://github.com/tvdeyen)
+
+## 3.6.5 (2018-05-08)
+
+- Fix for drag'n'drop trashed elements into pages with cells [#1430](https://github.com/AlchemyCMS/alchemy_cms/pull/1430) by [tvdeyen](https://github.com/tvdeyen)
+
+## 3.6.4 (2018-04-23)
+
+- Allows `Symbol`, `Regexp` and `Date` in all YAML config files [#1333](https://github.com/AlchemyCMS/alchemy_cms/pull/1333) by [robinboening](https://github.com/robinboening)
+
+## 3.6.3 (2017-10-24)
+
+* Remove `:display` cancan alias [#1318](https://github.com/AlchemyCMS/alchemy_cms/pull/1318) by [tvdeyen](https://github.com/tvdeyen)
+
 ## 3.6.2 (2017-09-01)
 
 * Handle custom errors in `Alchemy::Picture#url` [#1305](https://github.com/AlchemyCMS/alchemy_cms/pull/1305) by [tvdeyen](https://github.com/tvdeyen)

data/Gemfile

@@ -5,15 +5,16 @@ gemspec
 # Profiling
 gem 'rack-mini-profiler', group: :development, require: false
 
-gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+gem 'sqlite3', '~> 1.3.6' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
 gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
-gem 'pg'      if ENV['DB'] == 'postgresql'
+gem 'pg',     '~> 0.21'   if ENV['DB'] == 'postgresql'
 gem 'sassc-rails'
 
 group :development, :test do
   gem 'jasmine-rails',        github: 'searls/jasmine-rails'
   gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
   gem 'simplecov', require: false
+  gem 'sassc', '~> 2.1.0'
   if ENV['TRAVIS']
     gem 'codeclimate-test-reporter', '~> 1.0', require: false
   end
@@ -41,9 +42,3 @@ end
 group :development, :production do
   gem 'quiet_assets'
 end
-
-# We need this if we want to start the dummy app in production, ie on Teatro.io
-group :production do
-  gem 'uglifier', '>= 1.0.3'
-  gem 'therubyracer'
-end

data/alchemy_cms.gemspec

@@ -21,7 +21,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 'awesome_nested_set',               ['~> 3.1']
+  gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.0']
   gem.add_runtime_dependency 'bourbon',                          ['~> 4.2']
   gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']

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

@@ -145,7 +145,10 @@ module Alchemy
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard['id'])
-        new_attributes = {page_id: @page.id}
+        new_attributes = {
+          parent_element_id: params[:element][:parent_element_id],
+          page_id: @page.id
+        }
         if @page.can_have_cells?
           new_attributes = new_attributes.merge({cell_id: find_or_create_cell.try(:id)})
         end

data/app/models/alchemy/cell.rb

@@ -56,7 +56,7 @@ module Alchemy
       private
 
       def read_yml_file
-        ::YAML.safe_load(ERB.new(File.read(yml_file_path)).result, [], [], true) || []
+        ::YAML.safe_load(ERB.new(File.read(yml_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
       end
 
       def yml_file_path

data/app/models/alchemy/element/definitions.rb

@@ -26,7 +26,7 @@ module Alchemy
       #
       def read_definitions_file
         if ::File.exist?(definitions_file_path)
-          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, [Regexp, Date], [], true) || []
+          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
         else
           raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/app/models/alchemy/site.rb

@@ -24,7 +24,7 @@ module Alchemy
     scope :published, -> { where(public: true) }
 
     # Callbacks
-    before_create :create_default_language!, unless: -> { languages.any? }
+    before_create :create_default_language!
 
     # concerns
     include Alchemy::Site::Layout

data/app/views/alchemy/admin/elements/index.html.erb

@@ -10,7 +10,9 @@
         </li>
       <% end %>
     </ul>
-    <div id="cell_for_other_elements" class="sortable_cell for_other_elements_cell">
+    <div id="cell_for_other_elements"
+      class="sortable_cell for_other_elements_cell"
+      data-droppable-elements="<%= @page.element_names_from_definition.join(' ') %>">
       <%= render partial: 'alchemy/admin/elements/element',
         collection: @page.elements.not_trashed.not_in_cell %>
     </div>
@@ -18,7 +20,7 @@
       <%= content_tag :div,
         id: "cell_#{cell.name}",
         class: ["sortable_cell", "#{cell.name}_cell"].join(' '),
-        data: {'cell-id' => cell.id, 'data-droppable-elements' => cell.element_definitions.join(' ')} do %>
+        data: {'cell-id' => cell.id, 'droppable-elements' => cell.element_definitions.join(' ')} do %>
         <%= render partial: 'alchemy/admin/elements/element', collection: elements %>
       <% end %>
     <% end %>

data/app/views/alchemy/admin/elements/new.html.erb

@@ -11,7 +11,8 @@
   </div>
   <div id="paste_element_tab">
     <%= alchemy_form_for([:admin, @element]) do |f| %>
-      <%= f.hidden_field(:page_id) %>
+      <%= f.hidden_field :page_id %>
+      <%= f.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
         <%= select_tag 'paste_from_clipboard',

data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb

@@ -1,5 +1,5 @@
 <% if can? *navigate_module(navigation) %>
-  <%= content_tag :div, class: main_navigation_css_classes(navigation) do %>
+  <%= content_tag :div, class: main_navigation_css_classes(navigation), data: navigation["data"] do %>
     <%= link_to url_for_module(alchemy_module) do %>
       <% if navigation["image"] %>
         <%= image_tag(navigation["image"]) %>

data/lib/alchemy/config.rb

@@ -46,7 +46,8 @@ module Alchemy
       # If it does not exist, or its empty, it returns an empty Hash.
       #
       def read_file(file)
-        return YAML.load_file(file) || {} if File.exist?(file) # YAML.load_file returns false if file is empty.
+        YAML.safe_load(ERB.new(File.read(file)).result, YAML_WHITELIST_CLASSES, [], true) || {}
+      rescue Errno::ENOENT
         {}
       end
 

data/lib/alchemy/page_layout.rb

@@ -157,7 +157,7 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, [Date], [], true) || []
+          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/lib/alchemy/permissions.rb

@@ -35,7 +35,6 @@ module Alchemy
       def alchemy_guest_user_rules
         can([:show, :download], Alchemy::Attachment) { |a| !a.restricted? }
         can :see,               Alchemy::Page,       restricted: false, visible: true
-        can(:display,           Alchemy::Picture)    { |p| !p.restricted? }
 
         can :read, Alchemy::Content, Alchemy::Content.available.not_restricted do |c|
           c.public? && !c.restricted? && !c.trashed?
@@ -65,7 +64,6 @@ module Alchemy
         can [:show, :download], Alchemy::Attachment
         can :read,              Alchemy::Page,      Alchemy::Page.published, &:public?
         can :see,               Alchemy::Page,      restricted: true, visible: true
-        can :display,           Alchemy::Picture
 
         can :read, Alchemy::Content, Alchemy::Content.available do |c|
           c.public? && !c.trashed?
@@ -215,11 +213,6 @@ module Alchemy
         :unlock,
         :visit,
         to: :edit_content
-
-      alias_action :show,
-        :thumbnail,
-        :zoom,
-        to: :display
     end
 
     # Include the role specific permissions.

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.6.2"
+  VERSION = "3.6.7"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,5 +1,6 @@
 # Instantiate the global Alchemy namespace
 module Alchemy
+  Alchemy::YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
 end
 
 # Require globally used external libraries

data/lib/rails/generators/alchemy/base.rb

@@ -32,7 +32,7 @@ module Alchemy
       end
 
       def load_alchemy_yaml(name)
-        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, [Regexp], [], true)
+        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, YAML_WHITELIST_CLASSES, [], true)
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: rails generate alchemy:scaffold"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.7
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -995,7 +995,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4