orchparty 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89243d6fae72722e405faaebd5474333b809fe7
-  data.tar.gz: f91105683995435802fd753a8898e70dc5ecc280
+  metadata.gz: d0658e519783142f1e2400bb52fef05cc610197d
+  data.tar.gz: ff53d6024885289562d0e6358963c86894096075
 SHA512:
-  metadata.gz: 817fbaaa5bfed13ca75119641c50f30c59acfeb96d4570628595406bec6d2b1932ca8f45d960034954132d8f889e52b65befe96c601534e974d6aa6ee18f9d77
-  data.tar.gz: c9d8e7430128f01d17623e509ad5896892a6a2105fec115f1a84f4f6d2853307e6547aa85c87a6986ca5e372500799a79a1d0d566248914fc702629e70bc9729
+  metadata.gz: c3d992b77c8fbd7179610d7757e756977a949b957068452cd2dbee0e48dc604533a1926fd23c6c8c1fb8e825d8ae839f2628f32331529bd8cd204b97a726fa99
+  data.tar.gz: 18d0691bbc8f99ab0862c6d83eaef60a96b63a7b614c9db9d78ce6765d9f35a452b6c083f6be10edc3045bd217aa114ded9da4020bca2d24b274ade172b8586e

data/README.md

@@ -1,6 +1,7 @@
 # Orchparty
 
 [![Build Status](https://travis-ci.org/jannishuebl/orchparty.svg?branch=master)](https://travis-ci.org/jannishuebl/orchparty)
+[![Gem Version](https://badge.fury.io/rb/orchparty.svg)](https://badge.fury.io/rb/orchparty)
 
 Write your orchestration configuration with a Ruby DSL that allows you to have mixins, imports and variables.
 

data/lib/orchparty/transformations/mixin.rb

@@ -18,18 +18,31 @@ module Orchparty
       def transform_application(application, ast)
         application.services = application.services.transform_values! do |service|
           current = AST::Service.new
-          service.delete(:_mix).each do |mixin|
-            if mixin.include? "."
-              mixin_name, mixin_service_name = mixin.split(".")
-              current = current.deep_merge_concat(ast.mixins[mixin_name].services[mixin_service_name])
-            else
-              current = current.deep_merge_concat(application.mixins[mixin])
-            end
+          service.delete(:_mix).each do |mix|
+            mixin = transform_mixin(resolve_mixin(mix, application, ast), application, ast)
+            current = current.deep_merge_concat(mixin)
           end
           current.deep_merge_concat(service)
         end
         application
       end
+
+      def resolve_mixin(mix, application, ast)
+        if mix.include? "."
+          mixin_name, mixin_service_name = mix.split(".")
+          ast.mixins[mixin_name].services[mixin_service_name]
+        else
+          application.mixins[mix]
+        end
+      end
+
+      def transform_mixin(mixin, application, ast)
+        current = AST::Service.new
+        mixin[:_mix].each do |mix|
+          current = current.deep_merge_concat(resolve_mixin(mix, application, ast))
+        end
+        current.deep_merge_concat(mixin)
+      end
     end
   end
 end

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jannis Huebl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie