alchemy_cms 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4f6dae82d786affd1b4646081cbbbb07cb941511d5ecccaaa90519eeae2812
-  data.tar.gz: de3ff71ff079c16441e900d001fc3c41c6fbdc3b5e6be6fccf1c6a44e3de1288
+  metadata.gz: 4789f71b73e8e1c28df8895f5fd37a5b90871f18454aa06e4a43b1d7449ecdfb
+  data.tar.gz: df714e6c16fef1e84749c65c3a43b2105a45d90d11a90f633bef27980766c6c9
 SHA512:
-  metadata.gz: 80dc6505c9e9187bff95298e535f2e56d0d7e0dec99277ba5faae20a47fa7d5657f603a954c73aaca13af8ce8d8e4ce8a73a1dc4b89674b05db9744ca4c876f7
-  data.tar.gz: e46ae367795d98244ec710ba3819b61de1b38e9c029a926c1a640b4d02261bc21983133adc82360ab0e2e1b7cdc3b803220e016142db8dd5707954f6297cdb45
+  metadata.gz: '08acde8f5cde62a637166deb21acf95dc5496be094aaf6655403e386f4b1a8b3796ca9b45376c9013a13673a0758159d151590208350da4fec5bbca544b217c4'
+  data.tar.gz: 2722b7268f01d730a2ae343189c5e145b786ae39dfdce80d61889776870c3e4badace52e97a888b483e236229f8a19a86b10dc8a8914a329c1213d51154053ea

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## 4.0.4 (2018-09-05)
+
+- Allow Kaminari 1.x [#1467](https://github.com/AlchemyCMS/alchemy_cms/pull/1467) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.0.3 (2018-05-14)
+
+- Add must_revalidate to cache-control header [#1340](https://github.com/AlchemyCMS/alchemy_cms/pull/1340) ([afdev82](https://github.com/afdev82))
+
+## 4.0.2 (2018-05-08)
+
+- Fix draggable trash item feature [#1429](https://github.com/AlchemyCMS/alchemy_cms/pull/1429) ([tvdeyen](https://github.com/tvdeyen))
+- Allow CanCanCan 2.x [#1418](https://github.com/AlchemyCMS/alchemy_cms/pull/1418) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.0.1 (2018-04-23)
+
+- Add more classes to YAML.safe_load [#1414](https://github.com/AlchemyCMS/alchemy_cms/pull/1414) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 4.0.0 (2017-11-06)
 
 * Fixes image cropping issues [#1320](https://github.com/AlchemyCMS/alchemy_cms/pull/1320) and [#1321](https://github.com/AlchemyCMS/alchemy_cms/pull/1321) by [tvdeyen](https://github.com/tvdeyen)

data/alchemy_cms.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
   gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']
-  gem.add_runtime_dependency 'kaminari',                         ['~> 0.15']
+  gem.add_runtime_dependency 'kaminari',                         ['>= 0.15', '< 2.0']
   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']

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

@@ -147,7 +147,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: create_element_params[: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/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/tasks/tidy.rb

@@ -117,12 +117,20 @@ module Alchemy
         end
       end
 
+      def remove_duplicate_folded_pages
+        Alchemy::FoldedPage.select(:page_id, :user_id).group(:page_id, :user_id).having("count(*) > 1").each do |duplicate_page|
+          duplicate_page_ids = Alchemy::FoldedPage.where(duplicate_page.attributes.except("id")).pluck(:id)
+          duplicate_page_ids_except_oldest = duplicate_page_ids.reject { |i| i == duplicate_page_ids.min }
+          Alchemy::FoldedPage.where(id: duplicate_page_ids_except_oldest).delete_all
+        end
+      end
+
       private
 
       def destroy_orphaned_records(records, class_name)
         records.each do |record|
           log "Destroy orphaned #{class_name}: #{record.inspect}"
-          record.destroy
+          record.reload.try(:destroy)
         end
       end
     end

data/lib/alchemy/version.rb

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

data/lib/tasks/alchemy/tidy.rake

@@ -8,6 +8,7 @@ namespace :alchemy do
       Rake::Task['alchemy:tidy:element_positions'].invoke
       Rake::Task['alchemy:tidy:content_positions'].invoke
       Rake::Task['alchemy:tidy:remove_orphaned_records'].invoke
+      Rake::Task['alchemy:tidy:remove_duplicate_folded_pages'].invoke
     end
 
     desc "Creates missing cells for pages."
@@ -56,5 +57,10 @@ namespace :alchemy do
     task remove_orphaned_contents: [:environment] do
       Alchemy::Tidy.remove_orphaned_contents
     end
+
+    desc "Remove duplicate folded pages."
+    task remove_duplicate_folded_pages: [:environment] do
+      Alchemy::Tidy.remove_duplicate_folded_pages
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -199,16 +199,22 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: originator
   requirement: !ruby/object:Gem::Requirement
@@ -1008,7 +1014,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4