site_prism 6.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b74cd59603d8fff11657b6d51ccfe37bddf78004ab4b55bb692f11a54754fc4
-  data.tar.gz: 618953ce4d7c07d4cac6ed0ed6dbc54b4e1dbd835cf28e39b6488dfb7c8d8698
+  metadata.gz: cbf69e354e41352b4e8b03aa44073b0b4f6b1d77edbfe8be80c670aac96f2b81
+  data.tar.gz: 680daa2c693b77fe00c0e7ce1b3eeda648a9c088cefa7b6fbf2bb6783d5b57a4
 SHA512:
-  metadata.gz: 8a7bd17d94fd99d4772e94df111312047fc644a21f80a6d8343a8167a4e84529692e8a0e6048232f54320961fa451ae670e746eca0df5854cb6bf7139e0fa94b
-  data.tar.gz: 53c0d351c47adefab78baf703f5e571dbc03914cc69c6906e52dd8bf7761fc246dbd0693f6b77e710a2c058e6c244813868190644154d0b8174238eaf9aaa38b
+  metadata.gz: 1b963f301fbc93813259dfa275e02b60ed9ca49aea6765f86b5117a06cd9063c6f7cd2380a1b80c3e975de5f22869d315e7ed6b0a3973aae91ec66bfaa74f48e
+  data.tar.gz: a7f9fda146472e1ae262ed5078108bb1080ac085115e703a310b2a259d448449a2cc567e8809836beb3501d25bcffbc4fd80e38275127e916610794a97516214

data/lib/site_prism/addressable_url_matcher.rb

@@ -102,7 +102,11 @@ module SitePrism
     end
 
     def slugs
-      pattern.scan(/{[^}]+}/)
+      if RUBY_VERSION >= '3.2'
+        pattern.scan(Regexp.new('{[^}]+}', timeout: 5))
+      else
+        pattern.scan(/{[^}]+}/)
+      end
     end
 
     def all_expected_mappings_match?(expected_mappings, actual_mappings)

data/lib/site_prism/loadable.rb

@@ -23,11 +23,11 @@ module SitePrism
     #
     # NB: This will only trigger load validations if the page is already **not** loaded. If you want to verbosely trigger
     # the load validations irrespective, use `#run_load_validations`; which will clear any previous cache and then re-run the validations
-    def when_loaded
-      # Get original loaded value, in case we are nested
-      # inside another when_loaded block.
-      previously_loaded = loaded
-
+    #
+    # @param previously_loaded [Boolean, nil]
+    #   Original loaded value (which may be nil), in case we are nested inside another `#when_loaded` block or called
+    #   prior to the `#run_load_validations` invocation
+    def when_loaded(previously_loaded = loaded)
       # Within the block, check (and cache) loaded?, to see whether the page has indeed loaded according to the rules defined by the user.
       self.loaded = loaded?
 
@@ -38,7 +38,8 @@ module SitePrism
       # Return the yield value of the block if one was supplied.
       yield self if block_given?
     ensure
-      self.loaded = previously_loaded
+      # Restore the previous loaded state only if validations passed (i.e., loaded? was true).
+      self.loaded = previously_loaded if loaded
     end
 
     # Check if the page is loaded.
@@ -56,16 +57,18 @@ module SitePrism
       load_validations_pass?
     end
 
-    # Executes the `when_loaded` check to determine if the page is loaded, but also clears any previous cache
-    # of the loaded state and load error
+    # Executes the `#when_loaded` check to determine if the page is loaded, but also temporarily clears any previously cached
+    # loaded state / load error(s), to ensure load validations are re-ran fully
     #
     # This is useful if you want to re-run the load validations irrespective of whether the page was previously loaded or not
     #
     # The loadable object instance is yielded into the block.
-    def run_load_validations
+    def run_load_validations(&)
+      previously_loaded = loaded
+
       self.loaded = false
       self.load_error = nil
-      when_loaded
+      when_loaded(previously_loaded, &)
     end
 
     private

data/lib/site_prism/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SitePrism
-  VERSION = '6.0'
+  VERSION = '6.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: '6.0'
+  version: 6.0.1
 platform: ruby
 authors:
 - Luke Hill
@@ -151,14 +151,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.85.1
+        version: 1.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.85.1
+        version: 1.88.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement