pageflow 15.7.1 → 16.0.0

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/inputs/pageflow_permalink_input.rb

@@ -0,0 +1,47 @@
+class PageflowPermalinkInput
+  include Formtastic::Inputs::Base
+  include Formtastic::Inputs::Base::Stringish
+
+  def to_html
+    input_wrapping do
+      label_html << permalink_html
+    end
+  end
+
+  private
+
+  def permalink_html
+    template.content_tag(
+      :div,
+      base_url_html << permalink_inputs_html,
+      class: 'permalink'
+    )
+  end
+
+  def base_url_html
+    template.content_tag(
+      :div,
+      options[:base_url].gsub(%r{^https?://}, ''),
+      class: 'permalink_base_url'
+    )
+  end
+
+  def permalink_inputs_html
+    return '' if options[:directory_collection].empty?
+
+    builder.select(:directory_id, options[:directory_collection]) <<
+      builder.text_field(:slug, placeholder: options[:slug_placeholder])
+  end
+
+  def error_keys
+    [:directory, :slug]
+  end
+
+  def wrapper_html_options
+    if options[:directory_collection].empty?
+      super.merge(style: 'display: none')
+    else
+      super
+    end
+  end
+end

data/app/models/concerns/pageflow/permalinkable.rb

@@ -0,0 +1,12 @@
+module Pageflow
+  # @api private
+  module Permalinkable
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :permalink, optional: true
+
+      accepts_nested_attributes_for :permalink, update_only: true
+    end
+  end
+end

data/app/models/concerns/pageflow/reusable_file.rb

@@ -87,6 +87,11 @@ module Pageflow
       'unused'
     end
 
+    # Overwritten with the extension of the file.
+    def extension
+      'unused'
+    end
+
     # Overwritten in UploadableFile with attachment filename.
     def file_name
       'unused'

data/app/models/concerns/pageflow/uploadable_file.rb

@@ -80,6 +80,10 @@ module Pageflow
       File.basename(attachment.original_filename, '.*')
     end
 
+    def extension
+      File.extname(attachment.original_filename).sub(/\A\./, '')
+    end
+
     def can_upload?
       uploading?
     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
         )
       )
@@ -26,11 +26,13 @@ module Pageflow
       new(theme,
           config.transform_theme_customization_overrides.call(
             theme_customization.overrides,
-            entry
+            entry: entry,
+            theme: theme
           ),
           config.transform_theme_customization_files.call(
             theme_customization.selected_files.transform_values(&:urls),
-            entry
+            entry: entry,
+            theme: theme
           ))
     end
   end

data/app/models/pageflow/entry.rb

@@ -5,6 +5,7 @@ module Pageflow
 
     include FeatureTarget
     include EntryPublicationStates
+    include Permalinkable
     include SerializationBlacklist
 
     extend FriendlyId
@@ -12,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') }
 
@@ -35,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
@@ -56,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
@@ -126,6 +126,10 @@ module Pageflow
       [:title, [:title, :id]]
     end
 
+    def default_permalink_slug
+      title.to_s.parameterize
+    end
+
     def self.ransackable_attributes(_auth_object)
       %w[title type_name created_at edited_at first_published_at]
     end

data/app/models/pageflow/entry_at_revision.rb

@@ -15,7 +15,8 @@ module Pageflow
 
     delegate(:id, :slug,
              :entry_type,
-             :account, :theming,
+             :account, :site,
+             :permalink,
              :feature_state, :enabled_feature_names,
              :edit_lock,
              :password_digest,
@@ -42,11 +43,11 @@ module Pageflow
     end
 
     def theme
-      @theme ||= CustomizedTheme.find(entry: self, theme: revision.theme)
+      @theme ||= CustomizedTheme.find(entry: entry, theme: revision.theme)
     end
 
     def home_button
-      HomeButton.new(revision, theming)
+      HomeButton.new(revision, site)
     end
 
     def overview_button

data/app/models/pageflow/entry_duplicate.rb

@@ -3,6 +3,7 @@ module Pageflow
     def create!
       create_entry
 
+      copy_permalink
       copy_draft
       copy_memberships
 
@@ -21,6 +22,12 @@ module Pageflow
       @new_entry = Entry.create!(new_attributes)
     end
 
+    def copy_permalink
+      return if original_entry.permalink.blank?
+
+      new_entry.create_permalink!(directory: original_entry.permalink.directory)
+    end
+
     def copy_draft
       original_entry.draft.copy do |revision|
         revision.entry = new_entry
@@ -38,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/image_file_url_templates.rb

@@ -9,11 +9,11 @@ module Pageflow
     private
 
     def styles
-      example_file.attachment_styles(example_file.attachment).keys
+      example_file.attachment_styles(example_file.attachment).keys + [:original]
     end
 
     def example_file
-      @example_file ||= ImageFile.new(id: 0, file_name: ':basename.jpg')
+      @example_file ||= ImageFile.new(id: 0, file_name: ':basename.:extension')
     end
   end
 end

data/app/models/pageflow/permalink.rb

@@ -0,0 +1,39 @@
+module Pageflow
+  # @api private
+  class Permalink < ApplicationRecord
+    extend FriendlyId
+    friendly_id :slug_candidates, use: :scoped, scope: :directory
+
+    before_validation :set_default_slug
+
+    has_one :entry
+
+    belongs_to :directory, class_name: 'PermalinkDirectory'
+
+    validates(:slug,
+              format: /\A[0-9a-zA-Z_-]+\z/,
+              uniqueness: {scope: :directory})
+
+    validate :belongs_to_same_site_as_entry
+
+    private
+
+    def set_default_slug
+      self.slug = entry.default_permalink_slug if slug == ''
+    end
+
+    def slug_candidates
+      [entry.title, "#{entry.title}-#{entry.id}"]
+    end
+
+    def should_generate_new_friendly_id?
+      slug.nil?
+    end
+
+    def belongs_to_same_site_as_entry
+      return if !directory || !entry || entry.site_id == directory.site_id
+
+      errors.add(:directory, :invalid)
+    end
+  end
+end

data/app/models/pageflow/permalink_directory.rb

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

data/app/models/pageflow/published_entry.rb

@@ -46,12 +46,21 @@ module Pageflow
       PublishedEntry.new(scope.published.find(id))
     end
 
+    def self.find_by_permalink(directory: nil, slug:, scope:)
+      wrap(
+        scope.published.includes(permalink: :directory).where(
+          pageflow_permalink_directories: {path: directory || ''},
+          pageflow_permalinks: {slug: slug}
+        ).first
+      )
+    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
 
@@ -59,7 +68,7 @@ module Pageflow
       [
         entry.cache_version,
         revision.cache_version,
-        theming.cache_version
+        site.cache_version
       ].compact.join('-').presence
     end
 
@@ -72,5 +81,13 @@ module Pageflow
     def share_image_file
       PositionedFile.wrap(find_file_by_perma_id(ImageFile, share_image_id), share_image_x, share_image_y)
     end
+
+    class << self
+      private
+
+      def wrap(entry)
+        entry && new(entry)
+      end
+    end
   end
 end

data/app/models/pageflow/revision.rb

@@ -230,7 +230,7 @@ module Pageflow
     end
 
     def available_themes
-      Pageflow.config_for(entry).themes
+      @available_themes ||= Pageflow.config_for(entry).themes
     end
   end
 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/models/pageflow/theme_customization_file.rb

@@ -39,7 +39,7 @@ module Pageflow
     # A hash of urls based on the styles that were defined when
     # registering the entry type.
     def urls
-      attachment_styles.map { |style, _|
+      styles_from_options.map { |style, _|
         [style, attachment.url(style)]
       }.to_h
     end
@@ -51,6 +51,11 @@ module Pageflow
 
     # @api private
     def attachment_styles
+      styles_from_options.except(:original)
+    end
+
+    # @api private
+    def styles_from_options
       styles = options_from_entry_type.fetch(:styles, {})
       styles.respond_to?(:call) ? styles.call(self) : styles
     end

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