alki 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d43f615a01e47c804aef85ffd38c686eee21bf51
-  data.tar.gz: 87ed48fa6b70d31c1afecc2d8e79c2bced1f3faa
+  metadata.gz: bfc0e6ec1368d9f0df28e72d8978aef6afe37ecf
+  data.tar.gz: a251bd8975e08e982b0cf18710bb5abbea957cb0
 SHA512:
-  metadata.gz: 3111b599c8899e0962810df466bd66141a40720cddd03425084cb7ac8eb435a48b1212bd098449ae08fb6f2c175c70c176280b5a38b7a0afc02ca23d45f92ab4
-  data.tar.gz: 96e3b8c35bb8998d1cee45664a407c16b9f348f3140f17a69d48279835b4d84015e4f0996538a0b2607a6cba2201b909182af184f8ec14b8a26b1fe5975d74e0
+  metadata.gz: 6203b1f5a0914be306e711733aabe161f11346e286a4a2011eeea8d97cff7a2ebc8e5ed6ea41df0506917062b54dab07175b6061a6ccae32bf1cb29294009b91
+  data.tar.gz: 3a8d1da8bc5a4396fb5124c7e6b823747942f38b56e046e5933b77d806656b8567276f3e5d129caf1998f415ace2287e722adaf42958d951aa05a7083485467c

data/README.md

@@ -9,7 +9,7 @@ It's goal is to remove uncertainty and friction when building Ruby projects, all
 Best place to start would be to check out some examples:
 
 * https://github.com/alki-project/alki-example
-* https://github.com/alki-project/alki/test/fixtures/example
+* https://github.com/alki-project/alki/tree/master/test/fixtures/example
 
 # The Alki Assembly
 

data/alki.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '~> 10.0'
   spec.add_dependency "minitest", "~> 5.9", '>= 5.9.1'
-  spec.add_dependency "alki-dsl", "~> 0.3"
+  spec.add_dependency "alki-dsl", "~> 0.3", '>= 0.3.1'
   spec.add_dependency "alki-support", "~> 0.5"
 end

data/lib/alki/assembly.rb

@@ -1,21 +1,52 @@
 require 'alki/assembly_executor'
+require 'alki/dsls/assembly'
 
 module Alki
   module Assembly
-    def new
-      Alki::Assembly::Instance.new assembly, self.assembly_options
-    end
-
-    def assembly
-      self.definition.assembly
+    def new(overrides={})
+      Alki::Assembly::Instance.new create_assembly(overrides), self.assembly_options
     end
 
     def root
       self.definition.root
     end
 
+    private
+
+    def create_assembly(overrides={})
+      config_dir = if assembly_options[:load_path]
+        build_type :value, assembly_options[:load_path]
+      else
+        nil
+      end
+
+      build_type :assembly, root, config_dir, create_override_group(overrides)
+    end
+
+
+    def create_override_group(overrides)
+      unless overrides.empty?
+        root = build_type(:group)
+        overrides.each do |path,value|
+          set_override root, *path.to_s.split('.'), value
+        end
+        root
+      end
+    end
+
+    def set_override(root,*parent_keys,key,value)
+      parent = parent_keys.inject(root) do |parent,key|
+        parent.children[key.to_sym] ||= build_type(:group)
+      end
+      parent.children[key.to_sym] = build_type(:value, value)
+    end
+
+    def build_type(type,*args)
+      Alki::Support.load_class("alki/assembly_types/#{type}").new *args
+    end
+
     class Instance
-      def initialize(assembly,opts={})
+      def initialize(assembly,opts)
         @assembly = assembly
         @cache = {}
         @opts = opts

data/lib/alki/assembly_builder.rb

@@ -55,7 +55,7 @@ module Alki
     end
 
     def set_config_directory(config_dir)
-      Alki::Dsl.register_dir config_dir, 'alki/dsls/assembly'
+      Alki::Dsl.register_dir config_dir, 'alki/dsls/assembly', {config_dir: config_dir}
       @assembly_options[:load_path] = config_dir
     end
 

data/lib/alki/assembly_executor.rb

@@ -49,13 +49,6 @@ module Alki
       res.elem[:block].call evaluator
     end
 
-    def service(res,path)
-      with_scope_context(res) do |ctx,blk|
-        svc = apply_overlays res, path, ctx.instance_exec(&blk)
-        -> { svc }
-      end
-    end
-
     def apply_overlays(res,path,obj)
       res.elem[:overlays].inject(obj) do |obj,overlay_elem|
         unless res.cache[overlay_elem[:block]]
@@ -68,15 +61,6 @@ module Alki
       end
     end
 
-    def factory(res)
-      with_scope_context(res) do |ctx,blk|
-        factory = ctx.instance_exec(&blk)
-        -> (*args,&blk) {
-          factory.call *args, &blk
-        }
-      end
-    end
-
     def group(res)
       proc = -> (name,*args,&blk) {
         call res.pkg, res.cache, res.elem[:scope][name], *args, &blk

data/lib/alki/dsls/assembly.rb

@@ -13,12 +13,8 @@ Alki do
 
   finish do
     root = build_group(ctx[:elems], ctx[:overlays])
-    assembly = build_assembly root, nil
     add_class_method :root do
       root
     end
-    add_class_method :assembly do
-      assembly
-    end
   end
 end

data/lib/alki/dsls/assembly_types/assembly.rb

@@ -2,36 +2,44 @@ require 'alki/support'
 
 Alki do
   require_dsl 'alki/dsls/assembly_types/group'
+  require_dsl 'alki/dsls/assembly_types/value'
 
   dsl_method :assembly do |name,pkg=name.to_s,&blk|
     klass = Alki::Support.load_class pkg
-
-    elem = if blk
-      build_assembly klass.root, build_group_dsl(blk)
-    else
-      klass.root
+    config_dir = klass.assembly_options[:load_path]
+    config_dir = build_value config_dir if config_dir
+    overrides = if blk
+       build_group_dsl(blk)
     end
-    add name, elem
+
+    add_assembly name, klass.root, config_dir, overrides
   end
 
   element_type :assembly do
     attr :root
+    attr :config_dir
     attr :overrides, nil
 
     index do
-      if overrides
-        data.replace(
-          main: data.merge(main_data),
-          override: data.dup,
-        )
-        override.index data, key
+      if key == :config_dir
+        data.merge! main_data
+        config_dir
       else
-        root.index data.merge!(main_data), key
+        if overrides
+          data.replace(
+            main: data.merge(main_data),
+            override: data.dup,
+          )
+          override.index data, key
+        else
+          root.index data.merge!(main_data), key
+        end
       end
     end
 
     output do
       scope = root.output(data)[:scope]
+      scope[:config_dir] = (data[:prefix]||[]) + [:config_dir]
       scope.merge! overrides.output(data)[:scope] if overrides
       {
         type: :group,

data/lib/alki/dsls/assembly_types/group.rb

@@ -12,7 +12,7 @@ Alki do
 
   element_type :group do
     attr :children, {}
-    attr :overlays
+    attr :overlays, []
 
     index do
       data[:scope] ||= {}

data/lib/alki/dsls/assembly_types/value.rb

@@ -1,54 +1,100 @@
 Alki do
   dsl_method :set do |name,value=nil,&blk|
-    add_value name, false, -> (evaluator) {
-      val = if blk
-         evaluator.call blk
-      else
-        value
-      end
-      -> { val }
-    }
+    if blk
+      add_proc_value name, blk
+    else
+      add_value name, value
+    end
   end
 
   dsl_method :service do |name,&blk|
-    add_value name, true, -> (evaluator) {
-      svc = evaluator.call blk
-      -> { svc }
-    }
+    add_service name, blk
   end
 
   dsl_method :factory do |name,&blk|
-    add_value name, false, -> (evaluator) {
-      factory = evaluator.call blk
-      -> (*args,&blk) {
-        factory.call *args, &blk
+    add_factory name, blk
+  end
+
+  dsl_method :func do |name,&blk|
+    add_func name, blk
+  end
+
+  element_type :value do
+    attr :value
+
+    output do
+      {
+        type: :value,
+        block: ->(_) {
+          val = value
+          ->{ val }
+        },
+        scope: {}
+      }
+    end
+  end
+
+  element_type :proc_value do
+    attr :proc
+
+    output do
+      {
+        type: :value,
+        block: ->(e) {
+          val = e.call proc
+          ->{ val }
+        },
+        scope: data[:scope]
       }
-    }
+    end
   end
 
-  dsl_method :func do |name,&value_blk|
-    add_value name, false, -> (evaluator) {
-      -> (*args,&blk) {
-        evaluator.call(value_blk,*args,&blk)
+  element_type :service do
+    attr :block
+    output do
+      last_clear = data[:overlays].rindex(:clear)
+      overlays = last_clear ? data[:overlays][(last_clear + 1)..-1] : data[:overlays]
+      {
+        type: :value,
+        block: -> (evaluator) {
+          svc = evaluator.call block
+          -> { svc }
+        },
+        scope: data[:scope],
+        overlays: overlays
       }
-    }
+    end
   end
 
-  element_type :value do
-    attr :apply_overlays
+  element_type :factory do
     attr :block
+    output do
+      {
+        type: :value,
+        block: -> (evaluator) {
+          factory = evaluator.call block
+          -> (*args,&blk) {
+            factory.call *args, &blk
+          }
+        },
+        scope: data[:scope]
+      }
+    end
+  end
 
+  element_type :func do
+    attr :block
     output do
-      result  = {
+      {
         type: :value,
-        block: block,
-        scope: data[:scope].merge(root: [])
+        block: ->(evaluator) {
+          value_blk = block
+          -> (*args,&blk) {
+            evaluator.call(value_blk,*args,&blk)
+          }
+        },
+        scope: data[:scope]
       }
-      if apply_overlays
-        last_clear = data[:overlays].rindex(:clear)
-        result[:overlays] =  last_clear ? data[:overlays][(last_clear + 1)..-1] : data[:overlays]
-      end
-      result
     end
   end
 end

data/lib/alki/version.rb

@@ -1,3 +1,3 @@
 module Alki
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/alki.rb

@@ -1,3 +1,4 @@
+require 'alki/dsl'
 require 'alki/assembly_builder'
 
 module Alki

data/test/feature/alki_test.rb

@@ -9,7 +9,6 @@ describe Alki do
 
     it 'should return module with ::assembly, ::root, and ::new methods' do
       klass = build
-      klass.must_respond_to :assembly
       klass.must_respond_to :root
       klass.must_respond_to :new
     end

data/test/feature/example_test.rb

@@ -42,4 +42,8 @@ describe 'Example' do
       end
     end
   end
+
+  it 'should have config_dir value' do
+    Example.new.config_dir.must_equal Alki::Test.fixture_path('example','config')
+  end
 end

data/test/feature/overrides_test.rb

@@ -0,0 +1,18 @@
+require_relative '../test_helper'
+
+$LOAD_PATH.unshift Alki::Test.fixture_path('tlogger','lib')
+require 'tlogger'
+require 'stringio'
+
+describe 'Overrides' do
+  it 'should be possibly to override assembly values on initialize' do
+    assert_raises RuntimeError do
+      Tlogger.new.log << "test"
+    end
+    io = StringIO.new
+    logger = Tlogger.new(io: io)
+    logger.log << "test"
+    logger.log << "test"
+    io.string.must_equal "testtest"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: alki-support
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +127,7 @@ files:
 - lib/alki/version.rb
 - test/feature/alki_test.rb
 - test/feature/example_test.rb
+- test/feature/overrides_test.rb
 - test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
@@ -164,6 +171,7 @@ summary: Base library for building applications.
 test_files:
 - test/feature/alki_test.rb
 - test/feature/example_test.rb
+- test/feature/overrides_test.rb
 - test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb