pageflow-support 16.1.0 → 16.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266d6bc59226e8db71ae53f87bb7b2ff3de6f0081a4df7bdc19d773f74e4d8f2
-  data.tar.gz: eea3dba281c4c90558f0391898521947204d0f970310838b5b35df84f24d98e4
+  metadata.gz: f5025199d00a123265a8a38fc2ab1bb3450e577d61e0813fac8e5d971caf294f
+  data.tar.gz: 05dfba6fdfa469667ff2e98a6108c6f9b23dbade34680b74f1b80710f51be978
 SHA512:
-  metadata.gz: 942234acb0b8534fad62149958f3c7d701080231b8b7a906b37c69850d79319f7225590df196e0d36849ba48e7b07bc3eff130fd7e68292cf58b96204262cca4
-  data.tar.gz: 7c606816826bad55662f9c77849d84d674fad1caa08c9ad95c793946991dc7aba4d916f65d824f59458dd5b8b7aad77e5a9649781a4be05d49d3d61dacdcfb49
+  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

@@ -11,13 +11,13 @@ module Pageflow
         if File.exist?(directory)
           puts("Dummy directory #{directory} exists.")
         else
-          system("bundle exec rails new #{directory} --skip-spring " \
+          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
@@ -31,7 +31,7 @@ module Pageflow
 
       def rails_new_options
         result = '--skip-test-unit --skip-bundle --database=mysql'
-        result << ' --skip-javascript' if Pageflow::RailsVersion.experimental?
+        result << ' --skip-javascript'
         result
       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

@@ -21,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']
@@ -40,15 +44,13 @@ 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
 
-if Pageflow::RailsVersion.experimental?
-  rake 'shakapacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
-else
-  rake 'webpacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
-end
+rake 'shakapacker:install' if ENV['PAGEFLOW_INSTALL_SHAKAPACKER'] == 'true'
 
 # Install pageflow and the tested engine via their generators.
 
@@ -67,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',
@@ -95,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/support/config/capybara.rb

@@ -1,24 +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 = Selenium::WebDriver::Remote::Capabilities.chrome(
-    # see https://github.com/SeleniumHQ/selenium/issues/3738
-    'goog:loggingPrefs': {browser: 'ALL'}
+  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,
-                                 capabilities: [browser_options, 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-support
 version: !ruby/object:Gem::Version
-  version: 16.1.0
+  version: 16.2.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-25 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.1.0
+        version: 16.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.1.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
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Spec support for Pageflow extensions.