pageflow 15.8.0 → 16.1.0

data/app/models/pageflow/home_button.rb

@@ -1,14 +1,14 @@
 module Pageflow
   class HomeButton
-    attr_reader :revision, :theming
+    attr_reader :revision, :site
 
-    def initialize(revision, theming)
+    def initialize(revision, site)
       @revision = revision
-      @theming = theming
+      @site = site
     end
 
     def url
-      revision.configuration['home_url'].presence || theming_home_button_url
+      revision.configuration['home_url'].presence || site_home_button_url
     end
 
     def enabled?
@@ -27,9 +27,9 @@ module Pageflow
 
     private
 
-    def theming_home_button_url
-      if theming.home_url.present?
-        options = Pageflow.config.theming_url_options(theming) || {}
+    def site_home_button_url
+      if site.home_url.present?
+        options = Pageflow.config.site_url_options(site) || {}
         Pageflow::Engine.routes.url_for(options.merge(controller: 'pageflow/entries',
                                                       action: 'index',
                                                       only_path: !options[:host]))

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

@@ -14,7 +14,7 @@ module Pageflow
               format: /\A[0-9a-zA-Z_-]+\z/,
               uniqueness: {scope: :directory})
 
-    validate :belongs_to_same_theming_as_entry
+    validate :belongs_to_same_site_as_entry
 
     private
 
@@ -30,8 +30,8 @@ module Pageflow
       slug.nil?
     end
 
-    def belongs_to_same_theming_as_entry
-      return if !directory || !entry || entry.theming_id == directory.theming_id
+    def belongs_to_same_site_as_entry
+      return if !directory || !entry || entry.site_id == directory.site_id
 
       errors.add(:directory, :invalid)
     end

data/app/models/pageflow/permalink_directory.rb

@@ -1,10 +1,10 @@
 module Pageflow
   # @api private
   class PermalinkDirectory < ApplicationRecord
-    belongs_to :theming
+    belongs_to :site
 
     validates(:path,
               format: %r{\A([0-9a-zA-Z-]+/)*\z},
-              uniqueness: {scope: :theming_id})
+              uniqueness: {scope: :site_id})
   end
 end

data/app/models/pageflow/published_entry.rb

@@ -55,12 +55,18 @@ 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,
         entry.cache_key,
         revision.cache_key,
-        theming.cache_key
+        site.cache_key
       ].compact.join('-')
     end
 
@@ -68,7 +74,7 @@ module Pageflow
       [
         entry.cache_version,
         revision.cache_version,
-        theming.cache_version
+        site.cache_version
       ].compact.join('-').presence
     end
 

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

@@ -0,0 +1,67 @@
+module Pageflow
+  class Site < ApplicationRecord
+    belongs_to :account
+
+    has_many :entry_templates, dependent: :destroy
+    has_many :entries
+    has_many :permalink_directories, -> { order('path ASC') }
+
+    scope :with_home_url, -> { where.not(home_url: '') }
+    scope :for_request, ->(request) { Pageflow.config.site_request_scope.call(all, request) }
+
+    validates :account, :presence => true
+
+    delegate :enabled_feature_names, to: :account
+
+    def display_name
+      name.presence || I18n.t('pageflow.admin.sites.default_name')
+    end
+
+    def name_with_account_prefix
+      [account.name, name].compact.join(' - ')
+    end
+
+    def host
+      Pageflow.config.site_url_options(self)&.dig(:host)
+    end
+
+    def cname_domain
+      cname.split('.').pop(2).join('.')
+    end
+
+    def first_paged_entry_template
+      entry_templates.find_or_initialize_by(entry_type_name: 'paged')
+    end
+
+    def existing_and_potential_entry_templates
+      entry_type_names = Pageflow.config_for(account).entry_types.map(&:name)
+
+      allowed_existing_entry_templates =
+        entry_templates.where(entry_type_name: entry_type_names)
+
+      free_type_names =
+        entry_type_names - allowed_existing_entry_templates.map(&:entry_type_name)
+
+      potential_entry_templates = free_type_names.map do |type_name|
+        entry_templates.build(entry_type_name: type_name)
+      end
+
+      allowed_existing_entry_templates + potential_entry_templates
+    end
+
+    # @deprecated Depending on what you need this for, consider
+    # scoping your code to an entry type or look at a specific entry's
+    # theme name.
+    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/theme_customization.rb

@@ -4,7 +4,7 @@ module Pageflow
   #
   # @since 15.7
   class ThemeCustomization < ApplicationRecord
-    belongs_to :account
+    belongs_to :site
 
     serialize :overrides, JSON
     serialize :selected_file_ids, JSON

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/policies/pageflow/account_policy.rb

@@ -29,7 +29,7 @@ module Pageflow
         entry_creatable
       end
 
-      def themings_accessible
+      def sites_accessible
         entry_creatable
       end
 
@@ -62,7 +62,7 @@ module Pageflow
       publish?
     end
 
-    def update_theming_on_entry_of?
+    def update_site_on_entry_of?
       publish?
     end
 

data/app/policies/pageflow/entry_policy.rb

@@ -127,9 +127,9 @@ module Pageflow
       publish_on_account_of?
     end
 
-    def update_theming_on?
+    def update_site_on?
       user.admin? ||
-        (!permissions_config.only_admins_may_update_theming &&
+        (!permissions_config.only_admins_may_update_site &&
          publish_on_account_of?)
     end
 

data/app/policies/pageflow/entry_template_policy.rb

@@ -16,7 +16,7 @@ module Pageflow
     private
 
     def allows?(roles)
-      @user.memberships.where(role: roles, entity: @entry_template.account).any?
+      @user.memberships.where(role: roles, entity: @entry_template.site.account).any?
     end
   end
 end

data/app/policies/pageflow/{theming_policy.rb → site_policy.rb}

@@ -1,5 +1,5 @@
 module Pageflow
-  class ThemingPolicy < ApplicationPolicy
+  class SitePolicy < ApplicationPolicy
     class Scope < Scope
       attr_reader :user, :scope
 
@@ -8,7 +8,7 @@ module Pageflow
         @scope = scope
       end
 
-      def themings_allowed_for(accounts)
+      def sites_allowed_for(accounts)
         if user.admin?
           scope.all
         else
@@ -23,7 +23,7 @@ module Pageflow
       def publisher_memberships_for_accounts(user, accounts_ids)
         sanitize_sql_array(['LEFT OUTER JOIN pageflow_memberships ON ' \
                             'pageflow_memberships.user_id = :user_id AND ' \
-                            'pageflow_themings.account_id IN (:accounts_ids) AND ' \
+                            'pageflow_sites.account_id IN (:accounts_ids) AND ' \
                             'pageflow_memberships.entity_id IN (:accounts_ids) AND ' \
                             'pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
                             'pageflow_memberships.role IN (\'publisher\', \'manager\')',
@@ -35,19 +35,21 @@ module Pageflow
       end
     end
 
-    def initialize(user, theming)
+    attr_reader :user
+
+    def initialize(user, site)
       @user = user
-      @theming = theming
+      @account_role_query = AccountRoleQuery.new(user, site.account)
     end
 
-    def edit?
-      allows?(%w(publisher manager))
+    def read?
+      @user.admin? ||
+        (@account_role_query.has_at_least_role?(:manager) &&
+         Pageflow.config.allow_multiaccount_users)
     end
 
-    private
-
-    def allows?(roles)
-      @user.memberships.where(role: roles, entity: @theming.account).any?
+    def update?
+      read?
     end
   end
 end

data/app/views/admin/accounts/_entry_template_details.html.arb

@@ -1,7 +1,7 @@
 h5(entry_template.translated_entry_type_name)
 
 extensible_attributes_table_for(entry_template,
-                                Pageflow.config_for(entry_template.account)
+                                Pageflow.config_for(entry_template.site.account)
                                   .admin_attributes_table_rows.for(:entry_template)) do
   row :theme, class: 'theme' do
     entry_template.theme_name

data/app/views/admin/accounts/_form.html.erb

@@ -10,29 +10,11 @@
     <% end %>
   <% end %>
 
-  <%= f.semantic_fields_for :default_theming do |theming| %>
-    <%= f.inputs do %>
-      <%= theming.input :cname, hint: t('pageflow.admin.themings.cname_hint') %>
-      <%= theming.input :additional_cnames, hint: t('pageflow.admin.themings.additional_cnames_hint') %>
-      <%= theming.input :home_url, hint: t('pageflow.admin.themings.home_url_hint') %>
+  <% if resource.new_record? %>
+    <%= f.semantic_fields_for :default_site do |site| %>
+      <%= render 'admin/sites/fields', f: site, account_config: account_config %>
     <% end %>
-
-    <%= f.inputs do %>
-      <%= theming.input :imprint_link_label %>
-      <%= theming.input :imprint_link_url %>
-      <%= theming.input :copyright_link_label %>
-      <%= theming.input :copyright_link_url %>
-      <%= theming.input :privacy_link_url %>
-
-      <% account_config.admin_form_inputs.find_all_for(:theming).each do |form_input| %>
-        <%= form_input.build(theming) %>
-      <% end %>
-    <% end %>
-  <% end %>
-
-  <p>
-      <%= t('pageflow.admin.accounts.entry_template_hint') %>
-  </p>
+  <% end  %>
 
   <%= f.actions do %>
     <%= f.action(:submit) %>

data/app/views/admin/accounts/_site_defaults_inline_help.html.erb

@@ -0,0 +1,5 @@
+<li class="inline_help_item">
+  <p>
+    <%= t('pageflow.admin.accounts.site_defaults_inline_help') %>
+  </p>
+</li>

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

@@ -1,7 +1,7 @@
 <%= admin_form_for([:admin, resource]) do |f| %>
   <%= f.inputs do %>
     <%= f.input(:title,
-                hint: @entry.theming.permalink_directories.blank? &&
+                hint: @entry.site.permalink_directories.blank? &&
                       I18n.t('pageflow.admin.entries.title_hint')) %>
 
     <% if authorized?(:update_account_on, resource) &&
@@ -16,18 +16,9 @@
                   input_html: {class: 'entry_account_input'}) %>
     <%end %>
 
-    <% if authorized?(:update_theming_on, resource) && !resource.new_record? %>
-      <%= f.input(:theming,
-                  as: :searchable_select,
-                  ajax: {
-                    resource: Pageflow::Entry,
-                    collection_name: :eligible_themings,
-                    params: {
-                      entry_id: resource.id
-                    }
-                  },
-                  include_blank: false) %>
-    <% end %>
+    <%= render('admin/entries/site_input',
+               entry: resource,
+               form: f) %>
 
     <%= f.fields_for(:permalink, @entry.permalink || Pageflow::Permalink.new) do |permalink| %>
       <%= render('admin/entries/permalink_inputs',

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

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

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

@@ -0,0 +1,15 @@
+<% if authorized?(:update_site_on, entry) %>
+  <%= form.input(:site,
+                 as: :searchable_select,
+                 ajax: {
+                   resource: Pageflow::Entry,
+                   collection_name: :eligible_sites,
+                   params: {
+                     account_id: entry.account_id
+                   }
+                 },
+                 include_blank: false,
+                 wrapper_html: {
+                   style: ('display: none' if site_policy_scope.sites_allowed_for(entry.account).one?)
+                 }) %>
+<% end %>

data/app/views/admin/entries/{entry_type_name_input.html.erb → entry_site_and_type_name_input.html.erb}

@@ -1,4 +1,7 @@
 <%= fields_for(:entry, @entry, builder: ActiveAdmin::FormBuilder) do |form| %>
+  <%= render('admin/entries/site_input',
+             entry: @entry,
+             form: form) %>
   <%= render('pageflow/admin/entries/entry_type_name_input',
              form: form,
              entry_types: Pageflow.config_for(@entry.account).entry_types) %>

data/app/views/admin/entry_templates/_form.html.erb

@@ -4,7 +4,7 @@
 
   <%= f.inputs do %>
       <%= f.semantic_errors :entry_type_name %>
-      <%= render('admin/accounts/theming_defaults_inline_help') %>
+      <%= render('admin/accounts/site_defaults_inline_help') %>
       <%= f.hidden_field :entry_type_name, value: entry_type_name %>
       <%= f.input :default_locale,
                         as: :select,
@@ -12,15 +12,15 @@
                         collection: Pageflow.config.available_public_locales.map{ |locale|
                           [t('pageflow.public._language', locale: locale), locale.to_s]
                         },
-                        hint: t('pageflow.admin.themings.default_locale_hint') %>
+                        hint: t('pageflow.admin.sites.default_locale_hint') %>
       <%= f.input :default_author,
-        hint: t('pageflow.admin.themings.default_author_hint'),
+        hint: t('pageflow.admin.sites.default_author_hint'),
         placeholder: Pageflow.config.default_author_meta_tag %>
       <%= f.input :default_publisher,
-        hint: t('pageflow.admin.themings.default_publisher_hint'),
+        hint: t('pageflow.admin.sites.default_publisher_hint'),
         placeholder: Pageflow.config.default_publisher_meta_tag %>
       <%= f.input :default_keywords,
-        hint: t('pageflow.admin.themings.default_keywords_hint'),
+        hint: t('pageflow.admin.sites.default_keywords_hint'),
         placeholder: Pageflow.config.default_keywords_meta_tag %>
       <%= render('admin/accounts/share_providers_label') %>
       <%= f.semantic_fields_for :share_providers,

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

@@ -0,0 +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

@@ -0,0 +1,23 @@
+<%= 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') %>
+<% end %>
+
+<%= f.inputs do %>
+  <%= f.input :imprint_link_label %>
+  <%= f.input :imprint_link_url %>
+  <%= f.input :copyright_link_label %>
+  <%= 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 %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<%= admin_form_for [:admin, parent, resource] do |f| %>
+  <%= f.inputs :name %>
+  <%= render 'fields', f: f, account_config: Pageflow.config_for(resource.account) %>
+  <%= f.actions :submit, :cancel %>
+<% end %>

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

@@ -1,8 +1,7 @@
 module Pageflow
   module Admin
     class EntriesTab < ViewComponent
-      def build(theming)
-        account = theming.account
+      def build(account)
         embedded_index_table(account.entries,
                              blank_slate_text: I18n.t('pageflow.admin.entries.no_members')) do
           table_for_collection(sortable: true, class: 'entries', i18n: Pageflow::Entry) do