alchemy_cms 2.6.3 → 2.7.0

data/lib/alchemy/resource.rb

@@ -94,11 +94,6 @@ module Alchemy
       @_resource_name ||= resources_name.singularize
     end
 
-    def model_name
-      ActiveSupport::Deprecation.warn("model_name is deprecated. Please use resource_name instead!")
-      resource_name
-    end
-
     def namespaced_resource_name
       return @_namespaced_resource_name unless @_namespaced_resource_name.nil?
       resource_name_array = resource_array
@@ -106,11 +101,6 @@ module Alchemy
       @_namespaced_resource_name = resource_name_array.join('_').singularize
     end
 
-    def namespaced_model_name
-      ActiveSupport::Deprecation.warn("namespaced_model_name is deprecated. Please use namespaced_resource_name instead!")
-      namespaced_resource_name
-    end
-
     def permission_scope
       #(resource_namespaced? ? "#{resource_namespace.underscore}_admin_#{resources_name}" : "admin_#{resources_name}").to_sym
       @_permission = @controller_path.gsub('/', '_').to_sym

data/lib/alchemy/resources_helper.rb

@@ -52,11 +52,6 @@ module Alchemy
       resource_handler.permission_scope
     end
 
-    def resource_model_name
-      ActiveSupport::Deprecation.warn("resource_model_name is deprecated. Please use resource_name instead!")
-      resource_handler.resource_name
-    end
-
     def resource_name
       resource_handler.resource_name
     end

data/lib/alchemy/seeder.rb

@@ -1,8 +1,7 @@
-require "#{File.dirname(__FILE__)}/shell"
+require "alchemy/shell"
 
 module Alchemy
   class Seeder
-
     extend Shell
 
     class << self
@@ -14,36 +13,6 @@ module Alchemy
         create_root_page
       end
 
-    private
-
-      def desc(message)
-        puts "\n#{message}"
-        puts "#{'-' * message.length}\n"
-      end
-
-      def todo(todo)
-        add_todo todo
-      end
-
-      def add_todo(todo)
-        todos << todo
-      end
-
-      def todos
-        @@todos ||= []
-      end
-
-      def display_todos
-        if todos.length > 0
-          log "\nTODOS:", :message
-          log "------\n", :message
-          todos.each_with_index do |todo, i|
-            log "\n#{i+1}. ", :message
-            log todo, :message
-          end
-        end
-      end
-
     protected
 
       def create_default_site

data/lib/alchemy/shell.rb

@@ -4,10 +4,15 @@ require 'thor/shell/color'
 module Alchemy
 
   # Provides methods for collecting sentences and displaying them
-  # in a list on the shell / log 
+  # in a list on the shell / log
   #
   module Shell
 
+    def desc(message)
+      puts "\n#{message}"
+      puts "#{'-' * message.length}\n"
+    end
+
     def todo(todo)
       add_todo todo
     end

data/lib/alchemy/tinymce.rb

@@ -1,46 +1,41 @@
 module Alchemy
   module Tinymce
-
     mattr_accessor :languages, :themes, :plugins, :setup
 
     @@setup = nil
-
     @@plugins = %w(alchemy_link autoresize fullscreen inlinepopups paste table)
-
     @@languages = ['en', 'de']
-
     @@themes = ['advanced']
-
     @@init = {
-      :paste_convert_headers_to_strong => true,
-      :paste_convert_middot_lists => true,
-      :paste_remove_spans => true,
-      :paste_remove_styles => true,
-      :paste_strip_class_attributes => true,
-      :theme => 'advanced',
-      :skin => 'o2k7',
-      :skin_variant => 'silver',
-      :inlinepopups_skin => 'alchemy-tinymce-dialog',
-      :popup_css => "/assets/alchemy/tinymce_dialog.css",
-      :content_css => "/assets/alchemy/tinymce_content.css",
-      :dialog_type => "modal",
-      :width => "100%",
-      :theme_advanced_resizing => true,
-      :theme_advanced_resize_horizontal => false,
-      :theme_advanced_resizing_min_height => '135',
-      :theme_advanced_toolbar_align => 'left',
-      :theme_advanced_toolbar_location => 'top',
-      :theme_advanced_statusbar_location => 'bottom',
-      :theme_advanced_buttons1 => 'bold,italic,underline,strikethrough,sub,sup,|,numlist,bullist,indent,outdent,|,alchemy_link,unlink,|,removeformat,cleanup,|,fullscreen',
-      :theme_advanced_buttons2 => 'pastetext,pasteword,charmap,code,help',
-      :theme_advanced_buttons3 => '',
-      :fix_list_elements => true,
-      :convert_urls => false,
-      :entity_encoding => "raw"
+      paste_convert_headers_to_strong: true,
+      paste_convert_middot_lists: true,
+      paste_remove_spans: true,
+      paste_remove_styles: true,
+      paste_strip_class_attributes: true,
+      theme: 'advanced',
+      skin: 'o2k7',
+      skin_variant: 'silver',
+      inlinepopups_skin: 'alchemy-tinymce-dialog',
+      popup_css: "/assets/alchemy/tinymce_dialog.css",
+      content_css: "/assets/alchemy/tinymce_content.css",
+      dialog_type: "modal",
+      width: "100%",
+      theme_advanced_resizing: true,
+      theme_advanced_resize_horizontal: false,
+      theme_advanced_resizing_min_height: '135',
+      theme_advanced_toolbar_align: 'left',
+      theme_advanced_toolbar_location: 'top',
+      theme_advanced_statusbar_location: 'bottom',
+      theme_advanced_buttons1: 'bold,italic,underline,strikethrough,sub,sup,|,numlist,bullist,indent,outdent,|,alchemy_link,unlink,|,removeformat,cleanup,|,fullscreen',
+      theme_advanced_buttons2: 'pastetext,pasteword,charmap,code,help',
+      theme_advanced_buttons3: '',
+      fix_list_elements: true,
+      convert_urls: false,
+      entity_encoding: "raw"
     }
 
     def self.init=(settings)
-      @@init = @@init.merge(settings)
+      @@init.merge!(settings)
     end
 
     def self.init
@@ -48,7 +43,21 @@ module Alchemy
     end
 
     def self.custom_config_contents
-      @@custom_config_contents ||= Content.descriptions.select { |c| c['settings'] && !c['settings']['tinymce'].nil? }
+      @@custom_config_contents ||= content_definitions_from_elements(Element.definitions)
+    end
+
+    def self.page_custom_config_contents(page)
+      content_definitions_from_elements(page.element_definitions)
+    end
+
+  private
+
+    def self.content_definitions_from_elements(definitions)
+      definitions.collect do |el|
+        contents = el.fetch('contents', []).select { |c| c['settings'] && c['settings']['tinymce'].present? }
+        next if contents.blank?
+        contents.map { |c| c.merge('element' => el['name']) }
+      end.flatten.compact
     end
 
   end

data/lib/alchemy/upgrader.rb

@@ -1,3 +1,5 @@
+require 'alchemy/seeder'
+
 module Alchemy
   class Upgrader < Alchemy::Seeder
 
@@ -37,7 +39,7 @@ module Alchemy
       end
 
       # All available upgrade tasks
-      # 
+      #
       def all_upgrade_tasks
         private_methods - Object.private_methods - superclass.private_methods
       end

data/lib/alchemy/upgrader/two_point_five.rb

@@ -2,7 +2,7 @@ module Alchemy
   module Upgrader::TwoPointFive
 
   private
-  
+
     def convert_picture_storage
       desc "Convert the picture storage"
       converted_images = []
@@ -49,18 +49,25 @@ We changed the authentication provider from Authlogic to Devise.
 
 If you are upgrading from an old Alchemy version < 2.5.0, then you have to make changes to your Devise configuration.
 
-1. Run:
+1. Add devise-encryptable to your Gemfile
+
+# Gemfile
+gem 'devise-encryptable'
+
+$ bundle install
+
+2. Generate devise config:
 
 $ rails g alchemy:devise
 
-And alter the encryptor to authlogic_sha512
-and the stretches value from 10 to 20
+And alter the encryptor and stretches values
 
 # config/initializers/devise.rb
-config.stretches = Rails.env.test? ? 1 : 20
-config.encryptor = :authlogic_sha512
+  ...
+  config.stretches = Rails.env.test? ? 1 : 20
+  config.encryptor = :authlogic_sha512
 
-2. Add the encryptable module to your Alchemy config.yml:
+3. Add the encryptable module to your Alchemy config.yml:
 
 # config/alchemy/config.yml
 devise_modules:
@@ -74,6 +81,6 @@ devise_modules:
 WARN
       todo warn
     end
-    
+
   end
 end

data/lib/alchemy/upgrader/two_point_one.rb

@@ -7,18 +7,18 @@ module Alchemy
     # Also creates missing associations between pages and languages
     def upgrade_to_language
       desc "Creating languages for pages"
-      Alchemy::Page.all.each do |page|
-        if !page.language_code.blank? && page.language.nil?
+      Alchemy::Page.contentpages.each do |page|
+        if page.language_id.nil? && page.language_code.present?
           root = page.get_language_root
           lang = Alchemy::Language.find_or_create_by_language_code(
-            :name => page.language_code.capitalize,
-            :language_code => page.language_code,
-            :frontpage_name => root.name,
-            :page_layout => root.page_layout,
-            :public => true
+            name: page.language_code.capitalize,
+            language_code: page.language_code,
+            frontpage_name: root.name,
+            page_layout: root.page_layout,
+            public: true
           )
           page.language = lang
-          if page.save(:validate => false)
+          if page.save(validate: false)
             log "Set language for page #{page.name} to #{lang.name}."
           end
         else
@@ -34,9 +34,9 @@ module Alchemy
       layoutpages = Alchemy::Page.layoutpages
       if layoutpages.any?
         layoutpages.each do |page|
-          if page.language.class == String || page.language.nil?
+          if page.language_id.nil?
             page.language = default_language
-            if page.save(:validate => false)
+            if page.save(validate: false)
               log "Set language for page #{page.name} to #{default_language.name}."
             end
           else

data/lib/alchemy/upgrader/two_point_two.rb

@@ -1,69 +1,114 @@
 module Alchemy
   module Upgrader::TwoPointTwo
 
-  private
-  
-    def convert_essence_texts_displayed_as_select_into_essence_selects
-      desc "Converting EssenceTexts displayed as select into EssenceSelects"
-      contents_found = 0
-      elements = Alchemy::Element.descriptions.select { |e| e['contents'].present? && !e['contents'].detect { |c| c['settings'].present? && c['settings']['display_as'] == 'select' }.nil? }
-      contents = elements.collect { |el| el['contents'] }.flatten.select { |c| c['settings'] && c['settings']['display_as'] == 'select' }.flatten
-      content_names = contents.collect { |c| c['name'] }
-      Alchemy::Content.essence_texts.where(
-        :name => content_names,
-        :alchemy_elements => {:name => elements.collect { |e| e['name'] }}
-      ).joins(:element).each do |content|
-        new_content = Alchemy::Content.new(:name => content.name, :element_id => content.element.id)
-        if new_content.create_essence!('name' => content.name, 'type' => 'EssenceSelect')
-          new_content.essence.value = content.ingredient
-          if new_content.essence.save
-            contents_found += 1
-            log "Converted #{content.name}'s essence_type into EssenceSelect"
-            content.destroy
-          else
-            log "Could not save essence: #{new_content.essence.errors.full_messages.join(', ')}", :error
+    class ContentsConverter
+      include Alchemy::Shell
+
+      def initialize(display_as, essence_type)
+        @contents_found = 0
+        @display_as = display_as
+        @essence_type = essence_type
+      end
+
+      def convert!
+        if essence_texts.any?
+          essence_texts.each do |content|
+            convert_content(content)
           end
         else
-          log "Could not create content: #{new_content.errors.full_messages.join(', ')}", :error
+          log "No EssenceTexts displayed as #{@display_as} found.", :skip
         end
       end
-      if contents_found > 0
-        todo "Please open your elements.yml file and change all type values from these contents:\n\n#{content_names.join(', ')}\n\ninto EssenceSelect."
-      else
-        log "No EssenceTexts with display_as select setting found.", :skip
+
+    private
+
+      def essence_texts
+        Alchemy::Content.essence_texts.where(
+          :name => content_names,
+          :alchemy_elements => {:name => elements.collect { |e| e['name'] }}
+        ).joins(:element)
       end
