config_templates 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fc70c512563569519b377626daa1fed6184f16
-  data.tar.gz: 467a9ddc3ec1cdbf156933b6371c1e67705b0abd
+  metadata.gz: ed2ef886ddd1d008ef5eac84a4ff9f09dbb8bbad
+  data.tar.gz: 575336494ebd01c60efcf01c8bcdae3de8943767
 SHA512:
-  metadata.gz: 2c0739c8619d47b979fc00486aeea1fc6f9646cef9026fc9376b3934670193dbc749d072aeede38c3db2729e84bf36b563bfe14ce8fd6552004133e602e55471
-  data.tar.gz: b66806f532521f416d3e32e788a9404edb8b6ce0f9f80a446667a58f702c827e283581d2bf0af546bf69b5d22291facad8137b07183b4e84e09d29a8bf6676a1
+  metadata.gz: b866e4680f05c4cd026d323637bf63b05d752f5250be05a2b56177a8408a07c97495685fbfb9e31c1fee27147b3640f20ab7c9303b422e214311462d39d253ef
+  data.tar.gz: 77c7a6a8cc40ed17bbbed10c67addb738be7300b64545c004f466eb5155d687e5568fb9974dc47e6e557b1c5311f3dc8bc350d824871f0313aa73843a452b1ed

data/lib/config_templates.rb

@@ -2,6 +2,7 @@ require 'erb'
 require 'yaml'
 require 'fileutils'
 require 'deep_merge/core'
+require 'pathname'
 
 module ConfigTemplates
   def self.configure

data/lib/config_templates/collections/components.rb

@@ -15,8 +15,8 @@ module ConfigTemplates::Collections
         .map { |_, component| component }
     end
 
-    def find_by_path!(path)
-      find_by! ConfigTemplates::Criteria::Path.new path
+    def find_by_path!(path, relative_to = nil)
+      find_by! ConfigTemplates::Criteria::Path.new path, relative_to
     rescue
       raise ConfigTemplates::Errors::ComponentNotFound, path
     end

data/lib/config_templates/criteria/path.rb

@@ -1,11 +1,34 @@
 module ConfigTemplates::Criteria
   class Path
-    def initialize(path)
+    def initialize(path, relative_to)
       @path = path
+      @relative_to = relative_to
     end
 
     def filter(hash)
-      hash.key?(@path) ? { @path => hash[@path] } : {}
+      if @path.start_with? '@'
+        with_absolute_path hash
+      else
+        with_relative_path hash
+      end
+    end
+
+    private
+
+    def with_absolute_path(hash)
+      hash.key?(@path.sub!('@', '')) ? { @path => hash[@path] } : {}
+    end
+
+    def with_relative_path(hash)
+      hash.key?(relative_path) ? { relative_path => hash[relative_path] } : {}
+    end
+
+    def relative_path
+      @relative_path ||= begin
+        path = ::File.join ::File.dirname(@relative_to), @path
+        pathname = ::Pathname.new path
+        pathname.cleanpath.to_s
+      end
     end
   end
 end

data/lib/config_templates/extensions/include.rb

@@ -1,9 +1,12 @@
 module ConfigTemplates::Extensions
   class Include
     def call(context, invocation)
-      component = context.components.find_by_path! invocation.args.first
-      component.child!
-      component.render
+      child_component = context.components.find_by_path!(
+        invocation.args.first,
+        context.component.source_path
+      )
+      child_component.child!
+      child_component.render
     end
   end
 end

data/lib/config_templates/version.rb

@@ -1,3 +1,3 @@
 module ConfigTemplates
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/spec/fixtures/src/kapacitor/config.erb

@@ -1 +1 @@
-<%= include('spec/fixtures/src/kapacitor/include.erb') %>
+<%= include('include.erb') %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_templates
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - g.ivanov