alchemy_cms 3.6.5 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ba7afc95ce56fa86c022c3491a6c54df8e54beb28c55ec985776c4f058d711e3
-  data.tar.gz: 4de87182e062b2d0af03d0634446d5a351b57385887a662cd4d8077ace75d91d
+SHA1:
+  metadata.gz: 2d08ddeba7c6d9ee72222fdbd1076a7e15bf0cd7
+  data.tar.gz: f1b8bf8976c1072862a962bbff039a9700aeea3e
 SHA512:
-  metadata.gz: 6f16a6e5bbcdbf31cd12f7044f18916e3faa0a437c660b2626651ac01ef11b089cecf03109cf188a2d53d85327908ef697cafb66a4576d22df0fb6259245b87c
-  data.tar.gz: 21f7e0f844dd8b4a2c2e3d49bdc92b7ac9aad2458ac9f47b813ece1468012732070f079bd30b1fb615a7ca7494a0d381ea69558a4cfb799e607a56114491ea18
+  metadata.gz: 20578df18e78b1f0d54bcaff824f6679b3f929d347d1c2316f85d5cbb956789c15804325cf3fdd7e3993bb9cb2ad8915ec95df157360ce6f4a675778afde1c51
+  data.tar.gz: 656afe41082692275283b7fb664490637f4a536c024bda2c0272525b032a0434c72808e954f6769e1e34cefe7cac9a3c6bcf603f53266aa6a73f55ed33a913e6

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,17 @@
 # Change Log
 
+## 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)

data/Gemfile

@@ -5,7 +5,7 @@ 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',     '~> 0.21'   if ENV['DB'] == 'postgresql'
 gem 'sassc-rails'
@@ -14,6 +14,7 @@ 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/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/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/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.6.5"
+  VERSION = "3.6.6"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2020-10-08 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
@@ -994,9 +994,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14.4
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4
 test_files: []
+...