rjr 0.9.0 → 0.11.7

data/specs/node_spec.rb

@@ -15,12 +15,11 @@ describe RJR::Node do
     node = RJR::Node.new :node_id => 'foobar',
                          :headers => {:h => 123}
     node.em_run {
-      node.instance_variable_get(:@thread_pool).running?.should be_true
-
-      EventMachine.reactor_running?.should be_true
+      ThreadPool2Manager.running?.should be_true
+      EMAdapter.running?.should be_true
       block1_called = true
       node.em_run {
-        EventMachine.reactor_running?.should be_true
+        EMAdapter.running?.should be_true
         block2_called = true
         node.halt
       }
@@ -30,4 +29,141 @@ describe RJR::Node do
     block1_called.should be_true
     block2_called.should be_true
   end
+
+  #it "should gracefully stop managed subsystems" do
+  #  # TODO test w/ keep_alive
+  #  node = RJR::Node.new :node_id => 'foobar',
+  #                       :headers => {:h => 123}
+  #  node.em_run {}
+  #  EMAdapter.running?.should be_true
+  #  ThreadPool2Manager.running?.should be_true
+  #  node.stop
+  #  node.join
+  #end
+
+  it "should halt managed subsystems" do
+    node = RJR::Node.new :node_id => 'foobar',
+                         :headers => {:h => 123}
+    node.em_run {}
+    EMAdapter.running?.should be_true
+    ThreadPool2Manager.running?.should be_true
+    node.halt
+    node.join
+    EMAdapter.running?.should be_false
+    ThreadPool2Manager.running?.should be_false
+  end
+
+  it "should run a block directly via eventmachine" do
+    block1_called = false
+    block1_thread = nil
+
+    node = RJR::Node.new :node_id => 'foobar',
+                         :headers => {:h => 123}
+    node.em_run {
+      block1_called = true
+      block1_thread = Thread.current
+      node.halt
+    }
+    reactor_thread = EMAdapter.instance_variable_get(:@em_manager).instance_variable_get(:@reactor_thread)
+    node.join
+    block1_called.should be_true
+    block1_thread.should == reactor_thread
+  end
+
+  it "should run a block in a thread via eventmachine" do
+    block1_called = false
+    block1_thread = nil
+
+    node = RJR::Node.new :node_id => 'foobar',
+                         :headers => {:h => 123}
+    node.em_run_async {
+      block1_called = true
+      block1_thread = Thread.current
+      node.halt
+    }
+    reactor_thread = EMAdapter.instance_variable_get(:@em_manager).instance_variable_get(:@reactor_thread)
+    worker_threads = ThreadPool2Manager.thread_pool.instance_variable_get(:@worker_threads)
+    node.join
+    block1_called.should be_true
+    block1_thread.should_not == reactor_thread   
+    worker_threads.should include(block1_thread)
+  end
+
+  it "should schedule a job to be run in a thread via eventmachine after a specified interval" do
+    block1_called = false
+    block1_thread = nil
+
+    node = RJR::Node.new :node_id => 'foobar',
+                         :headers => {:h => 123}
+    node.em_schedule_async(1) {
+      block1_called = true
+      block1_thread = Thread.current
+      node.halt
+    }
+    reactor_thread = EMAdapter.instance_variable_get(:@em_manager).instance_variable_get(:@reactor_thread)
+    worker_threads = ThreadPool2Manager.thread_pool.instance_variable_get(:@worker_threads)
+
+    sleep 0.5
+    block1_called.should be_false
+
+    node.join
+    block1_called.should be_true
+    block1_thread.should_not == reactor_thread   
+    worker_threads.should include(block1_thread)
+  end
+
+  it "should schedule a job to be run directly via eventmachine repeatidly with specified interval" do
+    block1_threads = []
+
+    node = RJR::Node.new :node_id => 'foobar',
+                         :headers => {:h => 123}
+    node.em_repeat(1) {
+      block1_threads << Thread.current
+    }
+    reactor_thread = EMAdapter.instance_variable_get(:@em_manager).instance_variable_get(:@reactor_thread)
+
+    sleep 0.5
+    block1_threads.size.should == 0
+
+    sleep 0.6
+    block1_threads.size.should == 1
+
+    sleep 1.1
+    block1_threads.size.should == 2
+    node.halt
+    node.join
+
+    block1_threads.each { |bt|
+      bt.should == reactor_thread   
+    }
+  end
+
+  it "should schedule a job to be run in a thread via eventmachine repeatidly with specified interval" do
+    block1_threads = []
+
+    node = RJR::Node.new :node_id => 'foobar',
+                         :headers => {:h => 123}
+    node.em_repeat_async(1) {
+      block1_threads << Thread.current
+    }
+    reactor_thread = EMAdapter.instance_variable_get(:@em_manager).instance_variable_get(:@reactor_thread)
+    worker_threads = ThreadPool2Manager.thread_pool.instance_variable_get(:@worker_threads)
+
+    sleep 0.5
+    block1_threads.size.should == 0
+
+    sleep 0.6
+    block1_threads.size.should == 1
+
+    sleep 1.1
+    block1_threads.size.should == 2
+    node.halt
+    node.join
+
+    block1_threads.each { |bt|
+      bt.should_not == reactor_thread   
+      worker_threads.should include(bt)
+    }
+  end
+
 end

data/specs/tcp_node_spec.rb

@@ -29,4 +29,5 @@ describe RJR::TCPNode do
   end
 
   # TODO ensure closed / error event handlers are invoked
+  # TODO ensure callbacks can be invoked over established connection w/ json-rpc notifications
 end

data/specs/thread_pool_spec.rb

@@ -0,0 +1,41 @@
+require 'rjr/dispatcher'
+require 'rjr/thread_pool2'
+
+# TODO ? test ThreadPoolJob being_executed?, completed?, exec, handle_timeout!
+
+describe ThreadPool2 do
+  it "should start and stop successfully" do
+    tp = ThreadPool2.new 10, :timeout => 10
+    tp.running?.should be_false
+
+    tp.start
+    tp.running?.should be_true
+    tp.instance_variable_get(:@worker_threads).size.should == 10
+    tp.instance_variable_get(:@manager_thread).should_not be_nil
+    ['run', 'sleep'].should include(tp.instance_variable_get(:@manager_thread).status)
+    sleep 0.5
+
+    tp.stop
+    tp.running?.should be_false
+    tp.instance_variable_get(:@manager_thread).should be_nil
+    tp.instance_variable_get(:@worker_threads).size.should == 0
+  end
+
+  it "should accept and run work" do
+    tp = ThreadPool2.new 10, :timeout => 10
+    tp.start
+
+    tp.instance_variable_get(:@work_queue).size.should == 0
+    jobs_executed = []
+    tp << ThreadPool2Job.new { jobs_executed << 1 }
+    tp << ThreadPool2Job.new { jobs_executed << 2 }
+    tp.instance_variable_get(:@work_queue).size.should == 2
+
+    sleep 0.5
+    jobs_executed.should include(1)
+    jobs_executed.should include(2)
+    tp.instance_variable_get(:@work_queue).size.should == 0
+
+    tp.stop
+  end
+end

data/specs/util_spec.rb

@@ -0,0 +1,46 @@
+require 'rjr/dispatcher'
+require 'rjr/util'
+
+describe RJR::Definitions do
+  include RJR::Definitions
+  
+  before(:each) do
+    RJR::Dispatcher.init_handlers
+    RJR::Definitions.reset
+  end
+
+  it "should define methods" do
+    foobar = lambda {}
+    barfoo = lambda {}
+    rjr_method :foobar => foobar, :barfoo => barfoo
+    RJR::Dispatcher.handler_for('foobar').handler_proc.should == foobar
+    RJR::Dispatcher.handler_for('barfoo').handler_proc.should == barfoo
+  end
+
+  it "should track messages" do
+    rjr_message :foobar => { :foo => :bar }
+    rjr_message('foobar').should == {:foo => :bar}
+
+    rjr_message :foobar => { :bar => :foo }
+    rjr_message('foobar').should == {:bar => :foo}
+
+    rjr_message('money').should be_nil
+  end
+
+  it "should generate random message" do
+    rjr_message :foobar => { :foo => :bar, :transports => [:local, :amqp] }
+    rjr_message :barfoo => { :bar => :foo, :transports => [:local] }
+    rjr_message :forzzy => { :for => :zzy, :transports => [:amqp] }
+    rjr_message :moneyy => { :mon => :eyy }
+
+    [:foo, :bar, :for, :mon].should include(RJR::Definitions::rand_msg.first.first)
+    [:foo, :bar, :mon].should include(RJR::Definitions::rand_msg(:local).first.first)
+    [:foo, :for, :mon].should include(RJR::Definitions::rand_msg(:amqp).first.first)
+    RJR::Definitions::rand_msg(:tcp).first.first.should == :mon
+
+    RJR::Definitions.reset
+    rjr_message :foobar => { :foo => :bar, :transports => [:local, :amqp] }
+
+    RJR::Definitions::rand_msg(:tcp).should == nil
+  end
+end

data/specs/web_node_spec.rb

@@ -20,6 +20,7 @@ describe RJR::WebNode do
     }
 
     server.listen
