orchparty 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 340c0d432dea150fbc82594e7960a09c39a3ab7e
-  data.tar.gz: 6db077198c0059742dd904c87fc25baa563fb2f0
+  metadata.gz: 5d243c872d405da539b21a6b53298be09acb55f4
+  data.tar.gz: 5f965f1e90ad73cb73c6f8bf3647188b36098a57
 SHA512:
-  metadata.gz: 620506215b212773fe51d0c412bad3d2366bf11181dfc3278fa8c7a999a5449262944f9973929c02b30a583a900f61ad1e0009b444b6a796b5ed1a0df3275a4e
-  data.tar.gz: b2f012d2244d2ee3529124735ba073d26e96706aaa33b2351138fb0b9bba6882c3f55a85091047f7b69ef3c59104542bdba21596df5c4ae94bc0a4930f58a627
+  metadata.gz: e34429154f83613c266f7697457464f007115787ad62fb624c521d2add5034b7a833d14f360396396862ca8ff1a9472f85acf4d185115c06bce0b42d967272a5
+  data.tar.gz: 079360c3b92c0be1a00ba205c217f395eebc81c32a67d0214208bf33d1f6a09f664d840fb216b55d59d59f32dfe47bf61a4157df6aaa60278cd310b1a0623b32

data/lib/orchparty/dsl_parser.rb

@@ -48,13 +48,21 @@ module Orchparty
   class MixinBuilder
 
     def initialize(name)
-      @mixin = AST::Mixin.new(name: name, services: {})
+      @mixin = AST::Mixin.new(name: name, services: {}, mixins: {})
     end
 
     def service(name, &block)
       builder  = ServiceBuilder.new(name)
       builder.instance_eval(&block)
       @mixin.services[name] = builder._build
+      @mixin.mixins[name] = builder._build
+      self
+    end
+
+    def mixin(name, &block)
+      builder  = ServiceBuilder.new(name)
+      builder.instance_eval(&block)
+      @mixin.mixins[name] = builder._build
       self
     end
 

data/lib/orchparty/transformations/all.rb

@@ -6,7 +6,7 @@ module Orchparty
         ast.applications.each do |_, application|
           application.services.transform_values! do |service|
             if application.all.is_a?(Hash)
-              AST::Service.new(application.all.deep_merge(service)) 
+              AST::Service.new(application.all.deep_merge_concat(service)) 
             else
               service
             end

data/lib/orchparty/transformations/mixin.rb

@@ -30,7 +30,7 @@ module Orchparty
       def resolve_mixin(mix, application, ast)
         if mix.include? "."
           mixin_name, mixin_service_name = mix.split(".")
-          ast.mixins[mixin_name].services[mixin_service_name]
+          ast.mixins[mixin_name].mixins[mixin_service_name]
         else
           application.mixins[mix]
         end

data/lib/orchparty/transformations/variable.rb

@@ -30,6 +30,7 @@ module Orchparty
       end
 
       def build_context(application:, service:)
+        application._variables ||= {}
         variables = application._variables.merge(service._variables)
         Context.new(variables.merge({application: application.merge(application._variables), service: service.merge(service._variables)}))
       end

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jannis Huebl