alchemy_cms 3.6.6 → 4.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d08ddeba7c6d9ee72222fdbd1076a7e15bf0cd7
-  data.tar.gz: f1b8bf8976c1072862a962bbff039a9700aeea3e
+  metadata.gz: fea49a75834c1e4de115b939c2fd04639ca77174
+  data.tar.gz: e4c83f37c9a929cfa9044d8d6a022cf3b0e5947d
 SHA512:
-  metadata.gz: 20578df18e78b1f0d54bcaff824f6679b3f929d347d1c2316f85d5cbb956789c15804325cf3fdd7e3993bb9cb2ad8915ec95df157360ce6f4a675778afde1c51
-  data.tar.gz: 656afe41082692275283b7fb664490637f4a536c024bda2c0272525b032a0434c72808e954f6769e1e34cefe7cac9a3c6bcf603f53266aa6a73f55ed33a913e6
+  metadata.gz: a41485fcb8985472b02ba15ab4e9cadde62d74aa1623f8e4280e13f38fcc6bac2ad88f8d885aefffb8a49f8ffee3aba5264652260cb2496b587df24bec5607ef
+  data.tar.gz: aa3e7483fc33c9ae6bc502958ba65173d3d17df086b1a0eb377627daac908c35bea8e4a65fc2667cfb0a739c0aa74a4228c2f4d2a64504060fcd602d7ed73226

data/.travis.yml

@@ -1,18 +1,16 @@
 language: ruby
 sudo: false
-services:
-  - mysql
-  - postgresql
 cache:
   bundler: true
   directories:
     - "travis_phantomjs"
 rvm:
-- 2.3
-- 2.4
+- 2.2.6
+- 2.3.3
+- 2.4.0
 branches:
   only:
-    - 3.6-stable
+    - master
 
 before_install:
   - "phantomjs --version"
@@ -22,7 +20,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 -v "< 2"
+  - gem install bundler
 before_script: bundle exec rake alchemy:spec:prepare
 script: bundle exec rspec
 after_success: bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,31 +1,8 @@
 # Change Log
 
-## 3.6.6 (2020-10-08)
+## 4.0.0.beta (2017-06-20)
 
