pageflow 15.0.0.beta2 → 15.0.0.beta3

data/config/locales/de.yml

@@ -282,6 +282,10 @@ de:
         dimensions: Maße
         duration: Länge
         format: Format
+      pageflow/widget:
+        blur_strength: Unschärfe
+        invert: Farben invertieren
+        remove_logo: Logo entfernen
       user:
         account: Konto
         admin: System-Administrator
@@ -351,6 +355,10 @@ de:
           attributes:
             folder:
               must_be_same_account: Ordner muss zu gleichem Konto gehören wie Beitrag
+        pageflow/membership:
+          attributes:
+            user:
+              required: Benutzer muss ausgewählt sein
     models:
       account:
         one: Konto
@@ -1120,6 +1128,8 @@ de:
           audio_files: Audios
           image_files: Bilder
           video_files: Videos
+      media_loading_spinner:
+        widget_type_info_box_text: Dies ist eine Vorschau der Lade-Ansicht von 'Bild'. Die Animation wird ausgeführt, während die Seite geladen wird.
       nested_files:
         text_track_files:
           delete:
@@ -1392,7 +1402,19 @@ de:
           without_parent_page: Ohne übergeordnete Seite
       widgets:
         attributes:
+          media_loading_spinner:
+            blur_strength:
+              inline_help: Steuern Sie die Unschärfe des Hintergrundbilds.
+              label: Unschärfe
+            custom_background_image_id:
+              inline_help: Standardmäßig wird das Hintergrundbild der ersten Seite verwendet.
+              label: Hintegrundbild
+            remove_logo:
+              label: Logo entfernen
           title_loading_spinner:
+            blur_strength:
+              inline_help: Steuern Sie die Unschärfe des Hintergrundbilds.
+              label: Unschärfe
             custom_background_image_id:
               inline_help: Standardmäßig wird das Hintergrundbild der ersten Seite verwendet.
               label: Hintegrundbild
@@ -1733,6 +1755,8 @@ de:
       tr: Türkisch
       unknown: "(Unbekannt)"
       zh: Chinesisch
+    media_loading_spinner:
+      widget_type_name: Media
     page_transitions:
       crossfade: Überblenden
       cut: Harter Schnitt

data/config/locales/en.yml

@@ -282,6 +282,10 @@ en:
         dimensions: Dimensions
         duration: Duration
         format: Format
+      pageflow/widget:
+        blur_strength: Blurriness
+        invert: Invert Color
+        remove_logo: Remove Logo
       user:
         account: Account
         admin: System administrator
@@ -351,6 +355,10 @@ en:
           attributes:
             folder:
               must_be_same_account: Folder must belong to same account as story
+        pageflow/membership:
+          attributes:
+            user:
+              required: User must be selected
     models:
       account:
         one: Account
@@ -1120,6 +1128,8 @@ en:
           audio_files: Audios
           image_files: Images
           video_files: Videos
+      media_loading_spinner:
+        widget_type_info_box_text: This is a preview of the 'Image' loading view. The animation runs while the page is loading.
       nested_files:
         text_track_files:
           delete:
@@ -1392,7 +1402,19 @@ en:
           without_parent_page: Without parent page
       widgets:
         attributes:
+          media_loading_spinner:
+            blur_strength:
+              inline_help: Control the bluriness of background image.
+              label: Blur Strength
+            custom_background_image_id:
+              inline_help: By default, the background image of the first page is used.
+              label: Background Image
+            remove_logo:
+              label: Remove logo
           title_loading_spinner:
+            blur_strength:
+              inline_help: Control the bluriness of background image.
+              label: Blur Strength
             custom_background_image_id:
               inline_help: By default the background image of the first page is used.
               label: Background image
@@ -1705,6 +1727,8 @@ en:
       tr: Turkish
       unknown: "(Unknown)"
       zh: Chinese
+    media_loading_spinner:
+      widget_type_name: Media
     page_transitions:
       crossfade: Crossfade
       cut: Cut

data/db/migrate/20140418225525_setup_schema.rb

@@ -2,7 +2,7 @@
 
 class SetupSchema < ActiveRecord::Migration[5.2]
   def change
-    create_table 'friendly_id_slugs', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'friendly_id_slugs', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.string 'slug', null: false
       t.integer 'sluggable_id', null: false
       t.string 'sluggable_type', limit: 50
