props_template 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc53f3b47d33c98b7fc04e82ef1bcc711529a30c5631627ba2bbd55eeb47ded
-  data.tar.gz: 4c13c7771bfc1ef0d2a2848b0c24d03f029f47751625f18151c23702d0a42376
+  metadata.gz: 9a54115d5cb581b3b4a3c487ca6bdad66a2f533a56f1171d65c9f1759ca9f2ec
+  data.tar.gz: d7672f8b3324ec7ae2b63e790b2c0f38e73f3b5534ad18a5e8a1704bd14c98b2
 SHA512:
-  metadata.gz: c08a1f263224c6b4902ac849d7bded7b8e22d4520f3520a82cf7eac231f645ee9109dc8ac95649e2b8f5695c369f71868687482802113712daa3b18cd261bfbe
-  data.tar.gz: 6b3b68733f7b740be73438aff7602d30919798aa2d7693bc36437b096ff1e88a4414d4e93618ca90a74627897f96bc8ec781f0e84718b79a5ac925096a829900
+  metadata.gz: d07608d99ad469d3dfe6c4f264b7addb844b7a35f6a5ce2c13469bd1bd1dfa14d41c6800f62933a122d86d3ecf65a08aba95a4746d3fc329b5daf1305ec288af
+  data.tar.gz: b76b141b1938ebc83b40c2208c0d77274472c02615a17a0a6771147b38ac7639923b092b066333708087f2074b920e06d99e824b4b36fc9a8e4d517afb7d3f3a

data/lib/props_template/base.rb

@@ -168,6 +168,15 @@ module Props
       @child_index = child_index
     end
 
+    def capture_json
+      parent_stream = @stream
+      @stream = Oj::StringWriter.new(mode: :rails)
+      yield
+      @stream.raw_json.strip
+    ensure
+      @stream = parent_stream
+    end
+
     def result!
       if @scope.nil?
         @stream.push_object

data/lib/props_template/extension_manager.rb

@@ -70,22 +70,16 @@ module Props
 
     def handle_cache(options, item)
       if options[:cache]
-        recently_cached = false
-
         key, rest = Cache
           .normalize_options(options[:cache], item)
+
+        # A miss renders into a writer of its own, so its JSON is added to
+        # the output below like a hit's.
         state = @cache.cache(key, rest) do
-          recently_cached = true
           result = nil
-          start = base.stream.to_s.length
           base.scoped_state { |stream, deferred_paths, fragment_paths|
-            yield
+            raw = base.capture_json { yield }
             meta = Oj.dump([deferred_paths, fragment_paths]).strip
-            json_in_progress = base.stream.to_s
-            if json_in_progress[start] == ","
-              start += 1
-            end
-            raw = base.stream.to_s[start..].strip
             result = "#{meta}\n#{raw}"
           }
           result
@@ -96,9 +90,7 @@ module Props
         deferred.push(*next_deferred)
         fragments.push(*next_fragments)
 
-        if !recently_cached
-          base.stream.push_json(raw_json)
-        end
+        base.stream.push_json(raw_json)
       else
         yield
       end

data/lib/props_template/version.rb

@@ -1,3 +1,3 @@
 module Props
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: props_template
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Johny Ho