pageflow 15.8.0 → 16.1.0

data/lib/pageflow/ability_mixin.rb

@@ -31,7 +31,7 @@ module Pageflow
         AccountPolicy.new(user, account).see_badge_belonging_to?
       end
 
-      can :create, Membership do |membership|
+      can :create, Membership, Membership.all do |membership|
         membership.entity.nil? ||
           membership.user.nil? ||
           (!(membership.user.entries.include?(membership.entity) ||
@@ -95,7 +95,11 @@ module Pageflow
         Admin::EntryTabPolicy.new(user, tab).see?
       end
 
-      can :see_theming_admin_tab, Admin::Tab do |tab|
+      can :see_site_admin_tab, Admin::Tab do |tab|
+        Admin::AdminOnlyTabPolicy.new(user, tab).see?
+      end
+
+      can :see_account_admin_tab, Admin::Tab do |tab|
         Admin::AdminOnlyTabPolicy.new(user, tab).see?
       end
 
@@ -112,11 +116,11 @@ module Pageflow
           AccountPolicy.new(user, account).configure_folder_on?
         end
 
-        can :update_theming_on_entry_of, Account do |account|
-          AccountPolicy.new(user, account).update_theming_on_entry_of?
+        can :update_site_on_entry_of, Account do |account|
+          AccountPolicy.new(user, account).update_site_on_entry_of?
         end
 
-        can :create, Entry do |entry|
+        can :create, Entry, Entry.all do |entry|
           EntryPolicy.new(user, entry).create?
         end
 
@@ -180,8 +184,8 @@ module Pageflow
           EntryPolicy.new(user, entry).update_feature_configuration_on?
         end
 
-        can :update_theming_on, Entry do |entry|
-          EntryPolicy.new(user, entry).update_theming_on?
+        can :update_site_on, Entry do |entry|
+          EntryPolicy.new(user, entry).update_site_on?
         end
 
         can :use_files, Entry, EntryPolicy::Scope.new(user, Entry).resolve do |entry|
@@ -200,7 +204,7 @@ module Pageflow
           FilePolicy.new(user, record).use?
         end
 
-        can [:create, :update, :destroy], Folder do |folder|
+        can [:create, :update, :destroy], Folder, Folder.all do |folder|
           FolderPolicy.new(user, folder).manage?
         end
 
@@ -222,11 +226,15 @@ module Pageflow
           EntryPolicy.new(user, storyline.revision.entry).edit?
         end
 
-        can :edit, Theming do |theming|
-          ThemingPolicy.new(user, theming).edit?
+        can :read, Site do |site|
+          SitePolicy.new(user, site).read?
+        end
+
+        can :update, Site do |site|
+          SitePolicy.new(user, site).update?
         end
 
-        can :create, EntryTemplate do |entry_template|
+        can :create, EntryTemplate, EntryTemplate.all do |entry_template|
           EntryTemplatePolicy.new(user, entry_template).create?
         end
 
@@ -234,7 +242,7 @@ module Pageflow
           EntryTemplatePolicy.new(user, entry_template).update?
         end
 
-        can :create, ::User do |managed_user|
+        can :create, ::User, ::User.all do |managed_user|
           UserPolicy.new(user, managed_user).create?
         end
 
@@ -275,7 +283,7 @@ module Pageflow
         can :manage, [Entry, Revision]
         can :manage, Pageflow.config.file_types.map(&:model)
         can :manage, Folder
-        can :manage, Theming
+        can :manage, Site
         can :manage, EntryTemplate
         can :manage, ::User
       end

data/lib/pageflow/active_admin_can_can_fix.rb

@@ -17,13 +17,13 @@ module Pageflow
   #     :create, User  ->  :create_any, :users
   module ActiveAdminCanCanFix
     def can?(action, subject)
-      if [:read, :create].include?(action) &&
+      if [:read, :new, :create].include?(action) &&
          [Entry, Account, User].include?(subject)
         collection_name = subject.name.demodulize.underscore.pluralize.to_sym
 
         if action == :read
           super(:index, collection_name)
-        elsif action == :create
+        else
           super(:create_any, collection_name)
         end
       else

data/lib/pageflow/admin/attributes_table_rows.rb

@@ -12,7 +12,7 @@ module Pageflow
 
       # Insert an additional row into an attribute table.
       #
-      # @param resource_name [Symbol] Either :entry, :account or :theming.
+      # @param resource_name [Symbol] Either :entry, :account or :site.
       #
       # @param name [Symbol] Name of the attribute to display.
       #

data/lib/pageflow/admin/form_inputs.rb

@@ -11,7 +11,7 @@ module Pageflow
       # Register a proc which adds additional inputs to admin forms.
       #
       # @param resource_name [Symbol] A resource name like `:entry`,
-      #   `:account` or `:theming`
+      #   `:account` or `:site`
       # @param attribute_name [Symbol] The name of the additional
       #   attribute
       # @param options [Hash] Formtastic options

data/lib/pageflow/admin/tabs.rb

@@ -9,7 +9,7 @@ module Pageflow
       # Display additional tabs on admin resource pages.
       #
       # @param [Symbol] resource_name A resource name like `:entry`,
-      #   `:user` or `:account`
+      #   `:user`, `:account` or `:site`.
       # @param [Hash] options
       # @option options [Symbol] :name Unique identifier.
       # @option options [Arbre::Component] :component Component to

data/lib/pageflow/built_in_file_type.rb

@@ -41,5 +41,12 @@ module Pageflow
                    collection_name: 'text_track_files',
                    url_templates: TextTrackFileUrlTemplates.new)
     end
+
+    def self.other
+      FileType.new(model: 'Pageflow::OtherFile',
+                   collection_name: 'other_files',
+                   url_templates: OtherFileUrlTemplates.new,
+                   top_level_type: true)
+    end
   end
 end

data/lib/pageflow/configuration/permissions.rb

@@ -6,7 +6,7 @@ module Pageflow
       def initialize
         @only_admins_may_update_features = false
         @only_admins_may_see_admin_boolean = false
-        @only_admins_may_update_theming = false
+        @only_admins_may_update_site = false
       end
 
       # Restrict access to features tabs to admins. Defaults to false.
@@ -18,10 +18,10 @@ module Pageflow
       # @since 12.1
       attr_accessor :only_admins_may_see_admin_boolean
 
-      # Restrict access to theming drop down on entry edit admin page
+      # Restrict access to site drop down on entry edit admin page
       # to admins. Defaults to false.
       # @since 12.1
-      attr_accessor :only_admins_may_update_theming
+      attr_accessor :only_admins_may_update_site
     end
   end
 end

data/lib/pageflow/configuration.rb

@@ -151,21 +151,21 @@ module Pageflow
     attr_accessor :editor_routing_constraint
 
     # Either a lambda or an object with a `call` method taking two
-    # parameters: An `ActiveRecord` scope of {Pageflow::Theming} records
+    # parameters: An `ActiveRecord` scope of {Pageflow::Site} records
     # and an {ActionDispatch::Request} object. Has to return the scope
-    # in which to find themings.
+    # in which to find sites.
     #
-    # Defaults to {CnameThemingRequestScope} which finds themings
+    # Defaults to {CnameSiteRequestScope} which finds sites
     # based on the request subdomain. Can be used to alter the logic
-    # of finding a theming whose home_url to redirect to when visiting
+    # of finding a site whose home_url to redirect to when visiting
     # the public root path.
     #
     # Example:
     #
-    #     config.theming_request_scope = lambda do |themings, request|
-    #       themings.where(id: Pageflow::Account.find_by_name!(request.subdomain).default_theming_id)
+    #     config.site_request_scope = lambda do |sites, request|
+    #       sites.where(id: Pageflow::Account.find_by_name!(request.subdomain).default_site_id)
     #     end
-    attr_accessor :theming_request_scope
+    attr_accessor :site_request_scope
 
     # Either a lambda or an object with a `call` method taking two
     # parameters: An `ActiveRecord` scope of `Pageflow::Entry` records
@@ -195,8 +195,21 @@ module Pageflow
     # @since 12.4
     attr_accessor :public_entry_redirect
 
+    # Cache-Control header to set for published entries that have been
+    # published without a password. For password protected entries,
+    # cache control is always set to private to prevent caching
+    # authenticated responses in public caches like CDNs and serving
+    # them to unauthenticated users.
+    #
+    # Can be wrapped in a `features.register` block to use different
+    # caching strategies for different entries or accounts.
+    #
+    # @since 16.1
+    # @return [String]
+    attr_accessor :public_entry_cache_control_header
+
     # Either a lambda or an object with a `call` method taking a
-    # {Theming} as paramater and returing a hash of options used to
+    # {Site} as paramater and returing a hash of options used to
     # construct the url of a published entry.
     #
     # Can be used to change the host of the url under which entries
@@ -204,13 +217,13 @@ module Pageflow
     #
     # Example:
     #
-    #     config.public_entry_url_options = lambda do |theming|
-    #       {host: "#{theming.account.name}.example.com"}
+    #     config.public_entry_url_options = lambda do |site|
+    #       {host: "#{site.account.name}.example.com"}
     #     end
     attr_accessor :public_entry_url_options
 
     # Either a lambda or an object with a `call` method taking a
-    # {Theming} as paramater and returing a hash of options used to
+    # {Site} as paramater and returing a hash of options used to
     # construct the embed url of a published entry.
     attr_accessor :entry_embed_url_options
 
@@ -232,6 +245,12 @@ module Pageflow
     # boolean. Defaults to false.
     attr_accessor :confirm_encoding_jobs
 
+    # Controls default value of "published until" date field in editor
+    # publish entry view.
+    #
+    # @since 16.1
+    attr_accessor :default_published_until_duration_in_months
+
     # Used by Pageflow extensions to provide new tabs to be displayed
     # in the admin.
     #
@@ -281,7 +300,7 @@ module Pageflow
     # @since 0.10
     attr_accessor :available_public_locales
 
-    # Array of sharing providers which can be configured on theming level.
+    # Array of sharing providers which can be configured on site level.
     # Defaults to `[:facebook, :twitter, :linked_in, :whats_app, :telegram, :email]`.
     # @since 14.1
     attr_accessor :available_share_providers
@@ -310,7 +329,7 @@ module Pageflow
 
     # Share provider defaults.
     #
-    # Default share providers for new themings.
+    # Default share providers for new sites.
     # Must be a subset or equal to `available_share_providers`
     # @since 14.1
     attr_accessor :default_share_providers
@@ -402,16 +421,17 @@ module Pageflow
       @thumbnail_styles = Defaults::THUMBNAIL_STYLES.dup
       @css_rendered_thumbnail_styles = Defaults::CSS_RENDERED_THUMBNAIL_STYLES.dup
 
-      @theming_request_scope = CnameThemingRequestScope.new
+      @site_request_scope = CnameSiteRequestScope.new
       @public_entry_request_scope = lambda { |entries, request| entries }
       @public_entry_redirect = ->(_entry, _request) { nil }
-      @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
+      @public_entry_url_options = Pageflow::SitesHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
       @entry_embed_url_options = {protocol: 'https'}
 
       @transform_theme_customization_overrides = ->(overrides, _entry) { overrides }
       @transform_theme_customization_files = ->(files, _entry) { files }
 
       @confirm_encoding_jobs = false
+      @default_published_until_duration_in_months = 12
 
       @admin_resource_tabs = Pageflow::Admin::Tabs.new
       @admin_form_inputs = Pageflow::Admin::FormInputs.new
@@ -515,9 +535,9 @@ module Pageflow
     end
 
     # @api private
-    def theming_url_options(theming)
+    def site_url_options(site)
       options = public_entry_url_options
-      options.respond_to?(:call) ? options.call(theming) : options
+      options.respond_to?(:call) ? options.call(site) : options
     end
 
     # @api private
@@ -541,6 +561,7 @@ module Pageflow
       delegate :page_types, to: :config
       delegate :themes, to: :config
       delegate :widget_types, to: :config
+      delegate :public_entry_cache_control_header=, to: :config
 
       delegate :for_entry_type, to: :config
     end

data/lib/pageflow/engine.rb

@@ -31,6 +31,8 @@ require 'pageflow_paged'
 require 'pageflow_scrolled'
 require 'symmetric-encryption'
 
+require 'pageflow/rails_version'
+
 if Gem::Specification.find_all_by_name('pageflow-react', '>= 0.0').any?
   fail('The pageflow-react gem has been merged into the pageflow gem. ' \
        'See the pageflow changelog for update instructions.')
@@ -41,44 +43,63 @@ module Pageflow
   class Engine < ::Rails::Engine
     isolate_namespace Pageflow
 
-    config.paths.add('app/views/components', autoload: true)
-    config.paths.add('lib', autoload: true)
-
-    def eager_load!
-      # Manually eager load `lib/pageflow` as the least bad option:
-      #
-      # - Autoload paths are not eager loaded in production.
-      #
-      # - `lib` cannot be an eager load path since otherwise templates
-      #   in `lib/generators` are also executed.
-      #
-      # - `lib/pageflow` cannot be an eager load path since eager load
-      #   paths are automatically used as autoload paths. That way
-      #   `lib/pageflow/admin/something.rb` could be autoloaded via
-      #   `Admin::Something`.
-      #
-      # - Using `require` in `lib/pageflow.rb` disables code
-      #   reloading.
-      #
-      # - Using `require_dependency` in `lib/pageflow.rb` does not
-      #   activate code reloading either since it requires the
-      #   autoload path to be set up correctly, which only happens
-      #   during initialization.
-      super
-
-      lib_path = config.root.join('lib')
-      matcher = %r{\A#{Regexp.escape(lib_path.to_s)}/(.*)\.rb\Z}
-
-      already_required_files = [
-        'pageflow/engine',
-        'pageflow/global_config_api',
-        'pageflow/news_item_api',
-        'pageflow/version'
-      ]
-
-      Dir.glob("#{lib_path}/pageflow/**/*.rb").sort.each do |file|
-        logical_path = file.sub(matcher, '\1')
-        require_dependency(logical_path) unless already_required_files.include?(logical_path)
+    if Pageflow::RailsVersion.experimental?
+      config.autoload_paths << root.join('app/views/components')
+      config.eager_load_paths << root.join('app/views/components')
+
+      lib = root.join('lib')
+
+      config.autoload_paths << lib
+      config.eager_load_paths << lib
+
+      initializer 'pageflow.autoloading' do
+        Rails.autoloaders.main.ignore(
+          lib.join('generators'),
+          lib.join('tasks'),
+          lib.join('pageflow/paperclip_processors'),
+          lib.join('pageflow/version.rb')
+        )
+      end
+    else
+      config.paths.add('app/views/components', autoload: true)
+      config.paths.add('lib', autoload: true)
+
+      def eager_load!
+        # Manually eager load `lib/pageflow` as the least bad option:
+        #
+        # - Autoload paths are not eager loaded in production.
+        #
+        # - `lib` cannot be an eager load path since otherwise templates
+        #   in `lib/generators` are also executed.
+        #
+        # - `lib/pageflow` cannot be an eager load path since eager load
+        #   paths are automatically used as autoload paths. That way
+        #   `lib/pageflow/admin/something.rb` could be autoloaded via
+        #   `Admin::Something`.
+        #
+        # - Using `require` in `lib/pageflow.rb` disables code
+        #   reloading.
+        #
+        # - Using `require_dependency` in `lib/pageflow.rb` does not
+        #   activate code reloading either since it requires the
+        #   autoload path to be set up correctly, which only happens
+        #   during initialization.
+        super
+
+        lib_path = config.root.join('lib')
+        matcher = %r{\A#{Regexp.escape(lib_path.to_s)}/(.*)\.rb\Z}
+
+        already_required_files = [
+          'pageflow/engine',
+          'pageflow/global_config_api',
+          'pageflow/news_item_api',
+          'pageflow/version'
+        ]
+
+        Dir.glob("#{lib_path}/pageflow/**/*.rb").sort.each do |file|
+          logical_path = file.sub(matcher, '\1')
+          require_dependency(logical_path) unless already_required_files.include?(logical_path)
+        end
       end
     end
 
@@ -106,7 +127,7 @@ module Pageflow
     end
 
     initializer 'pageflow.factories', after: 'factory_bot.set_factory_paths' do
-      if Pageflow.configured? && defined?(FactoryBot)
+      if defined?(FactoryBot)
         FactoryBot.definition_file_paths.unshift(Engine.root.join('spec', 'factories'))
       end
     end

data/lib/pageflow/entry_export_import/entry_serialization.rb

@@ -44,7 +44,7 @@ module Pageflow
       def create_entry(data, options)
         entry_data = data.except(*DEFAULT_REMOVAL_COLUMNS)
         entry_data['account_id'] = options[:account].id
-        entry_data['theming_id'] = options[:account].default_theming.id
+        entry_data['site_id'] = options[:account].default_site.id
         Entry.create!(entry_data.merge(skip_draft_creation: true))
       end
 

data/lib/pageflow/entry_export_import/revision_serialization.rb

@@ -28,7 +28,7 @@ module Pageflow
       end
 
       def import(data, options)
-        Import.new(options).perform(data)
+        Import.new(**options).perform(data)
       end
 
       private

data/lib/pageflow/file_type.rb

@@ -123,11 +123,11 @@ module Pageflow
       @css_background_image_class_prefix || model.model_name.singular
     end
 
-    def css_background_image_urls_for(file, options)
+    def css_background_image_urls_for(file, **options)
       if call_arity(css_background_image_urls) == 1
         css_background_image_urls.call(file)
       else
-        css_background_image_urls.call(file, options)
+        css_background_image_urls.call(file, **options)
       end
     end
 

data/lib/pageflow/global_config_api.rb

@@ -87,8 +87,6 @@ module Pageflow
     # coniguration is now complete.
     def finalize!
       @finalized = true
-      configure!
-      @config.lint!
     end
 
     # @api private
@@ -103,6 +101,8 @@ module Pageflow
       @after_global_configure_blocks.each do |block|
         block.call(@config)
       end
+
+      @config.lint!
     end
 
     private

data/lib/pageflow/nested_revision_component.rb

@@ -14,10 +14,10 @@ module Pageflow
       end
 
       # @api private
-      def copy_nested_revision_component_to(record)
+      def copy_nested_revision_component_to(record, reset_perma_ids: false)
         nested_revision_component_collection_names.each do |collection_name|
           send(collection_name).each do |nested|
-            nested.copy_to(record.send(collection_name))
+            nested.copy_to(record.send(collection_name), reset_perma_ids: reset_perma_ids)
           end
         end
       end
@@ -38,12 +38,30 @@ module Pageflow
     extend ActiveSupport::Concern
     include Container
 
+    def duplicate
+      copy_with(reset_perma_ids: true) do |record|
+        yield record if block_given?
+        record.save!
+      end
+    end
+
     # @api private
-    def copy_to(collection)
+    def copy_to(collection, reset_perma_ids: false)
+      copy_with(reset_perma_ids: reset_perma_ids) do |record|
+        collection << record
+      end
+    end
+
+    private
+
+    def copy_with(reset_perma_ids:)
       record = dup
-      collection << record
+      record.perma_id = nil if reset_perma_ids && record.respond_to?(:perma_id=)
+
+      yield record
+      copy_nested_revision_component_to(record, reset_perma_ids: reset_perma_ids)
 
-      copy_nested_revision_component_to(record)
+      record
     end
   end
 end

data/lib/pageflow/primary_domain_entry_redirect.rb

@@ -5,20 +5,20 @@ module Pageflow
   # @since 12.4
   class PrimaryDomainEntryRedirect
     def call(entry, request)
-      theming = entry.theming
+      site = entry.site
 
-      if theming.cname.present? &&
-         !known_domains(theming).include?(request.host)
-        [request.protocol, theming.cname, request.fullpath].join
+      if site.cname.present? &&
+         !known_domains(site).include?(request.host)
+        [request.protocol, site.cname, request.fullpath].join
       end
     end
 
     private
 
-    def known_domains(theming)
+    def known_domains(site)
       [
-        theming.cname,
-        (theming.additional_cnames || '').split(',').map(&:strip)
+        site.cname,
+        (site.additional_cnames || '').split(',').map(&:strip)
       ].flatten
     end
   end

data/lib/pageflow/rails_version.rb

@@ -0,0 +1,19 @@
+module Pageflow
+  module RailsVersion
+    extend self
+
+    def detect
+      from_env || '5.2.0'
+    end
+
+    def experimental?
+      detect != '5.2.0'
+    end
+
+    private
+
+    def from_env
+      ENV['PAGEFLOW_RAILS_VERSION'] if ENV['PAGEFLOW_RAILS_VERSION'] != ''
+    end
+  end
+end