config_templates 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2ef886ddd1d008ef5eac84a4ff9f09dbb8bbad
-  data.tar.gz: 575336494ebd01c60efcf01c8bcdae3de8943767
+  metadata.gz: 9f30c2c11c2f2d4cdd040d9c5e5c235050c76dba
+  data.tar.gz: 658e799d25032fbdca3d667f61edb05a487c7261
 SHA512:
-  metadata.gz: b866e4680f05c4cd026d323637bf63b05d752f5250be05a2b56177a8408a07c97495685fbfb9e31c1fee27147b3640f20ab7c9303b422e214311462d39d253ef
-  data.tar.gz: 77c7a6a8cc40ed17bbbed10c67addb738be7300b64545c004f466eb5155d687e5568fb9974dc47e6e557b1c5311f3dc8bc350d824871f0313aa73843a452b1ed
+  metadata.gz: 881bc15e1e5f209b45c7388eeb20d49a718806372e480f052a16f85a28e8827eb295334b8f6901c691164843bcaea7974c0544c49cf287f71e261369e599ccf9
+  data.tar.gz: a6c61bd1fc3d14932c1b7c9dff390f3d749559dbebc13dc0687216997499f62a0fa90b6ab71c9d7a721aa27080a6dc5f4ff87969480c0fbdf63e733f36cc8d9e

data/lib/config_templates/collections/extensions.rb

@@ -2,8 +2,8 @@ module ConfigTemplates::Collections
   class Extensions
     def initialize
       @extensions = {
-        /^.+\?$/ => ::ConfigTemplates::Extensions::Stage,
-        'include' => ::ConfigTemplates::Extensions::Include
+        /^.+\?$/ => proc { |*args| ::ConfigTemplates::Extensions::Stage.new.call *args },
+        'include' => proc { |*args| ::ConfigTemplates::Extensions::Include.new.call *args }
       }
     end
 

data/lib/config_templates/contexts/compilation.rb

@@ -18,18 +18,22 @@ module ConfigTemplates::Contexts
     end
 
     def components
-      ::ConfigTemplates::Collections::Components.new(@criteria).tap do |collection|
-        @templates.find_all.each do |template|
-          context = ::ConfigTemplates::Contexts::Rendering.new
-          context.components = collection
-          collection << component(template, collection, context)
-        end
-      end
+      collection = ::ConfigTemplates::Collections::Components.new @criteria
+      add_components_to collection
+      collection
     end
 
     private
 
-    def component(template, components, context)
+    def add_components_to(collection)
+      @templates.find_all.each do |template|
+        context = ::ConfigTemplates::Contexts::Rendering.new
+        context.components = collection
+        collection << component(template, context)
+      end
+    end
+
+    def component(template, context)
       validator = @validators.find_by_file_name template.source_path
       engine = @engines.find_by_extension template.extension
       component = ::ConfigTemplates::Models::Component.new(template, context, validator, engine)

data/lib/config_templates/contexts/rendering.rb

@@ -29,9 +29,9 @@ module ConfigTemplates::Contexts
     end
 
     def method_missing(method_name, *args, &block)
-      extension_class = @extensions.find_by_name(method_name) || super
+      extension = @extensions.find_by_name(method_name) || super
       invocation = ::ConfigTemplates::Extensions::Invocation.new method_name, args, block
-      extension_class.new.call(self, invocation)
+      extension.call self, invocation
     end
 
     def respond_to_missing?(method_name)

data/lib/config_templates/extensions/include.rb

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

data/lib/config_templates/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_templates
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - g.ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler