alchemy_cms 4.0.0.rc2 → 4.0.0

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

@@ -1,6 +1,6 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_attachment, class: 'Alchemy::Attachment' do
     file File.new(Alchemy::Engine.root.join('lib', 'alchemy', 'test_support', 'fixtures', 'image.png'))
     name 'image'

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

@@ -1,9 +1,9 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/test_support/factories/page_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_cell, class: 'Alchemy::Cell' do
-    page { Alchemy::Page.find_by(language_root: true) || FactoryGirl.create(:alchemy_page, :language_root) }
+    page { Alchemy::Page.find_by(language_root: true) || FactoryBot.create(:alchemy_page, :language_root) }
     name "a_cell"
   end
 end

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

@@ -1,7 +1,7 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/test_support/factories/essence_text_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_content, class: 'Alchemy::Content' do
     name "text"
     essence_type "Alchemy::EssenceText"

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

@@ -1,6 +1,6 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_dummy_user, class: 'DummyUser' do
     sequence(:email) { |n| "john.#{n}@doe.com" }
     password 's3cr3t'

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

@@ -1,6 +1,6 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_element, class: 'Alchemy::Element' do
     name 'article'
     create_contents_after_create false

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

@@ -1,7 +1,7 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/test_support/factories/attachment_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_essence_file, class: 'Alchemy::EssenceFile' do
     attachment factory: :alchemy_attachment
   end

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

@@ -1,7 +1,7 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/test_support/factories/picture_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_essence_picture, class: 'Alchemy::EssencePicture' do
     picture factory: :alchemy_picture
   end

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

@@ -1,6 +1,6 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_essence_text, class: 'Alchemy::EssenceText' do
     body 'This is a headline'
   end

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

@@ -1,7 +1,7 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/test_support/factories/site_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_language, class: 'Alchemy::Language' do
     name 'Deutsch'
     code 'de'

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

@@ -1,15 +1,15 @@
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/test_support/factories/language_factory'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_page, class: 'Alchemy::Page' do
-    language { Alchemy::Language.default || FactoryGirl.create(:alchemy_language) }
+    language { Alchemy::Language.default || FactoryBot.create(:alchemy_language) }
     sequence(:name) { |n| "A Page #{n}" }
     page_layout "standard"
 
     parent_id do
       (Alchemy::Page.find_by(language_root: true) ||
-        FactoryGirl.create(:alchemy_page, :language_root)).id
+        FactoryBot.create(:alchemy_page, :language_root)).id
     end
 
     # This speeds up creating of pages dramatically.

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

@@ -1,6 +1,6 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_picture, class: 'Alchemy::Picture' do
     image_file File.new(Alchemy::Engine.root.join('lib', 'alchemy', 'test_support', 'fixtures', 'image.png'))
     name 'image'

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

@@ -1,6 +1,6 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :alchemy_site, class: 'Alchemy::Site' do
     name 'A Site'
     host 'domain.com'

data/lib/alchemy/upgrader/three_point_four.rb

@@ -8,6 +8,31 @@ module Alchemy
         Alchemy::Upgrader::Tasks::InstallAssetManifests.new.install
       end
 
+      def 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
+
       def alchemy_3_4_todos
         notice = <<-NOTE
 

data/lib/alchemy/version.rb

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

data/lib/tasks/alchemy/tidy.rake

@@ -1,4 +1,4 @@
-require 'alchemy/shell'
+require 'alchemy/tasks/tidy'
 
 namespace :alchemy do
   namespace :tidy do
@@ -58,131 +58,3 @@ 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,13 +148,21 @@ 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']
+      task run: [
+        'alchemy:upgrade:3.4:install_asset_manifests',
+        'alchemy:upgrade:3.4:store_image_file_format'
+      ]
 
       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
+
       task :todo do
         Alchemy::Upgrader::ThreePointFour.alchemy_3_4_todos
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -118,6 +118,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
@@ -125,6 +128,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
 - !ruby/object:Gem::Dependency
@@ -203,14 +209,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: non-stupid-digest-assets
   requirement: !ruby/object:Gem::Requirement
@@ -231,14 +237,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -842,6 +854,7 @@ 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
@@ -983,13 +996,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4