wip

Author: jho406

lib/props_template/base_with_extensions.rb

@@ -82,12 +82,18 @@ def handle_collection_item(collection, item, index, options)
       if !options[:key]
         @traveled_path.push(index)
       else
-        id, val = options[:key]
+        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
+        end
 
-        if id.nil?
+        if key.nil?
           @traveled_path.push(index)
         else
-          @traveled_path.push("#{id}=#{val}")
+          @traveled_path.push("#{key}=#{val}")
         end
       end
 

lib/props_template/extension_manager.rb

@@ -47,8 +47,16 @@ def has_extensions(options)
     def handle(options, item_context = nil)
       return yield if !has_extensions(options)
 
+      if (key = options[:key]) && item_context
+        val = if item_context.respond_to? key
+          item_context.send(key)
+        elsif item_context.is_a? Hash
+          item_context[key] || item_context[key.to_sym]
+        end
+      end
+
       if options[:defer] && !@deferment.disabled
-        placeholder = @deferment.handle(options)
+        placeholder = @deferment.handle(options, key, val)
         base.stream.push_value(placeholder)
         @fragment.handle(options)
       else
@@ -61,14 +69,6 @@ def handle(options, item_context = nil)
               yield
             end
 
-            if (key = options[:key]) && item_context
-              val = if item_context.respond_to? key
-                item_context.send(key)
-              elsif item_context.is_a? Hash
-                item_context[key] || item_context[key.to_sym]
-              end
-            end
-
             if key && val
               base.set!(key, val)
             end

lib/props_template/extensions/deferment.rb

@@ -34,16 +34,15 @@ def refine_options(options, item = nil)
       pass_opts
     end
 
-    def handle(options)
+    def handle(options, key, val)
       return if !options[:defer]
 
       type, rest = options[:defer]
       placeholder = rest[:placeholder]
       success_action = rest[:success_action]
       fail_action = rest[:fail_action]
 
-      if type.to_sym == :auto && options[:key]
-        key, val = options[:key]
+      if type.to_sym == :auto && key && val
         placeholder = {}
         placeholder[key] = val
       end