@@ -14,7 +14,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['sluggable_type'], name: 'index_friendly_id_slugs_on_sluggable_type'
     end
 
-    create_table 'pageflow_accounts', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_accounts', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.string 'name', default: '', null: false
       t.datetime 'created_at'
       t.datetime 'updated_at'
@@ -27,12 +27,12 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['default_theming_id'], name: 'index_pageflow_accounts_on_default_theming_id'
     end
 
-    create_table 'pageflow_accounts_themes', id: false, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_accounts_themes', id: false, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'account_id'
       t.integer 'theme_name'
     end
 
-    create_table 'pageflow_audio_files', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_audio_files', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'entry_id'
       t.integer 'uploader_id'
       t.string 'attachment_on_filesystem_file_name'
@@ -58,7 +58,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['parent_file_id', 'parent_file_model_type'], name: 'index_audio_files_on_parent_id_and_parent_model_type'
     end
 
-    create_table 'pageflow_chapters', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_chapters', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.datetime 'created_at'
       t.datetime 'updated_at'
       t.integer 'position', default: 0, null: false
@@ -68,7 +68,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['storyline_id'], name: 'index_pageflow_chapters_on_storyline_id'
     end
 
-    create_table 'pageflow_edit_locks', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_edit_locks', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'user_id'
       t.integer 'entry_id'
       t.datetime 'created_at'
@@ -77,7 +77,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['user_id'], name: 'index_pageflow_edit_locks_on_user_id'
     end
 
-    create_table 'pageflow_entries', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_entries', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.string 'title', default: '', null: false
       t.datetime 'created_at'
       t.datetime 'updated_at'
@@ -96,7 +96,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['theming_id'], name: 'index_pageflow_entries_on_theming_id'
     end
 
-    create_table 'pageflow_file_usages', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_file_usages', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'revision_id'
       t.integer 'file_id'
       t.string 'file_type'
@@ -107,7 +107,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['revision_id'], name: 'index_pageflow_file_usages_on_revision_id'
     end
 
-    create_table 'pageflow_folders', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_folders', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.string 'name'
       t.integer 'account_id'
       t.datetime 'created_at'
@@ -115,7 +115,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['account_id'], name: 'index_pageflow_folders_on_account_id'
     end
 
-    create_table 'pageflow_image_files', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_image_files', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'entry_id'
       t.integer 'uploader_id'
       t.string 'unprocessed_attachment_file_name'
@@ -137,7 +137,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['parent_file_id', 'parent_file_model_type'], name: 'index_image_files_on_parent_id_and_parent_model_type'
     end
 
-    create_table 'pageflow_memberships', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_memberships', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'user_id'
       t.integer 'entity_id'
       t.string 'name'
@@ -149,7 +149,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['user_id'], name: 'index_pageflow_memberships_on_user_id'
     end
 
-    create_table 'pageflow_pages', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_pages', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'chapter_id'
       t.string 'template', default: '', null: false
       t.text 'configuration'
@@ -162,7 +162,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['perma_id'], name: 'index_pageflow_pages_on_perma_id'
     end
 
-    create_table 'pageflow_revisions', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_revisions', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'entry_id'
       t.integer 'creator_id'
       t.datetime 'published_at'
@@ -195,7 +195,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['restored_from_id'], name: 'index_pageflow_revisions_on_restored_from_id'
     end
 
-    create_table 'pageflow_storylines', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_storylines', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'perma_id'
       t.integer 'revision_id'
       t.integer 'position'
@@ -205,7 +205,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['revision_id'], name: 'index_pageflow_storylines_on_revision_id'
     end
 
-    create_table 'pageflow_text_track_files', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_text_track_files', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'entry_id'
       t.integer 'uploader_id'
       t.string 'state'
@@ -232,7 +232,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['uploader_id'], name: 'index_pageflow_text_track_files_on_uploader_id'
     end
 
-    create_table 'pageflow_themings', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_themings', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.string 'imprint_link_url'
       t.string 'imprint_link_label'
       t.string 'copyright_link_url'
@@ -251,7 +251,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['cname'], name: 'index_pageflow_themings_on_cname'
     end
 
-    create_table 'pageflow_video_files', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_video_files', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.integer 'entry_id'
       t.integer 'uploader_id'
       t.string 'attachment_on_filesystem_file_name'
@@ -284,7 +284,7 @@ class SetupSchema < ActiveRecord::Migration[5.2]
       t.index ['parent_file_id', 'parent_file_model_type'], name: 'index_video_files_on_parent_id_and_parent_model_type'
     end
 
-    create_table 'pageflow_widgets', id: :integer, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+    create_table 'pageflow_widgets', id: :integer, options: 'ENGINE=InnoDB', force: :cascade do |t|
       t.string 'subject_type'
       t.integer 'subject_id'
       t.string 'type_name'

data/db/migrate/20190820152900_drop_accounts_themes.rb

@@ -0,0 +1,8 @@
+class DropAccountsThemes < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :pageflow_accounts_themes, id: false, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8', force: :cascade do |t|
+      t.integer 'account_id'
+      t.integer 'theme_name'
+    end
+  end
+end

data/lib/pageflow/built_in_page_type.rb

@@ -4,6 +4,7 @@ module Pageflow
     def self.plain
       Pageflow::React.create_page_type('background_image',
                                        thumbnail_candidates: default_thumbnail_candidates,
+                                       export_version: Pageflow::VERSION,
                                        file_types: [
                                          BuiltInFileType.image,
                                          BuiltInFileType.video
@@ -13,6 +14,7 @@ module Pageflow
     def self.video
       Pageflow::React.create_page_type('video',
                                        thumbnail_candidates: video_thumbnail_candidates,
+                                       export_version: Pageflow::VERSION,
                                        file_types: [
                                          BuiltInFileType.image,
                                          BuiltInFileType.video
@@ -22,6 +24,7 @@ module Pageflow
     def self.audio
       Pageflow::React.create_page_type('audio',
                                        thumbnail_candidates: default_thumbnail_candidates,
+                                       export_version: Pageflow::VERSION,
                                        file_types: [
                                          BuiltInFileType.audio,
                                          BuiltInFileType.image,

data/lib/pageflow/built_in_widget_type.rb

@@ -61,5 +61,12 @@ module Pageflow
                                          insert_point: :before_entry,
                                          server_rendering: true)
     end
+
+    def self.media_loading_spinner
+      Pageflow::React.create_widget_type('media_loading_spinner',
+                                         'loading_spinner',
+                                         insert_point: :before_entry,
+                                         server_rendering: true)
+    end
   end
 end

data/lib/pageflow/built_in_widget_types_plugin.rb

@@ -9,12 +9,18 @@ module Pageflow
                                                .phone_horizontal_slideshow_mode)
       end
 
+      config.widget_types.register_widget_defaults('loading_spinner',
+                                                   'blur_strength' => 50,
+                                                   'remove_logo' => false,
+                                                   'invert' => false)
       config.widget_types.register(Pageflow::BuiltInWidgetType.classic_loading_spinner,
                                    default: true)
 
       config.features.register('title_loading_spinner') do |feature_config|
+        feature_config.widget_types.register(Pageflow::BuiltInWidgetType.media_loading_spinner)
         feature_config.widget_types.register(Pageflow::BuiltInWidgetType.title_loading_spinner)
       end
+      config.features.enable_by_default('title_loading_spinner')
 
       config.widget_types.register(Pageflow::BuiltInWidgetType.navigation, default: true)
       config.widget_types.register(Pageflow::BuiltInWidgetType.mobile_navigation, default: true)

data/lib/pageflow/entry_export_import.rb

@@ -0,0 +1,43 @@
+module Pageflow
+  module EntryExportImport
+    extend self
+
+    def export(entry, archive_file_path)
+      archive = ZipArchive.new(archive_file_path)
+      publication = most_recent_publication(entry)
+
+      archive.add('entry.json', StringIO.new(EntrySerialization.dump(entry, publication).to_json))
+
+      AttachmentFiles.download_and_archive_originals(entry.draft, archive)
+      AttachmentFiles.download_and_archive_originals(publication, archive) if publication
+
+      archive.close
+    end
+
+    def import(archive_file_path, creator:)
+      archive = ZipArchive.new(archive_file_path)
+      file_mappings = FileMappings.new
+
+      entry = extract_entry(archive, creator, file_mappings)
+      AttachmentFiles.extract_and_upload_originals(entry,
+                                                   archive_file_path,
+                                                   file_mappings)
+      entry
+    end
+
+    private
+
+    def extract_entry(archive, creator, file_mappings)
+      archive.extract_to_tempfile('entry.json') do |tempfile|
+        EntrySerialization.import(JSON.parse(tempfile.read),
+                                  creator: creator,
+                                  account: creator.accounts.first,
+                                  file_mappings: file_mappings)
+      end
+    end
+
+    def most_recent_publication(entry)
+      entry.revisions.publications.first
+    end
+  end
+end

data/lib/pageflow/entry_export_import/attachment_files.rb

@@ -0,0 +1,65 @@
+module Pageflow
+  module EntryExportImport
+    # Download/upload files during export/import
+    module AttachmentFiles
+      extend self
+
+      def download_and_archive_originals(revision, archive)
+        revision.file_usages.each do |file_usage|
+          reusable_file = file_usage.file
+
+          reusable_file.attachments_for_export.each do |attachment|
+            download_and_archive_attachment_file(reusable_file, attachment, archive)
+          end
+        end
+      end
+
+      def extract_and_upload_originals(entry, archive_file_name, file_mappings)
+        each_reusable_file(entry) do |reusable_file|
+          exported_id = file_mappings.exported_id_for(reusable_file.class.name,
+                                                      reusable_file.id)
+
+          UploadAndPublishFileJob.perform_later(reusable_file,
+                                                exported_id,
+                                                archive_file_name)
+        end
+      end
+
+      def archive_path(reusable_file, attachment, exported_id: reusable_file.id)
+        File.join(reusable_file.file_type.collection_name,
+                  exported_id.to_s,
+                  attachment.name.to_s,
+                  attachment.original_filename)
+      end
+
+      private
+
+      def each_reusable_file(entry, &block)
+        Pageflow.config.file_types.each do |file_type|
+          file_type.model.where(entry: entry).each(&block)
+        end
+      end
+
+      def download_and_archive_attachment_file(reusable_file, attachment, archive)
+        archive_path = archive_path(reusable_file, attachment)
+
+        return if archive.include?(archive_path)
+
+        download_attachment_file(attachment) do |tempfile|
+          archive.add(archive_path, tempfile)
+        end
+      end
+
+      def download_attachment_file(attachment)
+        tempfile = Paperclip.io_adapters.for(attachment)
+
+        begin
+          yield(tempfile)
+        ensure
+          tempfile.close
+          tempfile.unlink
+        end
+      end
+    end
+  end
+end

data/lib/pageflow/entry_export_import/entry_serialization.rb

@@ -0,0 +1,68 @@
+module Pageflow
+  module EntryExportImport
+    module EntrySerialization
+      extend self
+
+      DEFAULT_REMOVAL_COLUMNS = %w[id updated_at].freeze
+
+      # Turn entry into JSON compatible data structure.
+      def dump(entry, publication = nil)
+        {
+          'page_type_versions' => PageTypeVersions.dump,
+          # features_configuration is specifically excluded via `Entry#blacklist_for_serialization`
+          # to prevent it from showing up in Active Admin JSON exports.
+          # It is included separately as part of the entry export.
+          'entry' => entry
+            .as_json(except: [:folder_id, :password_digest, :users_count])
+            .merge('features_configuration' => entry.features_configuration,
+                   'draft' => RevisionSerialization.dump(entry.draft),
+                   'last_publication' => dump_publication(publication))
+        }
+      end
+
+      # Create entry from serialized JSON export
+      def import(data, options)
+        PageTypeVersions.verify_compatibility!(data['page_type_versions'])
+
+        entry_data = data['entry']
+        entry = create_entry(entry_data.except('draft', 'last_publication'), options)
+
+        file_mappings = options.fetch(:file_mappings, FileMappings.new)
+
+        import_draft(entry_data, options, entry, file_mappings)
+        import_last_publication(entry_data, options, entry, file_mappings)
+
+        entry
+      end
+
+      private
+
+      def dump_publication(publication)
+        publication && RevisionSerialization.dump(publication)
+      end
+
+      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.create!(entry_data.merge(skip_draft_creation: true))
+      end
+
+      def import_draft(entry_data, options, entry, file_mappings)
+        RevisionSerialization.import(entry_data['draft'],
+                                     entry: entry,
+                                     creator: options[:creator],
+                                     file_mappings: file_mappings)
+      end
+
+      def import_last_publication(entry_data, options, entry, file_mappings)
+        return unless entry_data['last_publication']
+
+        RevisionSerialization.import(entry_data['last_publication'],
+                                     entry: entry,
+                                     creator: options[:creator],
+                                     file_mappings: file_mappings)
+      end
+    end
+  end
+end