RubyGems - alchemy_cms - Versions diffs - 3.4.2 → 3.5.0.rc1 - Mend

alchemy_cms 3.4.2 → 3.5.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (247) hide show

data/lib/alchemy/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.4.2"
+  VERSION = "3.5.0.rc1"
   def self.version
     VERSION

data/lib/rails/generators/alchemy/elements/templates/view.html.erb CHANGED

@@ -4,7 +4,7 @@
     <div class="<%= @element_name %>_images">
       <%%- element.contents.gallery_pictures.each do |image| -%>
       <div class="<%= @element_name %>_image <%%= image.essence.css_class %>">
-        <%%= render_essence_view(image, image_size: '160x120') %>
+        <%%= render_essence_view(image, size: '160x120') %>
       </div>
       <%%- end -%>
     </div>

data/lib/rails/generators/alchemy/elements/templates/view.html.haml CHANGED

@@ -4,7 +4,7 @@
     .<%= @element_name %>_images
       - element.contents.gallery_pictures.each do |image|
         .<%= @element_name %>_image{class: image.essence.css_class}
-          = render_essence_view(image, image_size: "160x120")
+          = render_essence_view(image, size: "160x120")
   <%- end -%>
   <%- @contents.each do |content| -%>
     <%- if @contents.length > 1 -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.slim CHANGED

@@ -4,7 +4,7 @@
     .<%= @element_name %>_images
       - element.contents.gallery_pictures.each do |image|
         .<%= @element_name %>_image class=image.essence.css_class
-          = render_essence_view(image, image_size: "160x120")
+          = render_essence_view(image, size: "160x120")
   <%- end -%>
   <%- @contents.each do |content| -%>
     <%- if @contents.length > 1 -%>

data/lib/rails/generators/alchemy/essence/templates/editor.html.erb CHANGED

@@ -5,13 +5,11 @@
   Please consult Alchemy::Content.rb docs for further methods on the content object
 %>
-<%% cache(content) do %>
 <div class="content_editor <%= @essence_name.classify.demodulize.underscore %>" id="<%%= content.dom_id %>" data-content-id="<%%= content.id %>">
   <%%= content_label(content) %>
   <%%= text_field_tag(
     content.form_field_name,
     content.ingredient,
-    :id => content.form_field_id
+    id: content.form_field_id
   ) %>
 </div>
-<%% end %>

data/lib/rails/generators/alchemy/install/files/_article_view.html.erb CHANGED

@@ -1,7 +1,7 @@
 <%- cache(element) do -%>
   <%= element_view_for(element, tag: 'article') do |el| -%>
     <h2><%= el.render :headline %></h2>
-    <%= el.render :picture, image_size: '1200x600' %>
+    <%= el.render :picture, size: '1200x600' %>
     <%= el.render :text %>
   <%- end -%>
 <%- end -%>

data/lib/rails/generators/alchemy/install/files/application.html.erb CHANGED

@@ -1,14 +1,13 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= @page.language_code %>">
 <head>
-  <%= render_meta_data %>
+  <%= render "alchemy/pages/meta_data" %>
   <%= stylesheet_link_tag 'application', media: 'all' %>
   <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
   <%= yield %>
-  <%= alchemy_preview_mode_code %>
-  <%= render "alchemy/menubar" %>
+  <%= render "alchemy/edit_mode" %>
 </body>
 </html>

data/lib/rails/generators/alchemy/install/install_generator.rb CHANGED

@@ -55,6 +55,10 @@ module Alchemy
         end
       end
+      def copy_dragonfly_config
+        template "#{current_path}/templates/dragonfly.rb.tt", "config/initializers/dragonfly.rb"
+      end
       private
       def config_path

data/lib/rails/generators/alchemy/install/templates/dragonfly.rb.tt ADDED

@@ -0,0 +1,35 @@
+# AlchemyCMS Dragonfly configuration.
+#
+# Consider using some kind of caching solution for image processing.
+# For small projects, we have good experience with Rack::Cache.
+#
+# Larger installations should consider using a CDN, start reading
+# http://markevans.github.io/dragonfly/cache/
+#
+# A complete reference can be found at
+# http://markevans.github.io/dragonfly/configuration/
+#
+# Pictures
+#
+Dragonfly.app(:alchemy_pictures).configure do
+  dragonfly_url nil
+  plugin :imagemagick
+  plugin :svg
+  secret '<%= SecureRandom.hex(32) %>'
+  url_format '/pictures/:job/:name.:ext'
+  datastore :file,
+    root_path: Rails.root.join('uploads/pictures').to_s,
+    server_root: Rails.root.join('public'),
+    store_meta: false
+end
+# Mount as middleware
+Rails.application.middleware.use Dragonfly::Middleware, :alchemy_pictures
+# Attachments
+Dragonfly.app(:alchemy_attachments).configure do
+  datastore :file,
+    root_path:  Rails.root.join('uploads/attachments').to_s,
+    store_meta: false
+end

