props_template 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e576ca76e76fabbf53a61bd1a4151ec9438e0be6024315ff36045e214ff45f3c
-  data.tar.gz: af5136ad10bb352e8bbf0c268f61b619431a13f1fdb6707a3a1178dd86aef0e0
+  metadata.gz: 47eaa94bedc38645ef945eb7308cdc257497b063b5a9df481d491ec3bb1ae3ca
+  data.tar.gz: 48da4764807eb7924b224e98175f81c822a67e6ead927904df452d620d39e6e0
 SHA512:
-  metadata.gz: 3bef324bee977c40a521e92c19d3d36ba7586d75802a06393185a22122b6b6f471c0f4461ccab0b3deff9797cf1d3db513772c7caf38cbcd90dc31b4a3097a8b
-  data.tar.gz: c6baaca2c8608dea574adf14a9327910a3cdaca5d48180e05591edc214719e5e62460342609d08cae69257d4c118fc04886a61f30746ca3408f528370dcb0918
+  metadata.gz: 40c1e3bfc2c99a3b37834abec4e9b8463d4585203583f9f2f7ba710d775e714a7950bf1bf60f9d86b67c34de6742a5b5a0d249e0154fb50736288123e9ebb1e4
+  data.tar.gz: 70953db156e838cf72b220f9549c3a4abc6684d5bf0b0ad8a6305b15abf56cd1bd876635248fa2c8f1e43f21241475716d1dca49605fe65279951a8f2e59ed84

data/lib/props_template/layout_patch.rb

@@ -3,7 +3,7 @@ module Props
     def render_template(view, template, layout_name, locals)
       if !view.respond_to?(:active_template_virtual_path) && template.respond_to?(:virtual_path)
         view.instance_eval <<~RUBY, __FILE__, __LINE__ + 1
-          def active_template_virtual_path; "#{template.virtual_path}";end
+          def active_template_virtual_path; @_active_template_virtual_path || "#{template.virtual_path}";end
         RUBY
       end
 

data/lib/props_template/searcher.rb

@@ -33,11 +33,12 @@ module Props
       fragment_name = Fragment.fragment_name_from_options(pass_opts)
       if fragment_name
         @fragment_name = fragment_name
-        @traveled_path = []
+        @fragment_path = @traveled_path.clone
       end
 
       fragment_context = @fragment_name
-      [@found_block, @traveled_path, pass_opts, fragment_context]
+
+      [@found_block, @traveled_path, pass_opts, @fragment_path, fragment_context]
     end
 
     def set_block_content!(*args)
@@ -61,7 +62,7 @@ module Props
           fragment_name = Fragment.fragment_name_from_options(options)
           if fragment_name
             @fragment_name = fragment_name
-            @traveled_path = []
+            @fragment_path = @traveled_path.clone
           end
 
           @partialer.handle(options)
@@ -96,6 +97,17 @@ module Props
 
         if item
           pass_opts = @partialer.refine_options(options, item)
+
+          if (key = pass_opts[:key])
+            val = if item.respond_to? key
+              item.send(key)
+            elsif item.is_a? Hash
+              item[key] || item[key.to_sym]
+            end
+
+            pass_opts[:key] = [pass_opts[:key], val]
+          end
+
           @traveled_path.push(key_index)
 
           if @depth == @search_path.size - 1
@@ -111,7 +123,7 @@ module Props
             fragment_name = Fragment.fragment_name_from_options(pass_opts)
             if fragment_name
               @fragment_name = fragment_name
-              @traveled_path = []
+              @fragment_path = @traveled_path.clone
             end
             # todo: what happens when cached: true is passed?
             # would there be any problems with not using the collection_rende?

data/lib/props_template/version.rb

@@ -1,3 +1,3 @@
 module Props
-  VERSION = "1.0.0.alpha.2".freeze
+  VERSION = "1.0.0.alpha.3".freeze
 end

data/lib/props_template.rb

@@ -51,10 +51,11 @@ module Props
         options.delete(:dig)
 
         @builder.set!(key, options, &block)
-        found_block, found_path, found_options, fragment_context = @builder.found!
+        found_block, found_path, found_options, fragment_path, fragment_context = @builder.found!
         @found_path = found_path || []
         @fragment_context = fragment_context
         @builder = prev_builder
+        @fragment_path = fragment_path
 
         if found_block
           set!(key, found_options, &found_block)
@@ -69,7 +70,7 @@ module Props
     end
 
     def found_path!
-      @found_path.join(".")
+      @found_path[@fragment_path.size..].join(".")
     end
 
     def fragment_context!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: props_template
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.alpha.3
 platform: ruby
 authors:
 - Johny Ho