alchemy_cms 4.6.7 → 5.0.0.beta1

data/app/models/alchemy/page.rb

@@ -17,7 +17,6 @@
 #  rgt              :integer
 #  parent_id        :integer
 #  depth            :integer
-#  visible          :boolean          default(FALSE)
 #  locked_by        :integer
 #  restricted       :boolean          default(FALSE)
 #  robot_index      :boolean          default(TRUE)
@@ -44,11 +43,10 @@ module Alchemy
 
     DEFAULT_ATTRIBUTES_FOR_COPY = {
       autogenerate_elements: false,
-      visible: false,
       public_on: nil,
       public_until: nil,
       locked_at: nil,
-      locked_by: nil
+      locked_by: nil,
     }
 
     SKIPPED_ATTRIBUTES_ON_COPY = %w(
@@ -78,16 +76,15 @@ module Alchemy
       :tag_list,
       :title,
       :urlname,
-      :visible,
       :layoutpage,
-      :menu_id
+      :menu_id,
     ]
 
-    acts_as_nested_set(dependent: :destroy)
+    acts_as_nested_set(dependent: :destroy, scope: [:layoutpage, :language_id])
 
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
-    belongs_to :language, optional: true
+    belongs_to :language
 
     belongs_to :creator,
       primary_key: Alchemy.user_class_primary_key,
@@ -110,43 +107,33 @@ module Alchemy
     has_one :site, through: :language
     has_many :site_languages, through: :site, source: :languages
     has_many :folded_pages
-    has_many :legacy_urls, class_name: 'Alchemy::LegacyPageUrl'
-    has_many :nodes, class_name: 'Alchemy::Node', inverse_of: :page
+    has_many :legacy_urls, class_name: "Alchemy::LegacyPageUrl"
+    has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page
 
-    validates_presence_of :language, on: :create, unless: :root
-    validates_presence_of :page_layout, unless: :systempage?
-    validates_format_of :page_layout, with: /\A[a-z0-9_-]+\z/, unless: -> { systempage? || page_layout.blank? }
-    validates_presence_of :parent_id, if: proc { Page.count > 1 }
+    before_validation :set_language,
+      if: -> { language.nil? }
+
+    validates_presence_of :page_layout
+    validates_format_of :page_layout, with: /\A[a-z0-9_-]+\z/, unless: -> { page_layout.blank? }
+    validates_presence_of :parent, unless: -> { layoutpage? || language_root? }
 
     before_save :set_language_code,
-      if: -> { language.present? },
-      unless: :systempage?
+      if: -> { language.present? }
 
     before_save :set_restrictions_to_child_pages,
-      if: :restricted_changed?,
-      unless: :systempage?
+      if: :restricted_changed?
 
     before_save :inherit_restricted_status,
-      if: -> { parent && parent.restricted? },
-      unless: :systempage?
+      if: -> { parent && parent.restricted? }
 
     before_save :set_published_at,
-      if: -> { public_on.present? && published_at.nil? },
-      unless: :systempage?
+      if: -> { public_on.present? && published_at.nil? }
 
     before_save :set_fixed_attributes,
       if: -> { fixed_attributes.any? }
 
-    before_create :set_language_from_parent_or_default,
-      if: -> { language_id.blank? },
-      unless: :systempage?
-
     after_update :create_legacy_url,
-      if: :should_create_legacy_url?,
-      unless: -> { definition['redirects_to_external'] }
-
-    after_update :attach_to_menu!,
-      if: :should_attach_to_menu?
+      if: :saved_change_to_urlname?
 
     after_update -> { nodes.update_all(updated_at: Time.current) }
 
@@ -159,26 +146,9 @@ module Alchemy
     # site_name accessor
     delegate :name, to: :site, prefix: true, allow_nil: true
 
-    attr_accessor :menu_id
-
-    deprecate visible: "Page slugs will be visible in URLs of child pages all the time. " \
-      "Please use Menus and Tags instead to re-organize your pages if your page tree does not reflect the URL hierarchy.",
-      deprecator: Alchemy::Deprecation
-
     # Class methods
     #
     class << self
-      # The root page of the page tree
-      #
-      # Internal use only. You wouldn't use this page ever.
-      #
-      # Automatically created when accessed the first time.
-      #
-      def root
-        super || create!(name: 'Root')
-      end
-      alias_method :rootpage, :root
-
       # Used to store the current page previewed in the edit page template.
       #
       def current_preview=(page)
@@ -222,29 +192,12 @@ module Alchemy
         end
       end
 