data/lib/rails/generators/alchemy/module/module_generator.rb CHANGED

@@ -20,7 +20,7 @@ module Alchemy
       def copy_templates
         template "controller.rb.tt", "app/controllers/admin/#{@controller_name}_controller.rb"
-        template "ability.rb.tt", "app/models/#{@module_name}_ability.rb"
+        template "ability.rb.tt", 'app/models', "alchemy_#{@module_name}_ability.rb"
         template "module_config.rb.tt", "config/initializers/alchemy_#{@module_name}.rb"
       end
     end

data/lib/tasks/alchemy/db.rake CHANGED

@@ -1,9 +1,15 @@
 require 'shellwords'
+require 'alchemy/seeder'
 require 'alchemy/tasks/helpers'
 include Alchemy::Tasks::Helpers
 namespace :alchemy do
   namespace :db do
+    desc "Seeds the database with Alchemy defaults"
+    task seed: [:environment] do
+      Alchemy::Seeder.seed!
+    end
     desc "Dumps the database to STDOUT (Pass DUMP_FILENAME to store the dump into a file)."
     task dump: :environment do
       dump_store = ENV['DUMP_FILENAME'] ? " > #{ENV['DUMP_FILENAME']}" : ""

data/lib/tasks/alchemy/tidy.rake CHANGED

@@ -7,6 +7,7 @@ namespace :alchemy do
       Rake::Task['alchemy:tidy:cells'].invoke
       Rake::Task['alchemy:tidy:element_positions'].invoke
       Rake::Task['alchemy:tidy:content_positions'].invoke
+      Rake::Task['alchemy:tidy:remove_orphaned_records'].invoke
     end
     desc "Creates missing cells for pages."
@@ -33,6 +34,28 @@ namespace :alchemy do
     task content_positions: [:environment] do
       Alchemy::Tidy.update_content_positions
     end
+    desc "Remove orphaned records (cells, elements, contents)."
+    task remove_orphaned_records: [:environment] do
+      Rake::Task['alchemy:tidy:remove_orphaned_cells'].invoke
+      Rake::Task['alchemy:tidy:remove_orphaned_elements'].invoke
+      Rake::Task['alchemy:tidy:remove_orphaned_contents'].invoke
+    end
+    desc "Remove orphaned cells."
+    task remove_orphaned_cells: [:environment] do
+      Alchemy::Tidy.remove_orphaned_cells
+    end
+    desc "Remove orphaned elements."
+    task remove_orphaned_elements: [:environment] do
+      Alchemy::Tidy.remove_orphaned_elements
+    end
+    desc "Remove orphaned contents."
+    task remove_orphaned_contents: [:environment] do
+      Alchemy::Tidy.remove_orphaned_contents
+    end
   end
 end
@@ -97,5 +120,67 @@ module Alchemy
         end
       end
     end
+    def self.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 self.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 self.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 self.destroy_orphaned_records(records, class_name)
+      records.each do |record|
+        log "Destroy orphaned #{class_name}: #{record.id}"
+        record.destroy
+      end
+    end
   end
 end

data/lib/tasks/alchemy/upgrade.rake CHANGED

@@ -2,25 +2,36 @@ require 'alchemy/upgrader'
 require 'alchemy/version'
 namespace :alchemy do
-  desc "Upgrades database content to Alchemy CMS v#{Alchemy::VERSION} (Set UPGRADE env variable to only run a specific task)."
-  task upgrade: :environment do
-    Alchemy::Upgrader.run!
+  desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
+  task upgrade: [
+    'alchemy:upgrade:prepare',
+    'alchemy:upgrade:3.0:run', 'alchemy:upgrade:3.0:todo',
+    'alchemy:upgrade:3.1:todo',
+    'alchemy:upgrade:3.2:run', 'alchemy:upgrade:3.2:todo',
+    'alchemy:upgrade:3.3:run', 'alchemy:upgrade:3.3:todo',
+    'alchemy:upgrade:3.4:run',
+    'alchemy:upgrade:3.5:run', 'alchemy:upgrade:3.5:todo'
+  ] do
+    Alchemy::Upgrader.display_todos
   end
   namespace :upgrade do
-    desc "List all available upgrade tasks."
-    task list: [:environment] do
-      puts "\nAvailable upgrade tasks"
-      puts "-----------------------\n"
-      methods = Alchemy::Upgrader.all_upgrade_tasks
-      if methods.any?
-        methods.each { |method| puts method }
-        puts "\nUsage:"
-        puts "------"
-        puts "Run one or more tasks with `bundle exec rake alchemy:upgrade UPGRADE=task_name1,task_name2`\n"
-      else
-        puts "No upgrades available."
-      end
+    desc 'Alchemy Upgrader: Prepares the database and updates Alchemys configuration file.'
+    task prepare: [
+      'alchemy:upgrade:database',
+      'alchemy:upgrade:config'
+    ]
+    desc "Alchemy Upgrader: Prepares the database."
+    task :database => [
+      'alchemy:install:migrations',
+      'db:migrate',
+      'alchemy:db:seed'
+    ]
+    desc "Alchemy Upgrader: Copy configuration file."
+    task config: [:environment] do |t|
+      Alchemy::Upgrader.copy_new_config_file
     end
     task fix_picture_format: [:environment] do
@@ -28,5 +39,143 @@ namespace :alchemy do
         picture.update_column(:image_file_format, picture.image_file_format.to_s.chomp)
       end
     end
+    desc 'Upgrade Alchemy to v3.0'
+    task '3.0' => [
+      'alchemy:upgrade:prepare',
+      'alchemy:upgrade:3.0:run',
+      'alchemy:upgrade:3.0:todo'
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
+    namespace '3.0' do
+      task run: [
+        'alchemy:upgrade:3.0:rename_registered_role_ro_member',
+        'alchemy:upgrade:3.0:publish_unpublished_public_pages'
+      ]
+      desc 'Rename the `registered` user role to `member`'
+      task rename_registered_role_ro_member: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointZero.rename_registered_role_ro_member
+      end
+      desc 'Sets `published_at` of public pages without a `published_at` date set to their `updated_at` value'
+      task publish_unpublished_public_pages: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointZero.publish_unpublished_public_pages
+      end
+      task :todo do |t|
+        Alchemy::Upgrader::ThreePointZero.alchemy_3_0_todos
+      end
+    end
+    desc 'Upgrade Alchemy to v3.1'
+    task '3.1' => [
+      'alchemy:upgrade:prepare',
+      'alchemy:upgrade:3.1:todo'
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
+    namespace '3.1' do
+      task :todo do |t|
+        Alchemy::Upgrader::ThreePointOne.alchemy_3_1_todos
+      end
+    end
+    desc 'Upgrade Alchemy to v3.2'
+    task '3.2' => [
+      'alchemy:upgrade:prepare',
+      'alchemy:upgrade:3.2:run',
+      'alchemy:upgrade:3.2:todo'
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
+    namespace '3.2' do
+      task run: [
+        'alchemy:upgrade:3.2:upgrade_acts_as_taggable_on_migrations',
+        'alchemy:upgrade:3.2:inject_seeder'
+      ]
+      desc 'Install and patch acts_as_taggable_on migrations.'
+      task upgrade_acts_as_taggable_on_migrations: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointTwo.upgrade_acts_as_taggable_on_migrations
+      end
+      desc 'Add Alchemy seeder to `db/seeds.rb` file.'
+      task inject_seeder: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointTwo.inject_seeder
+      end
+      task :todo do |t|
+        Alchemy::Upgrader::ThreePointTwo.alchemy_3_2_todos
+      end
+    end
+    desc 'Upgrade Alchemy to v3.3'
+    task '3.3' => [
+      'alchemy:upgrade:prepare',
+      'alchemy:upgrade:3.3:run',
+      'alchemy:upgrade:3.3:todo'
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
+    namespace '3.3' do
+      task run: [
+        'alchemy:upgrade:3.3:convert_available_contents',
+        'alchemy:upgrade:3.3:migrate_existing_elements'
+      ]
+      desc 'Convert `available_contents` config to `nestable_elements`.'
+      task convert_available_contents: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointThree.convert_available_contents
+      end
+      desc 'Migrate existing elements to `nestable_elements`.'
+      task migrate_existing_elements: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointThree.migrate_existing_elements
+      end
+      task :todo do |t|
+        Alchemy::Upgrader::ThreePointThree.alchemy_3_3_todos
+      end
+    end
+    desc 'Upgrade Alchemy to v3.4'
+    task '3.4' => ['alchemy:upgrade:prepare', 'alchemy:upgrade:3.4:run']
+    namespace '3.4' do
+      task run: ['alchemy:upgrade:3.4:install_asset_manifests']
+      desc 'Install asset manifests into `vendor/assets`'
+      task install_asset_manifests: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointFour.install_asset_manifests
+      end
+    end
+    desc 'Upgrade Alchemy to v3.5'
+    task '3.5' => [
+      'alchemy:upgrade:prepare',
+      'alchemy:upgrade:3.5:run',
+      'alchemy:upgrade:3.5:todo'
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
+    namespace '3.5' do
+      task run: ['alchemy:upgrade:3.5:install_dragonfly_config']
+      desc 'Install dragonfly config into `config/initializers`'
+      task install_dragonfly_config: [:environment] do |t|
+        Alchemy::Upgrader::ThreePointFive.install_dragonfly_config
+      end
+      task :todo do |t|
+        Alchemy::Upgrader::ThreePointFive.alchemy_3_5_todos
+      end
+    end
   end
 end