alchemy_cms 2.9.1 → 3.0.0.rc5

data/lib/alchemy/test_support/integration_helpers.rb

@@ -1,5 +1,3 @@
-require 'declarative_authorization/maintenance'
-
 module Alchemy
   module TestSupport
 
@@ -8,7 +6,6 @@ module Alchemy
     # This file is included in rspec integration/request tests.
     #
     module IntegrationHelpers
-      include ::Authorization::TestHelper
 
       # Used in Capybara features specs. Stubs the current_alchemy_user
       #
@@ -20,33 +17,10 @@ module Alchemy
           page.driver.headers = { 'Accept-Language' => 'en' }
         end
         if !user
-          user = mock_model('DummyUser', alchemy_roles: %w(admin), role_symbols: [:admin], language: 'en')
+          user = mock_model('DummyUser', alchemy_roles: %w(admin), language: 'en')
         end
         ApplicationController.any_instance.stub(:current_user).and_return(user)
       end
-
-      # Load additional authorization_rules for specs.
-      #
-      # For some strange reason, this isn't done automatically while running the specs
-      #
-      def load_authorization_rules
-        instance = Alchemy::Auth::Engine.get_instance
-        instance.load(File.join(File.dirname(__FILE__), '../../../spec/dummy', 'config/authorization_rules.rb'))
-      end
-
-      # Capybara actions to create a new element.
-      #
-      # You can pass the name of the desired element, or just use the default "Article".
-      #
-      def create_element!(name = 'Article')
-        within '.alchemy-elements-window' do
-          click_link Alchemy::I18n.t('New Element')
-        end
-        within '.new_alchemy_element' do
-          select(name, from: 'element[name]')
-          click_button 'Add'
-        end
-      end
     end
 
   end

data/lib/alchemy/tinymce.rb

@@ -1,37 +1,21 @@
 module Alchemy
   module Tinymce
-    mattr_accessor :languages, :themes, :plugins, :setup
+    mattr_accessor :languages, :plugins
 
-    @@setup = nil
-    @@plugins = %w(alchemy_link autoresize fullscreen inlinepopups paste table)
+    @@plugins = %w(alchemy_link autoresize charmap code directionality fullscreen link paste tabfocus 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: '',
+      skin: 'alchemy',
+      width: '100%',
+      resize: false,
+      autoresize_min_height: '105',
+      menubar: false,
+      statusbar: false,
+      toolbar1: 'bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen',
+      toolbar2: 'pastetext charmap code | undo redo | alchemy_link unlink',
       fix_list_elements: true,
       convert_urls: false,
-      entity_encoding: "raw"
+      entity_encoding: 'raw'
     }
 
     def self.init=(settings)
@@ -46,11 +30,7 @@ module Alchemy
       @@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
+    private
 
     def self.content_definitions_from_elements(definitions)
       definitions.collect do |el|

data/lib/alchemy/touching.rb

@@ -0,0 +1,41 @@
+module Alchemy
+  module Touching
+
+    # Touches the timestamps and userstamps
+    #
+    def touch
+      # Using update here, because we want the touch call to bubble up to the page.
+      update(touchable_attributes)
+    end
+
+    private
+
+    # If the model has a +contents+ association,
+    # it updates all their timestamps.
+    #
+    # CAUTION: Only use on bottom to top releations,
+    # e.g. +Alchemy::Picture+ or +Alchemy::Attachment+
+    # not on top to bottom ones like +Alchemy::Element+.
+    #
+    def touch_contents
+      return unless self.respond_to?(:contents)
+      self.contents.update_all(touchable_attributes)
+    end
+
+    # If the model has a +touchable_pages+ association,
+    # it updates all their timestamps.
+    #
+    # Used by +Alchemy::Element+
+    #
+    def touch_pages
+      return unless self.respond_to?(:touchable_pages)
+      self.touchable_pages.update_all(touchable_attributes)
+    end
+
+    # Returns the attributes hash for touching a model.
+    #
+    def touchable_attributes
+      {updated_at: Time.now, updater_id: Alchemy.user_class.try(:stamper)}
+    end
+  end
+end

data/lib/alchemy/upgrader.rb

@@ -5,14 +5,7 @@ module Alchemy
 
     Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
 
-    extend Alchemy::Upgrader::TwoPointNine
-    extend Alchemy::Upgrader::TwoPointSix
-    extend Alchemy::Upgrader::TwoPointFive
-    extend Alchemy::Upgrader::TwoPointFour
-    extend Alchemy::Upgrader::TwoPointThree
-    extend Alchemy::Upgrader::TwoPointTwo
-    extend Alchemy::Upgrader::TwoPointOne
-    extend Alchemy::Upgrader::TwoPointZero
+    extend Alchemy::Upgrader::ThreePointZero
 
     class << self
 
@@ -22,7 +15,16 @@ module Alchemy
         upgrade_tasks.each do |task|
           self.send(task)
         end
-        display_todos
+        puts "\n"
+        log "Upgrade done!"
+        if todos.any?
+          display_todos
+          log "\nThere are some follow ups to do", :message
+          log '-------------------------------', :message
+          log "\nPlease follow the TODOs above.", :message
+        else
+          log "\nThat's it.", :message
+        end
       end
 
       # Tasks that should run.
@@ -45,7 +47,7 @@ module Alchemy
         private_methods - Object.private_methods - superclass.private_methods
       end
 
-    private
+      private
 
       # Setup task
       def setup
@@ -58,13 +60,16 @@ module Alchemy
         desc "Copy configuration file."
         config_file = Rails.root.join('config/alchemy/config.yml')
         default_config = File.join(File.dirname(__FILE__), '../../config/alchemy/config.yml')
-        if FileUtils.identical? default_config, config_file
+        if !File.exists? config_file
+          log "No configuration file found. Creating it."
+          FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml')
+        elsif FileUtils.identical? default_config, config_file
           log "Configuration file already present.", :skip
         else
           log "Custom configuration file found."
           FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml.defaults')
           log "Copied new default configuration file."
-          todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file."
+          todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", 'Configuration has changed'
         end
       end
 

data/lib/alchemy/upgrader/three_point_zero.rb

@@ -0,0 +1,62 @@
+module Alchemy
+  module Upgrader::ThreePointZero
+    private
+
+    def rename_registered_role_ro_member
+      desc 'Rename the `registered` user role to `member`'
+      registered_users = Alchemy.user_class.where("alchemy_roles LIKE '%registered%'")
+      if registered_users.any?
+        registered_users.each do |user|
+          roles = user.read_attribute(:alchemy_roles).sub(/registered/, 'member')
+          user.update_column(:alchemy_roles, roles)
+          log "Renamed #{user.inspect} role to `member`"
+        end
+      else
+        log 'No users with `registered` role found.', :skip
+      end
+    end
+
+    def alchemy_3_todos
+      notice = <<-NOTE
+
+Alchemy User Class Removed
+--------------------------
+
+We removed the users model from Alchemy core!
+
+You have to provide your own user model or
+add the `alchemy-devise` gem to your Gemfile.
+
+If you want to use the default user class from Alchemy:
+
+  # Gemfile
+  gem 'alchemy-devise'
+
+  $ bin/rake alchemy_devise:install:migrations db:migrate
+
+In order to add your own user class to Alchemy, please
+make shure it meets the API:
+
+https://github.com/magiclabs/alchemy_cms/blob/master/lib/alchemy/auth_accessors.rb
+
+
+TinyMCE 4 Upgrade
+-----------------
+
+The TinyMCE configuration syntax has changed!
+
+If you have custom TinyMCE confugurations, like a customized toolbar
+then you have to upgrade the syntax to a TinyMCE 4 compatible one.
+
+Please have a look in the default TinyMCE configuration from Alchemy and
+also read the official TinyMCE documentation in how to upgrade.
+
+Alchemy default TinyMCE config: https://github.com/magiclabs/alchemy_cms/blob/master/lib/alchemy/tinymce.rb#L5-L19
+Offical TinyMCE documentation: http://www.tinymce.com/wiki.php/Configuration
+
+NOTE
+      todo notice, 'Alchemy v3.0 changes'
+    end
+
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,8 @@
 module Alchemy
-  VERSION = "2.9.1"
+  VERSION = "3.0.0.rc5"
 
   def self.version
     VERSION
   end
+
 end

data/lib/alchemy_cms.rb

@@ -1,11 +1,5 @@
-require 'rails'
-
 # Instantiate the global Alchemy namespace
 module Alchemy
 end
 
-if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
-  require 'alchemy/engine'
-else
-  raise "Alchemy #{Alchemy::VERSION} needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
-end
+require 'alchemy/engine'

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -15,11 +15,12 @@ module Alchemy
         @elements = load_alchemy_yaml('elements.yml')
         @elements.each do |element|
           @element = element
+          contents = element["contents"] || []
           if @element['available_contents']
             @available_contents_names = @element['available_contents'].collect { |c| c['name'] }
-            @contents = (element["contents"].delete_if { |c| @available_contents_names.include?(c['name']) } or [])
+            @contents = contents.delete_if { |c| @available_contents_names.include?(c['name']) } or []
           else
-            @contents = (element["contents"] or [])
+            @contents = contents
           end
           if element["name"] =~ /\A[a-z0-9_-]+\z/
             @element_name = element["name"].underscore

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,4 +1,3 @@
-<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 <%%= element_editor_for(element) do |el| -%>
 <%- if @element['picture_gallery'] -%>
   <%%= render_picture_gallery_editor(element, max_images: nil, crop: true) %>
