pageflow-support 16.0.0 → 16.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a94f3475148af3c9a6615c75796b97df0c85584e87f975d6f2b23f5b3bd3e0
-  data.tar.gz: f12b3476e0da841819f6a99cec6438624450559371dee32cbab9e7c07b1719f2
+  metadata.gz: f5025199d00a123265a8a38fc2ab1bb3450e577d61e0813fac8e5d971caf294f
+  data.tar.gz: 05dfba6fdfa469667ff2e98a6108c6f9b23dbade34680b74f1b80710f51be978
 SHA512:
-  metadata.gz: 30bb3817ba2efd1c4450518a19d604c719517cab54dd41d8aba9bc48d8890dc50c2186904d1dd69104eda4d85445c2b39f079ec42e35a45976f9c03d3de5363d
-  data.tar.gz: f6fe10eba2e0bdd08aba9e2e1fea7e22067375fcc836fed248b994ab421db3110e9164c4a48b44cdf81ba8c7f68321ed6139fd368b9c6bef30c37881cf283e8c
+  metadata.gz: 93baec3ea0932a52a834a9fd6a3c5957e03702274488c775c32ec501a733903b84bc3ff760c7ae319e30e6cf3c2bc4fce700ab947229af606964bf0ca1b40e46
+  data.tar.gz: a882466b94aa06c45741770e2ca9030dd75e807535fe94b74dbf80d12637108059bb3e54771c882d3697506e345e350a6601402db0ac8a4594b8beb5901c7a39

data/pageflow/caching_test_helpers.rb

@@ -0,0 +1,20 @@
+RSpec.configure do |config|
+  # Inspired by
+  # https://gitlab.com/gitlab-org/gitlab-foss/-/blob/6f5be4b446db2f17fc0307c4fce8ae285b35d89a/spec/support/caching.rb
+  config.around(:each, :use_clean_rails_memory_store_fragment_caching) do |example|
+    rails_cache = Rails.cache
+    controller_cache_store = ActionController::Base.cache_store
+
+    # Also replace Rails.cache for consistency since JBuilder uses
+    # it directly to cache fragments instead of going through
+    # ActionController::Base.cache_store.
+    ActionController::Base.cache_store = Rails.cache = ActiveSupport::Cache::MemoryStore.new
+    ActionController::Base.perform_caching = true
+
+    example.run
+  ensure
+    ActionController::Base.perform_caching = false
+    ActionController::Base.cache_store = controller_cache_store
+    Rails.cache = rails_cache
+  end
+end

data/pageflow/dummy/app.rb

@@ -1,5 +1,6 @@
 require 'pageflow/version'
 require 'pageflow/dummy/exit_on_failure_patch'
+require 'pageflow/rails_version'
 
 module Pageflow
   module Dummy
@@ -10,13 +11,13 @@ module Pageflow
         if File.exist?(directory)
           puts("Dummy directory #{directory} exists.")
         else
-          system("bundle exec rails new #{directory} " \
+          system('SKIP_EAGER_LOAD=true ' \
+                 "bundle exec rails new #{directory} --skip-spring " \
                  "--template #{template_path} #{rails_new_options}") ||
             raise('Error generating dummy app.')
         end
 
         require(File.join(ENV['RAILS_ROOT'], 'config', 'environment'))
-        require('pageflow/dummy/config/pageflow')
       end
 
       def directory
@@ -29,7 +30,9 @@ module Pageflow
       end
 
       def rails_new_options
-        '--skip-test-unit --skip-bundle --database=mysql'
+        result = '--skip-test-unit --skip-bundle --database=mysql'
+        result << ' --skip-javascript'
+        result
       end
     end
   end

data/pageflow/dummy/config/pageflow.rb

@@ -1,19 +1,20 @@
 Pageflow.configure do |config|
-  config.paperclip_s3_root = 'test-host'
+  s3_bucket = config.paperclip_s3_default_options.dig(:s3_credentials, :bucket)
 
-  config.paperclip_s3_default_options.merge!(
-    storage: :filesystem,
-    url: '/system/s3/:class/:attachment/:id_partition/:style/:filename',
-    path: ':rails_root/public:url'
-  )
+  if s3_bucket == 'com-example-pageflow-development'
+    config.paperclip_s3_root = 'test-host'
 
-  config.paperclip_direct_upload_options = lambda do |_|
-    {
-      url: '#',
-      fields: []
-    }
+    config.paperclip_s3_default_options.merge!(
+      storage: :filesystem,
+      url: '/system/s3/:class/:attachment/:id_partition/:style/:filename',
+      path: ':rails_root/public:url'
+    )
+
+    config.paperclip_direct_upload_options = lambda do |_|
+      {
+        url: '#',
+        fields: []
+      }
+    end
   end
 end
-
-# Reconstruct current config to ensure config block above is used
-Pageflow.configure!

data/pageflow/dummy/rails_template.rb

@@ -1,3 +1,5 @@
+require 'pageflow/rails_version'
+
 def source_paths
   [File.join(File.expand_path(File.dirname(__FILE__)), 'templates')]
 end
@@ -19,6 +21,10 @@ gsub_file('config/database.yml',
           /^  database: /,
           "  database: #{database_prefix}-")
 
+gsub_file('config/environments/test.rb',
+          'config.eager_load = ENV["CI"].present?',
+          'config.eager_load = ENV["CI"].present? && !ENV["SKIP_EAGER_LOAD"]')
+
 append_to_file('config/application.rb', <<-END)
   if ENV['PAGEFLOW_DB_HOST'].present?
     ActiveRecord::Tasks::DatabaseTasks::LOCAL_HOSTS << ENV['PAGEFLOW_DB_HOST']
@@ -30,17 +36,21 @@ inject_into_file('config/application.rb',
                  "require 'pageflow'\n",
                  after: "Bundler.require(*Rails.groups)\n")
 
-# Remove requires to missing gems (i.e. turbolinks)
-gsub_file('app/assets/javascripts/application.js', %r'//=.*', '')
+if in_root { File.exist?('app/assets/javascripts/application.js') }
+  # Remove requires to missing gems (i.e. turbolinks)
+  gsub_file('app/assets/javascripts/application.js', %r'//=.*', '')
+end
 
 # Recreate db. Ignore if it does not exist.
 
 in_root { run('rake db:environment:set db:drop:all', capture: true, abort_on_failure: false) }
+
+rake 'db:create' # workaround for https://github.com/rails/rails/issues/50038
 rake 'db:create:all'
 
 # Install Webpacker
 
-rake 'webpacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
+rake 'shakapacker:install' if ENV['PAGEFLOW_INSTALL_SHAKAPACKER'] == 'true'
 
 # Install pageflow and the tested engine via their generators.
 
@@ -59,6 +69,12 @@ prepend_to_file('config/initializers/pageflow.rb', <<-END)
   ActiveAdmin.application.load_paths.unshift(Dir[Rails.root.join('app/admin')].first)\n
 END
 
+# Adapt default configuration
+
+inject_into_file('config/initializers/pageflow.rb',
+                 "require 'pageflow/dummy/config/pageflow'\n",
+                 after: "Pageflow.finalize!\n")
+
 # Add required files for test theme
 
 copy_file('test_theme.scss',
@@ -87,4 +103,4 @@ copy_file('create_test_revision_components.rb',
 copy_file('add_custom_fields.rb',
           'db/migrate/99990000000000_add_custom_fields.rb')
 
-rake 'db:migrate db:test:load', env: 'development'
+rake 'db:migrate db:test:load_schema', env: 'development'

data/pageflow/global_config_api_test_helper.rb

@@ -24,7 +24,7 @@ module Pageflow
     #     # ...
     #   end
     def pageflow_configure(&block)
-      GlobalConfigApiTestHelper.custom_configure_block = block
+      GlobalConfigApiTestHelper.custom_configure_block << block
       Pageflow.configure!
     end
 
@@ -39,12 +39,14 @@ module Pageflow
 
         config.before(:suite) do
           Pageflow.configure do |pageflow_config|
-            GlobalConfigApiTestHelper.custom_configure_block&.call(pageflow_config)
+            GlobalConfigApiTestHelper.custom_configure_block.each do |block|
+              block.call(pageflow_config)
+            end
           end
         end
 
         config.before do
-          GlobalConfigApiTestHelper.custom_configure_block = nil
+          GlobalConfigApiTestHelper.custom_configure_block = []
           Pageflow.configure!
         end
       end

data/pageflow/lint.rb

@@ -25,8 +25,8 @@ module Pageflow
     #   require 'pageflow/lint'
     #
     #   Pageflow::Lint.entry_type(SomePlugin.entry_type)
-    def self.entry_type(*args)
-      Lint::EntryType.lint(*args)
+    def self.entry_type(*args, **kws)
+      Lint::EntryType.lint(*args, **kws)
     end
 
     # Ensure file type json partials render correctly.
@@ -52,8 +52,8 @@ module Pageflow
     #                              create_file_type: -> { SomePlugin.file_type },
     #                              create_file: -> { create(:some_file) })
     #   end
-    def self.file_type(*args)
-      Lint::FileType.lint(*args)
+    def self.file_type(*args, **kws)
+      Lint::FileType.lint(*args, **kws)
     end
 
     # Contract specs for page types
@@ -70,8 +70,8 @@ module Pageflow
     #   module SomePlugin
     #     Pageflow::Lint.page_type(SomePLugin.page_type)
     #   end
-    def self.page_type(*args)
-      Lint::PageType.lint(*args)
+    def self.page_type(*args, **kws)
+      Lint::PageType.lint(*args, **kws)
     end
 
     # Contracts specs for file import plugin
@@ -83,8 +83,8 @@ module Pageflow
     #   module SomePlugin
     #     Pageflow::Lint.file_import(SomePLugin.file_import)
     #   end
-    def self.file_import(*args)
-      Lint::FileImport.lint(*args)
+    def self.file_import(*args, **kws)
+      Lint::FileImport.lint(*args, **kws)
     end
   end
 end

data/pageflow/support/config/capybara.rb

@@ -1,29 +1,19 @@
 require 'capybara/rspec'
 require 'selenium-webdriver'
 require 'capybara/chromedriver/logger'
-require 'webdrivers/chromedriver'
 
 Capybara.register_driver :selenium_chrome_headless_no_sandbox do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new
-  browser_options.args << '--headless'
-  browser_options.args << '--disable-gpu'
-  # Required for chrome to work in container based Travis environment
-  # (see https://docs.travis-ci.com/user/chrome)
-  browser_options.args << '--no-sandbox'
-
-  capabilities = {
-    # see https://github.com/SeleniumHQ/selenium/issues/3738
-    loggingPrefs: {browser: 'ALL'},
-    # see https://github.com/dbalatero/capybara-chromedriver-logger/issues/11
-    chromeOptions: {
-      w3c: false
-    }
-  }
+  options = Selenium::WebDriver::Options.chrome(
+    logging_prefs: {browser: 'ALL'}
+  )
+
+  options.add_argument('--headless=new')
+  options.add_argument('--no-sandbox')
+  options.add_argument('--disable-gpu') if Gem.win_platform?
 
   Capybara::Selenium::Driver.new(app,
                                  browser: :chrome,
-                                 options: browser_options,
-                                 desired_capabilities: capabilities)
+                                 options: options)
 end
 
 Capybara.javascript_driver = :selenium_chrome_headless_no_sandbox

data/pageflow/support/config/paperclip.rb

@@ -13,7 +13,7 @@ RSpec.configure do |config|
 
   config.before(:each) do |example|
     unless example.metadata[:unstub_paperclip] || example.metadata[:js]
-      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process)
+      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process_styles)
       allow(Paperclip).to receive(:run).and_return('100x100')
     end
   end

data/pageflow/support/config/webmock.rb

@@ -2,7 +2,12 @@ require 'webmock/rspec'
 
 RSpec.configure do |config|
   config.before(:each) do
-    driver_urls = Webdrivers::Common.subclasses.map(&:base_url)
-    WebMock.disable_net_connect!(allow_localhost: true, allow: driver_urls)
+    WebMock.disable_net_connect!(
+      allow_localhost: true,
+      allow: [
+        'https://googlechromelabs.github.io',
+        'https://edgedl.me.gvt1.com'
+      ]
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-support
 version: !ruby/object:Gem::Version
-  version: 16.0.0
+  version: 16.2.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.0.0
+        version: 16.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.0.0
+        version: 16.2.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: ar_after_transaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- pageflow/caching_test_helpers.rb
 - pageflow/dom.rb
 - pageflow/dom/admin.rb
 - pageflow/dom/admin/attributes_tables.rb
@@ -222,7 +223,6 @@ files:
 - pageflow/lint/page_type.rb
 - pageflow/matchers/have_json_ld.rb
 - pageflow/matchers/have_meta_tag.rb
-- pageflow/rails_version.rb
 - pageflow/render_page_test_helper.rb
 - pageflow/shared_contexts/fake_translations.rb
 - pageflow/support.rb
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Spec support for Pageflow extensions.

data/pageflow/rails_version.rb

@@ -1,23 +0,0 @@
-module Pageflow
-  module RailsVersion
-    extend self
-
-    RAILS_VERSION_FILE = File.expand_path('../../../../.rails_version')
-
-    def detect
-      from_env || from_file || '5.2.0'
-    end
-
-    private
-
-    def from_env
-      ENV['PAGEFLOW_RAILS_VERSION']
-    end
-
-    def from_file
-      if File.exists?(RAILS_VERSION_FILE)
-        File.read(RAILS_VERSION_FILE).chomp.strip.presence
-      end
-    end
-  end
-end