props_template 0.13.0 → 0.17.1

data/lib/props_template.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'props_template/base_with_extensions'
 require 'props_template/searcher'
 require 'props_template/handler'
@@ -15,11 +13,9 @@ module Props
     self.template_lookup_options = { handlers: [:props] }
 
     delegate :result!, :array!,
-      :commands_to_json!,
       :deferred!,
       :fragments!,
       :set_block_content!,
-      :fragment_digest!,
       to: :builder!
 
     def initialize(context = nil, options = {})
@@ -49,11 +45,8 @@ module Props
       @builder
     end
 
-    private
-
-    def method_missing(*args, &block)
-      set!(*args, &block)
-    end
+    alias_method :method_missing, :set!
+    private :method_missing
   end
 end
 

data/lib/props_template/base.rb

@@ -1,6 +1,5 @@
 require 'oj'
 require 'active_support'
-
 #todo: active_support/core_ext/string/output_safety.rb
 
 module Props
@@ -8,38 +7,49 @@ module Props
   class InvalidScopeForObjError < StandardError; end
 
   class Base
-    def initialize
-      @commands = [[:push_object]]
+    def initialize(encoder = nil)
       @stream = Oj::StringWriter.new(mode: :rails)
       @scope = nil
     end
 
     def set_block_content!(options = {})
-      @commands.push([:push_object])
       @scope = nil
       yield
-      @commands.push([:pop])
+      if @scope.nil?
+        @stream.push_object
+      end
+      @stream.pop
     end
 
     def handle_set_block(key, options)
-      @commands.push([:push_key, key.to_s])
+      @stream.push_key(key)
       set_block_content!(options) do
         yield
       end
     end
 
+    def format_key(key)
+      key.to_s
+    end
+
     def set!(key, value = nil)
-      @scope ||= :object
+      key = format_key(key)
+
       if @scope == :array
         raise InvalidScopeForObjError.new('Attempted to set! on an array! scope')
       end
+
+      if @scope.nil?
+        @scope = :object
+        @stream.push_object
+      end
+
       if block_given?
         handle_set_block(key, value) do
           yield
         end
       else
-        @commands.push([:push_key, key.to_s])
-        @commands.push([:push_value, value])
+        @stream.push_value(value, key)
       end
 
       @scope = :object
@@ -76,19 +86,18 @@ module Props
         end
       end
     end
+
     #todo, add ability to define contents of array
     def array!(collection, options = {})
       if @scope.nil?
         @scope = :array
+        @stream.push_array
       else
         raise InvalidScopeForArrayError.new('array! expects exclusive use of this block')
       end
-      @commands[-1] = [:push_array]
 
-      if !collection.empty?
-        handle_collection(collection, options) do |item, index|
-          yield item, index
-        end
+      handle_collection(collection, options) do |item, index|
+        yield item, index
       end
 
       @scope = :array
@@ -96,18 +105,18 @@ module Props
       nil
     end
 
-    def commands_to_json!(commands)
-      commands.each do |command|
-        @stream.send(*command)
+    def result!
+      if @scope.nil?
+        @stream.push_object
+        @stream.pop
+      else
+        @stream.pop
       end
-      json = @stream.to_s
-      @stream.reset
-      json
-    end
 
-    def result!
-      @commands.push([:pop])
-      commands_to_json!(@commands)
+      json = @stream.raw_json
+      @scope = nil
+      @key_cache = {}
+      json
     end
   end
 end

data/lib/props_template/base_with_extensions.rb

@@ -3,13 +3,12 @@ require 'props_template/extensions/partial_renderer'
 require 'props_template/extensions/cache'
 require 'props_template/extensions/deferment'
 require 'props_template/extension_manager'
-require 'props_template/key_formatter'
-
 require 'active_support/core_ext/string/output_safety'
+require 'active_support/core_ext/array'
 
 module Props
   class BaseWithExtensions < Base
-    attr_reader :builder, :context, :fragments, :traveled_path, :deferred, :commands
+    attr_reader :builder, :context, :fragments, :traveled_path, :deferred, :stream
 
     def initialize(builder, context = nil, options = {})
       @context = context
@@ -17,7 +16,7 @@ module Props
       #todo: refactor so deferred can be its own class
       @em = ExtensionManager.new(self)
       @traveled_path = []
-      @key_formatter = KeyFormatter.new(camelize: :lower)
+      @key_cache = {}
       super()
     end
 
@@ -29,33 +28,32 @@ module Props
       @em.fragments
     end
 
-    def fragment_digest!
-      @em.fragment_digest
-    end
-
     def set_block_content!(options = {})
       return super if !@em.has_extensions(options)
 
-      @em.handle(@commands, options) do
+      @em.handle(options) do
         yield
       end
     end
 
     def scoped_state
-      prev_state = [@commands, @em.deferred, @em.fragments]
-      @commands = []
-      @em  = ExtensionManager.new(self)
-      yield
-      next_state = [@commands, @em.deferred, @em.fragments]
-      @commands = prev_state[0]
+      prev_state = [@stream, @em.deferred, @em.fragments]
+      @em = ExtensionManager.new(self)
+      prev_scope = @scope
+      @scope = nil
+
+      yield @stream, @em.deferred, @em.fragments
+
+      @scope = prev_scope
       @em = ExtensionManager.new(self, prev_state[1], prev_state[2])
+    end
 
-      next_state
+    def format_key(key)
+      @key_cache[key] ||= key.to_s.camelize(:lower)
+      @key_cache[key].dup
     end
 
     def set!(key, options = {}, &block)
-      key = @key_formatter.format(key)
-
       if block_given?
         options = @em.refine_options(options)
       end
@@ -78,23 +76,15 @@ module Props
     end
 
     def handle_collection_item(collection, item, index, options)
-      if collection.respond_to? :member_key
-        member_key = collection.member_key
-      end
-
-      if !member_key
+      if !options[:key]
         @traveled_path.push(index)
       else
-        id = if item.respond_to? member_key
-          item.send(member_key)
-        elsif item.is_a? Hash
-          item[member_key] || item[member_key.to_sym]
-        end
+        id, val = options[:key]
 
         if id.nil?
           @traveled_path.push(index)
         else
-          @traveled_path.push("#{member_key.to_s}=#{id}")
+          @traveled_path.push("#{id.to_s}=#{val}")
         end
       end
 
@@ -108,8 +98,19 @@ module Props
       @em.refine_all_item_options(all_options)
     end
 
-
     def refine_item_options(item, options)
+      return options if options.empty?
+
+      if key = options[:key]
+        val = if item.respond_to? key
+          item.send(key)
+        elsif item.is_a? Hash
+          item[key] || item[key.to_sym]
+        end
+
+        options[:key] = [options[:key], val]
+      end
+
       @em.refine_options(options, item)
     end
   end

data/lib/props_template/debug_writer.rb

@@ -0,0 +1,55 @@
+require 'oj'
+require 'active_support'
+require 'byebug'
+
+module Props
+  class DebugWriter
+    attr_accessor :commands
+
+    def initialize(opts)
+      @stream = Oj::StringWriter.new(opts)
+      @commands = []
+    end
+
+    def push_object
+      @commands.push([:push_object])
+    end
+
+    def push_key(key)
+      @commands.push([:push_key, key])
+    end
+
+    def push_value(value, key = nil)
+      if key
+        @commands.push([:push_value, value, key])
+      else
+        @commands.push([:push_value, value])
+      end
+    end
+
+    def push_array
+      @commands.push([:push_array])
+    end
+
+    def pop
+      @commands.push([:pop])
+    end
+
+    def reset
+      @commands = []
+      @stream.reset
+    end
+
+    def to_s
+      @commands.each do |command|
+        begin
+          @stream.send(*command)
+        rescue => e
+          byebug
+        end
+      end
+
+      @stream.to_s
+    end
+  end
+end

data/lib/props_template/extension_manager.rb

@@ -7,7 +7,7 @@ module Props
   class ExtensionManager
     attr_reader :base, :builder, :context
 
-    def initialize(base, defered=[], fragments={})
+    def initialize(base, defered=[], fragments=[])
       @base = base
       @context = base.context
       @builder = base.builder
@@ -25,6 +25,8 @@ module Props
     end
 
     def refine_all_item_options(all_options)
+      return all_options if all_options.empty?
+
       all_options = @partialer.find_and_add_template(all_options)
       all_options = @cache.multi_fetch_and_add_results(all_options)
       all_options
