pageflow-support 15.0.0.beta2 → 15.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28f755a329e07c337ed53b8bf65649db497c889dc690c0f0e8640d263955098a
-  data.tar.gz: bd9f1e1041d6a7aaadba1b6a18750f70c7cd40836e0eb096949fdc8b58b5879f
+  metadata.gz: 39ac32782bfcee2bc72db29ee0b1af15ce91bb6b13cf5f5454fdbcd7396a70ea
+  data.tar.gz: 2467696934a558f8b83ce5711215793307455b10bbd5917782b63641d26144d7
 SHA512:
-  metadata.gz: f25048cbd8e63ed0848a731e2c9215d602c1193b156d697f75789549f19cf44ae0bbf98a5c1960dbeed69048b281d74a68c50b7b3687d92228164a47cc9c7d00
-  data.tar.gz: c6bf708dfe1379507fcf093fbe877e4d85260603aa6c6387bbc8d889f0b67f5cd070a08e77921ed68220bb2d572ec830bc25acdac9616f9354d2c3a76915d1af
+  metadata.gz: 77e0bdd68deec024d75254c6b9fc6b38619c881cf6c96500976b544386959099241fb34f8cbc3d41d1ec2f2cb01e11ee41f6c70705287cd5f6ce3d7616631e97
+  data.tar.gz: ef34dfd1fe6b6deb45b4c2b2f25269b9b30eafc1909ae8cd292e2570dd94f5527b036a1cec0440456af0b3bfc9561ff1fe41bcd239193cdf5c77a37571c91db6

data/pageflow/dummy/rails_template.rb

@@ -77,8 +77,10 @@ END
 
 copy_file('create_test_uploadable_file.rb',
           'db/migrate/00000000000000_create_test_uploadable_file.rb')
+copy_file('create_test_multi_attachment_file.rb',
+          'db/migrate/00000000000001_create_test_multi_attachment_file.rb')
 copy_file('create_test_revision_component.rb',
-          'db/migrate/00000000000001_create_test_revision_component.rb')
+          'db/migrate/00000000000002_create_test_revision_component.rb')
 copy_file('add_custom_fields.rb',
           'db/migrate/99990000000000_add_custom_fields.rb')
 

data/pageflow/dummy/templates/create_test_multi_attachment_file.rb

@@ -0,0 +1,26 @@
+class CreateTestMultiAttachmentFile < ActiveRecord::Migration[4.2]
+  def change
+    create_table :test_multi_attachment_files do |t|
+      t.belongs_to(:entry, index: true)
+      t.belongs_to(:uploader, index: true)
+
+      t.integer(:parent_file_id)
+      t.string(:parent_file_model_type)
+
+      t.string(:state)
+      t.string(:rights)
+
+      t.string(:first_attachment_file_name)
+      t.string(:first_attachment_content_type)
+      t.integer(:first_attachment_file_size, limit: 8)
+      t.datetime(:first_attachment_updated_at)
+
+      t.string(:second_attachment_file_name)
+      t.string(:second_attachment_content_type)
+      t.integer(:second_attachment_file_size, limit: 8)
+      t.datetime(:second_attachment_updated_at)
+
+      t.timestamps
+    end
+  end
+end

data/pageflow/dummy/templates/create_test_revision_component.rb

@@ -5,6 +5,7 @@ class CreateTestRevisionComponent < ActiveRecord::Migration[4.2]
       t.integer :perma_id
 
       t.string :text
+      t.timestamps
     end
   end
 end

data/pageflow/dummy/templates/create_test_uploadable_file.rb

@@ -23,6 +23,7 @@ class CreateTestUploadableFile < ActiveRecord::Migration[4.2]
       t.timestamps
 
       t.string :custom
+      t.belongs_to(:related_image_file)
     end
   end
 end

data/pageflow/dummy/templates/database.yml

@@ -1,6 +1,6 @@
 common: &common
   adapter: mysql2
-  encoding: utf8
+  encoding: utf8mb4
   username: <%= ENV.fetch('PAGEFLOW_DB_USER', 'root') %>
   password: <%= ENV.fetch('PAGEFLOW_DB_PASSWORD', '') %>
   pool: 5

data/pageflow/lint/file_type.rb

@@ -1,5 +1,6 @@
 require 'pageflow/global_config_api_test_helper'
 require 'pageflow/test_page_type'
+require 'pageflow/entry_export_import'
 
 module Pageflow
   module Lint
@@ -15,7 +16,7 @@ module Pageflow
 
           before do
             pageflow_configure do |config|
-              page_type = TestPageType.new(name: :test,
+              page_type = TestPageType.new(name: 'test',
                                            file_types: [file_type])
               config.page_types.clear
               config.page_types.register(page_type)
@@ -51,6 +52,20 @@ module Pageflow
               expect(result).to be_a(Hash)
             end
           end
+
+          it 'can be exported and imported without error' do
+            exported_entry = create(:entry)
+            create(:file_usage, file: file, revision: exported_entry.draft)
+            user = create(:user, :manager, on: create(:account))
+
+            Dir.mktmpdir do |dir|
+              archive_file_path = File.join(dir, 'export.zip')
+              EntryExportImport.export(exported_entry, archive_file_path)
+              imported_entry = EntryExportImport.import(archive_file_path, creator: user)
+
+              expect(imported_entry.draft.find_files(file_type.model)).to be_present
+            end
+          end
         end
       end
     end

data/pageflow/test_page_type.rb

@@ -2,11 +2,43 @@ require 'pageflow/page_type'
 
 module Pageflow
   class TestPageType < PageType
-    attr_reader :name, :file_types
+    attr_reader(:name,
+                :file_types,
+                :revision_components,
+                :export_version)
 
-    def initialize(name:, file_types: [])
+    def initialize(name:,
+                   file_types: [],
+                   revision_components: [],
+                   template_path: nil,
+                   json_seed_template: nil,
+                   thumbnail_candidates: nil,
+                   export_version: '1.2.0',
+                   import_version_requirement: nil)
       @name = name
       @file_types = file_types
+      @revision_components = revision_components
+      @template_path = template_path
+      @json_seed_template = json_seed_template
+      @thumbnail_candidates = thumbnail_candidates
+      @export_version = export_version
+      @import_version_requirement = import_version_requirement
+    end
+
+    def template_path
+      @template_path || super
+    end
+
+    def json_seed_template
+      @json_seed_template || super
+    end
+
+    def thumbnail_candidates
+      @thumbnail_candidates || super
+    end
+
+    def import_version_requirement
+      @import_version_requirement || super
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-support
 version: !ruby/object:Gem::Version
-  version: 15.0.0.beta2
+  version: 15.0.0.beta3
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.0.0.beta2
+        version: 15.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.0.0.beta2
+        version: 15.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - pageflow/dummy/config/pageflow.rb
 - pageflow/dummy/rails_template.rb
 - pageflow/dummy/templates/add_custom_fields.rb
+- pageflow/dummy/templates/create_test_multi_attachment_file.rb
 - pageflow/dummy/templates/create_test_revision_component.rb
 - pageflow/dummy/templates/create_test_uploadable_file.rb
 - pageflow/dummy/templates/database.yml
@@ -215,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Spec support for Pageflow extensions.