pageflow 15.0.0.beta2 → 15.0.0.beta3

data/app/assets/stylesheets/pageflow/themes/default/loading_spinner/media.scss

@@ -0,0 +1,56 @@
+$media-loading-spinner-duration: 7s;
+
+.media_loading_spinner {
+  &:before {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 1;
+    background-color: rgba(0, 0, 0, 0.15);
+  }
+
+  &-image {
+    background-size: cover;
+    height: 100%;
+  }
+
+  &-logo {
+    @extend %pageflow_widget_margin_right !optional;
+    position: relative;
+
+    &:after {
+      @extend %background_logo;
+      content: "";
+      display: block;
+      z-index: 1;
+      opacity: 0;
+    }
+  }
+
+  &-logo-invert {
+    &:after{
+      background-image: image-url("pageflow/themes/#{$theme-name}/logo_header_invert.#{$logo-image-file-extension}");
+    }
+  }
+
+  &-fade {
+    @include animation(fade_out 1s ease 1);
+    @include animation-delay($media-loading-spinner-duration + 0.5s);
+    @include animation-fill-mode(forwards);
+
+    .media_loading_spinner-logo:after {
+      @include animation(fade_in 1s ease-out 1);
+      @include animation-fill-mode(forwards);
+    }
+  }
+
+  &-invert {
+    color: #000 !important;
+  }
+
+}
+

data/app/assets/stylesheets/pageflow/themes/default/loading_spinner/title.scss

@@ -8,25 +8,13 @@ $title-loading-spinner-subtitle-typography: () !default;
 
 $title-loading-spinner-phone-subtitle-typography: () !default;
 
-.title_loading_spinner {
-  $duration: 7s;
+.media_loading_spinner {
 
-  &:before {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 1;
-    background-color: rgba(0, 0, 0, 0.15);
-  }
-
-  &-image {
-    background-size: cover;
-    filter: blur(50px);
-    height: 100%;
+  &-fade {
+    .media_loading_spinner-titles {
+      @include animation(title_fade $media-loading-spinner-duration ease-out 1);
+      @include animation-fill-mode(forwards);
+    }
   }
 
   &-titles {
@@ -53,7 +41,7 @@ $title-loading-spinner-phone-subtitle-typography: () !default;
       content: "";
       display: block;
       width: 100px;
-      border-bottom: solid 2px #fff;
+      border-bottom: solid 2px;
       margin: 20px auto;
     }
 
@@ -96,36 +84,7 @@ $title-loading-spinner-phone-subtitle-typography: () !default;
       );
     }
   }
-
-  &-logo {
-    @extend %pageflow_widget_margin_right !optional;
-    position: relative;
-
-    &:after {
-      @extend %background_logo;
-      content: "";
-      display: block;
-      z-index: 1;
-      opacity: 0;
-    }
-  }
-
-  &-fade {
-    @include animation(fade_out 1s ease 1);
-    @include animation-delay($duration + 0.5s);
-    @include animation-fill-mode(forwards);
-
-    .title_loading_spinner-titles {
-      @include animation(title_fade $duration ease-out 1);
-      @include animation-fill-mode(forwards);
-    }
-
-    .title_loading_spinner-logo:after {
-      @include animation(fade_in 1s ease-out 1);
-      @include animation-fill-mode(forwards);
-    }
-  }
-
+  
   @include keyframes(title_fade) {
     0% {
       @include transform(translate(-50%, -30%));
@@ -155,4 +114,5 @@ $title-loading-spinner-phone-subtitle-typography: () !default;
       opacity: 0;
     }
   }
-}
+
+}

data/app/assets/stylesheets/pageflow/themes/default/logo/variant/watermark.scss

@@ -15,6 +15,9 @@ $logo-watermark-variant-fade-in-with-header: false !default;
 /// Set opacity value of watermark logos
 $logo-watermark-variant-opacity: 0.3 !default;
 
+/// Height of the logo in phone layout.
+$logo-watermark-mobile-height: null !default;
+
 @mixin logo-variant-watermark(
   $top,
   $width,
@@ -32,7 +35,13 @@ $logo-watermark-variant-opacity: 0.3 !default;
       height: $phone-height;
       top: 21px;
     }
-
+    @if $logo-watermark-mobile-height {
+      @include mobile {
+        width: $logo-watermark-mobile-height * $width / $height;
+        height: $logo-watermark-mobile-height;
+        top: 21px;
+      }
+    }
     @include logo-alignment;
   }
 

data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/info_box.scss