-    end
 
-    def convert_essence_texts_displayed_as_checkbox_into_essence_booleans
-      desc "Converting EssenceTexts displayed as checkbox into EssenceBooleans"
-      contents_found = 0
-      elements = Alchemy::Element.descriptions.select { |e| e['contents'].present? && !e['contents'].detect { |c| c['settings'].present? && c['settings']['display_as'] == 'checkbox' }.nil? }
-      contents = elements.collect { |el| el['contents'] }.flatten.select { |c| c['settings'] && c['settings']['display_as'] == 'checkbox' }.flatten
-      content_names = contents.collect { |c| c['name'] }
-      Alchemy::Content.essence_texts.where(
-        :name => content_names,
-        :alchemy_elements => {:name => elements.collect { |e| e['name'] }}
-      ).joins(:element).each do |content|
-        new_content = Alchemy::Content.new(:name => content.name, :element_id => content.element.id)
-        if new_content.create_essence!('name' => content.name, 'type' => 'EssenceBoolean')
-          new_content.essence.value = content.ingredient
-          if new_content.essence.save
-            contents_found += 1
-            log "Converted #{content.name}'s essence_type into EssenceBoolean"
-            content.destroy
-          else
-            log "Could not save essence: #{new_content.essence.errors.full_messages.join(', ')}", :error
-          end
+      def content_names
+        @content_names ||= contents.collect { |c| c['name'] }
+      end
+
+      def contents
+        @contents ||= elements.collect { |el|
+          el['contents']
+        }.flatten.select { |c|
+          c['settings'] && c['settings']['display_as'] == @display_as
+        }.flatten
+      end
+
+      def elements
+        @elements ||= Alchemy::Element.descriptions.select { |e|
+          e['contents'].present? && !e['contents'].detect { |c|
+            c['settings'].present? && c['settings']['display_as'] == @display_as
+          }.nil?
+        }
+      end
+
+      def convert_content(content)
+        if @new_content = new_content_from(content)
+          update_content(content)
         else
           log "Could not create content: #{new_content.errors.full_messages.join(', ')}", :error
         end
       end
-      if contents_found > 0
-        todo "Please open your elements.yml file and change all type values from these contents:\n\n#{content_names.join(', ')}\n\ninto EssenceBoolean."
-      else
-        log "No EssenceTexts with display_as checkbox setting found.", :skip
+
+      def new_content_from(content)
+        content = Alchemy::Content.create(
+          element_id: content.element.id,
+          name: content.name,
+          essence_type: essence_class
+        )
+        content.essence = essence_class.constantize.create
+        content
+      end
+
+      def essence_class
+        "Alchemy::#{@essence_type.classify}"
+      end
+
+      def update_content(content)
+        if update_essence_from(content)
+          @contents_found += 1
+          content.destroy
+          log "Converted #{content.name}'s essence_type into #{@essence_type}"
+        else
+          log "Could not save essence: #{new_content.essence.errors.full_messages.join(', ')}", :error
+        end
+      end
+
+      def update_essence_from(content)
+        @new_content.essence.ingredient = content.ingredient
+        @new_content.essence.save!
+      end
+
+      def display_result
+        if @contents_found > 0
+          todo "Please open your elements.yml file and change all type values from these contents:\n\n#{@content_names.join(', ')}\n\ninto #{@essence_type}."
+        else
+          log "No EssenceTexts with display_as #{@display_as} setting found.", :skip
+        end
       end
     end
 
+  private
+
+    def convert_essence_texts_displayed_as_select_into_essence_selects
+      desc "Converting all EssenceTexts displayed as select into EssenceSelects"
+      converter = ContentsConverter.new('select', 'EssenceSelect')
+      converter.convert!
+    end
+
+    def convert_essence_texts_displayed_as_checkbox_into_essence_booleans
+      desc "Converting all EssenceTexts displayed as checkbox into EssenceBooleans"
+      converter = ContentsConverter.new('checkbox', 'EssenceBoolean')
+      converter.convert!
+    end
+
   end
+
 end