netica 0.0.17-java → 0.0.19-java

data/README.md

@@ -67,6 +67,15 @@ Then, re-read the value of the Belief node.
 
 ## Release Notes
 
+### Version 0.0.19
+
+Add `load_from_storage` parameter to ActiveNetwork#find so we can retrieve the state of a network in storage without instantiating it. Defaults to true.
+
+### Version 0.0.18
+
+* Return a hash from ActiveNetwork#destroy indicating the outcome of deletion in each storage location. 
+* Make the java_library_path task visible in `rake -vT`
+
 ### Version 0.0.17
 
 * We don't wait, we sleep when a network is locked.

data/Rakefile

@@ -2,6 +2,8 @@ require "bundler/gem_tasks"
 require 'rspec'
 require 'rspec/core/rake_task'
 
+load "lib/tasks/netica.rake"
+
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = %w(--format progress --colour)
 end

data/lib/netica/active_network.rb

@@ -72,7 +72,7 @@ module Netica
     #
     # @param token [String] identifying token for ActiveNetwork sought
     # @return [ActiveNetwork] ActiveNetwork object found
-    def self.find(token)
+    def self.find(token, load_from_storage = true)
       environment = Netica::Environment.instance
       Netica::NeticaLogger.info "Searching in #{environment.network_container.class} #{environment.network_container.object_id} (length: #{environment.network_container.length}) for #{token}."
       environment.network_container.each do |an|
@@ -87,12 +87,14 @@ module Netica
       Netica::NeticaLogger.info "Network #{token} not found in current instance #{environment.object_id}."
       if Netica::Environment.instance.redis
         stored_state = Netica::Environment.instance.redis.get(token)
-        if stored_state
+        if stored_state && load_from_storage
           hash = JSON.parse(stored_state)
           active_network = Object.const_get(hash['class']).new(token)
           active_network.load_from_saved_state(hash)
           Netica::NeticaLogger.info "Network #{token} reloaded from saved state: #{hash}"
           return active_network
+        elsif stored_state
+          return stored_state
         else
           Netica::NeticaLogger.info "Network #{token} not found in redis."
         end
@@ -100,22 +102,33 @@ module Netica
       return nil
     end
     
-    def destroy
+    # Destroy the ActiveNetwork
+    #
+    # @param memory [Boolean] destroy the in-memory object?, default is `true`
+    # @param storage [Boolean] destroy object in redis?, default is `true`
+    # @return [Hash] outcome of deletion attempts per storage location
+    def destroy(memory = true, storage = true)
+      outcome = { token: token, deletion: { memory: nil, redis: nil}}
       environment = Netica::Environment.instance
-      environment.network_container.delete_if{|network| network.token == token}
-      if environment.redis
-        environment.redis.del(token)
+
+      if memory
+        rejection = environment.network_container.reject!{|network| network.token == token}
+        outcome[:deletion][:memory] = rejection.is_a?(Array)
       end
+        
+      if environment.redis && storage
+        outcome[:deletion][:redis] = (environment.redis.del(token) > 0)
+      end
+      outcome
     end
 
-    # Export the state of the ActiveNetwork as a Hash
+    # Load ActiveNetwork from a saved state
     #
     # @param hash [Hash] network state to be restored
-    # @return [Hash] network state and object class name
     def load_from_saved_state(hash)
       self.network = BayesNetwork.new(hash["network"]["dne_file_path"])
-      self.network.load_from_state(hash["network"])
       self.reloaded_at = Time.now
+      self.network.load_from_state(hash["network"])
     end
   end
 end

data/lib/netica/version.rb

@@ -1,3 +1,3 @@
 module Netica
-  VERSION = "0.0.17"
+  VERSION = "0.0.19"
 end

data/spec/netica/active_network_spec.rb

@@ -31,7 +31,7 @@ describe Netica::ActiveNetwork do
       end
       
       it "should be returned when searched for" do
-        Netica::ActiveNetwork.find("fake_token_identifier").should === @active_network
+        Netica::ActiveNetwork.find("fake_token_identifier", false).should === @active_network
       end
 
       context "the tuberculosis node" do
@@ -47,10 +47,52 @@ describe Netica::ActiveNetwork do
       
       it "should be deletable" do
         Netica::Environment.instance.active_networks.length.should eq(1)
-        @active_network.destroy
+        outcome = @active_network.destroy
+        outcome[:deletion][:memory].should be_true
+        outcome[:deletion][:redis].should be_nil
         Netica::Environment.instance.active_networks.length.should eq(0)
       end
     end
   end
+  
+  context "with redis" do
+    before(:all) do
+      Java::NorsysNetica::Environ.__persistent__ = true
+      redis_settings = { :redis => { :host => "127.0.0.1", :port => 6379 }}
+      Netica::Environment.engage(redis_settings)
+      @redis = Redis.new(redis_settings)
+    end
+    
+    after(:all) do
+      Netica::Environment.instance.processor.finalize
+    end
+    
+    context "with ChestClinic.dne" do
+      before(:all) do
+        @active_network = Netica::ActiveNetwork.new("fake_token_identifier", "#{File.dirname(__FILE__)}/../../examples/ChestClinic.dne")
+        @active_network_token = @active_network.token
+      end
+
+      describe "#save" do
+        it "should be savable" do
+          @redis.get(@active_network_token).should be_nil
+          @active_network.save
+          @redis.get(@active_network_token).should_not be_nil
+        end
+      end
+    
+      describe "#destroy" do
+        it "should be deletable" do
+          Netica::Environment.instance.active_networks.length.should eq(1)
+          @redis.get(@active_network_token).should_not be_nil
+          outcome = @active_network.destroy
+          outcome[:deletion][:memory].should be_true
+          outcome[:deletion][:redis].should be_true
+          @redis.get(@active_network_token).should be_nil
+          Netica::Environment.instance.active_networks.length.should eq(0)
+        end
+      end
+    end
+  end
 end
 

metadata

@@ -2,14 +2,14 @@
 name: netica
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.17
+  version: 0.0.19
 platform: java
 authors:
 - Jerry Richardson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis