pageflow 16.0.0 → 16.1.0

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,8 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_title(entry)
-      [entry.title, entry.site.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 = {})

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/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

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

@@ -9,7 +9,7 @@ module Pageflow
       'processed_attachments'
     end
 
-    after_attachment_on_s3_post_process :save_image_dimensions
+    before_attachment_on_s3_post_process :save_image_dimensions
 
     def thumbnail_url(*args)
       unless ready?
@@ -49,10 +49,10 @@ module Pageflow
           ultra: {geometry: '3840x3840>',
                   format: :JPG,
                   convert_options: '-quality 90 -interlace Plane'},
-          panorama_medium: {geometry: '1024x1024^',
+          panorama_medium: {geometry: ImageFile.scale_down_to_cover(1024, 1024),
                             format: panorama_format,
                             convert_options: '-quality 90 -interlace Plane'},
-          panorama_large: {geometry: '1920x1080^',
+          panorama_large: {geometry: ImageFile.scale_down_to_cover(1920, 1080),
                            format: panorama_format,
                            convert_options: '-quality 90 -interlace Plane'}
         )
@@ -63,6 +63,17 @@ module Pageflow
     end
     # <- UploadableFile-overrides
 
+    def self.scale_down_to_cover(width, height)
+      lambda do |image_file|
+        if image_file.width.present? && image_file.height.present? &&
+           (image_file.width <= width || image_file.height <= height)
+          '100%'
+        else
+          "#{width}x#{height}^"
+        end
+      end
+    end
+
     private
 
     def save_image_dimensions

data/app/models/pageflow/membership.rb

@@ -38,8 +38,9 @@ module Pageflow
     private
 
     def account_membership_exists
-      errors[:base] << 'Entry Membership misses presupposed Membership on account of entry' if
-        user.present? && !user.accounts.include?(entity.account)
+      return if user.blank? || user.accounts.include?(entity.account)
+
+      errors.add(:base, 'Entry Membership misses presupposed Membership on account of entry')
     end
 
     def on_entry?

data/app/models/pageflow/other_file.rb

@@ -0,0 +1,5 @@
+module Pageflow
+  class OtherFile < ApplicationRecord
+    include UploadableFile
+  end
+end

data/app/models/pageflow/other_file_url_templates.rb

@@ -0,0 +1,16 @@
+module Pageflow
+  # @api private
+  class OtherFileUrlTemplates
+    def call
+      {
+        original: UrlTemplate.from_attachment(example_file.attachment, :original)
+      }
+    end
+
+    private
+
+    def example_file
+      @example_file ||= OtherFile.new(id: 0, file_name: ':basename.:extension')
+    end
+  end
+end

data/app/models/pageflow/published_entry.rb

@@ -55,6 +55,12 @@ module Pageflow
       )
     end
 
+    def self.wrap_all(scope)
+      scope
+        .includes(:published_revision)
+        .map { |entry| new(entry) }
+    end
+
     def cache_key
       [
         self.class.model_name.cache_key,

data/app/models/pageflow/revision.rb

@@ -232,5 +232,9 @@ module Pageflow
     def available_themes
       @available_themes ||= Pageflow.config_for(entry).themes
     end
+
+    def self.ransackable_attributes(_auth_object)
+      %w[published_at]
+    end
   end
 end

data/app/models/pageflow/site.rb

@@ -55,5 +55,13 @@ module Pageflow
     def theme_name
       first_paged_entry_template.theme_name
     end
+
+    def self.ransackable_attributes(_auth_object)
+      %w[name]
+    end
+
+    def self.ransackable_associations(_auth_object)
+      %w[account]
+    end
   end
 end

data/app/models/pageflow/sitemaps.rb

@@ -0,0 +1,13 @@
+module Pageflow
+  # @api private
+  module Sitemaps
+    def self.entries_for(site:)
+      PublishedEntry.wrap_all(
+        site
+          .entries
+          .published_without_password_protection
+          .order('first_published_at DESC')
+      )
+    end
+  end
+end

data/app/models/pageflow/used_file.rb

@@ -10,9 +10,9 @@ module Pageflow
       @usage.configuration
     end
 
-    def update_attributes!(attributes)
+    def update!(attributes)
       super(attributes.except(:configuration))
-      @usage.update_attributes!(attributes.slice(:configuration))
+      @usage.update!(attributes.slice(:configuration))
     end
 
     def usage_id

data/app/models/pageflow/video_file_url_templates.rb

@@ -2,6 +2,8 @@ module Pageflow
   class VideoFileUrlTemplates
     def call
       {
+        original: url_template(:attachment, :original),
+
         high: url_template(:mp4_high),
         medium: url_template(:mp4_medium),
         fullhd: url_template(:mp4_fullhd),
@@ -26,7 +28,7 @@ module Pageflow
 
     def example_file
       @example_file ||= VideoFile.new(id: 0).tap do |video_file|
-        video_file.file_name = ':basename.mp4'
+        video_file.file_name = ':basename.:extension'
         video_file.output_presences = {':pageflow_hls_qualities' => true}
         video_file.poster_file_name = video_file.zencoder_poster.original_filename
       end

data/app/models/pageflow/widget.rb

@@ -72,7 +72,15 @@ module Pageflow
       end
 
       def from_db_by_role
-        Widget.all.index_by(&:role)
+        reject_unknown_widget_types(Widget.all)
+          .index_by(&:role)
+      end
+
+      def reject_unknown_widget_types(widgets)
+        widgets.select do |widget|
+          widget.type_name.blank? ||
+            config.widget_types.type_name?(widget.type_name)
+        end
       end
 
       def defaults_by_role

data/app/views/admin/entries/_permalink_inputs.html.erb

@@ -1,6 +1,5 @@
 <%= form.input(:permalink,
                as: :pageflow_permalink,
                base_url: pretty_site_url(entry.site),
-               directory_collection: collection_for_permalink_directories(entry.site,
-                                                                          form.object),
+               site: entry.site,
                slug_placeholder: entry.default_permalink_slug) %>

data/app/views/admin/sites/_attributes_table.html.arb

@@ -1,9 +1,12 @@
 extensible_attributes_table_for(site,
                                 Pageflow.config_for(site.account)
                                   .admin_attributes_table_rows.for(:site)) do
+  row :title
   row :host, class: 'host'
   row :account, class: 'account' do
     link_to(site.account.name,
             admin_account_path(site.account, tab: 'sites'))
   end
+  row :feeds_enabled
+  row :sitemap_enabled
 end

data/app/views/admin/sites/_fields.html.erb

@@ -1,4 +1,5 @@
 <%= f.inputs do %>
+  <%= f.input :title, hint: t('pageflow.admin.sites.title_hint') %>
   <%= f.input :cname, hint: t('pageflow.admin.sites.cname_hint') %>
   <%= f.input :additional_cnames, hint: t('pageflow.admin.sites.additional_cnames_hint') %>
   <%= f.input :home_url, hint: t('pageflow.admin.sites.home_url_hint') %>
@@ -11,6 +12,11 @@
   <%= f.input :copyright_link_url %>
   <%= f.input :privacy_link_url %>
 
+  <%= f.input :feeds_enabled, hint: t('pageflow.admin.sites.feeds_hint',
+                                      site_host: @site&.persisted? ? @site.host : '<host>') %>
+  <%= f.input :sitemap_enabled, hint: t('pageflow.admin.sites.sitemap_hint',
+                                        site_host: @site&.persisted? ? @site.host : '<host>') %>
+
   <% account_config.admin_form_inputs.find_all_for(:site).each do |form_input| %>
     <%= form_input.build(f) %>
   <% end %>

data/app/views/components/pageflow/admin/extensible_attributes_table.rb

@@ -78,8 +78,14 @@ module Pageflow
         #
         # This is also the reason we can not use SimpleDelegator here
         # and also delegate_missing in Rails 5 would not work.
-        def method_missing(method, *args, &block)
-          @context.public_send(method, *args, &block)
+        def method_missing(method, *args, **kwargs, &block)
+          # Required for Ruby 2.6. Remove together with
+          # Pageflow::RailsVersion.experimental? conditionals.
+          if kwargs.present?
+            @context.public_send(method, *args, **kwargs, &block)
+          else
+            @context.public_send(method, *args, &block)
+          end
         end
         # rubocop:enable Style/MethodMissing
       end

data/app/views/components/pageflow/admin/sites_tab.rb

@@ -9,6 +9,9 @@ module Pageflow
               link_to(site.display_name,
                       admin_account_site_path(site.account, site))
             end
+            column :title do |site|
+              site.title.presence || '-'
+            end
             column :host do |site|
               site.host.presence || '-'
             end

data/app/views/pageflow/editor/config/_seeds.json.jbuilder

@@ -1,6 +1,7 @@
 json.key_format!(camelize: :lower)
 json.call(Pageflow.config,
           :confirm_encoding_jobs,
+          :default_published_until_duration_in_months,
           :available_locales,
           :available_public_locales,
           :available_text_track_kinds,

data/app/views/pageflow/feeds/index.atom.builder

@@ -0,0 +1,20 @@
+atom_feed language: @feed.locale,
+          root_url: @feed.root_url,
+          url: @feed.custom_url do |feed|
+  feed.title(@feed.title)
+  feed.updated(@feed.updated_at&.utc)
+
+  @feed.entries.each do |entry|
+    feed.entry(entry,
+               url: social_share_entry_url(entry),
+               published: entry.first_published_at.utc,
+               updated: entry.published_at.utc) do |feed_entry|
+      feed_entry.title(entry.title)
+      feed_entry.content(feed_entry_content(entry), type: 'html')
+
+      feed_entry.author do |author|
+        author.name(entry.author)
+      end
+    end
+  end
+end

data/app/views/pageflow/sitemaps/index.xml.builder

@@ -0,0 +1,9 @@
+xml.instruct!
+xml.urlset xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9' do
+  @entries.each do |entry|
+    xml.url do
+      xml.loc(social_share_entry_url(entry))
+      xml.lastmod(entry.published_at.utc.xmlschema)
+    end
+  end
+end

data/config/initializers/features.rb

@@ -1,4 +1,5 @@
 Pageflow.configure do |config|
   config.features.register('highdef_video_encoding')
+  config.features.register('force_fullhd_video_quality')
   config.features.register('selectable_themes')
 end

data/config/initializers/paperclip.rb

@@ -1,3 +1,7 @@
+require 'pageflow/paperclip_processors/vtt'
+require 'pageflow/paperclip_processors/audio_waveform'
+require 'pageflow/paperclip_processors/noop'
+
 Paperclip.interpolates(:pageflow_s3_root) do |_attachment, _style|
   Pageflow.config.paperclip_s3_root
 end