nestene 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e479ea793383b23ce3bf9de77bf12ebd31feab21
-  data.tar.gz: 6a8ba3f519fd58266ebebf33f134a1a5399ebb42
+  metadata.gz: 3dc00c22cd4e58cd1a82ac111d8531cd31ffa244
+  data.tar.gz: 35aa72d30e3c2d36b3b48245bffee533cd9e12b7
 SHA512:
-  metadata.gz: 8fd66164e61c692eabc430c7d7e3cf1cb7a0a89e9a3ec2ff5f9dcac2de720de88a349f3ea14c09f77dc52e25b9e534efabc7b938acd539731e79c3730ae26be6
-  data.tar.gz: 8573732417285586aefc07059efb2a9ceb6d7b186abf9bf324fea0a093c276d64b48db75ecc49b63dfd426cd104fe58a4c9e2956f7e9183b6d963490795e6d4f
+  metadata.gz: 8203a4de036bd60499bd616201969e37678a74a0cdf972884bd1db4a7a17dee6708be152ba168310c469477c86cdb4789f8738fda76063ebfcb4a808f36df97d
+  data.tar.gz: dac861c5b236c5c8a788e54d528b643e8e3bf58c3e36a634c49dbbf3fac773ef43b460d0624f02184333e8baf321453e1ba0a3541ec515c2f25ef49b56b54c2e

data/TODO.txt

@@ -15,3 +15,5 @@ done:
 - Limit size of auton execution history
 - Pretty Print JSON for the nestene's state
 - Add module for autons -> automatic registry
+- Add method to self-terminate auton to the context
+

data/features/support/env.rb

@@ -4,6 +4,7 @@ require 'nestene'
 require 'capybara/cucumber'
 require 'capybara/poltergeist'
 require 'pry'
+require 'timeout'
 Capybara.javascript_driver = :poltergeist
 
 Capybara.app = Nestene::Ui::App

data/lib/nestene/actor/auton_queue.rb

@@ -12,24 +12,38 @@ module Nestene
 
 
       def execute_next_step topic, auton_id, state
+
+        return unless state
+
         executing = nil
         type = nil
         ser = nil
         running = false
 
-        Celluloid::Actor["storage:%s" % auton_id].update do |state|
-          running = state.state == :ready && !state.queue.to_execute.empty?
-          if running
-            nx = state.queue.to_execute.shift
-            executing = ExecutingMethod.new(nx)
-            state.queue.currently_executing = executing
-            type = state.type
-            ser = state.serialized
+        storage_actor = Celluloid::Actor["storage:%s" % auton_id]
+
+        return unless storage_actor
+
+        storage_actor.update do |state|
+          if state
+            running = state.state == :ready && !state.queue.to_execute.empty?
+            if running
+              nx = state.queue.to_execute.shift
+              executing = ExecutingMethod.new(nx)
+              state.queue.currently_executing = executing
+              type = state.type
+              ser = state.serialized
+            end
           end
         end
 
         return unless running
 
+        if executing.name == '__terminate_this_auton'
+          Celluloid::Actor["storage:%s" % auton_id].async.shutdown
+          return
+        end
+
         instance = Nestene::class_from_string(type).from_structure(ser)
 
         if instance.public_methods.include?(:context=)
@@ -65,20 +79,22 @@ module Nestene
         end
 
         Celluloid::Actor["storage:%s" % auton_id].update do |state|
-          state.queue.currently_executing = nil
-          state.serialized = instance.to_structure
-          if exception
-            if instance.methods.include?(:handle_exception) && executing.name != :handle_exception
-              method = ScheduledMethod.new
-              method.name = :handle_exception
-              method.parameters = [exception.class.name, exception.message, executing.name, executing.parameters]
-              method.uuid = SecureRandom.uuid
-              state.queue.to_execute.unshift method
-            else
-              state.queue.failed = true
+          if state
+            state.queue.currently_executing = nil
+            state.serialized = instance.to_structure
+            if exception
+              if instance.methods.include?(:handle_exception) && executing.name != :handle_exception
+                method = ScheduledMethod.new
+                method.name = :handle_exception
+                method.parameters = [exception.class.name, exception.message, executing.name, executing.parameters]
+                method.uuid = SecureRandom.uuid
+                state.queue.to_execute.unshift method
+              else
+                state.queue.failed = true
+              end
             end
+            state.queue.add_executed executed
           end
-          state.queue.add_executed executed
         end
       end
 

data/lib/nestene/actor/auton_storage.rb

@@ -36,6 +36,13 @@ module Nestene
         structure ? AutonState.from_structure(structure) : nil
       end
 
+      def shutdown
+        Celluloid::Actor.delete("storage:%s" % @auton_id)
+        @storage.delete(@auton_id)
+        publish('state_update', @auton_id, nil)
+        terminate
+      end
+
       def update &block
         before = @storage.load(@auton_id)
         state = AutonState.from_structure(@storage.load(@auton_id))

data/lib/nestene/actor/core.rb

@@ -138,8 +138,10 @@ module Nestene
       end
 
       def notify_waiters topic, auton_id, state
-        future = @execution_futures.delete(auton_id)
-        future.signal(SelfValue.new) if future
+        if state
+          future = @execution_futures.delete(auton_id)
+          future.signal(SelfValue.new) if future
+        end
       end
 
     end

data/lib/nestene/actor/delayed_scheduler.rb

