alchemy_cms 2.8.3 → 2.9.0

data/app/controllers/alchemy/elements_controller.rb

@@ -43,7 +43,7 @@ module Alchemy
 
     def load_element
       element = Element.available
-      if !current_user
+      if !current_alchemy_user
         element = element.not_restricted
       end
       @element = element.find(params[:id])

data/app/controllers/alchemy/pages_controller.rb

@@ -6,7 +6,7 @@ module Alchemy
     # And we cannot define the breadcrump method as helper_method, because rspec does not see helper_methods.
     # Not the best solution, but's working.
     # Anyone with a better idea please provide a patch.
-    include BaseHelper
+    include Alchemy::BaseHelper
 
     rescue_from ActionController::RoutingError, :with => :render_404
 
@@ -57,7 +57,7 @@ module Alchemy
       end
     end
 
-  private
+    private
 
     # Load the current page and store it in @page.
     #
@@ -96,7 +96,7 @@ module Alchemy
 
     def render_page_or_redirect
       @page ||= load_page
-      if User.admins.count == 0 && @page.nil?
+      if signup_required?
         redirect_to signup_path
       elsif @page.nil? && last_legacy_url
         @page = last_legacy_url.page
@@ -126,6 +126,12 @@ module Alchemy
       end
     end
 
+    def signup_required?
+      if Alchemy.user_class.respond_to?(:admins)
+        Alchemy.user_class.admins.size == 0 && @page.nil?
+      end
+    end
+
     def redirect_to_public_child
       @page = @page.self_and_descendants.published.not_restricted.first
       if @page

data/app/controllers/alchemy/pictures_controller.rb

@@ -90,6 +90,7 @@ module Alchemy
         image_file.process(:resize, resize_string)
       elsif params[:crop] == 'crop' && @size.present?
         width, height = @size.split('x').collect(&:to_i)
+        raise ArgumentError, "You have to state both width and height in the form 'widthxheight' when cropping" if width.nil? || height.nil?
         # prevent upscaling unless :upsample param is true
         # unfurtunally dragonfly does not handle this correctly while cropping
         unless params[:upsample] == 'true'

data/app/helpers/alchemy/admin/base_helper.rb

@@ -197,16 +197,8 @@ module Alchemy
       # (internal) Returns max image count as integer or nil. Used for the picture editor in element editor views.
       def max_image_count
         return nil if !@options
-        if @options[:maximum_amount_of_images].blank?
-          image_count = @options[:max_images]
-        else
-          image_count = @options[:maximum_amount_of_images]
-        end
-        if image_count.blank?
-          nil
-        else
-          image_count.to_i
-        end
+        image_count = @options[:maximum_amount_of_images] || @options[:max_images]
+        image_count.blank? ? nil : image_count.to_i
       end
 
       # (internal) Renders a select tag for all items in the clipboard

data/app/helpers/alchemy/admin/pages_helper.rb

@@ -6,7 +6,7 @@ module Alchemy
       # Used for rendering the folder link in +Admin::Pages#index+ sitemap.
       #
       def sitemap_folder_link(page)
-        if page.folded?(current_user.id)
+        if page.folded?(current_alchemy_user.id)
           css_class = 'folded'
           title = _t('Show childpages')
         else

data/app/helpers/alchemy/base_helper.rb

@@ -33,7 +33,7 @@ module Alchemy
 
     # Returns an icon
     def render_icon(icon_class)
-      content_tag('span', '', :class => "icon #{icon_class}")
+      content_tag('span', '', class: "icon #{icon_class}")
     end
 
     # Returns a div with an icon and the passed content

data/app/helpers/alchemy/pages_helper.rb

@@ -423,7 +423,7 @@ module Alchemy
               Alchemy.loadAlchemyMenuBar({
                 page_id: #{@page.id},
                 route: '#{Alchemy::MountPoint.get}',
-                locale: '#{current_user.language || ::I18n.default_locale}'
+                locale: '#{current_alchemy_user.language || ::I18n.default_locale}'
               });
             } catch(e) {
               if(console){console.log(e)}

data/app/models/alchemy/attachment.rb

@@ -1,14 +1,13 @@
-require 'userstamp'
 require 'acts-as-taggable-on'
 
 module Alchemy
   class Attachment < ActiveRecord::Base
-    include Filetypes
-    include NameConversions
+    include Alchemy::Filetypes
+    include Alchemy::NameConversions
 
     acts_as_taggable
     file_accessor :file
-    stampable :stamper_class_name => 'Alchemy::User'
+    stampable stamper_class_name: Alchemy.user_class_name
 
     attr_accessible :file, :name, :file_name, :tag_list
 

data/app/models/alchemy/cell.rb

@@ -12,7 +12,7 @@
 #
 module Alchemy
   class Cell < ActiveRecord::Base
-    include Logger
+    include Alchemy::Logger
 
     attr_accessible :page_id, :name
 

data/app/models/alchemy/content.rb

@@ -1,12 +1,11 @@
-require 'userstamp'
 require 'acts_as_list'
 
 module Alchemy
   class Content < ActiveRecord::Base
-    include Logger
+    include Alchemy::Logger
 
     # Concerns
-    include Factory
+    include Alchemy::Content::Factory
 
     attr_accessible(
       :do_not_index,
@@ -20,7 +19,7 @@ module Alchemy
     belongs_to :essence, :polymorphic => true, :dependent => :destroy
     belongs_to :element
 
-    stampable stamper_class_name: 'Alchemy::User'
+    stampable stamper_class_name: Alchemy.user_class_name
 
     acts_as_list
 

data/app/models/alchemy/element.rb

@@ -1,10 +1,9 @@
 require 'acts-as-taggable-on'
-require 'userstamp'
 require 'acts_as_list'
 
 module Alchemy
   class Element < ActiveRecord::Base
-    include Logger
+    include Alchemy::Logger
 
     FORBIDDEN_DEFINITION_ATTRIBUTES = %w(contents available_contents amount picture_gallery taggable hint)
     SKIPPED_ATTRIBUTES_ON_COPY = %w(id position folded created_at updated_at creator_id updater_id cached_tag_list)
@@ -24,7 +23,7 @@ module Alchemy
 
     # All Elements inside a cell are a list. All Elements not in cell are in the cell_id.nil list.
     acts_as_list :scope => [:page_id, :cell_id]
-    stampable(:stamper_class_name => 'Alchemy::User')
+    stampable stamper_class_name: Alchemy.user_class_name
 
     has_many :contents, :order => :position, :dependent => :destroy
     belongs_to :cell
@@ -54,8 +53,8 @@ module Alchemy
     #default_scope { from_current_site }
 
     # Concerns
-    include Definitions
-    include Presenters
+    include Alchemy::Element::Definitions
+    include Alchemy::Element::Presenters
 
     # class methods
     class << self
@@ -147,7 +146,7 @@ module Alchemy
     end
 
     # Trashing an element means nullifying its position, folding and unpublishing it.
-    def trash
+    def trash!
       self.update_column(:public, false)
       self.update_column(:folded, true)
       self.remove_from_list

data/app/models/alchemy/folded_page.rb

@@ -1,6 +1,6 @@
 module Alchemy
   class FoldedPage < ActiveRecord::Base
     belongs_to :page
-    belongs_to :user
+    belongs_to :user, class_name: Alchemy.user_class_name
   end
 end

data/app/models/alchemy/language.rb

@@ -66,7 +66,7 @@ module Alchemy
       end
     end
 
-    include Code
+    include Alchemy::Language::Code
 
   private
 

data/app/models/alchemy/message.rb

@@ -46,7 +46,7 @@ module Alchemy
 
       case field.to_sym
       when :email
-        validates_format_of field, :with => ::Devise.email_regexp, :if => :email_is_filled
+        validates_format_of field, with: Alchemy::Config.get(:email_regexp), if: -> { email.present? }
       when :email_confirmation
         validates_confirmation_of :email
       end
@@ -68,11 +68,5 @@ module Alchemy
       false
     end
 
-  private
-
-    def email_is_filled #:nodoc:
-      !email.blank?
-    end
-
   end
 end

data/app/models/alchemy/page.rb

@@ -1,6 +1,5 @@
 require 'acts-as-taggable-on'
 require 'awesome_nested_set'
-require 'userstamp'
 
 module Alchemy
   class Page < ActiveRecord::Base
@@ -44,12 +43,13 @@ module Alchemy
     acts_as_taggable
     acts_as_nested_set(:dependent => :destroy)
 
-    stampable(:stamper_class_name => 'Alchemy::User')
+    stampable stamper_class_name: Alchemy.user_class_name
 
     has_many :folded_pages
+
     has_many :legacy_urls, :class_name => 'Alchemy::LegacyPageUrl'
     belongs_to :language
-    belongs_to :locker, class_name: 'Alchemy::User', foreign_key: 'locked_by'
+    belongs_to :locker, class_name: Alchemy.user_class_name, foreign_key: 'locked_by'
 
     validates_presence_of :language, :on => :create, :unless => :root
     validates_presence_of :page_layout, :unless => :systempage?
@@ -64,12 +64,12 @@ module Alchemy
     after_update :create_legacy_url, :if => :urlname_changed?, :unless => :redirects_to_external?
 
     # Concerns
-    include Scopes
-    include Natures
-    include Naming
-    include Users
-    include Cells
-    include Elements
+    include Alchemy::Page::PageScopes
+    include Alchemy::Page::PageNatures
+    include Alchemy::Page::PageNaming
+    include Alchemy::Page::PageUsers
+    include Alchemy::Page::PageCells
+    include Alchemy::Page::PageElements
 
     # Class methods
     #
@@ -206,7 +206,9 @@ module Alchemy
 
     # Touches the timestamps and userstamps
     def touch
-      Page.where(id: self.id).update_all(updated_at: Time.now, updater_id: User.stamper)
+      update_hash = {updated_at: Time.now}
+      update_hash[:updater_id] = Alchemy.user_class.stamper if Alchemy.user_class.respond_to?(:stamper)
+      Page.where(id: self.id).update_all(update_hash)
     end
 
     # Returns the previous page on the same level or nil.

data/app/models/alchemy/page/{cells.rb → page_cells.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Cells
+  module Page::PageCells
 
     extend ActiveSupport::Concern
 
@@ -68,4 +68,4 @@ module Alchemy
     end
 
   end
-end
+end

data/app/models/alchemy/page/{elements.rb → page_elements.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Elements
+  module Page::PageElements
 
     extend ActiveSupport::Concern
 
@@ -207,7 +207,7 @@ module Alchemy
 
     # Trashes all elements that are not allowed for this page_layout.
     def trash_not_allowed_elements
-      elements.select { |e| !definition['elements'].include?(e.name) }.map(&:trash)
+      elements.select { |e| !definition['elements'].include?(e.name) }.map(&:trash!)
     end
 
     # Deletes unique and already present definitions from @elements_for_layout.

data/app/models/alchemy/page/{naming.rb → page_naming.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Naming
+  module Page::PageNaming
 
     extend ActiveSupport::Concern
     include NameConversions

data/app/models/alchemy/page/{natures.rb → page_natures.rb}

@@ -1,5 +1,5 @@
 module Alchemy
-  module Page::Natures
+  module Page::PageNatures
 
     extend ActiveSupport::Concern
 
@@ -17,8 +17,8 @@ module Alchemy
     end
 
     def folded?(user_id)
-      folded_page = folded_pages.find_by_user_id(user_id)
-      folded_page.try(:folded) || false
+      return unless Alchemy.user_class < ActiveRecord::Base
+      folded_pages.where(user_id: user_id, folded: true).any?
     end
 
     def contains_feed?

data/app/models/alchemy/page/{scopes.rb → page_scopes.rb}

@@ -2,7 +2,7 @@ module Alchemy
 
   # ActiveRecord scopes for Alchemy::Page
   #
-  module Page::Scopes
+  module Page::PageScopes
     extend ActiveSupport::Concern
 
     included do
@@ -18,7 +18,7 @@ module Alchemy
       #
       scope :all_locked, where(locked: true)
 
-      # All pages locked by given +Alchemy::User+
+      # All pages locked by given user
       #
       scope :all_locked_by, ->(user) {
         all_locked.where(locked_by: user.id)
@@ -52,7 +52,7 @@ module Alchemy
         )
       }
 
-      # Last 5 pages that where recently edited by given +Alchemy::User+
+      # Last 5 pages that where recently edited by given user
       #
       scope :all_last_edited_from, ->(user) {
         where(updater_id: user.id).order('updated_at DESC').limit(5)

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

@@ -0,0 +1,33 @@
+module Alchemy
+  module Page::PageUsers
+    extend ActiveSupport::Concern
+
+    # Returns the name of the creator of this page.
+    #
+    # If no creator could be found or associated user model
+    # does not respond to +#name+ it returns +'unknown'+
+    #
+    def creator_name
+      (creator && creator.respond_to?(:name) ? creator.name : nil) || I18n.t('unknown')
+    end
+
+    # Returns the name of the last updater of this page.
+    #
+    # If no updater could be found or associated user model
+    # does not respond to +#name+ it returns +'unknown'+
+    #
+    def updater_name
+      (updater && updater.respond_to?(:name) ? updater.name : nil) || I18n.t('unknown')
+    end
+
+    # Returns the name of the user currently editing this page.
+    #
+    # If no locker could be found or associated user model
+    # does not respond to +#name+ it returns +'unknown'+
+    #
+    def locker_name
+      (locker && locker.respond_to?(:name) ? locker.name : nil) || I18n.t('unknown')
+    end
+
+  end
+end

data/app/models/alchemy/picture.rb

@@ -1,10 +1,9 @@
 require 'acts-as-taggable-on'
 require 'dragonfly'
-require 'userstamp'
 
 module Alchemy
   class Picture < ActiveRecord::Base
-    include NameConversions
+    include Alchemy::NameConversions
 
     has_many :essence_pictures, :class_name => 'Alchemy::EssencePicture', :foreign_key => 'picture_id'
     has_many :contents, :through => :essence_pictures
@@ -39,7 +38,7 @@ module Alchemy
       :upload_hash
     )
 
-    stampable(:stamper_class_name => 'Alchemy::User')
+    stampable stamper_class_name: Alchemy.user_class_name
 
     scope :recent, where("#{self.table_name}.created_at > ?", Time.now-24.hours).order(:created_at)
     scope :deletable, where("alchemy_pictures.id NOT IN (SELECT picture_id FROM alchemy_essence_pictures)")
@@ -145,6 +144,7 @@ module Alchemy
       return "111x93" if size == "111x93" || size.blank?
       x = size.split('x')[0].to_i
       y = size.split('x')[1].to_i
+      return "111x93" if x.zero? || y.zero?
       if (x > y)
         zoom_factor = 111.0 / x
         new_x = 111

data/app/models/alchemy/site.rb

@@ -9,10 +9,10 @@ module Alchemy
     # associations
     has_many :languages
 
-    scope :published, where(public: true)
+    scope :published, -> { where(public: true) }
 
     # concerns
-    include Layout
+    include Alchemy::Site::Layout
 
     # Returns true if this site is the current site
     def current?