alchemy_cms 4.6.2 → 5.0.0.beta1

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

@@ -21,20 +21,17 @@ module Alchemy
 
       # All pages locked by given user
       #
-      scope :locked_by, ->(user) {
-        if user.class.respond_to? :primary_key
-          locked.where(locked_by: user.send(user.class.primary_key))
-        end
-      }
+      scope :locked_by,
+        ->(user) {
+          if user.class.respond_to? :primary_key
+            locked.where(locked_by: user.send(user.class.primary_key))
+          end
+        }
 
       # All not locked pages
       #
       scope :not_locked, -> { where(locked_at: nil, locked_by: nil) }
 
-      # All visible pages
-      #
-      scope :visible, -> { where(visible: true) }
-
       # All not restricted pages
       #
       scope :not_restricted, -> { where(restricted: false) }
@@ -45,29 +42,27 @@ module Alchemy
 
       # All pages that are a published language root
       #
-      scope :public_language_roots, -> {
-        published.language_roots.where(
-          language_code: Language.published.pluck(:language_code)
-        )
-      }
+      scope :public_language_roots,
+        -> {
+          published.language_roots.where(
+            language_code: Language.published.pluck(:language_code),
+          )
+        }
 
       # 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)
-      }
+      scope :all_last_edited_from,
+        ->(user) {
+          where(updater_id: user.id).order("updated_at DESC").limit(5)
+        }
 
       # Returns all pages that have the given +language_id+
       #
-      scope :with_language, ->(language_id) {
-        where(language_id: language_id)
-      }
+      scope :with_language, ->(language_id) { where(language_id: language_id) }
 
       # Returns all content pages.
       #
-      scope :contentpages, -> {
-        where(layoutpage: [false, nil]).where.not(parent_id: nil)
-      }
+      scope :contentpages, -> { where(layoutpage: [false, nil]) }
 
       # Returns all public contentpages that are not locked.
       #
@@ -79,9 +74,7 @@ module Alchemy
       #
       # Used for flushing all pages caches at once.
       #
-      scope :flushable_layoutpages, -> {
-        not_locked.layoutpages.where.not(parent_id: Page.unscoped.root.id)
-      }
+      scope :flushable_layoutpages, -> { not_locked.layoutpages }
 
       # All searchable pages
       #
@@ -89,9 +82,10 @@ module Alchemy
 
       # All pages from +Alchemy::Site.current+
       #
-      scope :from_current_site, -> {
-        where(Language.table_name => {site_id: Site.current || Site.default}).joins(:language)
-      }
+      scope :from_current_site,
+        -> {
+          where(Language.table_name => { site_id: Site.current || Site.default }).joins(:language)
+        }
 
       # All pages for xml sitemap
       #

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

@@ -29,8 +29,6 @@ module Alchemy
       end
 
       def call
-        return @page.urlname if @page.definition["redirects_to_external"]
-
         if @page.language_root?
           language_root_path
         elsif @site.languages.select(&:public?).length > 1

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,12 +62,12 @@ 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,
@@ -76,21 +76,10 @@ module Alchemy
 
     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/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/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

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/concerns/alchemy/touch_elements.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # If the model has a +elements+ association,
+  # it updates all their timestamps after save.
+  #
+  # Should only be used on bottom to top relations,
+  # e.g. +Alchemy::Picture+ or +Alchemy::Attachment+
+  # not on top to bottom ones like +Alchemy::Page+.
+  #
+  module TouchElements
+    def self.included(base)
+      base.after_save(:touch_elements)
+    end
+
+    private
+
+    def touch_elements
+      return unless respond_to?(:elements)
+
+      elements.map(&:touch)
+    end
+  end
+end

data/app/serializers/alchemy/content_serializer.rb

@@ -6,9 +6,6 @@ module Alchemy
       :name,
       :ingredient,
       :element_id,
-      :position,
-      :created_at,
-      :updated_at,
       :settings
 
     has_one :essence, polymorphic: true

data/app/serializers/alchemy/essence_boolean_serializer.rb

@@ -2,9 +2,9 @@
 
 module Alchemy
   class EssenceBooleanSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :value,
-      :created_at,
-      :updated_at
+    )
   end
 end