rjr 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a404d0bde0749357c01f0e57696e73ff39ea6d
-  data.tar.gz: 0c5394cf7df7774def9553b772c1cb92c53504de
+  metadata.gz: 4d55a14977509a3c88cdd498f075666cb3e3bac3
+  data.tar.gz: d41f1a19c4750ec55392b1530499ddfea7832dbc
 SHA512:
-  metadata.gz: cf24b7e0fc705957af5ffe74879ab053a78393f33b28070cde205cb04a3879282d492dec85efd29938a6f51c27bee5a1ec3b6b6294e683d6bed7ed1cc0dfb1bb
-  data.tar.gz: ed2bf6a3203387e00aeb5c84f0d836c50833ddd4901c581085ae66c8b286cddbba356ea0023bf8cbd6221c5b693a5508675ad9697f70023cdc319dd6f1f58335
+  metadata.gz: 26d189aa6818b7b2046756be51fb112cabcd183e1a9d67ba7686ff75b99f459d70333c1504f049d995b2d5c518b86042a7b8542a16c16efc1c2e81304927cc86
+  data.tar.gz: 87c4581787d211a26b8e8dc99eb53413183032eb151c02ceb7f1bafb07648b299a7c63b9ef9fd62b55f40d21fc31b3eb54f2366bb69b84556c26e279e7fc3120

data/lib/rjr/common.rb

@@ -15,6 +15,16 @@ end
 
 module RJR
 
+# Return the persistent rjr nodes
+def self.persistent_nodes
+  # rerun each time (eg don't store in var) incase new nodes were included
+  RJR::Nodes.constants.collect { |n|
+    nc = RJR::Nodes.const_get(n)
+    nc.superclass == RJR::Node && nc.persistent? ?
+    nc : nil
+  }.compact
+end
+
 # Logger helper class.
 #
 # Encapsulates the standard ruby logger in a thread safe manner. Dispatches

data/lib/rjr/dispatcher.rb

@@ -184,11 +184,16 @@ class Dispatcher
   # Registered json-rpc request signatures and environments which to execute handlers in
   attr_reader :environments
 
+  # Flag toggling whether or not to keep requests (& responses) around.
+  attr_accessor :keep_requests
+
   # Requests which have been dispatched
   def requests ; @requests_lock.synchronize { Array.new(@requests) } ; end
 
   # RJR::Dispatcher intializer
-  def initialize
+  def initialize(args = {})
+    @keep_requests = args[:keep_requests] || false
+
     clear!
     @requests_lock = Mutex.new
   end
@@ -306,7 +311,7 @@ class Dispatcher
 
      end
 
-     @requests_lock.synchronize { @requests << request }
+     @requests_lock.synchronize { @requests << request } if @keep_requests
      return request.result
   end
 

data/lib/rjr/inspect.rb

@@ -5,6 +5,11 @@
 # manually include this module to incorporate these additional rjr method
 # definitions into your node
 #
+# Note by default RJR will _not_ keep persistant copies or requests
+# and responses. If available these are leveraged here to provide
+# a detailed analysis of the server. To enabled set the 'keep_requests'
+# flag on your RJR::Dispatcher instance to true
+#
 # Copyright (C) 2013 Mohammed Morsi <mo@morsi.org>
 # Licensed under the Apache License, Version 2.0
 

data/lib/rjr/node.rb

@@ -44,6 +44,19 @@ class Node
   # Dispatcher to use to satisfy requests
   attr_accessor :dispatcher
 
+  class <<self
+    # Bool indiciting if this node is persistent
+    def persistent?
+      self.const_defined?(:PERSISTENT_NODE) &&
+      self.const_get(:PERSISTENT_NODE)
+    end
+  end
+
+  # Bool indicating if this node class is persistent
+  def persistent?
+    self.class.persistent?
+  end
+
   # alias of RJR_NODE_TYPE
   def node_type
     self.class::RJR_NODE_TYPE
@@ -60,7 +73,7 @@ class Node
   # @option args [Hash<String,String>] :headers optional headers to set on all json-rpc messages
   # @option args [Dispatcher] :dispatcher dispatcher to assign to the node
   def initialize(args = {})
-     @connection_event_handlers = {:closed => [], :error => []}
+     clear_event_handlers
      @response_lock = Mutex.new
      @response_cv   = ConditionVariable.new
      @responses     = []
@@ -99,6 +112,10 @@ class Node
   end
 
   ##################################################################
+  # Reset connection event handlers
+  def clear_event_handlers
+    @connection_event_handlers = {:closed => [], :error => []}
+  end
 
   # Register connection event handler
   # @param [:error, :close] event the event to register the handler for

data/lib/rjr/nodes/amqp.rb

@@ -51,6 +51,7 @@ module Nodes
 #
 class AMQP < RJR::Node
   RJR_NODE_TYPE = :amqp
+  PERSISTENT_NODE = true
 
   private
 

data/lib/rjr/nodes/local.rb

@@ -37,6 +37,7 @@ module Nodes
 #
 class Local < RJR::Node
   RJR_NODE_TYPE = :local
+  PERSISTENT_NODE = true
 
   # allows clients to override the node type for the local node
   attr_accessor :node_type

data/lib/rjr/nodes/tcp.rb

@@ -79,6 +79,7 @@ end
 #
 class TCP < RJR::Node
   RJR_NODE_TYPE = :tcp
+  PERSISTENT_NODE = true
 
   attr_accessor :connections
 

data/lib/rjr/nodes/unix.rb

@@ -64,6 +64,7 @@ end
 #
 class Unix < RJR::Node
   RJR_NODE_TYPE = :unix
+  PERSISTENT_NODE = true
 
   attr_accessor :connections
 

data/lib/rjr/nodes/web.rb

@@ -93,6 +93,7 @@ end
 class Web < RJR::Node
 
   RJR_NODE_TYPE = :web
+  PERSISTENT_NODE = false
 
   public
 

data/lib/rjr/nodes/ws.rb

@@ -54,6 +54,7 @@ module Nodes
 #
 class WS < RJR::Node
   RJR_NODE_TYPE = :ws
+  PERSISTENT_NODE = true
 
   private
 

data/lib/rjr/version.rb

@@ -1,3 +1,3 @@
 module RJR
-  VERSION = '0.18.1'
+  VERSION = '0.18.2'
 end

data/specs/dispatcher_spec.rb

@@ -221,33 +221,47 @@ module RJR
           r.error_class.should == ArgumentError
         end
 
-        it "should register request" do
-          d = Dispatcher.new
-          h = proc {}
-          d.handle('foobar', &h)
-
-          d.requests.size.should == 0
-          d.dispatch :rjr_method => 'foobar'
-          d.requests.size.should == 1
-          d.requests.first.rjr_method.should == 'foobar'
+        context "keep_requests is false (default)" do
+          it "should not store requests" do
+            d = Dispatcher.new
+            d.handle('foobar') {}
+            d.requests.should be_empty
+            d.dispatch :rjr_method => 'foobar'
+            d.requests.should be_empty
+          end
         end
 
-        it "should set params on request" do
-          d = Dispatcher.new
-          h = proc { |p| }
-          d.handle('foobar', &h)
-
-          d.dispatch(:rjr_method => 'foobar', :rjr_method_args => [42])
-          d.requests.first.rjr_method_args.should == [42]
-        end
-
-        it "should set result on request" do
-          d = Dispatcher.new
-          h = proc { 42 }
-          d.handle('foobar', &h)
-
-          d.dispatch :rjr_method => 'foobar'
-          d.requests.first.result.result.should == 42
+        context "keep_requests is true" do
+          it "should store request locally" do
+            d = Dispatcher.new :keep_requests => true
+            h = proc {}
+            d.handle('foobar', &h)
+
+            d.requests.size.should == 0
+            d.dispatch :rjr_method => 'foobar'
+            d.requests.size.should == 1
+            d.requests.first.rjr_method.should == 'foobar'
+          end
+
+          it "should set params on request" do
+            d = Dispatcher.new
+            d.keep_requests = true
+            h = proc { |p| }
+            d.handle('foobar', &h)
+
+            d.dispatch(:rjr_method => 'foobar', :rjr_method_args => [42])
+            d.requests.first.rjr_method_args.should == [42]
+          end
+
+          it "should set result on request" do
+            d = Dispatcher.new
+            d.keep_requests = true
+            h = proc { 42 }
+            d.handle('foobar', &h)
+
+            d.dispatch :rjr_method => 'foobar'
+            d.requests.first.result.result.should == 42
+          end
         end
       end
     end

data/specs/node_spec.rb

@@ -10,6 +10,38 @@ module RJR
       end
     end
 
+    describe "::persistent?" do
+      context "PERSISTENT_NODE is defined and true" do
+        it "returns true" do
+          new_node = Class.new(Node)
+          new_node.const_set(:PERSISTENT_NODE, true)
+          new_node.should be_persistent
+        end
+      end
+
+      context "PERSISTENT_NODE is not defined or returns false" do
+        it "returns false" do
+          Node.should_not be_persistent
+        end
+      end
+    end
+
+    describe "#persistent?" do
+      context "instance of a persistent node" do
+        it "returns true" do
+          new_node = Class.new(Node)
+          new_node.const_set(:PERSISTENT_NODE, true)
+          new_node.new.should be_persistent
+        end
+      end
+
+      context "not an instance of a persistent node" do
+        it "returns false" do
+          Node.new.should_not be_persistent
+        end
+      end
+    end
+
     it "should initialize properly from params" do
       d = Dispatcher.new
       node = Node.new :node_id => 'foobar',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjr
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Mo Morsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec