alki 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3555b8b45ee20ff856590c5bd5b38cd91042d93a
-  data.tar.gz: d97785bfd1cc1cb00da4166f08af02dc959149ee
+  metadata.gz: d65c6ea707a3c2b160cf29edcb6cdd092a9239f3
+  data.tar.gz: 9ec9b017122f9a6a0cd2c5741835e2a0b0bd570b
 SHA512:
-  metadata.gz: 47710dd291c0d8d8c4bdcff0d01bf9d4c4c370697183aba0a846ddfbef1ffe1022eab6848227af07eccdf2c48773fce4856bf1c5f56c0ba78a44440e04bce1b3
-  data.tar.gz: 844374a0d77f694b1b7075326b5fbe5528dea1835a93bfe619a8289703edb2988c1d9ba385acaf32d2eeba93efda4a23e44d54755d21fa475d3cd73cd6820aae
+  metadata.gz: ad08a969ea2df6707a7e92139a52d70d1cbf5549d5bf5566dfe11f1253b5b014d2e4db986dd94585db0a85faf9a0aacc93cffcd04d7e01efe41695f940e47216
+  data.tar.gz: b0ba6db2280081859a064f287b144ec7425de30f0d090370c900c8b0e37c2b56562a4599e9be97f4b2ba6044f9a4fb7f9102db2cb6cb1bec7e1c266777b03f9c

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'alki-testing', path: '/home/matt/Projects/personal/alki/alki-testing'
+gem 'alki-testing'
 
 gemspec

data/alki.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '~> 10.0'
-  spec.add_dependency "alki-dsl", "~> 0.4", ">= 0.4.2"
+  spec.add_dependency "alki-dsl", "~> 0.5"
   spec.add_dependency "alki-support", "~> 0.7"
   spec.add_dependency "concurrent-ruby", "~> 1.0"
   spec.add_dependency "ice_nine", "~> 0.11"

data/config/assembly.rb

@@ -7,13 +7,11 @@ Alki do
   end
 
   factory :build_service do
-    -> (klass, grp=nil) {
+    -> (klass, grp=nil, args=[]) {
       klass = Alki.load klass
       grp ||= parent
-      args = if klass.respond_to? :uses
-        klass.uses.map {|path| grp.lookup path }
-      else
-        []
+      if klass.respond_to? :uses
+        args += klass.uses.map {|path| grp.lookup path }
       end
       klass.new *args
     }

data/lib/alki/assembly/instance.rb

@@ -1,7 +1,6 @@
 require 'delegate'
 require 'concurrent'
 require 'alki/support'
-require 'concurrent'
 
 module Alki
   module Assembly

data/lib/alki/assembly/meta/tags.rb

@@ -8,8 +8,8 @@ module Alki
 
         def process(_executor,from,data)
           data[:tags]||={}
-          @tags.each do |tag|
-            (data[:tags][tag.to_sym]||=[]) << from
+          @tags.each do |tag,value|
+            (data[:tags][tag.to_sym]||={})[from] = value
           end
         end
       end

data/lib/alki/assembly/types/factory.rb

@@ -1,5 +1,6 @@
 Alki do
   require 'alki/execution/value_helpers'
+  require 'alki/execution/factory'
 
   attr :block
 
@@ -19,7 +20,7 @@ Alki do
             if !args.empty? || blk
               __create__ *args, &blk
             else
-              method(:__create__)
+              Alki::Execution::Factory.new method(:__create__)
             end
           }
         }

data/lib/alki/assembly/types/group.rb

@@ -1,4 +1,5 @@
 Alki do
+  require 'ostruct'
   require 'alki/execution/helpers'
 
   attr(:children){ {} }
@@ -8,9 +9,9 @@ Alki do
 
     data[:tags] ||= {}
     data[:tags] = data[:tags].inject({}) do |tags,(tag,tagged)|
-      tagged.each do |path|
+      tagged.each do |path,value|
         if path.empty? || path[0] == key.to_sym
-          tags[tag] = (tags[tag]||[]) | [path[1..-1]]
+          (tags[tag]||={})[(path[1..-1]||[])] = value
         end
       end
       tags
@@ -22,8 +23,8 @@ Alki do
       if target.size == 1 && target[0].to_s.start_with?('%')
         tags = data[:tags][target[0].to_s[1..-1].to_sym]
         if tags
-          tags.each do |target|
-            (no[target]||=[]).push *overlays
+          tags.keys.each do |path|
+            (no[path]||=[]).push *overlays
           end
         end
       elsif target.empty? || target.shift == key.to_sym
@@ -46,7 +47,7 @@ Alki do
       methods: {
         children: -> {
           children_names
-        }
+        },
       },
       proc: ->{self}
     }

data/lib/alki/assembly/types/service.rb

@@ -7,6 +7,7 @@ Alki do
     overlays = (data[:overlays][[]]||[]).sort_by(&:order).group_by(&:type)
     value_overlays = overlays[:value]||[]
     reference_overlays = overlays[:reference]||[]
+    tags = data[:tags].inject({}){|tags,(tag,tagged)| tags[tag] = tagged[[]]; tags}
     methods = {
       __build__: block,
       __apply_overlays__: -> obj, overlays {
@@ -34,6 +35,7 @@ Alki do
       },
       modules: [Alki::Execution::Helpers],
       scope: data[:scope],
+      meta: {tags: tags}
     }
   end
 end

data/lib/alki/dsls/assembly_group.rb

@@ -6,6 +6,10 @@ Alki do
   init do
     ctx[:root] = build(:group,{})
     ctx[:meta] = []
+    @addons = Array ctx[:addons]
+    @addons.each do |addon|
+      require_dsl addon
+    end
   end
 
   helper :add do |name,elem|
@@ -25,7 +29,7 @@ Alki do
     Alki.load("alki/assembly/meta/#{type}").new *args
   end
 
-  dsl_method :add_overlay do |type,target,overlay,args|
+  helper :add_overlay do |type,target,overlay,args|
     (ctx[:meta]||=[]) << [
       [],
       build_meta(
@@ -48,11 +52,21 @@ Alki do
     ctx[:meta].push *prefix_meta(*prefix,meta)
   end
 
-  dsl_method :tag do |*tags|
+  dsl_method :use do |addon_name|
+    addon = Alki.load addon_name
+    if addon.respond_to?(:alki_addon)
+      addon = addon.alki_addon
+    end
+    require_dsl addon
+    @addons << addon
+  end
+
+  dsl_method :tag do |*tags,**value_tags|
     unless tags.all?{|t| t.is_a? Symbol }
       raise "Tags must be symbols"
     end
-    @tags = tags
+    tags.each {|tag| value_tags[tag] = true }
+    @tags = value_tags
   end
 
   dsl_method :config_dir do

data/lib/alki/execution/factory.rb

@@ -0,0 +1,16 @@
+require 'forwardable'
+
+module Alki
+  module Execution
+    class Factory
+      extend Forwardable
+
+      def initialize(method)
+        @method = method
+      end
+
+      def_delegators :@method, :call, :to_proc, :to_s, :[]
+      def_delegator :@method, :call, :new
+    end
+  end
+end

data/lib/alki/execution/helpers.rb

@@ -10,7 +10,11 @@ module Alki
           end
           elem.to_s.split('.').inject(group) do |group,name|
             raise "Invalid lookup elem" unless group.is_a? Helpers
-            group.send name.to_sym
+            if name =~ /^\d/
+              group[name.to_i]
+            else
+              group.send name.to_sym
+            end
           end
         end
       end

data/lib/alki/version.rb

@@ -1,3 +1,3 @@
 module Alki
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/test/feature/factories_test.rb

@@ -36,13 +36,31 @@ describe 'Factories' do
     proc_counter.must_equal 2
   end
 
-  it 'should return Proc of factory if no arguments are provided when referenced' do
-    assembly do
-      factory :test do
-        -> (val) { val + 1 }
+  describe 'if no arguments are provided' do
+    before do
+      assembly do
+        factory :test do
+          -> (val) { val + 1 }
+        end
       end
     end
-    proc = obj.test
-    proc.call(1).must_equal 2
+
+    def just_yield(*args)
+      yield *args
+    end
+
+    it 'should return object with call methods' do
+      obj.test.call(1).must_equal 2
+      obj.test[1].must_equal 2
+      obj.test.(1).must_equal 2
+    end
+
+    it 'should return object with #new method' do
+      obj.test.new(1).must_equal 2
+    end
+
+    it 'should return object that is convertible to a proc' do
+      just_yield(1,&obj.test).must_equal 2
+    end
   end
 end

data/test/feature/reference_overlays_test.rb

@@ -21,4 +21,36 @@ describe 'Reference Overlays' do
     end
     assembly.new.svc.must_equal :oval_osvc_ofunc_of1_of2
   end
+
+  it 'should work on tags across mounts' do
+    child = Alki.create_assembly do
+      set :val, :svc1
+
+      tag :tag1
+      service :svc1 do
+        val
+      end
+
+      reference_overlay '%tag2', :overlay
+      set :overlay, -> val { :"child_#{val.call}"}
+    end
+
+    assembly = Alki.create_assembly do
+      mount :child, child
+
+      set :val2, :svc2
+
+      tag :tag2
+      service :svc2 do
+        val2
+      end
+
+      reference_overlay '%tag1', :overlay
+      set :overlay, -> val { :"parent_#{val.call}"}
+    end
+    obj = assembly.new
+
+    obj.svc2.must_equal :child_svc2
+    obj.child.svc1.must_equal :parent_svc1
+  end
 end

data/test/feature/tags_test.rb

@@ -1,6 +1,20 @@
 require 'alki/feature_test'
 
 describe 'Tags' do
+  it 'should allow accessing tags in services' do
+    assembly = Alki.create_assembly do
+      tag :tag1, tag2: false
+      group :grp do
+        tag :tag2, tag3: :value
+        service :svc1 do
+          meta[:tags]
+        end
+      end
+    end
+    obj = assembly.new
+    obj.grp.svc1.must_equal tag1: true, tag2: true, tag3: :value
+  end
+
   it 'should allow setting overlays via tags' do
     assembly = Alki.create_assembly do
       tag :tag1, :tag2

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

@@ -1,4 +1,6 @@
 Alki do
+  use 'example/dsls/num_handler'
+
   factory :num_handler do
     require 'num_handler'
     -> (num,str) {
@@ -6,9 +8,7 @@ Alki do
     }
   end
 
-  service :fizz do
-    num_handler 3, settings.fizz
-  end
+  num_handler :fizz, 3
 
   service :buzz do
     num_handler 5, settings.buzz

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

@@ -0,0 +1 @@
+Alki::Loader.register 'dsls', builder: 'alki/dsls/dsl', name: 'example/dsls'

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

@@ -0,0 +1,8 @@
+Alki do
+  dsl_method :num_handler do |name, num|
+    ctx[:module].service name do
+      require 'num_handler'
+      NumHandler.new(num,settings.send(name),output)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: alki-support
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +141,7 @@ files:
 - lib/alki/execution/cache_entry.rb
 - lib/alki/execution/context.rb
 - lib/alki/execution/context_class_builder.rb
+- lib/alki/execution/factory.rb
 - lib/alki/execution/helpers.rb
 - lib/alki/execution/reference.rb
 - lib/alki/execution/value_helpers.rb
@@ -177,7 +172,9 @@ files:
 - test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
+- test/fixtures/example/lib/alki_loader.rb
 - test/fixtures/example/lib/array_output.rb
+- test/fixtures/example/lib/dsls/num_handler.rb
 - test/fixtures/example/lib/echo_handler.rb
 - test/fixtures/example/lib/example.rb
 - test/fixtures/example/lib/log_overlay.rb
@@ -233,7 +230,9 @@ test_files:
 - test/fixtures/example/config/assembly.rb
 - test/fixtures/example/config/handlers.rb
 - test/fixtures/example/config/settings.rb
+- test/fixtures/example/lib/alki_loader.rb
 - test/fixtures/example/lib/array_output.rb
+- test/fixtures/example/lib/dsls/num_handler.rb
 - test/fixtures/example/lib/echo_handler.rb
 - test/fixtures/example/lib/example.rb
 - test/fixtures/example/lib/log_overlay.rb