pageflow-support 15.8.0 → 16.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21076315b25b8c73d4956f7771567f9457ec197aebe56a3722f497837d5d2b99
-  data.tar.gz: cf0b9da8151febb9f4691fc96d738d5b11ba91651c2cc3b00c68395ffe3be7ce
+  metadata.gz: 266d6bc59226e8db71ae53f87bb7b2ff3de6f0081a4df7bdc19d773f74e4d8f2
+  data.tar.gz: eea3dba281c4c90558f0391898521947204d0f970310838b5b35df84f24d98e4
 SHA512:
-  metadata.gz: e1b0b144ceeb7cb9a65b143bfa15b48eb972c06f1f7203486b4148eb3cf4e1bc09c40a9ce45868bff203d71d1e84821785edc65f44e94f31b26ea0e049a70e3d
-  data.tar.gz: f983c779564d1241e083c54b34148bf206e99861519998999b483cd3c8e99672ae892565a13deb1649ab6106c7f90db48c973a592b79383078af9d6ff4a42bbd
+  metadata.gz: 942234acb0b8534fad62149958f3c7d701080231b8b7a906b37c69850d79319f7225590df196e0d36849ba48e7b07bc3eff130fd7e68292cf58b96204262cca4
+  data.tar.gz: 7c606816826bad55662f9c77849d84d674fad1caa08c9ad95c793946991dc7aba4d916f65d824f59458dd5b8b7aad77e5a9649781a4be05d49d3d61dacdcfb49

data/pageflow/dom/admin/attributes_tables.rb

@@ -48,14 +48,14 @@ module Pageflow
         private_class_method :url
       end
 
-      # The theming attributes table on the account page
+      # The site attributes table on the account page
       #
       # @since 12.2
-      class ThemingAttributesTable < AttributesTable
-        selector '.attributes_table.pageflow_theming'
+      class SiteAttributesTable < AttributesTable
+        selector '.attributes_table.pageflow_site'
 
-        def self.url(theming)
-          url_helpers.admin_account_path(theming.account)
+        def self.url(site)
+          url_helpers.admin_account_site_path(site.account, site)
         end
         private_class_method :url
       end

data/pageflow/dom/admin/edit_forms.rb

@@ -64,21 +64,21 @@ module Pageflow
         end
       end
 
-      # Edit form for theming in account admin.
+      # Edit form for site in account admin.
       #
       # @since 12.2
-      class ThemingEditForm < EditForm
-        selector '.edit.admin_accounts'
+      class SiteEditForm < EditForm
+        selector '.edit.admin_sites'
 
-        def self.url(theming)
-          url_helpers.edit_admin_account_path(theming.account)
+        def self.url(site)
+          url_helpers.edit_admin_account_site_path(site.account, site)
         end
         private_class_method :url
 
         private
 
         def field_prefix
-          'account[default_theming_attributes]'
+          'site'
         end
       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,7 +11,7 @@ module Pageflow
         if File.exist?(directory)
           puts("Dummy directory #{directory} exists.")
         else
-          system("bundle exec rails new #{directory} " \
+          system("bundle exec rails new #{directory} --skip-spring " \
                  "--template #{template_path} #{rails_new_options}") ||
             raise('Error generating dummy app.')
         end
@@ -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' if Pageflow::RailsVersion.experimental?
+        result
       end
     end
   end

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
@@ -30,8 +32,10 @@ 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.
 
@@ -40,7 +44,11 @@ rake 'db:create:all'
 
 # Install Webpacker
 
-rake 'webpacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
+if Pageflow::RailsVersion.experimental?
+  rake 'shakapacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
+else
+  rake 'webpacker:install' if ENV['PAGEFLOW_INSTALL_WEBPACKER'] == 'true'
+end
 
 # Install pageflow and the tested engine via their generators.
 

data/pageflow/dummy/templates/add_custom_fields.rb

@@ -2,6 +2,6 @@ class AddCustomFields < ActiveRecord::Migration[4.2]
   def change
     add_column :pageflow_entries, :custom_field, :string
     add_column :pageflow_accounts, :custom_field, :string
-    add_column :pageflow_themings, :custom_field, :string
+    add_column :pageflow_sites, :custom_field, :string
   end
 end

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

@@ -11,19 +11,14 @@ Capybara.register_driver :selenium_chrome_headless_no_sandbox do |app|
   # (see https://docs.travis-ci.com/user/chrome)
   browser_options.args << '--no-sandbox'
 
-  capabilities = {
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
     # see https://github.com/SeleniumHQ/selenium/issues/3738
-    loggingPrefs: {browser: 'ALL'},
-    # see https://github.com/dbalatero/capybara-chromedriver-logger/issues/11
-    chromeOptions: {
-      w3c: false
-    }
-  }
+    'goog:loggingPrefs': {browser: 'ALL'}
+  )
 
   Capybara::Selenium::Driver.new(app,
                                  browser: :chrome,
-                                 options: browser_options,
-                                 desired_capabilities: capabilities)
+                                 capabilities: [browser_options, capabilities])
 end
 
 Capybara.javascript_driver = :selenium_chrome_headless_no_sandbox

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: 15.8.0
+  version: 16.1.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.8.0
+        version: 16.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.8.0
+        version: 16.1.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,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 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 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