pageflow 15.8.0 → 16.1.0

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -219,7 +219,7 @@ textarea.short {
   text-decoration: underline;
 }
 
-.input-hidden_via_binding {
+.hidden_via_binding {
   display: none;
 }
 

data/app/controllers/pageflow/chapters_controller.rb

@@ -31,7 +31,7 @@ module Pageflow
 
       authorize!(:update, chapter)
       verify_edit_lock!(chapter.entry)
-      chapter.update_attributes(chapter_params)
+      chapter.update(chapter_params)
 
       respond_with(chapter)
     end
@@ -43,7 +43,7 @@ module Pageflow
       authorize!(:edit_outline, storyline.entry)
       verify_edit_lock!(storyline.entry)
       params.require(:ids).each_with_index do |id, index|
-        entry.chapters.update(id, storyline_id: storyline.id, position: index)
+        entry.chapters.find(id).update(storyline_id: storyline.id, position: index)
       end
 
       head :no_content

data/app/controllers/pageflow/editor/files_controller.rb

@@ -72,7 +72,7 @@ module Pageflow
         file = entry.find_file(file_type.model, params[:id])
 
         authorize!(:update, file.to_model)
-        file.update_attributes!(update_params)
+        file.update!(update_params)
 
         head(:no_content)
       end

data/app/controllers/pageflow/entries_controller.rb

@@ -6,9 +6,9 @@ module Pageflow
     include EntryPasswordProtection
 
     def index
-      theming = Theming.for_request(request).with_home_url.first!
+      site = Site.for_request(request).with_home_url.first!
 
-      redirect_to(theming.home_url)
+      redirect_to(site.home_url)
     end
 
     def show
@@ -85,11 +85,21 @@ module Pageflow
 
       delegate_to_rack_app!(entry.entry_type.frontend_app) do |_status, headers, _body|
         allow_iframe_for_embed(headers)
+        apply_cache_control(entry, headers)
       end
     end
 
     def allow_iframe_for_embed(headers)
       headers.except!('X-Frame-Options') if params[:embed]
     end
+
+    def apply_cache_control(entry, headers)
+      config = Pageflow.config_for(entry)
+
+      return if config.public_entry_cache_control_header.blank?
+      return if entry.password_protected?
+
+      headers['Cache-Control'] = config.public_entry_cache_control_header
+    end
   end
 end

data/app/controllers/pageflow/feeds_controller.rb

@@ -0,0 +1,18 @@
+module Pageflow
+  # @api private
+  class FeedsController < Pageflow::ApplicationController
+    def index
+      site = Site.for_request(request).first!
+      return head 404 unless site.feeds_enabled?
+
+      @feed = EntriesFeed.for(
+        site: site,
+        locale: params[:locale]
+      )
+
+      respond_to do |format|
+        format.atom
+      end
+    end
+  end
+end

data/app/controllers/pageflow/pages_controller.rb

@@ -20,7 +20,7 @@ module Pageflow
 
       authorize!(:update, page)
       verify_edit_lock!(page.chapter.entry)
-      page.update_attributes(page_params)
+      page.update(page_params)
 
       respond_with(page)
     end
@@ -32,7 +32,7 @@ module Pageflow
       authorize!(:edit_outline, entry.to_model)
       verify_edit_lock!(chapter.entry)
       params.require(:ids).each_with_index do |id, index|
-        entry.pages.update(id, :chapter_id => chapter.id, :position => index)
+        entry.pages.find(id).update(chapter_id: chapter.id, position: index)
       end
 
       head :no_content

data/app/controllers/pageflow/sitemaps_controller.rb

@@ -0,0 +1,15 @@
+module Pageflow
+  # @api private
+  class SitemapsController < Pageflow::ApplicationController
+    def index
+      site = Site.for_request(request).first!
+      return head 404 unless site.sitemap_enabled?
+
+      @entries = Sitemaps.entries_for(site: site)
+
+      respond_to do |format|
+        format.xml
+      end
+    end
+  end
+end

data/app/controllers/pageflow/storylines_controller.rb

@@ -31,7 +31,7 @@ module Pageflow
 
       authorize!(:update, storyline)
       verify_edit_lock!(storyline.entry)
-      storyline.update_attributes(storyline_params)
+      storyline.update(storyline_params)
 
       respond_with(storyline)
     end
@@ -42,7 +42,7 @@ module Pageflow
       authorize!(:edit_outline, entry.to_model)
       verify_edit_lock!(entry)
       params.require(:ids).each_with_index do |id, index|
-        entry.storylines.update(id, position: index)
+        entry.storylines.find(id).update(position: index)
       end
 
       head :no_content

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -10,7 +10,7 @@ module Pageflow
       config = Pageflow.config_for(entry)
 
       json.locale entry.locale
-      json.theming entry.theming.as_json(only: [:privacy_link_url])
+      json.site entry.site.as_json(only: [:privacy_link_url])
       json.enabled_feature_names entry.enabled_feature_names
       json.page_types PageTypesSeed.new(config).as_json
 

data/app/helpers/pageflow/embed_code_helper.rb

@@ -24,7 +24,7 @@ module Pageflow
 
       def entry_embed_url_options(entry)
         options = Pageflow.config.entry_embed_url_options
-        options = options.call(entry.theming) if options.respond_to?(:call)
+        options = options.call(entry.site) if options.respond_to?(:call)
         options
       end
     end

data/app/helpers/pageflow/entries_helper.rb

@@ -1,7 +1,8 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_title(entry)
-      [entry.title, entry.theming.cname_domain.presence].compact.join(' - ')
+      [entry.title,
+       entry.site.title.presence || entry.site.cname_domain.presence].compact.join(' - ')
     end
 
     def pretty_entry_url(entry, options = {})
@@ -20,21 +21,21 @@ module Pageflow
       private
 
       def with_custom_canonical_url_prefix(entry)
-        return if entry.theming.canonical_entry_url_prefix.blank?
+        return if entry.site.canonical_entry_url_prefix.blank?
         entry = ensure_entry_with_revision(entry)
 
         [
-          entry.theming.canonical_entry_url_prefix.gsub(':locale', entry.locale),
+          entry.site.canonical_entry_url_prefix.gsub(':locale', entry.locale),
           entry.to_param,
-          entry.theming.trailing_slash_in_canonical_urls ? '/' : ''
+          entry.site.trailing_slash_in_canonical_urls ? '/' : ''
         ].join
       end
 
       def default(routes, entry, options)
         params =
           options
-          .reverse_merge(trailing_slash: entry.theming.trailing_slash_in_canonical_urls)
-          .reverse_merge(Pageflow.config.theming_url_options(entry.theming) || {})
+          .reverse_merge(trailing_slash: entry.site.trailing_slash_in_canonical_urls)
+          .reverse_merge(Pageflow.config.site_url_options(entry.site) || {})
 
         if entry.permalink.present?
           routes.permalink_url(
@@ -57,8 +58,8 @@ module Pageflow
     end
 
     def entry_privacy_link_url(entry)
-      return unless entry.theming.privacy_link_url.present?
-      "#{entry.theming.privacy_link_url}?lang=#{entry.locale}"
+      return unless entry.site.privacy_link_url.present?
+      "#{entry.site.privacy_link_url}?lang=#{entry.locale}"
     end
 
     def entry_file_rights(entry)
@@ -80,23 +81,23 @@ module Pageflow
     def entry_global_links(entry)
       links = []
 
-      if entry.theming.imprint_link_label.present? && entry.theming.imprint_link_url.present?
-        links << link_to(raw(entry.theming.imprint_link_label),
-                         entry.theming.imprint_link_url,
+      if entry.site.imprint_link_label.present? && entry.site.imprint_link_url.present?
+        links << link_to(raw(entry.site.imprint_link_label),
+                         entry.site.imprint_link_url,
                          target: '_blank',
                          tabindex: 2,
                          class: 'legal')
       end
 
-      if entry.theming.copyright_link_label.present? && entry.theming.copyright_link_url.present?
-        links << link_to(raw(entry.theming.copyright_link_label),
-                         entry.theming.copyright_link_url,
+      if entry.site.copyright_link_label.present? && entry.site.copyright_link_url.present?
+        links << link_to(raw(entry.site.copyright_link_label),
+                         entry.site.copyright_link_url,
                          target: '_blank',
                          tabindex: 2,
                          class: 'copy')
       end
 
-      if entry.theming.privacy_link_url.present?
+      if entry.site.privacy_link_url.present?
         links << link_to(I18n.t('pageflow.public.privacy_notice'),
                          entry_privacy_link_url(entry),
                          target: '_blank',

data/app/helpers/pageflow/feeds_helper.rb

@@ -0,0 +1,66 @@
+module Pageflow
+  # Helpers to render alternate links to atom feeds.
+  #
+  # @since 16.1
+  module FeedsHelper
+    # Render alternate links to atom feed of entries in the same site
+    # using the same locale.
+    def feed_link_tags_for_entry(entry)
+      return '' unless entry.site.feeds_enabled?
+
+      href =
+        entry.site.custom_feed_url.presence&.gsub(':locale', entry.locale) ||
+        pageflow.feed_url(
+          {
+            locale: entry.locale,
+            format: 'atom'
+          }.merge(Pageflow.config.site_url_options(entry.site) || {})
+        )
+
+      tag(:link,
+          rel: 'alternate',
+          type: 'application/atom+xml',
+          title: 'Feed',
+          href: href)
+    end
+
+    # @api private
+    def feed_entry_content(entry)
+      FeedContent.new(self, entry).build
+    end
+
+    # @api private
+    FeedContent = Struct.new(:template, :entry) do
+      def build
+        [image_html, summary_html, link_html].compact.join
+      end
+
+      private
+
+      def image_html
+        return if entry.thumbnail_file.blank?
+
+        template.content_tag(
+          :p,
+          template.tag(
+            :img,
+            src: entry.thumbnail_file.thumbnail_url(:thumbnail_large),
+            width: 560, height: 315
+          )
+        )
+      end
+
+      def summary_html
+        template.content_tag(:p, template.raw(entry.summary))
+      end
+
+      def link_html
+        template.content_tag(
+          :p,
+          template.link_to(template.t('pageflow.public.read_more'),
+                           template.social_share_entry_url(entry))
+        )
+      end
+    end
+  end
+end

data/app/helpers/pageflow/page_types_helper.rb

@@ -17,16 +17,16 @@ module Pageflow
     def page_type_templates(entry)
       safe_join(Pageflow.config.page_types.map do |page_type|
         content_tag(:script,
-                    render_to_string(template: page_type.template_path,
-                                     locals: {
-                                       configuration: {},
-                                       page: Page.new,
-                                       entry: entry,
+                    render(template: page_type.template_path,
+                           locals: {
+                             configuration: {},
+                             page: Page.new,
+                             entry: entry,
 
-                                       # Required by RevisionFileHelper#find_file_in_entry
-                                       :@entry => entry
-                                     },
-                                     layout: false).to_str,
+                             # Required by RevisionFileHelper#find_file_in_entry
+                             :@entry => entry
+                           },
+                           layout: false).to_str,
                     type: 'text/html', data: {template: "#{page_type.name}_page"})
       end)
     end

data/app/helpers/pageflow/sites_helper.rb

@@ -0,0 +1,11 @@
+module Pageflow
+  module SitesHelper
+    DEFAULT_PUBLIC_ENTRY_OPTIONS = lambda do |site|
+      site.cname.present? ? {host: site.cname} : nil
+    end
+
+    def pretty_site_url(site)
+      pageflow.public_root_url(Pageflow.config.site_url_options(site))
+    end
+  end
+end

data/app/helpers/pageflow/social_share_helper.rb

@@ -32,8 +32,8 @@ module Pageflow
 
       title = ["#{entry.title}:"]
       title << page.title
-      title << '-' if entry.theming.cname_domain.present?
-      title << entry.theming.cname_domain
+      title << '-' if entry.site.cname_domain.present?
+      title << entry.site.cname_domain
 
       title.join(' ')
     end

data/app/inputs/pageflow_permalink_input.rb

@@ -27,9 +27,9 @@ class PageflowPermalinkInput
   end
 
   def permalink_inputs_html
-    return '' if options[:directory_collection].empty?
+    return '' if options[:site].permalink_directories.empty?
 
-    builder.select(:directory_id, options[:directory_collection]) <<
+    builder.select(:directory_id, directory_select_options) <<
       builder.text_field(:slug, placeholder: options[:slug_placeholder])
   end
 
@@ -38,10 +38,22 @@ class PageflowPermalinkInput
   end
 
   def wrapper_html_options
-    if options[:directory_collection].empty?
+    if options[:site].permalink_directories.empty?
       super.merge(style: 'display: none')
+    elsif options[:site].permalink_directories.one?
+      result = super
+      result.merge(class: "#{result[:class]} no_directories")
     else
       super
     end
   end
+
+  def directory_select_options
+    template.options_from_collection_for_select(
+      options[:site].permalink_directories,
+      'id',
+      'path',
+      builder.object.directory_id
+    )
+  end
 end

data/app/models/concerns/pageflow/reusable_file.rb

@@ -30,8 +30,8 @@ module Pageflow
         file_type_of_parent = Pageflow.config.file_types.find_by_model!(parent_class)
         models_of_nested_file_types = file_type_of_parent.nested_file_types.map(&:model)
         unless models_of_nested_file_types.include?(self.class)
-          errors[:base] << 'File type of provided parent file does not permit nesting files of '\
-                           "type #{self.class.name}"
+          errors.add(:base, 'File type of provided parent file does not permit nesting files of '\
+                            "type #{self.class.name}")
         end
       end
     end
@@ -39,7 +39,7 @@ module Pageflow
     def parent_belongs_to_same_entry
       if parent_file.present?
         unless parent_file.using_entries.include?(entry)
-          errors[:base] << 'Parent file does not belong to same entry as nested file'
+          errors.add(:base, 'Parent file does not belong to same entry as nested file')
         end
       end
     end

data/app/models/pageflow/account.rb

@@ -9,49 +9,31 @@ module Pageflow
     has_many :users, through: :memberships, source: :user, class_name: '::User'
     has_many :entry_memberships, through: :entries, source: :memberships
 
-    has_many :themings, dependent: :destroy
-    has_many :entry_templates, dependent: :destroy
-    belongs_to :default_theming, :class_name => 'Theming'
+    has_many :sites, dependent: :destroy
+    belongs_to :default_site, :class_name => 'Site'
 
-    validates :default_theming, :presence => true
-    validates_associated :entry_templates
+    validates :default_site, :presence => true
 
-    accepts_nested_attributes_for :default_theming, :update_only => true
+    accepts_nested_attributes_for :default_site, :update_only => true
 
     scope :with_landing_page, -> { where.not(:landing_page_name => '') }
 
-    def build_default_theming(*args)
-      super.tap do |theming|
-        theming.account = self
+    def build_default_site(*args)
+      super.tap do |site|
+        site.account = self
       end
     end
 
-    def first_paged_entry_template
-      EntryTemplate.find_or_initialize_by(account: self, entry_type_name: 'paged')
+    def blacklist_for_serialization
+      [:features_configuration]
     end
 
-    def existing_and_potential_entry_templates
-      entry_type_names = Pageflow.config_for(self).entry_types.map(&:name)
-      existing_entry_templates = EntryTemplate.where(account_id: id).load
-      allowed_existing_entry_templates =
-        existing_entry_templates.select do |template|
-          entry_type_names.include?(template.entry_type_name)
-        end
-      free_type_names =
-        entry_type_names - allowed_existing_entry_templates.map(&:entry_type_name)
-
-      potential_entry_templates = free_type_names.map do |type_name|
-        EntryTemplate.new(
-          account_id: id,
-          entry_type_name: type_name
-        )
-      end
-
-      allowed_existing_entry_templates + potential_entry_templates
+    def self.ransackable_attributes(_auth_object)
+      %w[id name]
     end
 
-    def blacklist_for_serialization
-      [:features_configuration]
+    def self.ransackable_associations(_auth_object)
+      []
     end
   end
 end

data/app/models/pageflow/audio_file_url_templates.rb

@@ -2,6 +2,7 @@ module Pageflow
   class AudioFileUrlTemplates
     def call
       {
+        original: url_template(:attachment, :original),
         m4a: url_template(:m4a),
         mp3: url_template(:mp3),
         ogg: url_template(:ogg),
@@ -17,7 +18,7 @@ module Pageflow
 
     def example_file
       @example_file ||= AudioFile.new(id: 0,
-                                      file_name: ':basename.mp3',
+                                      file_name: ':basename.:extension',
                                       peak_data_file_name: 'audio.json')
     end
   end

data/app/models/pageflow/{cname_theming_request_scope.rb → cname_site_request_scope.rb}

@@ -1,7 +1,7 @@
 module Pageflow
-  class CnameThemingRequestScope
-    def call(themings, request)
-      themings.where(<<-SQL, host: request.host)
+  class CnameSiteRequestScope
+    def call(sites, request)
+      sites.where(<<-SQL, host: request.host)
         cname = :host OR
         FIND_IN_SET(
           :host,

data/app/models/pageflow/customized_theme.rb

@@ -14,7 +14,7 @@ module Pageflow
         entry: entry,
         theme: theme,
         theme_customization: Pageflow.theme_customizations.get(
-          account: entry.account,
+          site: entry.site,
           entry_type_name: entry.type_name
         )
       )

data/app/models/pageflow/draft_entry.rb

@@ -52,7 +52,7 @@ module Pageflow
     end
 
     def update_meta_data!(attributes)
-      draft.update_attributes!(attributes)
+      draft.update!(attributes)
     end
 
     def self.find(id)

data/app/models/pageflow/entries_feed.rb

@@ -0,0 +1,32 @@
+module Pageflow
+  # @api private
+  EntriesFeed = Struct.new(:title, :locale, :custom_url, :root_url, :entries) do
+    def updated_at
+      entries.map(&:published_at).max
+    end
+
+    class << self
+      def for(site:, locale:)
+        new(
+          site.title.presence || site.host,
+          locale,
+          site.custom_feed_url&.gsub(':locale', locale),
+          site.canonical_entry_url_prefix&.gsub(':locale', locale),
+          find_entries(site, locale)
+        )
+      end
+
+      private
+
+      def find_entries(site, locale)
+        Pageflow::PublishedEntry.wrap_all(
+          site
+            .entries
+            .published_without_password_protection
+            .where(pageflow_revisions: {locale: locale})
+            .order('first_published_at DESC')
+        )
+      end
+    end
+  end
+end

data/app/models/pageflow/entry.rb

@@ -13,7 +13,7 @@ module Pageflow
 
     belongs_to :account, counter_cache: true
     belongs_to :folder, optional: true
-    belongs_to :theming
+    belongs_to :site
 
     has_many :revisions, -> { order('frozen_at DESC') }
 
@@ -36,7 +36,7 @@ module Pageflow
 
     has_secure_password validations: false
 
-    validates :account, :theming, :presence => true
+    validates :account, :site, :presence => true
     validates :title, presence: true
     validate :entry_type_is_available_for_account
     validate :folder_belongs_to_same_account
@@ -57,8 +57,7 @@ module Pageflow
     end
 
     def entry_template
-      @entry_template ||= EntryTemplate.find_or_initialize_by(
-        account_id: account.id,
+      @entry_template ||= site.entry_templates.find_or_initialize_by(
         entry_type_name: type_name
       )
     end

data/app/models/pageflow/entry_at_revision.rb

@@ -15,7 +15,7 @@ module Pageflow
 
     delegate(:id, :slug,
              :entry_type,
-             :account, :theming,
+             :account, :site,
              :permalink,
              :feature_state, :enabled_feature_names,
              :edit_lock,
@@ -47,7 +47,7 @@ module Pageflow
     end
 
     def home_button
-      HomeButton.new(revision, theming)
+      HomeButton.new(revision, site)
     end
 
     def overview_button

data/app/models/pageflow/entry_duplicate.rb

@@ -45,7 +45,7 @@ module Pageflow
         type_name: original_entry.type_name,
         title: new_title,
         account: original_entry.account,
-        theming: original_entry.theming,
+        site: original_entry.site,
         features_configuration: original_entry.features_configuration,
 
         skip_draft_creation: true

data/app/models/pageflow/entry_template.rb

@@ -3,15 +3,15 @@ module Pageflow
     include ThemeReferencer
     include SerializedConfiguration
     serialize :default_share_providers, JSON
-    belongs_to :account
-    delegate :enabled_feature_names, to: :account
+    belongs_to :site
+    delegate :enabled_feature_names, to: :site
     has_many :widgets, as: :subject, dependent: :destroy
 
-    validates :account, presence: true
+    validates :site, presence: true
     validates :entry_type_name, presence: true
     validates :entry_type_name,
               uniqueness: {
-                scope: :account
+                scope: :site
               }
 
     def entry_type