@@ -22,13 +22,16 @@ module Nestene
 
         @schedule.delete_if{|e| e.first == auton_id}
 
-        state.queue.delayed.each do |d|
-          @schedule << [auton_id, d]
-        end
+        if state
+
+          state.queue.delayed.each do |d|
+            @schedule << [auton_id, d]
+          end
 
-        @schedule.sort_by!{|e| e[1].execute_at}
+          @schedule.sort_by!{|e| e[1].execute_at}
 
-        async.schedule_methods
+          async.schedule_methods
+        end
 
       end
 

data/lib/nestene/auton_context.rb

@@ -36,9 +36,11 @@ module Nestene
       Celluloid::Actor[:nestene_core].create_auton type, auton_id
     end
 
-    attr_reader :auton_id
-
+    def terminate
+      schedule_step '__terminate_this_auton'
+    end
 
+    attr_reader :auton_id
 
   end
 end

data/lib/nestene/storage.rb

@@ -32,12 +32,16 @@ module Nestene
     end
 
     def store(key, value)
-      final_name = "%s/%s" % [@dir,@converter.key_to_file_name(key)]
-      tmp_name = "%s.temp" % final_name
-      File.open(tmp_name,"w") do |f|
-        f.write(JSON.pretty_generate(value))
+      if value != nil
+        final_name = "%s/%s" % [@dir,@converter.key_to_file_name(key)]
+        tmp_name = "%s.temp" % final_name
+        File.open(tmp_name,"w") do |f|
+          f.write(JSON.pretty_generate(value))
+        end
+        File.rename(tmp_name, final_name)
+      else
+        delete(key)
       end
-      File.rename(tmp_name, final_name)
     end
 
     def load(key)
@@ -49,6 +53,11 @@ module Nestene
       end
     end
 
+    def delete(key)
+      file_name = "%s/%s" % [@dir,@converter.key_to_file_name(key)]
+      File.unlink(file_name)
+    end
+
   end
 
   class MemoryStorage
@@ -66,7 +75,15 @@ module Nestene
     end
 
     def store(key, value)
-      @storage[key] = value
+      if value != nil
+        @storage[key] = value
+      else
+        delete(key)
+      end
+    end
+
+    def delete(key)
+      @storage.delete(key)
     end
   end
 

data/lib/nestene/version.rb

@@ -1,3 +1,3 @@
 module Nestene
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/nestene/storage_spec.rb

@@ -23,9 +23,9 @@ module Nestene
 
     after{FileUtils.remove_entry_secure tmpdir}
 
-    describe :list do
+    subject {DiskStorage.new(tmpdir)}
 
-      subject {DiskStorage.new(tmpdir)}
+    describe :list do
 
       context "when there is nothing in the storage" do
         it "should return empty list" do
@@ -44,8 +44,6 @@ module Nestene
 
     describe :load do
 
-      subject {DiskStorage.new(tmpdir)}
-
       context "when the object does not exist" do
         it "should return nil" do
           expect(subject.load('whatever')).to be_nil
@@ -62,20 +60,37 @@ module Nestene
     end
 
     describe :store do
-      subject {DiskStorage.new(tmpdir)}
-
-      it "stores structure" do
+      it "should store structure" do
         subject.store('test',{})
         expect(subject.load('test')).to eq({})
       end
+
+      context "when structure is nil" do
+        it 'should delete the entry' do
+          subject.store('test',{})
+          subject.store('test',nil)
+          expect(subject.load('test')).to eq(nil)
+          expect(subject.list).to_not include('test')
+        end
+      end
+    end
+
+    describe :delete do
+      it "deletes existing strucuture" do
+        subject.store('test',{})
+        subject.delete('test')
+        expect(subject.load('test')).to eq(nil)
+        expect(subject.list).to_not include('test')
+      end
     end
 
   end
 
   describe MemoryStorage do
-    describe :list do
 
-      subject {MemoryStorage.new}
+    subject {MemoryStorage.new}
+
+    describe :list do
 
       context "when there is nothing in the storage" do
         it "should return empty list" do
@@ -85,7 +100,6 @@ module Nestene
 
       context "when there is at least one object in the storage" do
         before {subject.store("test",{})}
-
         it "should return list of existing objects" do
           expect(subject.list).to eq(['test'])
         end
@@ -93,9 +107,6 @@ module Nestene
     end
 
     describe :load do
-
-      subject {MemoryStorage.new}
-
       context "when the object does not exist" do
         it "should return nil" do
           expect(subject.load('whatever')).to be_nil
@@ -108,17 +119,33 @@ module Nestene
           expect(subject.load('test')).to eq({})
         end
       end
-
     end
 
 
     describe :store do
-      subject {MemoryStorage.new}
-
-      it "stores structure" do
+      it "should store structure" do
         subject.store('test',{})
         expect(subject.load('test')).to eq({})
       end
+
+      context "when structure is nil" do
+        it 'should delete the entry' do
+          subject.store('test',{})
+          subject.store('test',nil)
+          expect(subject.load('test')).to eq(nil)
+          expect(subject.list).to_not include('test')
+        end
+      end
+
+    end
+
+    describe :delete do
+      it "deletes existing strucuture" do
+        subject.store('test',{})
+        subject.delete('test')
+        expect(subject.load('test')).to eq(nil)
+        expect(subject.list).to_not include('test')
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nestene
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dragan Milic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler