pageflow 16.0.0 → 16.2.0

data/app/assets/stylesheets/pageflow/editor/file_thumbnails.scss

@@ -15,6 +15,10 @@
       @include note-icon;
     }
 
+    &.other {
+      @include fa-cloud-download-icon;
+    }
+
     &.uploading {
       @include up-bold-icon;
     }

data/app/assets/stylesheets/pageflow/editor/help.scss

@@ -162,11 +162,11 @@
 }
 
 .editor .help_button {
-  @include background-icon-right($color: var(--ui-primary-color),
-                                 $font-size: 16px, $right: 5px, $top: 5px);
+  @include background-icon-left($color: var(--ui-primary-color),
+                                $font-size: 16px, $left: 5px, $top: 50%);
   @include help-circled-icon;
 
-  padding: 7px 30px 0 5px;
+  padding: 7px 5px 0 28px;
   float: right;
   height: 20px;
   cursor: pointer;

data/app/assets/stylesheets/pageflow/editor/info_box.scss

@@ -3,6 +3,13 @@
     margin-bottom: 1em;
   }
 
+  &.error {
+    color: var(--ui-on-error-surface-color);
+    background-color: var(--ui-error-surface-color);
+    border-radius: rounded();
+    padding: space(3);
+  }
+
   .shortcuts {
     dt {
       display: block;

data/app/assets/stylesheets/pageflow/editor/inputs/file_input.scss

@@ -38,11 +38,6 @@
   }
 
   .drop_down_button {
-    button {
-      @include fa-ellipsis-v-icon;
-      width: 31px;
-    }
-
     position: absolute;
     bottom: 0;
     left: 70px;

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

@@ -14,7 +14,7 @@ label {
 
 /** Make sure the label is on top when an inline help text is displayed */
 label:hover span.name {
-  z-index: 4;
+  z-index: 5;
   position: relative;
 }
 
@@ -91,7 +91,7 @@ textarea.short {
 
   // Make sure the input is on top when an inline help text is displayed
   &:hover input {
-    z-index: 4;
+    z-index: 5;
     position: relative;
   }
 
@@ -207,7 +207,7 @@ textarea.short {
     border-radius: rounded(sm);
     width: 100%;
     height: auto;
-    z-index: 3;
+    z-index: 4;
   }
 
   font-weight: normal;
@@ -219,7 +219,7 @@ textarea.short {
   text-decoration: underline;
 }
 
-.input-hidden_via_binding {
+.hidden_via_binding {
   display: none;
 }
 

data/app/assets/stylesheets/pageflow/{editor/wysihtml5.scss → ui/input/text_area_input.scss}

@@ -1,4 +1,4 @@
-.toolbar {
+.text_area_input .toolbar {
   margin-left: -2px;
   margin-top: 3px;
   position: relative;
@@ -174,4 +174,16 @@
     border-bottom: solid 9px var(--ui-surface-color);
     border-left: solid 9px transparent;
   }
+
+  // Hide inline help text that only makes sense when editing a
+  // Pageflow entry outside the editor
+  .open_in_new_tab_section .inline_help {
+    display: none;
+  }
+}
+
+.editor .text_area_input {
+  .open_in_new_tab_section .inline_help {
+    display: block;
+  }
 }

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

@@ -19,3 +19,4 @@
 
 @import "./ui/input/extended_select_input";
 @import "./ui/input/check_box_group_input";
+@import "./ui/input/text_area_input";

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/entry_publications_controller.rb

@@ -39,7 +39,11 @@ module Pageflow
       end
 
       def entry_publication_params
-        params.fetch(:entry_publication, {}).permit(:published_until, :password, :password_protected)
+        params
+          .fetch(:entry_publication, {})
+          .permit(:published_until,
+                  :password, :password_protected,
+                  :noindex)
       end
 
       def published_entries_quota(entry)

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

@@ -59,7 +59,7 @@ module Pageflow
                           :content_type,
                           :file_size,
                           :url,
-                          configuration: :alt])
+                          configuration: [:alt, :source_url]])
           .require(:files)
       end
 

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

@@ -8,7 +8,7 @@ module Pageflow
     def index
       site = Site.for_request(request).with_home_url.first!
 
-      redirect_to(site.home_url)
+      redirect_to(site.home_url, allow_other_host: true)
     end
 
     def show
@@ -73,7 +73,7 @@ module Pageflow
     def redirect_according_to_entry_redirect(entry)
       return unless (redirect_location = entry_redirect(entry))
 
-      redirect_to(redirect_location, status: :moved_permanently)
+      redirect_to(redirect_location, status: :moved_permanently, allow_other_host: true)
     end
 
     def entry_redirect(entry)
@@ -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/entries_helper.rb

@@ -1,7 +1,10 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_title(entry)
-      [entry.title, entry.site.cname_domain.presence].compact.join(' - ')
+      return entry.title if entry.site.title == ' '
+
+      [entry.title,
+       entry.site.title.presence || entry.site.cname_domain.presence].compact.join(' - ')
     end
 
     def pretty_entry_url(entry, options = {})

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/meta_tags_helper.rb

@@ -9,7 +9,8 @@ module Pageflow
       {
         keywords: entry.keywords,
         author: entry.author,
-        publisher: entry.publisher
+        publisher: entry.publisher,
+        noindex: entry.noindex?
       }
     end
   end

data/app/helpers/pageflow/page_types_helper.rb

@@ -15,18 +15,18 @@ module Pageflow
     end
 
     def page_type_templates(entry)
+      # Required by RevisionFileHelper#find_file_in_entry
+      @entry = 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,
-
-                                       # Required by RevisionFileHelper#find_file_in_entry
-                                       :@entry => entry
-                                     },
-                                     layout: false).to_str,
+                    render(template: page_type.template_path,
+                           locals: {
+                             configuration: {},
+                             page: Page.new,
+                             entry: entry
+                           },
+                           layout: false).to_str,
                     type: 'text/html', data: {template: "#{page_type.name}_page"})
       end)
     end