@@ -78,6 +78,11 @@ $classic-player-controls-info-box-border-radius: 4px !default;
 
   .js &-info_box {
     pointer-events: none;
+
+    a {
+      pointer-events: all;
+    }
+
     margin: 0;
     margin-bottom: 60px + $classic-player-controls-border-width * 4;
     width: 434px;

data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/info_box.scss

@@ -73,6 +73,10 @@ $slim-player-controls-info-box-header-typography: () !default;
     @include transition(opacity 0.2s linear, visibility 0.2s linear, transform 0.2s ease);
     pointer-events: none;
 
+    a {
+      pointer-events: all;
+    }
+
     position: absolute;
     left: 50%;
     @include transform(translate3d(-50%, 0, 0));

data/app/controllers/pageflow/editor/files_controller.rb

@@ -19,11 +19,11 @@ module Pageflow
         authorize!(:edit, entry.to_model)
         verify_edit_lock!(entry)
 
-        @file = entry.create_file!(file_type.model, create_params)
+        @file = entry.create_file!(file_type, create_params)
         @file.publish! if params[:no_upload]
 
         respond_with(:editor, @file)
-      rescue ActiveRecord::RecordInvalid => e
+      rescue ActiveRecord::RecordInvalid, DraftEntry::InvalidForeignKeyCustomAttributeError => e
         debug_log_with_backtrace(e)
         head :unprocessable_entity
       end
@@ -118,7 +118,10 @@ module Pageflow
       end
 
       def file_custom_params
-        file_params.permit(file_type.custom_attributes)
+        file_params.permit(file_type
+                             .custom_attributes
+                             .select { |_, options| options[:permitted_create_param] }
+                             .keys)
       end
 
       def file_params

data/app/helpers/pageflow/meta_tags_helper.rb

@@ -7,9 +7,9 @@ module Pageflow
 
     def meta_tags_data_for_entry(entry)
       {
-        keywords: entry.keywords.presence || Pageflow.config.default_keywords_meta_tag,
-        author: entry.author.presence || Pageflow.config.default_author_meta_tag,
-        publisher: entry.publisher.presence || Pageflow.config.default_publisher_meta_tag
+        keywords: entry.keywords,
+        author: entry.author,
+        publisher: entry.publisher
       }
     end
   end

data/app/helpers/pageflow/social_share_links_helper.rb

@@ -8,7 +8,7 @@ module Pageflow
       google: 'https://plus.google.com/share?url=%{url}',
       linked_in: 'https://www.linkedin.com/shareArticle?mini=true&url=%{url}',
       telegram: 'tg://msg?text=%{url}',
-      twitter: 'http://twitter.com/home?status=%{url}',
+      twitter: 'https://twitter.com/intent/tweet?url=%{url}',
       whats_app: 'WhatsApp://send?text=%{url}'
     }.freeze
 

data/app/jobs/pageflow/entry_export_import/upload_and_publish_file_job.rb

@@ -0,0 +1,41 @@
+module Pageflow
+  module EntryExportImport
+    # Uploads a file attachment associated with an ReusableFile
+    # and publishes the file afterwards
+    class UploadAndPublishFileJob < ApplicationJob
+      queue_as :file_upload
+
+      def perform(reusable_file, exported_id, archive_file_name)
+        archive = ZipArchive.new(archive_file_name)
+
+        reusable_file.attachments_for_export.each do |attachment|
+          archive_path = AttachmentFiles.archive_path(reusable_file,
+                                                      attachment,
+                                                      exported_id: exported_id)
+
+          archive.extract_to_tempfile(archive_path) do |tempfile|
+            # Paperclip skips post processing anyway since the name of
+            # the tempfile does not pass the validation defined in
+            # UploadableFile. To be explicit, we disable post
+            # processing manually as well.
+            attachment.post_processing = false
+            attachment.assign(tempfile)
+
+            # Calling `attachment.assign` changes the
+            # `<attachment-name>_file_name` attribute based on the
+            # name of the tempfile. To prevent `flush_writes` from
+            # using these new values when constructing the
+            # destionation path, we need to undo the attribute
+            # changes. Restoring the attributes does not reset the
+            # list of files queued for write  in the attachment.
+            reusable_file.restore_attributes
+
+            attachment.flush_writes
+          end
+        end
+
+        reusable_file.publish!
+      end
+    end
+  end
+end

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

@@ -83,6 +83,12 @@ module Pageflow
       'unused'
     end
 
+    # Overwritten with the list of attachments of the file type
+    # that should get included in export archives.
+    def attachments_for_export
+      []
+    end
+
     # Overwritten in UploadableFile based on initial state_machine-state.
     # Defaults to false for files that only use the ReusableFile module
     def can_upload?

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

@@ -65,6 +65,11 @@ module Pageflow
     end
 
     # ReusableFile-overrides:
+
+    def attachments_for_export
+      [attachment]
+    end
+
     def url
       if attachment.present?
         attachment.url

data/app/models/pageflow/draft_entry.rb

@@ -2,6 +2,8 @@ module Pageflow
   class DraftEntry
     include ActiveModel::Conversion
 