-      def layout_root_for(language_id)
-        where({parent_id: Page.root.id, layoutpage: true, language_id: language_id}).limit(1).first
-      end
-
-      def find_or_create_layout_root_for(language_id)
-        layoutroot = layout_root_for(language_id)
-        return layoutroot if layoutroot
-        language = Language.find(language_id)
-        Page.create!(
-          name: "Layoutroot for #{language.name}",
-          layoutpage: true,
-          language: language,
-          autogenerate_elements: false,
-          parent_id: Page.root.id
-        )
-      end
-
       def copy_and_paste(source, new_parent, new_name)
         page = copy(source, {
           parent_id: new_parent.id,
           language: new_parent.language,
           name: new_name,
-          title: new_name
+          title: new_name,
         })
         if source.children.any?
           source.copy_children_to(page)
@@ -254,34 +207,29 @@ module Alchemy
 
       def all_from_clipboard(clipboard)
         return [] if clipboard.blank?
-        where(id: clipboard.collect { |p| p['id'] })
+
+        where(id: clipboard.collect { |p| p["id"] })
       end
 
       def all_from_clipboard_for_select(clipboard, language_id, layoutpage = false)
         return [] if clipboard.blank?
+
         clipboard_pages = all_from_clipboard(clipboard)
         allowed_page_layouts = Alchemy::PageLayout.selectable_layouts(language_id, layoutpage)
-        allowed_page_layout_names = allowed_page_layouts.collect { |p| p['name'] }
+        allowed_page_layout_names = allowed_page_layouts.collect { |p| p["name"] }
         clipboard_pages.select { |cp| allowed_page_layout_names.include?(cp.page_layout) }
       end
 
       def link_target_options
-        options = [[Alchemy.t(:default, scope: 'link_target_options'), '']]
+        options = [[Alchemy.t(:default, scope: "link_target_options"), ""]]
         link_target_options = Config.get(:link_target_options)
         link_target_options.each do |option|
-          options << [Alchemy.t(option, scope: 'link_target_options',
-                                default: option.to_s.humanize), option]
+          options << [Alchemy.t(option, scope: "link_target_options",
+                                        default: option.to_s.humanize), option]
         end
         options
       end
 
-      # Returns an array of all pages in the same branch from current.
-      # I.e. used to find the active page in navigation.
-      def ancestors_for(current)
-        return [] if current.nil?
-        current.self_and_ancestors.contentpages
-      end
-
       private
 
       # Aggregates the attributes from given source for copy of page.
@@ -296,7 +244,7 @@ module Alchemy
         differences.stringify_keys!
         attributes = source.attributes.merge(differences)
         attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY)
-        attributes['name'] = new_name_for_copy(differences['name'], source.name)
+        attributes["name"] = new_name_for_copy(differences["name"], source.name)
         attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY)
       end
 
@@ -312,7 +260,8 @@ module Alchemy
       #
       def new_name_for_copy(custom_name, source_name)
         return custom_name if custom_name.present?
-        "#{source_name} (#{Alchemy.t('Copy')})"
+
+        "#{source_name} (#{Alchemy.t("Copy")})"
       end
     end
 
@@ -340,13 +289,7 @@ module Alchemy
     #   Use this for your custom element loading logic.
     #
     # @return [ActiveRecord::Relation]
-    def find_elements(options = {}, show_non_public = false)
-      if show_non_public
-        Alchemy::Deprecation.warn "Passing true as second argument to page#find_elements to include" \
-          " invisible elements has been removed. Please implement your own ElementsFinder" \
-          " and pass it with options[:finder]."
-      end
-
+    def find_elements(options = {})
       finder = options[:finder] || Alchemy::ElementsFinder.new(options)
       finder.elements(page: self)
     end
@@ -384,9 +327,10 @@ module Alchemy
     #   only public pages (true), skip public pages (false)
     #
     def previous(options = {})
-      pages = self_and_siblings.where('lft < ?', lft)
+      pages = self_and_siblings.where("lft < ?", lft)
       select_page(pages, options.merge(order: :desc))
     end
+
     alias_method :previous_page, :previous
 
     # Returns the next page on the same level or nil.
@@ -397,9 +341,10 @@ module Alchemy
     #   only public pages (true), skip public pages (false)
     #
     def next(options = {})
-      pages = self_and_siblings.where('lft > ?', lft)
+      pages = self_and_siblings.where("lft > ?", lft)
       select_page(pages, options.merge(order: :asc))
     end
+
     alias_method :next_page, :next
 
     # Locks the page to given user
@@ -445,9 +390,10 @@ module Alchemy
     def copy_children_to(new_parent)
       children.each do |child|
         next if child == new_parent
+
         new_child = Page.copy(child, {
           language_id: new_parent.language_id,
-          language_code: new_parent.language_code
+          language_code: new_parent.language_code,
         })
         new_child.move_to_child_of(new_parent)
         child.copy_children_to(new_child) unless child.children.blank?
@@ -466,22 +412,22 @@ module Alchemy
       update_columns(
         published_at: current_time,
         public_on: already_public_for?(current_time) ? public_on : current_time,
-        public_until: still_public_for?(current_time) ? public_until : nil
+        public_until: still_public_for?(current_time) ? public_until : nil,
       )
     end
 
     # Updates an Alchemy::Page based on a new ordering to be applied to it
     #
     # Note: Page's urls should not be updated (and a legacy URL created) if nesting is OFF
-    # or if a page is external or if the URL is the same
+    # or if the URL is the same
     #
     # @param [TreeNode]
     #   A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated
     #
     def update_node!(node)
-      hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted}
+      hash = { lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted }
 
-      if Config.get(:url_nesting) && !definition['redirects_to_external'] && urlname != node.url
+      if urlname != node.url
         LegacyPageUrl.create(page_id: id, urlname: urlname)
         hash[:urlname] = node.url
       end
@@ -506,6 +452,7 @@ module Alchemy
     #
     def editable_by?(user)
       return true unless has_limited_editors?
+
       (editor_roles & user.alchemy_roles).any?
     end
 
@@ -531,7 +478,7 @@ module Alchemy
     # does not respond to +#name+ it returns +'unknown'+
     #
     def creator_name
-      creator.try(:name) || Alchemy.t('unknown')
+      creator.try(:name) || Alchemy.t("unknown")
     end
 
     # Returns the name of the last updater of this page.
@@ -540,7 +487,7 @@ module Alchemy
     # does not respond to +#name+ it returns +'unknown'+
     #
     def updater_name
-      updater.try(:name) || Alchemy.t('unknown')
+      updater.try(:name) || Alchemy.t("unknown")
     end
 
     # Returns the name of the user currently editing this page.
@@ -549,7 +496,7 @@ module Alchemy
     # does not respond to +#name+ it returns +'unknown'+
     #
     def locker_name
-      locker.try(:name) || Alchemy.t('unknown')
+      locker.try(:name) || Alchemy.t("unknown")
     end
 
     # Menus (aka. root nodes) this page is attached to
@@ -573,8 +520,8 @@ module Alchemy
         .limit(1).first
     end
 
-    def set_language_from_parent_or_default
-      self.language = parent.language || Language.default
+    def set_language
+      self.language = parent&.language || Language.current
       set_language_code
     end
 
@@ -582,41 +529,13 @@ module Alchemy
       self.language_code = language.code
     end
 
-    def should_create_legacy_url?
-      if active_record_5_1?
-        saved_change_to_urlname?
-      else
-        urlname_changed?
-      end
-    end
-
     # Stores the old urlname in a LegacyPageUrl
     def create_legacy_url
-      if active_record_5_1?
-        former_urlname = urlname_before_last_save
-      else
-        former_urlname = urlname_was
-      end
-      legacy_urls.find_or_create_by(urlname: former_urlname)
+      legacy_urls.find_or_create_by(urlname: urlname_before_last_save)
     end
 
     def set_published_at
       self.published_at = Time.current
     end
-
-    def attach_to_menu!
-      current_site_id = Alchemy::Site.current.id
-      node = Alchemy::Node.find_by!(id: menu_id, site_id: current_site_id)
-      node.children.create!(
-        site_id: current_site_id,
-        language_id: language_id,
-        page_id: id,
-        name: name
-      )
-    end
-
-    def should_attach_to_menu?
-      menu_id.present? && nodes.none?
-    end
   end
 end

data/app/models/alchemy/picture/transformations.rb

@@ -49,6 +49,7 @@ module Alchemy
     #
     def crop(size, crop_from = nil, crop_size = nil, upsample = false)
       raise "No size given!" if size.empty?
+
       render_to = sizes_from_string(size)
       if crop_from && crop_size
         top_left = point_from_string(crop_from)
@@ -79,7 +80,7 @@ module Alchemy
       height = 0 if height.nil?
       {
         width: width,
-        height: height
+        height: height,
       }
     end
 
