alki 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86b3c33eb9fbe55a5ed070f96148396c637b5fbb
-  data.tar.gz: 2a917840ba25b11141b89afbb64facc3472028c5
+  metadata.gz: 3bbada7ba7f3a9320332e73d98ec87b1e19162ad
+  data.tar.gz: 328c2661e806dee2d265da56e59e64683809954e
 SHA512:
-  metadata.gz: 85abda997dc2d9f53889c0de62c83c02785342e516b1869644d34540ef24e11ab5e333853ccd884a60c58264dd76f97f5e223077258740699363df3924ad2869
-  data.tar.gz: 05e05fe8cb0f7d1199b8d51a172a679529ad96ad5c530a7c850a66bb06130e46320f8cc2cb3fe9a6e121797dcd799fd3b287efa7a5d38401c27ffd0cfdd40723
+  metadata.gz: 9604a0947cb69443b966621bc337200e48dd9589e380b93039cc81af6fb5479316406d3c19a2112cfbfe72ae2d2b5f5d0e08201977d4ccfff6d23e31f166aaf0
+  data.tar.gz: 235b0dc2ebd06d5be3d5d0777f25f0081f225e120e5b492c1172dd933ae26358d943d43562218bb5351a2d603507856159d3902f285ab4f414cae6724aba0861

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'alki-testing'
+gem 'alki-testing', '= 0.3.0'
 gem 'rake'
 
 gemspec

data/lib/alki/assembly/instance.rb

@@ -1,6 +1,7 @@
 require 'delegate'
 require 'concurrent'
 require 'alki/support'
+require 'alki/executor'
 require 'alki/assembly/instance_builder'
 
 module Alki
@@ -18,10 +19,10 @@ module Alki
 
       def __reload__
         @lock.with_read_lock do
-          if @obj
+          unless @needs_load
             @lock.with_write_lock do
+              @version += 1
               @needs_load = true
-              @version+=1
             end
           end
         end
@@ -69,9 +70,9 @@ module Alki
         @lock.with_write_lock do
           @needs_load = false
           @obj.__unload__ if @obj.respond_to?(:__unload__)
-          InstanceBuilder.build @assembly_module, @overrides do |instance,executor|
+          @executor = Executor.new(self)
+          InstanceBuilder.build @executor,@assembly_module, @overrides do |instance|
             @obj = instance
-            @executor = executor
             self
           end
         end

data/lib/alki/assembly/instance_builder.rb

@@ -1,5 +1,4 @@
 require 'alki/assembly/types'
-require 'alki/executor'
 require 'alki/override_builder'
 require 'alki/assembly/meta/overlay'
 require 'alki/overrides'
@@ -9,11 +8,10 @@ module Alki
   module Assembly
     module InstanceBuilder
       class << self
-        def build(assembly,overrides,&instance_wrapper)
+        def build(executor, assembly,overrides,&instance_wrapper)
           assembly = Alki.load(assembly)
-          executor = Executor.new
 
-          overrides = inject_assembly_instance overrides, instance_wrapper, executor
+          overrides = inject_assembly_instance overrides, instance_wrapper
 
           executor.root = Types.build :assembly, assembly.root, overrides.root
           executor.meta = IceNine.deep_freeze(assembly.meta+overrides.meta)
@@ -23,10 +21,10 @@ module Alki
 
         private
         
-        def inject_assembly_instance(overrides,instance_wrapper,executor)
+        def inject_assembly_instance(overrides,instance_wrapper)
           root = overrides.root.dup
           root.children = root.children.merge(assembly_instance: assembly_instance)
-          meta = overrides.meta + [wrap_assembly_instance(instance_wrapper,executor)]
+          meta = overrides.meta + [wrap_assembly_instance(instance_wrapper)]
           Overrides.new(root,meta)
         end
 
@@ -34,11 +32,11 @@ module Alki
           Types.build(:service,-> { root })
         end
 
-        def wrap_assembly_instance(wrapper,executor)
+        def wrap_assembly_instance(wrapper)
           [[],Meta::Overlay.new(
             :value,
             [:assembly_instance],
-            -> obj { wrapper.call obj, executor },
+            wrapper,
             []
           )]
         end

data/lib/alki/execution/context.rb

@@ -2,15 +2,19 @@ require 'alki/execution/reference'
 module Alki
   module Execution
     class Context
-      def initialize(executor,meta)
-        @__executor__ = executor
+      def initialize(instance,meta)
+        @__instance__ = instance
         @__meta__ = meta
       end
 
       private
 
+      def __executor__
+        @__instance__.__executor__
+      end
+
       def __reference__(path,args,blk)
-        Reference.new(@__executor__,@__meta__,path,args,blk)
+        Reference.new(@__instance__,@__meta__,path,args,blk)
       end
 
       def __execute__(path,args,blk)

data/lib/alki/execution/context_class_builder.rb

@@ -22,7 +22,7 @@ module Alki
 
           methods[:"__raw_#{name}__"] = {
             body:->(*args,&blk) {
-              @__executor__.execute @__meta__, path, args, blk
+              __executor__.execute @__meta__, path, args, blk
             },
             private: true
           }

data/lib/alki/execution/reference.rb

@@ -1,17 +1,21 @@
 module Alki
   module Execution
     class Reference
-      attr_accessor :executor, :meta, :path, :args, :blk
-      def initialize(executor,meta,path,args,blk)
-        @executor = executor
+      attr_accessor :instance, :meta, :path, :args, :blk
+      def initialize(instance,meta,path,args,blk)
+        @instance = instance
         @meta = meta
         @path = path
         @args = args
         @blk = blk
       end
 
+      def executor
+        @instance.__executor__
+      end
+
       def call
-        @executor.execute @meta, @path, @args, @blk
+        executor.execute @meta, @path, @args, @blk
       end
     end
   end

data/lib/alki/executor.rb

@@ -8,12 +8,13 @@ module Alki
   class Executor
     attr_accessor :root, :meta
 
-    def initialize
+    def initialize(instance)
       @semaphore = Concurrent::ReentrantReadWriteLock.new
       @lookup_cache = {}
       @call_cache = {}
       @context_cache = {}
       @data = nil
+      @instance = instance
     end
 
     def lock
@@ -123,7 +124,7 @@ module Alki
       case type
         when :value then value
         when :proc then proc.call *args, &blk
-        when :class then value.new(self,meta).__call__ *args, &blk
+        when :class then value.new(@instance,meta).__call__ *args, &blk
       end
     end
 

data/lib/alki/version.rb

@@ -1,3 +1,3 @@
 module Alki
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/test/feature/references_test.rb

@@ -32,4 +32,24 @@ describe 'References' do
       )
     end
   end
+
+  describe 'reference objects' do
+    before do
+      @obj = Alki.singleton_assembly do
+        service :broken do
+          1.foo
+        end
+      end
+    end
+    it 'should raise errors correctly after reload' do
+      ref = @obj.__reference_broken__
+      assert_raises NoMethodError do
+        ref.call
+      end
+      @obj.__reload__
+      assert_raises NoMethodError do
+        ref.call
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alki-dsl