orchparty 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac78e884fa172964ef9faa589250a9a84144b05b2cf59020a97a496d0d34cb07
-  data.tar.gz: 0a52fc9c1cd9705faa1220bd6c994d3ea98cf95b363d138db8ede2487d4736f9
+  metadata.gz: 95212b8fd49f250ddfdc2775c5b68a073b82f870f4ab3258e1bef55903b72d5c
+  data.tar.gz: f3735dde2cb6735877a56cb38e5a794737e05d36c87bd15b5640c18b41f55885
 SHA512:
-  metadata.gz: a251302607e58260e1b571c0670b1b89ad387fe2ba4e2ed7bbbb2e56d8cc657762ec565929cad89858b4ed0f2317edaf4066b5560e43c32ded95dd615fa0032a
-  data.tar.gz: c20d1750ed9a972fc07543658e747597db74313784b9e7fcf64489ed891f793adec6a5605cd799820257121de9bb8ba86503d4a8caeda733d7df38b37dbe48ea
+  metadata.gz: 753c03352a0349947d80f6ac4ed0feb7b8bc0ccde1ca23a7287400d3a05dc5b6cb94a1d24b263eab94b22f70021300dde16b76673723d42682b5a1dd46c651b8
+  data.tar.gz: cb6930b9f0bf3254a06d8bc0effb46ae0a840b76554631fbbec14c1d59ea586ed9eb57aa73b4ad5d0dab13862cf1e937b89b2a25ed9eb97d9854d165cc94b657

data/lib/orchparty/dsl_parser.rb

@@ -21,6 +21,14 @@ module Orchparty
       builder.instance_eval(&block)
       builder._build
     end
+
+    def assign_or_merge(node, key, value)
+      if node[key]
+        node[key] = node[key].deep_merge_concat(value)
+      else
+        node[key] = value
+      end
+    end
   end
 
   class RootBuilder < Builder
@@ -175,9 +183,9 @@ module Orchparty
 
     def method_missing(name, *values, &block)
       if block_given?
-        @node[name] = HashBuilder.build(block)
+        assign_or_merge(@node, name,  HashBuilder.build(block))
       else
-        @node[name] = values.first
+        assign_or_merge(@node, name, values.first)
       end
     end
 

data/lib/orchparty/transformations/mixin.rb

@@ -17,8 +17,7 @@ module Orchparty
         application.services = application.services.transform_values! do |service|
           current = AST.service
           service.delete(:_mix).each do |mix|
-            mixin = transform_mixin(resolve_mixin(mix, application, ast), application, ast)
-            current = current.deep_merge_concat(mixin)
+            current = current.deep_merge_concat(resolve_mixin(mix, application, ast))
           end
           current.deep_merge_concat(service)
         end
@@ -26,12 +25,13 @@ module Orchparty
       end
 
       def resolve_mixin(mix, application, ast)
-        if mix.include? "."
+        mixin = if mix.include? "."
           mixin_name, mixin_service_name = mix.split(".")
           ast._mixins[mixin_name]._mixins[mixin_service_name]
         else
           application._mixins[mix]
         end
+        transform_mixin(mixin, application, ast)
       end
 
       def transform_mixin(mixin, application, ast)

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Jannis Huebl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Write your orchestration configuration with a Ruby DSL that allows you to