+    sleep 1
 
     res = client.invoke_request 'http://localhost:9678', 'foobar', 'myparam'
     res.should == 'retval'

data/specs/ws_node_spec.rb

@@ -13,7 +13,7 @@ describe RJR::WSNode do
       #@client_port.should == 9678
       @rjr_node.should == server
       @rjr_node_id.should == 'ws'
-      @rjr_node_type.should == :websockets
+      @rjr_node_type.should == :ws
       param.should == 'myparam'
       foobar_invoked = true
       'retval'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjr
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -63,23 +63,30 @@ description: Ruby Json Rpc library
 email: mo@morsi.org
 executables:
 - rjr-server
+- rjr-client
+- rjr-client-launcher
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/rjr/semaphore.rb
 - lib/rjr/udp_node.rb
+- lib/rjr/em_adapter.rb
 - lib/rjr/errors.rb
+- lib/rjr/missing_node.rb
+- lib/rjr/inspect.rb
 - lib/rjr/ws_node.rb
 - lib/rjr/tcp_node.rb
 - lib/rjr/web_node.rb
 - lib/rjr/node.rb
+- lib/rjr/thread_pool2.rb
 - lib/rjr/common.rb
 - lib/rjr/thread_pool.rb
 - lib/rjr/message.rb
-- lib/rjr/web_socket.rb
+- lib/rjr/tcp_node2.rb
 - lib/rjr/multi_node.rb
 - lib/rjr/local_node.rb
 - lib/rjr/dispatcher.rb
+- lib/rjr/util.rb
 - lib/rjr/amqp_node.rb
 - lib/rjr.rb
 - specs/dispatcher_spec.rb
@@ -87,14 +94,20 @@ files:
 - specs/amqp_node_spec.rb
 - specs/tcp_node_spec.rb
 - specs/multi_node_spec.rb
+- specs/util_spec.rb
 - specs/local_node_spec.rb
 - specs/web_node_spec.rb
 - specs/ws_node_spec.rb
+- specs/inspect_spec.rb
+- specs/thread_pool_spec.rb
 - specs/message_spec.rb
+- specs/em_adapter_spec.rb
 - LICENSE
 - Rakefile
 - README.md
 - bin/rjr-server
+- bin/rjr-client
+- bin/rjr-client-launcher
 homepage: http://github.com/movitto/rjr
 licenses: []
 post_install_message: 
@@ -113,7 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.3
-requirements: []
+requirements:
+- amqp gem is needed to use the amqp node
+- eventmachine_httpserver and em-http-request gems are needed to use the web node
+- em-websocket and em-websocket-client gems are needed to use the web socket node
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: