alki 0.3.0 → 0.4.0

data/lib/alki.rb

@@ -1,33 +1,39 @@
-module Alki
-  def self.create_package!(name=nil,root=nil)
-    require 'alki/util'
-    require 'alki/standard_package'
+require 'alki/support'
+require 'alki/assembly'
+require 'alki/class_builder'
+require 'alki/dsl'
 
+module Alki
+  def self.create_assembly!(name=nil,root=nil)
     if !root
-      root = Alki::Util.find_pkg_root(caller_locations(1, 1)[0].absolute_path)
+      root = Alki::Support.find_root(caller_locations(1, 1)[0].absolute_path) do |dir|
+        File.exists?(File.join(dir,'config','assembly.rb'))
+      end
     end
     if !name
       path = caller_locations(1,1)[0].absolute_path
       lib_dir = File.join(root,'lib','')
       unless path.start_with?(lib_dir) && path.end_with?('.rb')
-        raise "Can't auto-detect name of package"
+        raise "Can't auto-detect name of assembly"
       end
       name = path[lib_dir.size..-4]
     end
-    unless name =~ /[A-Z]/
-      name = Alki::Util.classify(name)
-    end
-    klass = Class.new(Alki::StandardPackage)
-    klass.send :define_method, :initialize do
-      super root
-    end
-
-    mod = Module.new
-    mod.const_set :Package, klass
-    mod.send :define_singleton_method, :new do
-      klass.new
-    end
-
-    Alki::Util.create_class(name,mod)
+    config_root = File.join(root,'config')
+    Alki::ClassBuilder.build(
+      name: name,
+      class_modules: [Alki::Assembly],
+      type: :module,
+      class_methods: {
+        assembly_class: {
+          body: ->{
+            @assembly_class ||= Alki::Dsl.load(File.join(config_root,'assembly.rb'))[:class]
+          }
+        },
+        config_root: {
+          body: ->{ config_root }
+        }
+      }
+    )
+    Alki::Dsl.register_dir config_root, 'alki/dsls/assembly', prefix: File.join(name,'assembly')
   end
 end

data/test/feature/create_package_test.rb

@@ -4,13 +4,14 @@ describe 'Alki.create_package!' do
   describe 'example' do
     it 'should do fizzbuzz' do
       $LOAD_PATH << File.join(fixtures_path,'example','lib')
+      $LOAD_PATH << File.join(fixtures_path,'tlogger','lib')
       require 'example'
       app = Example.new
       app.range_handler.handle 1..20
       app.output.to_a.must_equal [
-                                     "1","2","Fizz!","4","Buzz!","Fizz!","7", "8", "Fizz!",
-                                     "Buzz!", "11", "Fizz!", "13", "14", "Fizzbuzz!", "16",
-                                     "17", "Fizz!", "19", "Buzz!"
+                                   "1","2","Fizz!","4","Buzz!","Fizz!","7", "8", "Fizz!",
+                                   "Buzz!", "11", "Fizz!", "13", "14", "Fizzbuzz!", "16",
+                                   "17", "Fizz!", "19", "Buzz!"
                                  ]
     end
   end

data/test/fixtures/example/config/{package.rb → assembly.rb}

@@ -22,9 +22,12 @@ Alki do
     ArrayOutput.new
   end
 
+  assembly :tlogger do
+    set :io, STDERR
+  end
+
   service :log do
-    require 'logger'
-    Logger.new STDERR
+    tlogger.log
   end
 
   service :message_proc do

data/test/fixtures/example/config/handlers.rb

@@ -25,6 +25,6 @@ Alki do
 
   overlay do
     require 'log_overlay'
-    LogOverlay.new log
+    LogOverlay.new lazy('log')
   end
 end

data/test/fixtures/example/lib/example.rb

@@ -1,3 +1,3 @@
 require 'alki'
 
-Alki.create_package!
+Alki.create_assembly!

data/test/fixtures/example/lib/switch_handler.rb

@@ -1,9 +1,9 @@
 class SwitchHandler
   def initialize(handlers)
-    @handlers = handlers
+    @types = handlers
   end
 
   def handle(val)
-    @handlers.find {|h| h.handle val }
+    @types.find {|h| h.handle val }
   end
 end

data/test/fixtures/tlogger/config/assembly.rb

@@ -0,0 +1,10 @@
+Alki do
+  set :io do
+    raise "Most override io service"
+  end
+
+  service :log do
+    require 'logger'
+    Logger.new io
+  end
+end

data/test/fixtures/tlogger/lib/tlogger.rb

@@ -0,0 +1,3 @@
+require 'alki'
+
+Alki.create_assembly!

data/test/integration/dsls/assembly_test.rb

@@ -0,0 +1,28 @@
+require_relative '../../test_helper'
+require 'alki/dsls/assembly'
+require 'alki/assembly_processor'
+
+describe Alki::Dsls::Assembly do
+  it 'should work' do
+    res = Alki::Dsls::Assembly.build do
+      service :test do
+        :val
+      end
+
+      load 'file'
+
+      group :group1 do
+        service :test2 do
+          :val2
+        end
+      end
+    end
+    p res[:class].assembly
+    res[:class].assembly.children[:file].name.must_equal 'file'
+    res[:class].assembly.children[:test].block.call.must_equal :val
+    res[:class].assembly.children[:group1].children[:test2].block.call.must_equal :val2
+
+    r = res[:class].assembly.lookup [:group1,:test2]
+    p r
+  end
+end

data/test/integration/dsls/assembly_type_test.rb

@@ -0,0 +1,58 @@
+require_relative '../../test_helper'
+require 'alki/dsls/assembly_type'
+
+describe Alki::Dsls::AssemblyType do
+  def build(&blk)
+    @klass = Alki::Dsls::AssemblyType.build(&blk)[:class]
+  end
+
+  def klass
+    @klass
+  end
+
+  describe :build do
+    it 'should create struct class with given attributes' do
+      build do
+        attr :attr1
+        attr :attr2
+      end
+      obj = klass.new(:val1,:val2)
+      obj.attr1.must_equal :val1
+      obj.attr2.must_equal :val2
+    end
+
+    it 'should create index and output methods using given blocks' do
+      build do
+        index do
+          :val1
+        end
+
+        output do
+          :val2
+        end
+      end
+
+      obj = klass.new
+      obj.index(:data,:key).must_equal :val1
+      obj.output(:data).must_equal :val2
+    end
+
+    it 'should allow accessing attrs and processor/data/key from index/output methods' do
+      build do
+        attr :attr1
+
+        index do
+          [attr1,data,key].map(&:to_s).join
+        end
+
+        output do
+          [attr1,data].map(&:to_s).join
+        end
+      end
+
+      obj = klass.new(1)
+      obj.index(2,3).must_equal "123"
+      obj.output(2).must_equal "12"
+    end
+  end
+end

data/test/integration/dsls/service_dsl_test.rb

@@ -0,0 +1,57 @@
+require_relative '../../test_helper'
+require 'alki/dsls/service'
+
+describe Alki::Dsls::Service do
+  def build(&blk)
+    @c = Alki::Dsls::Service.build(&blk)[:class]
+  end
+
+  describe :use do
+    it 'should add second argument to ::uses' do
+      build do
+        use :test, 'test_service'
+        use :test2, :test_service2
+      end.uses.must_equal(['test_service','test_service2'])
+    end
+
+    it 'should set instance variable for each use from new arguments' do
+      build do
+        use :test, 'test_service'
+        use :test2, 'test_service2'
+      end
+      obj = @c.new :val1, :val2
+      obj.instance_variable_get(:@test).must_equal :val1
+      obj.instance_variable_get(:@test2).must_equal :val2
+    end
+
+    it 'should raise error if number of new arguments doesn\'t match number of use statements' do
+      build do
+        use :test, 'test_service'
+        use :test2, 'test_service2'
+      end
+      assert_raises ArgumentError do
+        @c.new
+      end
+      assert_raises ArgumentError do
+        @c.new :val1
+      end
+      assert_raises ArgumentError do
+        @c.new :val1, :val2, :val3
+      end
+    end
+
+    it 'should use first argument as service name if none provided' do
+      build do
+        use :test
+        use :test2
+      end.uses.must_equal(['test','test2'])
+    end
+
+    it 'should allow hash syntax for arguments' do
+      build do
+        use test: 'ts'
+        use test2: 'ts2'
+      end.uses.must_equal(['ts','ts2'])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+- !ruby/object:Gem::Dependency
+  name: alki-dsl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: alki-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Base library for building applications. Provides tools for organizing
   and connection application units.
 email:
@@ -52,26 +94,28 @@ files:
 - README.md
 - Rakefile
 - alki.gemspec
+- config/dsls.rb
 - lib/alki.rb
-- lib/alki/class_builder.rb
-- lib/alki/dsl_builder.rb
-- lib/alki/group_builder.rb
-- lib/alki/group_dsl.rb
-- lib/alki/loader.rb
+- lib/alki/assembly.rb
+- lib/alki/assembly_executor.rb
+- lib/alki/assembly_handler_base.rb
+- lib/alki/dsls/assembly.rb
+- lib/alki/dsls/assembly_type.rb
+- lib/alki/dsls/assembly_type_dsl.rb
+- lib/alki/dsls/assembly_types/assembly.rb
+- lib/alki/dsls/assembly_types/group.rb
+- lib/alki/dsls/assembly_types/load.rb
+- lib/alki/dsls/assembly_types/overlay.rb
+- lib/alki/dsls/assembly_types/service.rb
+- lib/alki/dsls/service.rb
 - lib/alki/overlay_delegator.rb
-- lib/alki/package.rb
-- lib/alki/package_builder.rb
-- lib/alki/package_executor.rb
-- lib/alki/package_processor.rb
 - lib/alki/service_delegator.rb
-- lib/alki/standard_package.rb
 - lib/alki/test.rb
-- lib/alki/util.rb
 - lib/alki/version.rb
 - test/feature/create_package_test.rb
 - test/fixtures/config.rb
+- test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
-- test/fixtures/example/config/package.rb
 - test/fixtures/example/config/settings.rb
 - test/fixtures/example/lib/array_output.rb
 - test/fixtures/example/lib/echo_handler.rb
@@ -80,10 +124,12 @@ files:
 - test/fixtures/example/lib/num_handler.rb
 - test/fixtures/example/lib/range_handler.rb
 - test/fixtures/example/lib/switch_handler.rb
-- test/integration/class_builder_test.rb
-- test/integration/loader_test.rb
+- test/fixtures/tlogger/config/assembly.rb
+- test/fixtures/tlogger/lib/tlogger.rb
+- test/integration/dsls/assembly_test.rb
+- test/integration/dsls/assembly_type_test.rb
+- test/integration/dsls/service_dsl_test.rb
 - test/test_helper.rb
-- test/unit/package_processor_test.rb
 homepage: https://github.com/medlefsen/alki
 licenses:
 - MIT
@@ -111,8 +157,8 @@ summary: Base library for building applications.
 test_files:
 - test/feature/create_package_test.rb
 - test/fixtures/config.rb
+- test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
-- test/fixtures/example/config/package.rb
 - test/fixtures/example/config/settings.rb
 - test/fixtures/example/lib/array_output.rb
 - test/fixtures/example/lib/echo_handler.rb
@@ -121,7 +167,9 @@ test_files:
 - test/fixtures/example/lib/num_handler.rb
 - test/fixtures/example/lib/range_handler.rb
 - test/fixtures/example/lib/switch_handler.rb
-- test/integration/class_builder_test.rb
-- test/integration/loader_test.rb
+- test/fixtures/tlogger/config/assembly.rb
+- test/fixtures/tlogger/lib/tlogger.rb
+- test/integration/dsls/assembly_test.rb
+- test/integration/dsls/assembly_type_test.rb
+- test/integration/dsls/service_dsl_test.rb
 - test/test_helper.rb
-- test/unit/package_processor_test.rb

data/lib/alki/class_builder.rb

@@ -1,41 +0,0 @@
-require 'alki/dsl_builder'
-
-module Alki
-  class ClassBuilder
-    def initialize(*dsl_factories)
-      @dsl_factories = dsl_factories.flatten
-    end
-
-    def build(name=nil,&blk)
-      self.class.build(name,@dsl_factories,&blk)
-    end
-
-    def self.build(name=nil,dsl_factories,&blk)
-      Class.new.tap do |c|
-        builder = -> {
-          Module.new.tap do |m|
-            m.define_singleton_method :klass do
-              c
-            end
-          end
-        }
-        m = DslBuilder.build(c,dsl_factories,
-                         builder: builder,exec: :class_exec,
-                         &blk)
-        c.include m
-        if name
-          *ans, ln = name.to_s.split(/::/)
-          parent = Object
-          ans.each do |a|
-            unless parent.const_defined? a
-              parent.const_set a, Module.new
-            end
-            parent = parent.const_get a
-          end
-
-          parent.const_set ln, c
-        end
-      end
-    end
-  end
-end

data/lib/alki/dsl_builder.rb

@@ -1,43 +0,0 @@
-module Alki
-  class DslBuilder
-    def initialize(*dsl_factories,builder: nil, exec: nil)
-      @builder = builder
-      @exec = exec
-      @dsl_factories = dsl_factories.flatten
-    end
-
-    def build(obj,&blk)
-      self.class.build(obj,@dsl_factories,
-                       builder: @builder,
-                       exec: @exec,
-                       &blk)
-    end
-
-    def self.build(obj,dsl_factories,builder: nil, exec: nil, &blk)
-      builder ||= Object.method(:new)
-      exec ||= :instance_exec
-      unless dsl_factories.is_a?(Array)
-        dsl_factories = [dsl_factories]
-      end
-      builder = builder.call
-      dsls = []
-      dsl_factories.each do |dsl_factory|
-        if dsl_factory.respond_to? :new_dsl
-          dsl = dsl_factory.new_dsl obj
-        else
-          dsl = dsl_factory.new obj
-        end
-        dsl.dsl_methods.each do |method_name|
-          method = dsl.method(method_name)
-          builder.define_singleton_method method_name do |*args,&blk|
-            method.call *args, &blk
-          end
-        end
-        dsls << dsl
-      end
-      builder.send(exec,&blk)
-      dsls.each {|dsl| dsl.finalize if dsl.respond_to? :finalize }
-      builder
-    end
-  end
-end

data/lib/alki/group_builder.rb

@@ -1,25 +0,0 @@
-require 'alki/group_dsl'
-require 'alki/dsl_builder'
-
-module Alki
-  class GroupBuilder
-    def self.build(loader,obj = {},&dsl)
-      Alki::GroupBuilder.new(loader).build(obj,&dsl)
-      obj
-    end
-
-    def initialize(loader)
-      @loader = loader
-      @builder = Alki::DslBuilder.new(self)
-    end
-
-    def new_dsl(obj)
-      GroupDsl.new(obj,loader: @loader, group_builder: @builder)
-    end
-
-    def build(group={},&dsl)
-      @builder.build(group,&dsl)
-      group
-    end
-  end
-end

data/lib/alki/group_dsl.rb

@@ -1,98 +0,0 @@
-require 'alki/util'
-
-module Alki
-  class GroupDsl
-    def initialize(root,group_builder:,loader:)
-      @root = root
-      @group_builder = group_builder
-      @loader = loader
-    end
-
-    def dsl_methods
-      [:set,:service,:factory,:load,:import,:group,:overlay,:clear_overlays]
-    end
-
-    def set(name,value=nil,&blk)
-      service name, &(blk || -> { value })
-    end
-
-    def service(name,&blk)
-      name = name.to_sym
-      @root[name] = {
-        type: :service,
-        block: blk
-      }
-    end
-
-    def factory(name,&blk)
-      name = name.to_sym
-      @root[name] = {
-        type: :factory,
-        block: blk
-      }
-    end
-
-    def import(name)
-      instance_exec &@loader.load(name.to_s)
-    end
-
-    def load(name)
-      group(name.to_sym) do
-        import(name)
-      end
-    end
-
-    def package(name,pkg,klass=nil,&blk)
-      if pkg.is_a? String
-        require pkg
-        if klass == nil
-          pkg = Alki::Util.classify(pkg)
-        else
-          pkg = klass
-        end
-      end
-      if pkg.is_a? Class
-        pkg = pkg.new
-      end
-      if pkg.response_to? :package_definition
-        pkg = pkg.package_definition
-      end
-      unless pkg.is_a? Hash
-        raise "Invalid package: #{pkg.inspect}"
-      end
-      name = name.to_sym
-      overrides = {}
-      @group_builder.build(overrides,&blk) if blk
-      overrides[:original] = {
-        type: :package,
-        children: pkg,
-        overrides: {}
-      }
-      @root[name] = {
-        type: :package,
-        children: pkg,
-        overrides: overrides
-      }
-    end
-
-    def group(name,&blk)
-      name = name.to_sym
-      children = {}
-      @group_builder.build(children,&blk)
-      @root[name] = {
-        type: :group,
-        children: children
-      }
-    end
-
-    def overlay(&blk)
-      @root['overlays'] ||= []
-      @root['overlays'] << blk
-    end
-
-    def clear_overlays
-      @root['overlays'] ||= []
-      @root['overlays'] << :clear
-    end
-  end
-end

data/lib/alki/loader.rb

@@ -1,32 +0,0 @@
-module Alki
-  class Loader
-    def self.load(config_file)
-      Fiber.new do
-        Kernel.load config_file
-        Thread.current[:alki_loader_current]
-      end.resume
-    end
-
-    def initialize(root_dir)
-      @root_dir = root_dir
-    end
-
-    def load_all
-      Dir[File.join(@root_dir,'**','*.rb')].inject({}) do |h,path|
-        file = path.gsub(File.join(@root_dir,''),'').gsub(/\.rb$/,'')
-        h.merge!(file => Loader.load(path))
-      end
-    end
-
-    def load(file)
-      Loader.load File.expand_path("#{file}.rb",@root_dir)
-    end
-  end
-end
-
-module Kernel
-  def Alki(&blk)
-    Thread.current[:alki_loader_current] = blk if blk
-    ::Alki
-  end
-end