+    class InvalidForeignKeyCustomAttributeError < StandardError; end
+
     attr_reader :entry, :draft
 
     delegate(:id, :slug,
@@ -38,8 +40,10 @@ module Pageflow
       entry.title
     end
 
-    def create_file!(model, attributes)
-      file = model.create!(attributes.except(:configuration)) do |f|
+    def create_file!(file_type, attributes)
+      check_foreign_key_custom_attributes(file_type.custom_attributes, attributes)
+
+      file = file_type.model.create!(attributes.except(:configuration)) do |f|
         f.entry = entry
       end
 
@@ -109,5 +113,25 @@ module Pageflow
     def resolve_widgets(options = {})
       widgets.resolve(Pageflow.config_for(entry), options)
     end
+
+    private
+
+    def check_foreign_key_custom_attributes(custom_attributes, attributes)
+      custom_attributes
+        .each do |attribute_name, options|
+          file_type = options[:model]
+          file_id = attributes[attribute_name]
+
+          next if !file_type || file_is_used(file_type, file_id)
+
+          raise(InvalidForeignKeyCustomAttributeError,
+                "Custom attribute #{attribute_name} references #{file_type} #{file_id} " \
+                'which is not used in this revsion')
+        end
+    end
+
+    def file_is_used(file_type, file_id)
+      draft.file_usages.where(file_type: file_type, file_id: file_id).exists?
+    end
   end
 end

data/app/models/pageflow/membership.rb

@@ -11,7 +11,7 @@ module Pageflow
                foreign_key: 'entity_id',
                optional: true
 
-    validates :user, :entity, :role, presence: true
+    validates :entity, :role, presence: true
     validates :user_id, uniqueness: {scope: [:entity_type, :entity_id]}
     validate :account_membership_exists, if: :on_entry?
     validates :role,
@@ -38,9 +38,8 @@ module Pageflow
     private
 
     def account_membership_exists
-      unless user.accounts.include?(entity.account)
-        errors[:base] << 'Entry Membership misses presupposed Membership on account of entry'
-      end
+      errors[:base] << 'Entry Membership misses presupposed Membership on account of entry' if
+        user.present? && !user.accounts.include?(entity.account)
     end
 
     def on_entry?

data/app/models/pageflow/revision.rb

@@ -103,6 +103,18 @@ module Pageflow
       self[:share_providers] || entry.theming.default_share_providers
     end
 
+    def author
+      read_attribute(:author) || Pageflow.config.default_author_meta_tag
+    end
+
+    def publisher
+      read_attribute(:publisher) || Pageflow.config.default_publisher_meta_tag
+    end
+
+    def keywords
+      read_attribute(:keywords) || Pageflow.config.default_keywords_meta_tag
+    end
+
     def active_share_providers
       share_providers.select { |_k, v| v }.keys
     end
@@ -161,16 +173,20 @@ module Pageflow
         file_usage.copy_to(revision)
       end
 
-      Pageflow.config.revision_components.each do |model|
-        model.all_for_revision(self).each do |record|
-          record.copy_to(revision)
-        end
+      find_revision_components.each do |revision_component|
+        revision_component.copy_to(revision)
       end
 
       revision.save!
       revision
     end
 
+    def find_revision_components
+      Pageflow.config.revision_components.flat_map do |model|
+        model.all_for_revision(self).to_a
+      end
+    end
+
     def self.depublish_all
       published.update_all(:published_until => Time.now)
     end

data/app/models/pageflow/widget.rb

@@ -61,10 +61,14 @@ module Pageflow
       private
 
       def all
-        placeholders_by_role
-          .merge(defaults_by_role)
-          .merge(from_db_by_role)
-          .values
+        initial_widgets = placeholders_by_role.merge(defaults_by_role)
+        initial_widgets.merge(from_db_by_role) { |_role_key, old_val, new_val|
+          if old_val.configuration.present?
+            new_val.configuration = {} if new_val.configuration.nil?
+            new_val.configuration = old_val.configuration.merge(new_val.configuration)
+          end
+          new_val
+        }.values
       end
 
       def from_db_by_role
@@ -73,13 +77,15 @@ module Pageflow
 
       def defaults_by_role
         config.widget_types.defaults_by_role.each_with_object({}) do |(role, widget_type), result|
-          result[role] = Widget.new(role: role, type_name: widget_type.name, subject: nil)
+          result[role] = Widget.new(role: role, type_name: widget_type.name,
+                                    subject: nil,
+                                    configuration:
+                                      config.widget_types.default_configuration(role))
         end
       end
 
       def placeholders_by_role
         return {} unless options[:include_placeholders]
-
         config.widget_types.roles.each_with_object({}) do |role, result|
           result[role] = Widget.new(role: role, type_name: nil, subject: nil)
         end