@@ -109,7 +110,7 @@ module Alchemy
     def image_size
       {
         width: image_file_width,
-        height: image_file_height
+        height: image_file_height,
       }
     end
 
@@ -118,6 +119,7 @@ module Alchemy
     #
     def can_be_cropped_to(string, upsample = false)
       return true if upsample
+
       is_bigger_than sizes_from_string(string)
     end
 
@@ -147,7 +149,7 @@ module Alchemy
       y = 0 if y.nil?
       {
         x: x,
-        y: y
+        y: y,
       }
     end
 
@@ -158,7 +160,7 @@ module Alchemy
     def get_top_left_crop_corner(dimensions)
       {
         x: (image_file_width - dimensions[:width]) / 2,
-        y: (image_file_height - dimensions[:height]) / 2
+        y: (image_file_height - dimensions[:height]) / 2,
       }
     end
 
@@ -182,7 +184,7 @@ module Alchemy
     def size_when_fitting(target, dimensions = get_base_dimensions)
       zoom = [
         dimensions[:width].to_f / target[:width],
-        dimensions[:height].to_f / target[:height]
+        dimensions[:height].to_f / target[:height],
       ].max
 
       if zoom == 0.0
@@ -205,7 +207,7 @@ module Alchemy
         x1: point[:x],
         y1: point[:y],
         x2: point[:x] + mask[:width],
-        y2: point[:y] + mask[:height]
+        y2: point[:y] + mask[:height],
       }
     end
 
@@ -252,7 +254,7 @@ module Alchemy
     def reduce_to_image(dimensions)
       {
         width: [dimensions[:width], image_file_width].min,
-        height: [dimensions[:height], image_file_height].min
+        height: [dimensions[:height], image_file_height].min,
       }
     end
   end

data/app/models/alchemy/picture/url.rb

@@ -12,7 +12,7 @@ module Alchemy
       :format,
       :quality,
       :size,
-      :upsample
+      :upsample,
     ]
 
     # Returns a path to picture for use inside a image_tag helper.
@@ -66,8 +66,8 @@ module Alchemy
       end
 
       options = {
-        flatten: target_format != 'gif' && image_file_format == 'gif'
-      }.merge(options)
+        flatten: target_format != "gif" && image_file_format == "gif",
+      }.with_indifferent_access.merge(options)
 
       encoding_options = []
 
@@ -77,13 +77,13 @@ module Alchemy
       end
 
       if options[:flatten]
-        encoding_options << '-flatten'
+        encoding_options << "-flatten"
       end
 
       convertion_needed = target_format != image_file_format || encoding_options.present?
 
       if has_convertible_format? && convertion_needed
-        image = image.encode(target_format, encoding_options.join(' '))
+        image = image.encode(target_format, encoding_options.join(" "))
       end
 
       image

data/app/models/alchemy/picture.rb

@@ -26,13 +26,13 @@ module Alchemy
 
     include Alchemy::NameConversions
     include Alchemy::Taggable
-    include Alchemy::ContentTouching
+    include Alchemy::TouchElements
     include Alchemy::Picture::Transformations
     include Alchemy::Picture::Url
 
     has_many :essence_pictures,
-      class_name: 'Alchemy::EssencePicture',
-      foreign_key: 'picture_id',
+      class_name: "Alchemy::EssencePicture",
+      foreign_key: "picture_id",
       inverse_of: :ingredient_association
 
     has_many :contents, through: :essence_pictures
@@ -62,35 +62,24 @@ module Alchemy
     # We need to define this method here to have it available in the validations below.
     class << self
       def allowed_filetypes
-        Config.get(:uploader).fetch('allowed_filetypes', {}).fetch('alchemy/pictures', [])
+        Config.get(:uploader).fetch("allowed_filetypes", {}).fetch("alchemy/pictures", [])
       end
     end
 
     validates_presence_of :image_file
-    validates_size_of :image_file, maximum: Config.get(:uploader)['file_size_limit'].megabytes
+    validates_size_of :image_file, maximum: Config.get(:uploader)["file_size_limit"].megabytes
     validates_property :format,
       of: :image_file,
       in: allowed_filetypes,
       case_sensitive: false,
       message: Alchemy.t("not a valid image")
 
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
-    scope :named, ->(name) {
-      where("#{table_name}.name LIKE ?", "%#{name}%")
-    }
-
-    scope :recent, -> {
-      where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at)
-    }
-
-    scope :deletable, -> {
-      where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})")
-    }
-
-    scope :without_tag, -> {
-      left_outer_joins(:taggings).where(gutentag_taggings: {id: nil})
-    }
+    scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") }
+    scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
+    scope :deletable, -> { where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})") }
+    scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: { id: nil }) }
 
     # Class methods
 
@@ -102,6 +91,7 @@ module Alchemy
       def last_upload
         last_picture = Picture.last
         return Picture.all unless last_picture
+
         Picture.where(upload_hash: last_picture.upload_hash)
       end
 
@@ -123,11 +113,11 @@ module Alchemy
         pictures.order(:name)
       end
 
-      def filtered_by(filter = '')
+      def filtered_by(filter = "")
         case filter
-        when 'recent'      then recent
-        when 'last_upload' then last_upload
-        when 'without_tag' then without_tag
+        when "recent" then recent
+        when "last_upload" then last_upload
+        when "without_tag" then without_tag
         else
           all
         end
@@ -166,7 +156,7 @@ module Alchemy
       {
         name: image_file_name,
         size: image_file_size,
-        error: errors[:image_file].join
+        error: errors[:image_file].join,
       }
     end
 
@@ -176,7 +166,7 @@ module Alchemy
       if name.blank?
         "image_#{id}"
       else
-        ::CGI.escape(name.gsub(/\.(gif|png|jpe?g|tiff?)/i, '').tr('.', ' '))
+        ::CGI.escape(name.gsub(/\.(gif|png|jpe?g|tiff?)/i, "").tr(".", " "))
       end
     end
 
@@ -190,6 +180,7 @@ module Alchemy
     #
     def humanized_name
       return "" if image_file_name.blank?
+
       convert_to_humanized_name(image_file_name, suffix)
     end
 
@@ -213,7 +204,7 @@ module Alchemy
     #
     def convertible?
       Config.get(:image_output_format) &&
-        Config.get(:image_output_format) != 'original' &&
+        Config.get(:image_output_format) != "original" &&
         has_convertible_format?
     end
 

data/app/models/alchemy/site/layout.rb

@@ -3,7 +3,7 @@
 module Alchemy
   module Site::Layout
     extend ActiveSupport::Concern
-    SITE_DEFINITIONS_FILE = Rails.root.join('config/alchemy/site_layouts.yml')
+    SITE_DEFINITIONS_FILE = Rails.root.join("config/alchemy/site_layouts.yml")
 
     module ClassMethods
       # Returns the site layouts definition defined in +site_layouts.yml+ file
@@ -28,7 +28,7 @@ module Alchemy
     # Returns site's layout definition
     #
     def definition
-      self.class.definitions.detect { |l| l['name'] == partial_name }
+      self.class.definitions.detect { |l| l["name"] == partial_name }
     end
 
     # Returns the name for the layout partial

data/app/models/alchemy/site.rb

@@ -23,10 +23,12 @@ module Alchemy
     # associations
     has_many :languages
 
-    scope :published, -> { where(public: true) }
+    before_destroy if: -> { languages.any? } do
+      errors.add(:languages, :still_present)
+      throw(:abort)
+    end
 
-    # Callbacks
-    before_create :create_default_language!, unless: -> { languages.any? }
+    scope :published, -> { where(public: true) }
 
     # concerns
     include Alchemy::Site::Layout
@@ -64,7 +66,7 @@ module Alchemy
       end
 
       def default
-        Site.first || create_default_site!
+        Site.first
       end
 
       def find_for_host(host)
@@ -81,38 +83,6 @@ module Alchemy
           site.aliases.split.include?(host) if site.aliases.present?
         end
       end
-
-      private
-
-      def create_default_site!
-        default_site = Alchemy::Config.get(:default_site)
-        if default_site
-          create!(name: default_site['name'], host: default_site['host'])
-        else
-          raise DefaultSiteNotFoundError
-        end
-      end
-    end
-
-    private
-
-    # If no languages are present, create a default language based
-    # on the host app's Alchemy configuration.
-    def create_default_language!
-      default_language = Alchemy::Config.get(:default_language)
-      if default_language
-        languages.build(
-          name:           default_language['name'],
-          language_code:  default_language['code'],
-          locale:         default_language['code'],
-          frontpage_name: default_language['frontpage_name'],
-          page_layout:    default_language['page_layout'],
-          public:         true,
-          default:        true
-        )
-      else
-        raise DefaultLanguageNotFoundError
-      end
     end
   end
 end