react_on_rails_pro 17.0.0.rc.7 → 17.0.0.rc.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630407c86698264ad5285eb75bc45413c73e0fbc40b446433ad185906e2ffec6
-  data.tar.gz: 6cef12ecc7a9253bac5039f8cad92df8e5d507734a0eb11a8947aba4cc5b4c8c
+  metadata.gz: 6013b40c199b7e3a943a2b2d77321d8f5481d9f6e5a63b9d02d8a52e1d91753b
+  data.tar.gz: e33168cb4f032e3ea0fcd9668eef969e0769dac6b9fb6d62da622205f9e1f9eb
 SHA512:
-  metadata.gz: 81c69d87b625f8956e12e78045feccfcb3b81ba539ea8ab61cc430a2b3006db0903d0fe14fafa6adafeff1ffec885edde537c1d9253b35561001004b318143a0
-  data.tar.gz: 158dee699e167aa45ae70cbfb099c64767077631833f33f365a3d5d4fd8286a92f4eb1f7ee6d2e6a230cf7397a236a04dbe1ad62b47a18324e77a49567d6455d
+  metadata.gz: c99af25077139ada7aa948a235c0020f95ae007ce0c4294bf73a4f12e561d63dd6138bb3f5b5e13cd52deffdc4c8b3d1fa5b8c892df47adde5fcd40d4a947762
+  data.tar.gz: 40d17fa6a656718d015ab0195974a135d199ea11c6db12b63ac4e3be5636bcf531fcc103908c1625facd68728e2f0ddc855d4c02b6fa4b6c52f123604ea7c6b4

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    react_on_rails (17.0.0.rc.7)
+    react_on_rails (17.0.0.rc.8)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -20,14 +20,14 @@ PATH
 PATH
   remote: .
   specs:
-    react_on_rails_pro (17.0.0.rc.7)
+    react_on_rails_pro (17.0.0.rc.8)
       async (>= 2.29)
       async-http (~> 0.95)
       execjs (~> 2.9)
       io-endpoint (~> 0.17.0)
       jwt (>= 2.5, < 4)
       nokogiri (>= 1.12, < 2)
-      react_on_rails (= 17.0.0.rc.7)
+      react_on_rails (= 17.0.0.rc.8)
 
 GEM
   remote: https://rubygems.org/

data/app/helpers/react_on_rails_pro_helper.rb

@@ -46,19 +46,6 @@ module ReactOnRailsProHelper
     end
   end
 
-  def fetch_react_component(component_name, options, &)
-    ReactOnRailsPro::Cache.fetch_react_component(
-      component_name,
-      options,
-      {
-        on_cache_hit: lambda do |cached_component_name, cached_options|
-          load_pack_for_cached_react_component(cached_component_name, cached_options)
-        end
-      },
-      &
-    )
-  end
-
   # Provide caching support for react_component in a manner akin to Rails fragment caching.
   # All the same options as react_component apply with the following difference:
   #
@@ -446,6 +433,37 @@ module ReactOnRailsProHelper
 
   private
 
+  def fetch_react_component(component_name, options)
+    return yield unless ReactOnRailsPro::Cache.use_cache?(options)
+
+    cache_key = ReactOnRailsPro::Cache.react_component_cache_key(component_name, options)
+    Rails.logger.debug { "React on Rails Pro cache_key is #{cache_key.inspect}" }
+    cache_options = ReactOnRailsPro::Cache.cache_write_options(options[:cache_options])
+    if ReactOnRailsPro::Cache.cache_write_expired?(options[:cache_options])
+      return add_component_cache_metadata(yield, cache_key, false)
+    end
+
+    cache_hit = true
+    normalized_cache_tags = []
+    result = Rails.cache.fetch(cache_key, cache_options) do
+      cache_hit = false
+      normalized_cache_tags = ReactOnRailsPro::Cache.normalize_tags(options[:cache_tags])
+      yield
+    end
+    ReactOnRailsPro::Cache.register_normalized_tags(normalized_cache_tags, cache_key, cache_options) unless cache_hit
+    load_pack_for_cached_react_component(component_name, options) if cache_hit
+
+    add_component_cache_metadata(result, cache_key, cache_hit)
+  end
+
+  def add_component_cache_metadata(result, cache_key, cache_hit)
+    return result unless result.is_a?(Hash)
+
+    result[:RORP_CACHE_KEY] = cache_key
+    result[:RORP_CACHE_HIT] = cache_hit
+    result
+  end
+
   def load_pack_for_cached_react_component(component_name, options)
     render_options = ReactOnRails::ReactComponent::RenderOptions.new(
       react_component_name: component_name,

data/lib/react_on_rails_pro/cache.rb

@@ -23,32 +23,6 @@ module ReactOnRailsPro
     RSC_BUNDLE_MISSING_CACHE_KEY = "rsc-bundle-missing"
 
     class << self
-      # options[:cache_options] can include :compress, :expires_in, :race_condition_ttl and
-      # other options
-      def fetch_react_component(component_name, options = nil, callback_options = nil)
-        options ||= {}
-        on_cache_hit = cache_hit_callback(callback_options)
-
-        return yield unless use_cache?(options)
-
-        cache_key = react_component_cache_key(component_name, options)
-        Rails.logger.debug { "React on Rails Pro cache_key is #{cache_key.inspect}" }
-        cache_options = cache_write_options(options[:cache_options])
-        return add_component_cache_metadata(yield, cache_key, false) if cache_write_expired?(options[:cache_options])
-
-        cache_hit = true
-        normalized_cache_tags = []
-        result = Rails.cache.fetch(cache_key, cache_options) do
-          cache_hit = false
-          normalized_cache_tags = normalize_tags(options[:cache_tags])
-          yield
-        end
-        register_normalized_tags(normalized_cache_tags, cache_key, cache_options) unless cache_hit
-        on_cache_hit&.call(component_name, options) if cache_hit
-
-        add_component_cache_metadata(result, cache_key, cache_hit)
-      end
-
       # Registers cache tags for an already-written cache entry so a later
       # ReactOnRailsPro.revalidate_tag can delete it. Call after a successful
       # cache write (never on a cache hit). No-op when tags are nil or [].
@@ -126,20 +100,6 @@ module ReactOnRailsPro
 
       private
 
-      def cache_hit_callback(callback_options)
-        return nil unless callback_options
-
-        callback_options[:on_cache_hit]
-      end
-
-      def add_component_cache_metadata(result, cache_key, cache_hit)
-        return result unless result.is_a?(Hash)
-
-        result[:RORP_CACHE_KEY] = cache_key
-        result[:RORP_CACHE_HIT] = cache_hit
-        result
-      end
-
       def meaningful_revalidation_tags(tags)
         tags.flat_map do |tag|
           if tag.is_a?(Array)

data/lib/react_on_rails_pro/version.rb

@@ -14,6 +14,6 @@
 # https://github.com/shakacode/react_on_rails/blob/main/REACT-ON-RAILS-PRO-LICENSE.md
 
 module ReactOnRailsPro
-  VERSION = "17.0.0.rc.7"
+  VERSION = "17.0.0.rc.8"
   PROTOCOL_VERSION = "2.0.0"
 end

data/sig/react_on_rails_pro/cache.rbs

@@ -13,12 +13,6 @@
 
 module ReactOnRailsPro
   class Cache
-    def self.fetch_react_component: (
-      String component_name,
-      ?Hash[Symbol, untyped] options,
-      ?Hash[Symbol, untyped] callback_options
-    ) { () -> untyped } -> untyped
-
     def self.use_cache?: (Hash[Symbol, untyped] options) -> bool
 
     def self.base_cache_key: (String type, ?prerender: bool?) -> Array[String]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails_pro
 version: !ruby/object:Gem::Version
-  version: 17.0.0.rc.7
+  version: 17.0.0.rc.8
 platform: ruby
 authors:
 - Justin Gordon
@@ -111,14 +111,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.0.0.rc.7
+        version: 17.0.0.rc.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.0.0.rc.7
+        version: 17.0.0.rc.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement