props_template 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f31ca5a3810b9348f75dae05f2b5cb8927faaedf321a4a565914b5760968090c
-  data.tar.gz: 6709d2fc54d81aaf2977158bffc0754089343e7aa8d32d50cbfb01a54a5b289b
+  metadata.gz: 9a54115d5cb581b3b4a3c487ca6bdad66a2f533a56f1171d65c9f1759ca9f2ec
+  data.tar.gz: d7672f8b3324ec7ae2b63e790b2c0f38e73f3b5534ad18a5e8a1704bd14c98b2
 SHA512:
-  metadata.gz: 3d3c08391669747b2b3cecfae77e4c47893a1dd887e21ab999a56e7c5e58a3afed3ccdc8147f4bed75fe1c33a3b903975357e00b515e8f445c5f1d1fef9049bc
-  data.tar.gz: da253f3b0d7f903ef0683990e270a1e5f4140c57416d023cce6645ac0156580a66145cc1061cf74d0f2b300d3e8e570d6bc3683d2aa2f88f5427496ddf43fbb3
+  metadata.gz: d07608d99ad469d3dfe6c4f264b7addb844b7a35f6a5ce2c13469bd1bd1dfa14d41c6800f62933a122d86d3ecf65a08aba95a4746d3fc329b5daf1305ec288af
+  data.tar.gz: b76b141b1938ebc83b40c2208c0d77274472c02615a17a0a6771147b38ac7639923b092b066333708087f2074b920e06d99e824b4b36fc9a8e4d517afb7d3f3a

data/lib/props_template/base.rb

@@ -63,6 +63,21 @@ module Props
       nil
     end
 
+    def set_value!(key, value)
+      if @scope == :array
+        raise InvalidScopeForObjError.new("Attempted to set! on an array! scope")
+      end
+
+      if @scope.nil?
+        @scope = :object
+        @stream.push_object
+      end
+
+      @stream.push_value(value, format_key(key))
+
+      nil
+    end
+
     def handle_collection_item(collection, item, index, options)
       @item_context = item
 
@@ -124,7 +139,7 @@ module Props
           [value, value]
         end
 
-        set!(
+        set_value!(
           key,
           object.is_a?(Hash) ? object.fetch(attribute) : object.public_send(attribute)
         )
@@ -153,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/base_with_extensions.rb

@@ -27,7 +27,7 @@ module Props
     end
 
     def set_content!(options = {})
-      return super if !@em.has_extensions(options)
+      return super if options.empty? || !@em.has_extensions(options)
 
       @em.handle(options, item_context) do
         yield

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/searcher.rb

@@ -46,6 +46,10 @@ module Props
       yield
     end
 
+    def set_value!(key, value)
+      nil
+    end
+
     def set!(key, options = {}, &block)
       return if @found_block || !block && !options.is_a?(Props::Options)
 

data/lib/props_template/version.rb

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

data/lib/props_template.rb

@@ -67,8 +67,10 @@ module Props
           @builder.item_context = found_item
           set!(key, found_options, &found_block)
         end
-      else
+      elsif block || options.is_a?(Props::Options)
         @builder.set!(key, options, &block)
+      else
+        @builder.set_value!(key, options)
       end
     end
 

metadata

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