pageflow 16.0.0 → 16.2.0

data/app/models/pageflow/entry_at_revision.rb

@@ -22,6 +22,7 @@ module Pageflow
              :password_digest,
              :to_model, :to_key, :to_param, :persisted?, :to_json,
              :first_published_at, :published_until, :published?,
+             :last_published_with_noindex?,
              :type_name,
              to: :entry)
 
@@ -35,6 +36,7 @@ module Pageflow
              :locale,
              :author, :publisher, :keywords,
              :published_at,
+             :noindex?,
              :configuration,
              to: :revision)
 

data/app/models/pageflow/image_file.rb

@@ -2,6 +2,9 @@ module Pageflow
   class ImageFile < ApplicationRecord
     include UploadableFile
     include ImageAndTextTrackProcessingStateMachine
+    include OutputSource
+
+    before_post_process :set_output_presences
 
     # used in paperclip initializer to interpolate the storage path
     # needs to be "processed_attachments" for images for legacy reasons
@@ -9,7 +12,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?
@@ -35,24 +38,24 @@ module Pageflow
       panorama_format = File.extname(attachment.original_filename) == '.png' ? :PNG : :JPG
 
       Pageflow
-        .config.thumbnail_styles
+        .config.thumbnail_styles.transform_values { |options| options.merge(style_defaults) }
         .merge(
           print: {geometry: '300x300>',
-                  format: :JPG,
+                  **style_defaults,
                   convert_options: '-quality 10 -interlace Plane'},
           medium: {geometry: '1024x1024>',
-                   format: :JPG,
+                   **style_defaults,
                    convert_options: '-quality 70 -interlace Plane'},
           large: {geometry: '1920x1920>',
-                  format: :JPG,
+                  **style_defaults,
                   convert_options: '-quality 70 -interlace Plane'},
           ultra: {geometry: '3840x3840>',
-                  format: :JPG,
+                  **style_defaults,
                   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 +66,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
@@ -71,5 +85,17 @@ module Pageflow
       self.height = geo.height
     rescue Paperclip::Errors::NotIdentifiedByImageMagickError
     end
+
+    def style_defaults
+      if output_present?(:webp)
+        {format: :webp, processors: [:pageflow_webp]}
+      else
+        {format: :JPG}
+      end
+    end
+
+    def set_output_presences
+      self.output_presences = {webp: true} if entry&.feature_state('webp_images')
+    end
   end
 end

data/app/models/pageflow/image_file_url_templates.rb

@@ -2,12 +2,18 @@ module Pageflow
   class ImageFileUrlTemplates
     def call
       styles.each_with_object({}) do |style, result|
-        result[style] = UrlTemplate.from_attachment(example_file.attachment, style)
+        result[style] = replace_extension_with_placeholder(
+          UrlTemplate.from_attachment(example_file.attachment, style)
+        )
       end
     end
 
     private
 
+    def replace_extension_with_placeholder(url)
+      url.gsub(/.JPG$/, '.:processed_extension')
+    end
+
     def styles
       example_file.attachment_styles(example_file.attachment).keys + [:original]
     end

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

@@ -65,6 +65,8 @@ module Pageflow
     scope(:with_password_protection, -> { where('password_protected IS TRUE') })
     scope(:without_password_protection, -> { where('password_protected IS NOT TRUE') })
 
+    scope(:without_noindex, -> { where('noindex IS NOT TRUE') })
+
     scope :editable, -> { where('frozen_at IS NULL') }
     scope :frozen, -> { where('frozen_at IS NOT NULL') }
 
@@ -204,6 +206,10 @@ module Pageflow
         .merge(read_attribute(:configuration) || {})
     end
 
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[published_at]
+    end
+
     private
 
     def files(model)

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 = nil)
+      %w[name]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[account]
+    end
   end
 end

data/app/models/pageflow/sitemaps.rb

@@ -0,0 +1,14 @@
+module Pageflow
+  # @api private
+  module Sitemaps
+    def self.entries_for(site:)
+      PublishedEntry.wrap_all(
+        site
+          .entries
+          .published_without_password_protection
+          .published_without_noindex
+          .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
@@ -23,6 +23,14 @@ module Pageflow
       @usage.perma_id
     end
 
+    def cache_key
+      [@file.cache_key, @usage.cache_key].join('-')
+    end
+
+    def cache_key_with_version
+      [@file.cache_key_with_version, @usage.cache_key_with_version].join('-')
+    end
+
     # Not delegated by default. Required to allow using instances in
     # Active Record conditions.
 

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,8 @@ 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)
+          @context.public_send(method, *args, **kwargs, &block)
         end
         # rubocop:enable Style/MethodMissing
       end

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

@@ -39,6 +39,14 @@ module Pageflow
                 end
               end
 
+              if revision.noindex?
+                span(class: 'publication_state_indicator published_with_noindex') do
+                  span(class: 'tooltip_bubble') do
+                    t('pageflow.admin.entries.noindex')
+                  end
+                end
+              end
+
               if revision.password_protected?
                 span(class: 'publication_state_indicator published_with_password_protection') do
                   span(class: 'tooltip_bubble') do

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,8 +1,10 @@
 json.key_format!(camelize: :lower)
 json.call(Pageflow.config,
           :confirm_encoding_jobs,
+          :default_published_until_duration_in_months,
           :available_locales,
           :available_public_locales,
+          :available_file_licenses,
           :available_text_track_kinds,
           :available_share_providers)
 json.file_types Pageflow.config_for(entry).file_types do |file_type|

data/app/views/pageflow/editor/entries/_entry.json.jbuilder

@@ -6,6 +6,7 @@ json.default_file_rights entry.account.default_file_rights
 json.published(entry.published?)
 json.publishable(can?(:publish, entry.to_model))
 json.password_protected(entry.password_digest.present?)
+json.last_published_with_noindex(entry.last_published_with_noindex?)
 
 json.metadata do
   json.(entry,

data/app/views/pageflow/editor/entry_publications/check.json.jbuilder

@@ -6,6 +6,7 @@ json.entry do
   json.(@entry_publication.entry, :published_until)
   json.published(@entry_publication.entry.published?)
   json.password_protected(@entry_publication.entry.password_digest.present?)
+  json.last_published_with_noindex(@entry_publication.entry.last_published_with_noindex?)
 end
 json.exhausted_html(render_html_partial('pageflow/editor/quotas/published_entries_exhausted',
                                         entry: @entry_publication.entry,

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/image_files/_image_file.json.jbuilder

@@ -1,2 +1,3 @@
 json.call(image_file, :width, :height)
+json.processed_extension image_file.output_present?(:webp) ? 'webp' : 'JPG'
 json.created_at image_file.created_at.try(:utc).try(:iso8601, 0)

data/app/views/pageflow/meta_tags/_entry.html.erb

@@ -2,3 +2,4 @@
   <% if keywords.present? %><meta name="keywords" content="<%= keywords %>"><% end %>
   <% if author.present? %><meta name="author" content="<%= author %>"><% end %>
   <% if publisher.present? %><meta name="publisher" content="<%= publisher %>"><% end %>
+  <% if noindex %><meta name="robots" content="noindex"><% 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,7 @@
 Pageflow.configure do |config|
+  config.features.register('webp_images')
   config.features.register('highdef_video_encoding')
+  config.features.register('force_fullhd_video_quality')
+  config.features.register('large_player_pool')
   config.features.register('selectable_themes')
 end

data/config/initializers/paperclip.rb

@@ -1,3 +1,8 @@
+require 'pageflow/paperclip_processors/vtt'
+require 'pageflow/paperclip_processors/audio_waveform'
+require 'pageflow/paperclip_processors/webp'
+require 'pageflow/paperclip_processors/noop'
+
 Paperclip.interpolates(:pageflow_s3_root) do |_attachment, _style|
   Pageflow.config.paperclip_s3_root
 end
@@ -29,6 +34,9 @@ Paperclip.interpolates(:pageflow_hls_qualities) do |attachment, _style|
 end
 
 Paperclip.configure do |config|
+  config.register_processor(:pageflow_webp,
+                            Pageflow::PaperclipProcessors::Webp)
+
   config.register_processor(:pageflow_vtt,
                             Pageflow::PaperclipProcessors::Vtt)