@@ -13,4 +12,3 @@
   <p><%%= render_new_content_link(element) %></p>
 <%- end -%>
 <%%- end -%>
-<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.haml

@@ -1,4 +1,3 @@
-<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
   = render_picture_gallery_editor(element, max_images: nil, crop: true)
@@ -9,6 +8,6 @@
 <%- if @element['available_contents'] -%>
   - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
     = render_essence_editor content
-  %p = render_new_content_link(element)
-<% end -%>
+  %p
+    = render_new_content_link(element)
 <% end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.slim

@@ -1,4 +1,3 @@
-<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
   = render_picture_gallery_editor(element, max_images: nil, crop: true)
@@ -11,4 +10,3 @@
     = render_essence_editor content
   p = render_new_content_link(element)
 <% end -%>
-<%- end -%>

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

@@ -1,27 +1,27 @@
-<%- if @element['contents'].present? || @element['available_contents'].present? -%>
-<%%= element_view_for(element) do |el| -%>
-<%- if @element["picture_gallery"] -%>
-  <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') %>
+<%%- cache(element) do -%>
+  <%%= element_view_for(element) do |el| -%>
+  <%- if @element["picture_gallery"] -%>
+    <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') %>
+      </div>
+      <%%- end -%>
     </div>
-    <%%- end -%>
-  </div>
-<%- end -%>
-<%- @contents.each do |content| -%>
-  <%- if @contents.length > 1 -%>
-  <div class="<%= content["name"] %>">
+  <%- end -%>
+  <%- @contents.each do |content| -%>
+    <%- if @contents.length > 1 -%>
+    <div class="<%= content["name"] %>">
+      <%%= el.render :<%= content["name"] %> %>
+    </div>
+    <%- else -%>
     <%%= el.render :<%= content["name"] %> %>
-  </div>
-  <%- else -%>
-  <%%= el.render :<%= content["name"] %> %>
+    <%- end -%>
+  <%- end -%>
+  <%- if @element['available_contents'] -%>
+    <%%- element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content| -%>
+      <%%= render_essence_view(content) %>
+    <%%- end -%>
   <%- end -%>
-<%- end -%>
-<%- if @element['available_contents'] -%>
-  <%% element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
-    <%%= render_essence_view content %>
-  <%% end %>
-<%- end -%>
+  <%%- end -%>
 <%%- end -%>
-<%- end -%>

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

@@ -1,21 +1,20 @@
-<%- if @element['contents'].present? || @element['available_contents'].present? -%>
-= element_view_for(element) do |el|
+- cache(element) do
+  = element_view_for(element) do |el|
   <%- if @element["picture_gallery"] -%>
-  .<%= @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")
+    .<%= @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")
   <%- end -%>
-<%- @contents.each do |content| -%>
-  <%- if @contents.length > 1 -%>
-  .<%= content["name"] %>
+  <%- @contents.each do |content| -%>
+    <%- if @contents.length > 1 -%>
+    .<%= content["name"] %>
+      = el.render :<%= content["name"] %>
+    <%- else -%>
     = el.render :<%= content["name"] %>
-  <%- else -%>
-  = el.render :<%= content["name"] %>
+    <%- end -%>
+  <%- end -%>
+  <%- if @element['available_contents'] -%>
+    - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
+      = render_essence_view(content)
   <%- end -%>
-<%- end -%>
-<%- if @element['available_contents'] -%>
-  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
-    = render_essence_view content
-<%- end -%>
-<%- end -%>

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

@@ -1,21 +1,20 @@
-<%- if @element['contents'].present? || @element['available_contents'].present? -%>
-= element_view_for(element) do |el|
+- cache(element) do
+  = element_view_for(element) do |el|
   <%- if @element["picture_gallery"] -%>
-  .<%= @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")
+    .<%= @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")
   <%- end -%>
-<%- @contents.each do |content| -%>
-  <%- if @contents.length > 1 -%>
-  .<%= content["name"] %>
+  <%- @contents.each do |content| -%>
+    <%- if @contents.length > 1 -%>
+    .<%= content["name"] %>
+      = el.render :<%= content["name"] %>
+    <%- else -%>
     = el.render :<%= content["name"] %>
-  <%- else -%>
-  = el.render :<%= content["name"] %>
+    <%- end -%>
+  <%- end -%>
+  <%- if @element['available_contents'] -%>
+    - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
+      = render_essence_view(content)
   <%- end -%>
-<%- end -%>
-<%- if @element['available_contents'] -%>
-  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
-    = render_essence_view content
-<%- end -%>
-<%- end -%>