pageflow 15.8.0 → 16.0.0

data/app/helpers/pageflow/entries_helper.rb

@@ -1,7 +1,7 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_title(entry)
-      [entry.title, entry.theming.cname_domain.presence].compact.join(' - ')
+      [entry.title, entry.site.cname_domain.presence].compact.join(' - ')
     end
 
     def pretty_entry_url(entry, options = {})
@@ -20,21 +20,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 +57,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 +80,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/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/models/pageflow/account.rb

@@ -9,47 +9,21 @@ 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')
-    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
-    end
-
     def blacklist_for_serialization
       [:features_configuration]
     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/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

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

@@ -60,7 +60,7 @@ module Pageflow
         self.class.model_name.cache_key,
         entry.cache_key,
         revision.cache_key,
-        theming.cache_key
+        site.cache_key
       ].compact.join('-')
     end
 
@@ -68,7 +68,7 @@ module Pageflow
       [
         entry.cache_version,
         revision.cache_version,
-        theming.cache_version
+        site.cache_version
       ].compact.join('-').presence
     end
 

data/app/models/pageflow/site.rb

@@ -0,0 +1,59 @@
+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
+  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/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,6 @@
 <%= form.input(:permalink,
                as: :pageflow_permalink,
-               base_url: pretty_theming_url(entry.theming),
-               directory_collection: collection_for_permalink_directories(entry.theming,
+               base_url: pretty_site_url(entry.site),
+               directory_collection: collection_for_permalink_directories(entry.site,
                                                                           form.object),
                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,