pageflow-support 15.2.0 → 15.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7dff851c0e864899d86c230a45e7cf87264af49a
-  data.tar.gz: '08450dc8956eb095b105fb45b98f6c7d1858ef3b'
+SHA256:
+  metadata.gz: 18c79a7e3225b11a5a2f488c54d3ad9b9c3ca34261fb56ce597964e0390f6a32
+  data.tar.gz: f7a543daa4eb496e1c39bd6de98d189aebf4b354facb6edad98a73960089363f
 SHA512:
-  metadata.gz: 6387898f647524d61a4435a38625968015d78853660a9d056e196449ff756bcfc8671e944991e5681d273052d31d54d6edd45a863802193dd3199a716f5b1aee
-  data.tar.gz: 9496fe2453985763df389938bc4998634cd18b73868a06107956394c0bcd55b1120e0096f2850605e8ea21b07a8441bfcd69aea47032e034eae0c2f39b83a336
+  metadata.gz: c0ebb382f49925848049db5ac3d54e6c778d02d9d36067dbf5d7303a90455c758f6b590c78c97769358721620e365a7a626c3141ed44812d2af4ef2985fae1d3
+  data.tar.gz: d934aa57b72540a2efdbdae413eaed530e586cbf6ee33abb149722d8e2767c9628fce15655db7c40b915f2a104ea33ec716483282097f9b0f2dde6a987fe1f34

data/pageflow/dom/editor/edit_configuration_view.rb

@@ -8,6 +8,10 @@ module Pageflow
           node.find('.destroy')
         end
 
+        def back_button
+          node.find('.back')
+        end
+
         def input_value(label_text)
           node.find_field(label_text).value
         end

data/pageflow/dummy/app.rb

@@ -1,4 +1,5 @@
 require 'pageflow/version'
+require 'pageflow/dummy/exit_on_failure_patch'
 
 module Pageflow
   module Dummy
@@ -10,7 +11,8 @@ module Pageflow
           puts("Dummy directory #{directory} exists.")
         else
           system("bundle exec rails new #{directory} " \
-                 "--template #{template_path} #{rails_new_options}")
+                 "--template #{template_path} #{rails_new_options}") ||
+            raise('Error generating dummy app.')
         end
 
         require(File.join(ENV['RAILS_ROOT'], 'config', 'environment'))

data/pageflow/dummy/exit_on_failure_patch.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+
+# Thor exits with 0, when an error occurs. This behavior is deprecated
+# in 1.0 [1], but has not yet changed. As a result the dummy app
+# generation is not aborted and tests fail due to confusing follow up
+# errors. Rails provides an `abort_on_failure` option for `rake` and
+# `generate` actions [2], but it needs to be added to each such
+# action. In particular, generating the dummy app invokes other
+# generators, which we do not have control over.
+#
+# To work around this problem, we override the default behavior for
+# all generators and make them fail loudly.
+#
+# [1] https://github.com/erikhuda/thor/blob/master/CHANGELOG.md#100
+# [2] https://github.com/rails/rails/pull/34420/
+
+module Rails
+  module Generators
+    class Base
+      def self.exit_on_failure?
+        true
+      end
+    end
+  end
+end

data/pageflow/dummy/rails_template.rb

@@ -35,10 +35,13 @@ gsub_file('app/assets/javascripts/application.js', %r'//=.*', '')
 
 # Recreate db. Ignore if it does not exist.
 
-log :rake, 'db:drop:all'
-in_root { run('rake db:environment:set db:drop:all 2> /dev/null', verbose: false) }
+in_root { run('rake db:environment:set db:drop:all', capture: true, abort_on_failure: false) }
 rake 'db:create:all'
 
+# Install Webpacker
+
+rake 'webpacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
+
 # Install pageflow and the tested engine via their generators.
 
 generate 'pageflow:install', '--force'
@@ -79,8 +82,8 @@ 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/00000000000002_create_test_revision_component.rb')
+copy_file('create_test_revision_components.rb',
+          'db/migrate/00000000000002_create_test_revision_components.rb')
 copy_file('add_custom_fields.rb',
           'db/migrate/99990000000000_add_custom_fields.rb')
 

data/pageflow/dummy/templates/create_test_revision_components.rb

@@ -0,0 +1,27 @@
+class CreateTestRevisionComponents < ActiveRecord::Migration[4.2]
+  def change
+    create_table :test_revision_components do |t|
+      t.belongs_to :revision
+      t.integer :perma_id
+
+      t.string :text
+      t.timestamps
+    end
+
+    create_table :test_nested_revision_components do |t|
+      t.belongs_to :parent
+      t.integer :perma_id
+
+      t.string :text
+      t.timestamps
+    end
+
+    create_table :test_deeply_nested_revision_components do |t|
+      t.belongs_to :parent
+      t.integer :perma_id
+
+      t.string :text
+      t.timestamps
+    end
+  end
+end

data/pageflow/lint/entry_type.rb

@@ -10,7 +10,12 @@ module Pageflow
 
           describe '#editor_fragment_renderer' do
             it 'renders head fragment without error' do
-              entry = DraftEntry.new(FactoryBot.create(:entry))
+              entry = DraftEntry.new(
+                FactoryBot.create(
+                  :entry,
+                  type_name: entry_type.name
+                )
+              )
 
               expect {
                 entry_type.editor_fragment_renderer.head_fragment(entry)
@@ -18,7 +23,12 @@ module Pageflow
             end
 
             it 'renders body fragment without error' do
-              entry = DraftEntry.new(FactoryBot.create(:entry))
+              entry = DraftEntry.new(
+                FactoryBot.create(
+                  :entry,
+                  type_name: entry_type.name
+                )
+              )
 
               expect {
                 entry_type.editor_fragment_renderer.body_fragment(entry)
@@ -26,7 +36,12 @@ module Pageflow
             end
 
             it 'renders seed fragment without error' do
-              entry = DraftEntry.new(FactoryBot.create(:entry))
+              entry = DraftEntry.new(
+                FactoryBot.create(
+                  :entry,
+                  type_name: entry_type.name
+                )
+              )
 
               expect {
                 entry_type.editor_fragment_renderer.seed_fragment(entry)

data/pageflow/render_page_test_helper.rb

@@ -18,7 +18,7 @@ module Pageflow
       helper.extend(InfoBoxHelper)
       helper.extend(BackgroundImageHelper)
       helper.extend(EntryJsonSeedHelper)
-      helper.extend(PageBackgroundAssetHelper)
+      helper.extend(PageflowPaged::PageBackgroundAssetHelper)
       helper.extend(PagesHelper)
       helper.extend(VideoFilesHelper)
 

data/pageflow/support/config/paperclip.rb

@@ -1,13 +1,21 @@
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:all) do
     Dir.glob(Rails.root.join('public', 'system', 's3', '*')).each do |f|
       FileUtils.rm_r(f)
     end
   end
 
-  config.before(:each, stub_paperclip: true) do
-    allow_any_instance_of(Paperclip::Attachment).to receive(:post_process)
-    allow(Paperclip).to receive(:run).and_return('100x100')
+  config.after(:each, unstub_paperclip: true) do
+    Dir.glob(Rails.root.join('public', 'system', 's3', '*')).each do |f|
+      FileUtils.rm_r(f)
+    end
+  end
+
+  config.before(:each) do |example|
+    unless example.metadata[:unstub_paperclip] || example.metadata[:js]
+      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process)
+      allow(Paperclip).to receive(:run).and_return('100x100')
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-support
 version: !ruby/object:Gem::Version
-  version: 15.2.0
+  version: 15.5.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.2.0
+        version: 15.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.2.0
+        version: 15.5.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -201,10 +201,11 @@ files:
 - pageflow/dummy.rb
 - pageflow/dummy/app.rb
 - pageflow/dummy/config/pageflow.rb
+- pageflow/dummy/exit_on_failure_patch.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_revision_components.rb
 - pageflow/dummy/templates/create_test_uploadable_file.rb
 - pageflow/dummy/templates/database.yml
 - pageflow/dummy/templates/test_theme.scss
@@ -249,8 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Spec support for Pageflow extensions.

data/pageflow/dummy/templates/create_test_revision_component.rb

@@ -1,11 +0,0 @@
-class CreateTestRevisionComponent < ActiveRecord::Migration[4.2]
-  def change
-    create_table :test_revision_components do |t|
-      t.belongs_to :revision
-      t.integer :perma_id
-
-      t.string :text
-      t.timestamps
-    end
-  end
-end