data/app/helpers/pageflow/revision_file_helper.rb

@@ -19,9 +19,9 @@ module Pageflow
     #
     # @since 15.0
     # @returns UsedFile
-    def find_file_in_entry(file_type, file_perma_id)
-      raise 'No entry of type PublishedEntry or DraftEntry set.' unless @entry.present?
-      @entry.find_file_by_perma_id(file_type, file_perma_id)
+    def find_file_in_entry(file_type, file_perma_id, entry = @entry)
+      raise 'No entry of type PublishedEntry or DraftEntry set.' unless entry.present?
+      entry.find_file_by_perma_id(file_type, file_perma_id)
     end
   end
 end

data/app/helpers/pageflow/social_share_helper.rb

@@ -8,7 +8,7 @@ module Pageflow
       if target.is_a?(Page)
         render('pageflow/social_share/page_meta_tags', entry: @entry, page: @entry.share_target)
       else
-        render('pageflow/social_share/entry_meta_tags', entry: @entry)
+        render('pageflow/social_share/entry_meta_tags', entry: target)
       end
     end
 
@@ -55,7 +55,7 @@ module Pageflow
 
     def social_share_entry_image_tags(entry)
       share_images = []
-      image_file = find_file_in_entry(ImageFile, entry.share_image_id)
+      image_file = find_file_in_entry(ImageFile, entry.share_image_id, entry)
 
       if image_file
         image_url = image_file.thumbnail_url(:medium)

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/entry_publication_states.rb

@@ -11,6 +11,9 @@ module Pageflow
       scope(:published_with_password_protection,
             -> { published.merge(Revision.with_password_protection) })
 
+      scope(:published_without_noindex,
+            -> { published.merge(Revision.without_noindex) })
+
       scope(:not_published,
             lambda do
               includes(:published_revision)
@@ -22,6 +25,8 @@ module Pageflow
     def publication_state
       if published_with_password_protection?
         'published_with_password_protection'
+      elsif published? && published_revision.noindex?
+        'published_with_noindex'
       elsif published?
         'published_without_password_protection'
       else
@@ -45,6 +50,10 @@ module Pageflow
       published? ? published_revision.published_until : nil
     end
 
+    def last_published_with_noindex?
+      !!revisions.publications.first&.noindex
+    end
+
     module ClassMethods
       def with_publication_state(state)
         case state

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/concerns/pageflow/uploadable_file.rb

@@ -38,6 +38,11 @@ module Pageflow
       end
     end
 
+    # see https://github.com/rails/rails/issues/50048
+    def file_name
+      attachment_on_s3_file_name
+    end
+
     def attachment
       attachment_on_s3
     end

data/app/models/pageflow/account.rb

@@ -27,5 +27,13 @@ module Pageflow
     def blacklist_for_serialization
       [:features_configuration]
     end
+
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id name]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      []
+    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/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

@@ -29,8 +29,8 @@ module Pageflow
 
     has_many :imports, class_name: 'Pageflow::FileImport', dependent: :destroy
 
-    has_one :draft, -> { editable }, :class_name => 'Revision'
-    has_one :published_revision, -> { published }, :class_name => 'Revision'
+    has_one :draft, -> { editable }, class_name: 'Revision', inverse_of: :entry
+    has_one :published_revision, -> { published }, class_name: 'Revision', inverse_of: :entry
 
     has_one :edit_lock, :dependent => :destroy
 
@@ -88,6 +88,7 @@ module Pageflow
           revision.published_at = Time.now
           revision.published_until = options[:published_until]
           revision.password_protected = options[:password_protected]
+          revision.noindex = !!options[:noindex]
         end
       end
     end
@@ -111,6 +112,7 @@ module Pageflow
         revision.published_at = nil
         revision.published_until = nil
         revision.password_protected = nil
+        revision.noindex = nil
       end
     end
 
@@ -130,15 +132,15 @@ module Pageflow
       title.to_s.parameterize
     end
 
-    def self.ransackable_attributes(_auth_object)
+    def self.ransackable_attributes(_auth_object = nil)
       %w[title type_name created_at edited_at first_published_at]
     end
 
-    def self.ransackable_associations(_auth_object)
+    def self.ransackable_associations(_auth_object = nil)
       %w[account published_revision]
     end
 
-    def self.ransackable_scopes(_)
+    def self.ransackable_scopes(_auth_object = nil)
       [:with_publication_state, :published]
     end