@@ -34,36 +36,35 @@ module Props
       @deferment.deferred
     end
 
-    def fragment_digest
-      @fragment.name
-    end
-
     def fragments
       @fragment.fragments
     end
 
     def has_extensions(options)
-      options[:defer] || options[:cache] || options[:partial]
+      options[:defer] || options[:cache] || options[:partial] || options[:key]
     end
 
-    def handle(commands, options)
+    def handle(options)
       return yield if !has_extensions(options)
 
       if options[:defer]
         placeholder = @deferment.handle(options)
-        commands.push([:push_value, placeholder])
+        base.stream.push_value(placeholder)
         @fragment.handle(options)
       else
         handle_cache(options) do
           base.set_block_content! do
             if options[:partial]
-              current_digest = @fragment.name
               @fragment.handle(options)
               @partialer.handle(options)
-              @fragment.name = current_digest
             else
               yield
             end
+
+            if options[:key]
+              id, val = options[:key]
+              base.set!(id, val)
+            end
           end
         end
       end
@@ -71,33 +72,33 @@ module Props
 
     private
 
-    def content_for_cache(commands, deferred_paths, fragment_paths)
-      suffix = [
-        [:push_value, deferred_paths],
-        [:push_value, fragment_paths],
-        [:pop]
-      ]
-
-      [[:push_array]] + commands + suffix
-    end
-
     def handle_cache(options)
       if options[:cache]
+        recently_cached = false
+
         state = @cache.cache(*options[:cache]) do
-          commands = content_for_cache(*base.scoped_state {yield})
-          base.commands_to_json!(commands).strip
+          recently_cached = true
+          result = nil
+          start = base.stream.to_s.length
+          base.scoped_state { |stream, deferred_paths, fragment_paths|
+            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..-1].strip
+            result = "#{meta}\n#{raw}"
+          }
+          result
         end
 
-        value, next_deferred, next_fragments = Oj.load(state)
-        base.commands.push([:push_value, value])
-        deferred.push(*next_deferred)
-
-        next_fragments.each do |k, v|
-          if fragments[k]
-            fragments[k].push(*v)
-          else
-            fragments[k] = v
-          end
+        if !recently_cached
+          meta, raw_json = state.split("\n")
+          next_deferred, next_fragments = Oj.load(meta)
+          base.stream.push_json(raw_json)
+          deferred.push(*next_deferred)
+          fragments.push(*next_fragments)
         end
       else
         yield

data/lib/props_template/extensions/cache.rb

@@ -25,12 +25,6 @@ module Props
       @context
     end
 
-    def instrument(name, **options)
-      ActiveSupport::Notifications.instrument(name, options) do |payload|
-        yield payload
-      end
-    end
-
     def multi_fetch(keys, options = {})
       result = {}
       key_to_ckey = {}
@@ -49,7 +43,7 @@ module Props
 
       read_caches = {}
 
-      instrument('read_multi_fragments.action_view', payload) do |payload|
+      ActiveSupport::Notifications.instrument('read_multi_fragments.action_view', payload) do |payload|
         read_caches = ::Rails.cache.read_multi(*ckeys, options)
         payload[:read_caches] = read_caches
       end
@@ -122,7 +116,7 @@ module Props
 
     def cache_key(key, options)
       name_options = options.slice(:skip_digest, :virtual_path)
-      key = fragment_name_with_digest(key, name_options)
+      key = @context.cache_fragment_name(key, **name_options)
 
       if @context.respond_to?(:combined_fragment_cache_key)
         key = @context.combined_fragment_cache_key(key)
@@ -132,19 +126,6 @@ module Props
 
       ::ActiveSupport::Cache.expand_cache_key(key, :props)
     end
-
-    def fragment_name_with_digest(key, options)
-      if @context.respond_to?(:cache_fragment_name)
-        # Current compatibility, fragment_name_with_digest is private again and cache_fragment_name
-        # should be used instead.
-        @context.cache_fragment_name(key, options)
-      elsif @context.respond_to?(:fragment_name_with_digest)
-        # Backwards compatibility for period of time when fragment_name_with_digest was made public.
-        @context.fragment_name_with_digest(key)
-      else
-        key
-      end
-    end
   end
 end