-- 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)
-* Do not move elements in tidy cells task [#1303](https://github.com/AlchemyCMS/alchemy_cms/pull/1303) by [tvdeyen](https://github.com/tvdeyen)
-* Add a store image file format rake task [#1302](https://github.com/AlchemyCMS/alchemy_cms/pull/1302) by [tvdeyen](https://github.com/tvdeyen)
-
-## 3.6.1 (2017-08-16)
-
-* Do not ask `systempage?` everytime we load the page definition [#1239](https://github.com/AlchemyCMS/alchemy_cms/pull/1283) by [tvdeyen](https://github.com/tvdeyen)
-  This speeds up rendering large sitemaps by about 6 times.
+* Rails 5
 
 ## 3.6.0 (2017-06-20)
 

data/Gemfile

@@ -5,16 +5,15 @@ gemspec
 # Profiling
 gem 'rack-mini-profiler', group: :development, require: false
 
-gem 'sqlite3', '~> 1.3.6' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+gem 'sqlite3' 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 'pg'      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
@@ -36,9 +35,11 @@ group :development, :test do
   gem 'rspec-activemodel-mocks', '~> 1.0'
   gem 'rspec-rails', '~> 3.0'
   gem 'shoulda-matchers', '~> 3.1'
+  gem 'rails-controller-testing', '~> 1.0'
 end
 
-# We need this if we want to start the dummy app in development mode
-group :development, :production do
-  gem 'quiet_assets'
+# 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/README.md

@@ -34,8 +34,9 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 
 ## Rails Version
 
-**This version of Alchemy CMS runs with Rails 4.2**
+**This version of Alchemy CMS runs with Rails 5.0 only**
 
+* 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).
 * For a Rails 3.2 compatible version use the [`2.8-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.8-stable).
 * For a Rails 3.1 compatible version use the [`2.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.1-stable).
@@ -45,7 +46,9 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 
 ## Ruby Version
 
-Alchemy runs with Ruby >= 2.1.0.
+Alchemy runs with Ruby >= 2.2.2.
+
+For a Ruby 2.1 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
 
 For a Ruby 2.0.0 compatible version use the [`3.2-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.2-stable).
 

data/Rakefile

@@ -39,7 +39,13 @@ namespace :alchemy do
   namespace :spec do
     desc "Prepares database for testing Alchemy"
     task :prepare do
-      system 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:drop db:create db:migrate:reset && cd -'
+      system <<-BASH
+cd spec/dummy
+export RAILS_ENV=test
+bin/rake db:environment:set
+bin/rake db:migrate:reset
+cd -
+BASH
     end
   end
 end

data/alchemy_cms.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails 4'
   gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails 4 CMS.'
   gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  gem.required_ruby_version = '>= 2.0.0'
+  gem.required_ruby_version = '>= 2.2.2'
   gem.license               = 'BSD New'
   gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   gem.require_paths         = ['lib']
@@ -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.0']
+  gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'bourbon',                          ['~> 4.2']
   gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'kaminari',                         ['~> 0.15']
   gem.add_runtime_dependency 'magiclabs-userstamp',              ['~> 3.0']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
-  gem.add_runtime_dependency 'rails',                            ['>= 4.2.0', '< 5.0']
+  gem.add_runtime_dependency 'rails',                            ['~> 5.0.0']
   gem.add_runtime_dependency 'ransack',                          ['~> 1.4']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['~> 2.0']

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

@@ -145,10 +145,7 @@ module Alchemy
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard['id'])
-        new_attributes = {
-          parent_element_id: params[:element][:parent_element_id],
-          page_id: @page.id
-        }
+        new_attributes = {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, YAML_WHITELIST_CLASSES, [], true) || []
+        ::YAML.safe_load(ERB.new(File.read(yml_file_path)).result, [], [], 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, YAML_WHITELIST_CLASSES, [], true) || []
+          ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, [Regexp, Date], [], true) || []
         else
           raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:scaffold`"
         end

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

@@ -96,6 +96,7 @@ module Alchemy
 
     # Returns the self#page_layout definition from config/alchemy/page_layouts.yml file.
     def definition
+      return {} if systempage?
       definition = PageLayout.get(page_layout)
       if definition.nil?
         log_warning "Page definition for `#{page_layout}` not found. Please check `page_layouts.yml` file."

data/app/models/alchemy/picture/url.rb

@@ -1,7 +1,5 @@
 module Alchemy
   module Picture::Url
-    include Alchemy::Logger
-
     TRANSFORMATION_OPTIONS = [
       :crop,
       :crop_from,
@@ -30,9 +28,6 @@ module Alchemy
       image = encoded_image(image, options)
 
       image.url(options.except(*TRANSFORMATION_OPTIONS).merge(name: name))
-    rescue MissingImageFileError, WrongImageFormatError => e
-      log_warning e.message
-      nil
     end
 
     private
@@ -58,10 +53,7 @@ module Alchemy
     #
     def encoded_image(image, options = {})
       target_format = options[:format] || default_render_format
-
-      unless target_format.in?(Alchemy::Picture.allowed_filetypes)
-        raise WrongImageFormatError.new(self, target_format)
-      end
+      raise WrongImageFormatError if !target_format.in?(Alchemy::Picture.allowed_filetypes)
 
       options = {
         flatten: target_format != 'gif' && image_file_format == 'gif'

data/app/models/alchemy/site.rb

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

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

@@ -10,9 +10,7 @@
         </li>
       <% end %>
     </ul>
-    <div id="cell_for_other_elements"
-      class="sortable_cell for_other_elements_cell"
-      data-droppable-elements="<%= @page.element_names_from_definition.join(' ') %>">
+    <div id="cell_for_other_elements" class="sortable_cell for_other_elements_cell">
       <%= render partial: 'alchemy/admin/elements/element',
         collection: @page.elements.not_trashed.not_in_cell %>
     </div>
@@ -20,7 +18,7 @@
       <%= content_tag :div,
         id: "cell_#{cell.name}",
         class: ["sortable_cell", "#{cell.name}_cell"].join(' '),
-        data: {'cell-id' => cell.id, 'droppable-elements' => cell.element_definitions.join(' ')} do %>
+        data: {'cell-id' => cell.id, 'data-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,8 +11,7 @@
   </div>
   <div id="paste_element_tab">
     <%= alchemy_form_for([:admin, @element]) do |f| %>
-      <%= f.hidden_field :page_id %>
-      <%= f.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
+      <%= f.hidden_field(:page_id) %>
       <div class="input select">
         <label for="paste_from_clipboard" class="control-label"><%= Alchemy.t("Element") %></label>
         <%= select_tag 'paste_from_clipboard',

data/bin/spring

@@ -7,9 +7,10 @@ unless defined?(Spring)
   require 'rubygems'
   require 'bundler'
 
-  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
-    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
-    gem 'spring', match[1]
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  if spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
     require 'spring/binstub'
   end
 end

data/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb

@@ -1,6 +1,18 @@
 class AddImageFileFormatToAlchemyPictures < ActiveRecord::Migration
   def up
     add_column :alchemy_pictures, :image_file_format, :string
+
+    say_with_time "Storing file format of existing pictures" do
+      Alchemy::Picture.all.each do |pic|
+        begin
+          format = pic.image_file.identify('-ping -format "%m"')
+          pic.update_column('image_file_format', format.to_s.chomp.downcase)
+        rescue Dragonfly::Job::Fetch::NotFound => e
+          say(e.message, true)
+        end
+      end
+      Alchemy::Picture.count
+    end
   end
 
   def down

data/lib/alchemy/config.rb

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

data/lib/alchemy/errors.rb

@@ -55,14 +55,9 @@ module Alchemy
 
   # Raised if calling +image_file+ on a Picture object returns nil.
   class WrongImageFormatError < StandardError
-    def initialize(image, requested_format)
-      @image = image
-      @requested_format = requested_format
-    end
-
     def message
       allowed_filetypes = Alchemy::Picture.allowed_filetypes.map(&:upcase).to_sentence
-      "Requested image format (#{@requested_format.inspect}) for #{@image.inspect} is not one of allowed filetypes (#{allowed_filetypes})."
+      "Requested image format is not one of allowed filetypes (#{allowed_filetypes})."
     end
   end
 

data/lib/alchemy/logger.rb

@@ -7,7 +7,7 @@ module Alchemy
     end
 
     def log_warning(message)
-      Alchemy::Logger.warn(message, caller(1..1))
+      Alchemy::Logger.warn(message, caller(0..0))
     end
   end
 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, YAML_WHITELIST_CLASSES, [], true) || []
+          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, [Date], [], true) || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/lib/alchemy/permissions.rb

@@ -35,6 +35,7 @@ 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?
@@ -64,6 +65,7 @@ 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?
@@ -213,6 +215,11 @@ module Alchemy
         :unlock,
         :visit,
         to: :edit_content
+
+      alias_action :show,
+        :thumbnail,
+        :zoom,
+        to: :display
     end
 
     # Include the role specific permissions.

data/lib/alchemy/upgrader/three_point_four.rb

@@ -6,30 +6,5 @@ module Alchemy
       desc 'Install asset manifests into `vendor/assets`'
       Alchemy::Upgrader::Tasks::InstallAssetManifests.new.install
     end
-
-    def self.store_image_file_format
-      desc 'Store image file format'
-      pictures = Alchemy::Picture.where(image_file_format: nil)
-      count = pictures.size
-      converted_pics = 0
-      errored_pics = 0
-      puts "-- Storing file format of #{count} pictures"
-      pictures.find_each(batch_size: 100).with_index do |pic, i|
-        begin
-          puts "   -> Reading file format of #{pic.image_file_name} (#{i + 1}/#{count})"
-          format = pic.image_file.identify('-ping -format "%m"')
-          pic.update_column('image_file_format', format.to_s.chomp.downcase)
-          converted_pics += 1
-        rescue Dragonfly::Job::Fetch::NotFound => e
-          puts "   -> #{e.message}"
-          errored_pics += 1
-        end
-      end
-      puts "-- Done! Converted #{converted_pics} images."
-      unless errored_pics.zero?
-        puts "   !! But #{errored_pics} images caused errors."
-        puts "      Please check errors above and re-run `rake alchemy:upgrade:3.4:store_image_file_format`"
-      end
-    end
   end
 end

data/lib/alchemy/version.rb

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

data/lib/alchemy_cms.rb

@@ -1,6 +1,5 @@
 # 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, YAML_WHITELIST_CLASSES, [], true)
+        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, [Regexp], [], true)
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: rails generate alchemy:scaffold"
       end

data/lib/tasks/alchemy/tidy.rake

@@ -1,4 +1,4 @@
-require 'alchemy/tasks/tidy'
+require 'alchemy/shell'
 
 namespace :alchemy do
   namespace :tidy do
@@ -58,3 +58,131 @@ namespace :alchemy do
     end
   end
 end
+
+module Alchemy
+  class Tidy
+    extend Shell
+
+    class << self
+      def create_missing_cells(page_layouts, cells)
+        page_layouts.each do |layout|
+          next if layout['cells'].blank?
+          cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
+          Alchemy::Page.where(page_layout: layout['name']).each do |page|
+            cells_for_layout.each do |cell_for_layout|
+              cell = Alchemy::Cell.find_or_initialize_by(name: cell_for_layout['name'], page_id: page.id)
+              cell.elements << page.elements.select { |element| cell_for_layout['elements'].include?(element.name) }
+              if cell.new_record?
+                cell.save
+                log "Creating cell #{cell.name} for page #{page.name}"
+              else
+                log "Cell #{cell.name} for page #{page.name} already present", :skip
+              end
+            end
+          end
+        end
+      end
+
+      def update_element_positions
+        Alchemy::Page.all.each do |page|
+          if page.elements.any?
+            puts "\n## Updating element positions of page `#{page.name}`"
+          end
+          page.elements.group_by(&:cell_id).each do |_cell_id, elements|
+            elements.each_with_index do |element, idx|
+              position = idx + 1
+              if element.position != position
+                log "Updating position for element ##{element.id} to #{position}"
+                element.update_column(:position, position)
+              else
+                log "Position for element ##{element.id} is already correct (#{position})", :skip
+              end
+            end
+          end
+        end
+      end
+
+      def update_content_positions
+        Alchemy::Element.all.each do |element|
+          if element.contents.any?
+            puts "\n## Updating content positions of element `#{element.name}`"
+          end
+          element.contents.group_by(&:essence_type).each do |essence_type, contents|
+            puts "-> Contents of type `#{essence_type}`"
+            contents.each_with_index do |content, idx|
+              position = idx + 1
+              if content.position != position
+                log "Updating position for content ##{content.id} to #{position}"
+                content.update_column(:position, position)
+              else
+                log "Position for content ##{content.id} is already correct (#{position})", :skip
+              end
+            end
+          end
+        end
+      end
+
+      def remove_orphaned_cells
+        puts "\n## Removing orphaned cells"
+        cells = Alchemy::Cell.unscoped.all
+        if cells.any?
+          orphaned_cells = cells.select do |cell|
+            cell.page.nil? && cell.page_id.present?
+          end
+          if orphaned_cells.any?
+            destroy_orphaned_records(orphaned_cells, 'cell')
+          else
+            log "No orphaned cells found", :skip
+          end
+        else
+          log "No cells found", :skip
+        end
+      end
+
+      def remove_orphaned_elements
+        puts "\n## Removing orphaned elements"
+        elements = Alchemy::Element.unscoped.all
+        if elements.any?
+          orphaned_elements = elements.select do |element|
+            element.page.nil? && element.page_id.present? ||
+              element.cell.nil? && element.cell_id.present?
+          end
+          if orphaned_elements.any?
+            destroy_orphaned_records(orphaned_elements, 'element')
+          else
+            log "No orphaned elements found", :skip
+          end
+        else
+          log "No elements found", :skip
+        end
+      end
+
+      def remove_orphaned_contents
+        puts "\n## Removing orphaned contents"
+        contents = Alchemy::Content.unscoped.all
+        if contents.any?
+          orphaned_contents = contents.select do |content|
+            content.essence.nil? && content.essence_id.present? ||
+              content.element.nil? && content.element_id.present?
+          end
+          if orphaned_contents.any?
+            destroy_orphaned_records(orphaned_contents, 'content')
+          else
+            log "No orphaned contents found", :skip
+          end
+        else
+          log "No contents found", :skip
+        end
+      end
+
+      private
+
+      def destroy_orphaned_records(records, class_name)
+        records.each do |record|
+          log "Destroy orphaned #{class_name}: #{record.id}"
+          record.destroy
+        end
+      end
+    end
+  end
+end

data/lib/tasks/alchemy/upgrade.rake

@@ -148,20 +148,12 @@ namespace :alchemy do
     task '3.4' => ['alchemy:upgrade:prepare', 'alchemy:upgrade:3.4:run']
 
     namespace '3.4' do
-      task run: [
-        'alchemy:upgrade:3.4:install_asset_manifests',
-        'alchemy:upgrade:3.4:store_image_file_format'
-      ]
+      task run: ['alchemy:upgrade:3.4:install_asset_manifests']
 
       desc 'Install asset manifests into `vendor/assets`'
       task install_asset_manifests: [:environment] do
         Alchemy::Upgrader::ThreePointFour.install_asset_manifests
       end
-
-      desc 'Store image file format on Alchemy pictures.'
-      task store_image_file_format: [:environment] do
-        Alchemy::Upgrader::ThreePointFour.store_image_file_format
-      end
     end
 
     desc 'Upgrade Alchemy to v3.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 4.0.0.beta
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2017-06-20 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.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -229,22 +229,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -847,7 +841,6 @@ files:
 - lib/alchemy/shell.rb
 - lib/alchemy/ssl_protection.rb
 - lib/alchemy/tasks/helpers.rb
-- lib/alchemy/tasks/tidy.rb
 - lib/alchemy/test_support/config_stubbing.rb
 - lib/alchemy/test_support/controller_requests.rb
 - lib/alchemy/test_support/essence_shared_examples.rb
@@ -986,18 +979,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubyforge_project:
-rubygems_version: 2.6.14.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.12
+signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4
 test_files: []
-...

data/lib/alchemy/tasks/tidy.rb

@@ -1,130 +0,0 @@
-require 'alchemy/shell'
-
-module Alchemy
-  class Tidy
-    extend Shell
-
-    class << self
-      def create_missing_cells(page_layouts, cells)
-        page_layouts.each do |layout|
-          next if layout['cells'].blank?
-          cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
-          Alchemy::Page.where(page_layout: layout['name']).each do |page|
-            cells_for_layout.each do |cell_for_layout|
-              cell = Alchemy::Cell.find_or_initialize_by(name: cell_for_layout['name'], page_id: page.id)
-              if cell.new_record?
-                log "Creating cell #{cell.name} for page #{page.name}"
-              else
-                log "Cell #{cell.name} for page #{page.name} already present", :skip
-              end
-            end
-          end
-        end
-      end
-
-      def update_element_positions
-        Alchemy::Page.all.each do |page|
-          if page.elements.any?
-            puts "\n## Updating element positions of page `#{page.name}`"
-          end
-          page.elements.group_by(&:cell_id).each do |_cell_id, elements|
-            elements.each_with_index do |element, idx|
-              position = idx + 1
-              if element.position != position
-                log "Updating position for element ##{element.id} to #{position}"
-                element.update_column(:position, position)
-              else
-                log "Position for element ##{element.id} is already correct (#{position})", :skip
-              end
-            end
-          end
-        end
-      end
-
-      def update_content_positions
-        Alchemy::Element.all.each do |element|
-          if element.contents.any?
-            puts "\n## Updating content positions of element `#{element.name}`"
-          end
-          element.contents.group_by(&:essence_type).each do |essence_type, contents|
-            puts "-> Contents of type `#{essence_type}`"
-            contents.each_with_index do |content, idx|
-              position = idx + 1
-              if content.position != position
-                log "Updating position for content ##{content.id} to #{position}"
-                content.update_column(:position, position)
-              else
-                log "Position for content ##{content.id} is already correct (#{position})", :skip
-              end
-            end
-          end
-        end
-      end
-
-      def remove_orphaned_cells
-        puts "\n## Removing orphaned cells"
-        cells = Alchemy::Cell.unscoped.all
-        if cells.any?
-          orphaned_cells = cells.select do |cell|
-            cell.page.nil? && cell.page_id.present?
-          end
-          if orphaned_cells.any?
-            log "Found #{orphaned_cells.size} orphaned cells"
-            destroy_orphaned_records(orphaned_cells, 'cell')
-          else
-            log "No orphaned cells found", :skip
-          end
-        else
-          log "No cells found", :skip
-        end
-      end
-
-      def remove_orphaned_elements
-        puts "\n## Removing orphaned elements"
-        elements = Alchemy::Element.unscoped.all
-        if elements.any?
-          orphaned_elements = elements.select do |element|
-            element.page.nil? && element.page_id.present? ||
-              element.cell.nil? && element.cell_id.present?
-          end
-          if orphaned_elements.any?
-            log "Found #{orphaned_elements.size} orphaned elements"
-            destroy_orphaned_records(orphaned_elements, 'element')
-          else
-            log "No orphaned elements found", :skip
-          end
-        else
-          log "No elements found", :skip
-        end
-      end
-
-      def remove_orphaned_contents
-        puts "\n## Removing orphaned contents"
-        contents = Alchemy::Content.unscoped.all
-        if contents.any?
-          orphaned_contents = contents.select do |content|
-            content.essence.nil? && content.essence_id.present? ||
-              content.element.nil? && content.element_id.present?
-          end
-          if orphaned_contents.any?
-            log "Found #{orphaned_contents.size} orphaned contents"
-            destroy_orphaned_records(orphaned_contents, 'content')
-          else
-            log "No orphaned contents found", :skip
-          end
-        else
-          log "No contents found", :skip
-        end
-      end
-
-      private
-
-      def destroy_orphaned_records(records, class_name)
-        records.each do |record|
-          log "Destroy orphaned #{class_name}: #{record.inspect}"
-          record.destroy
-        end
-      end
-    end
-  end
-end