rjr 0.16.4 → 0.16.5

data/README.md

@@ -4,7 +4,7 @@ Copyright (C) 2012-2013 Mo Morsi <mo@morsi.org>
 
 RJR is made available under the Apache License, Version 2.0
 
-RJR is an implementation of the {http://en.wikipedia.org/wiki/JSON-RPC JSON-RPC}
+RJR is an implementation of the [JSON-RPC](http://en.wikipedia.org/wiki/JSON-RPC)
 Version 2.0 Specification. It allows a developer to register custom JSON-RPC
 method handlers which may be invoked simultaneously over a variety of transport
 mechanisms.
@@ -14,6 +14,10 @@ Currently supported transports include:
 
 Note some transports require additional dependencies, see rjr.gemspec for more info.
 
+**Note** currently there is an [issue](https://github.com/flori/json/issues/179) regarding compatability with the latest json gem.
+Developers wishing to use RJR should use version 1.7.5 or lower (workaround is in progress).
+
+
 ### Intro ###
 To install rjr simply run:
     gem install rjr
@@ -26,15 +30,18 @@ Source code is available via:
 Simply require the transports which you would
 like to use:
 
+```ruby
     require 'rjr/nodes/tcp'
     require 'rjr/nodes/amqp'
     require 'rjr/nodes/ws'
     require 'rjr/nodes/web'
     require 'rjr/nodes/local'
     require 'rjr/nodes/multi'
+```
 
 server.rb:
 
+```ruby
     # listen for methods via amqp, websockets, http, and via local calls
     amqp_node  = RJR::Nodes::AMQP.new  :node_id => 'server', :broker => 'localhost'
     ws_node    = RJR::Nodes::WS.new    :node_id => 'server', :host   => 'localhost', :port => 8080
@@ -51,10 +58,11 @@ server.rb:
     # start the server and block
     multi_node.listen
     multi_node.join
-
+```
 
 amqp_client.rb:
 
+```ruby
     # invoke the method over amqp and return result
     amqp_node = RJR::Nodes::AMQP.new :node_id => 'client', :broker => 'localhost'
     puts amqp_node.invoke('server-queue', 'hello', 'world')
@@ -62,10 +70,11 @@ amqp_client.rb:
     # send a notification via amqp,
     # notifications immediately return and always return nil
     amqp_node.notify('server-queue', 'hello', 'world')
-
+```
 
 ws_client.js:
 
+```javascript
     // use the js client to invoke the method via a websocket
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     <script type="text/javascript" src="site/json.js" />
@@ -83,12 +92,13 @@ ws_client.js:
     };
     node.open();
     </script>
+```
 
 ### Reference ###
 
-The source repository can be found {https://github.com/movitto/rjr here}
+The source repository can be found [here](https://github.com/movitto/rjr)
 
-Online API documentation and examples can be found {http://rubydoc.info/github/movitto/rjr here}
+Online API documentation and examples can be found [here](http://rubydoc.info/github/movitto/rjr)
 
 Generate documentation via
 
@@ -106,28 +116,29 @@ are protected from concurrent access.
 Various metadata fields are made available to json-rpc method handlers through
 instance variables. These include:
 
-
-* @rjr_node
-* @rjr_node_id
-* @rjr_node_type
-* @rjr_callback
-* @rjr_headers
-* @rjr_client_ip
-* @rjr_client_port
-* @rjr_method
-* @rjr_method_args
-* @rjr_handler
+- @rjr_node
+- @rjr_node_id
+- @rjr_node_type
+- @rjr_callback
+- @rjr_headers
+- @rjr_client_ip
+- @rjr_client_port
+- @rjr_method
+- @rjr_method_args
+- @rjr_handler
 
 RJR implements a callback interface through which methods may be invoked on a client
 after an initial server connection is established. Store and/or invoke @rjr_callback to make
 use of this.
 
+```ruby
     node.dispatcher.handle("register_callback") do |*args|
       $my_registry.invoke_me_later {
         # rjr callback will already be setup to send messages to the correct client
         @rjr_callback.invoke 'callback_method', 'with', 'custom', 'params'
       }
     end
+```
 
 RJR also permits arbitrary headers being set on JSON-RPC requests and responses. These
 will be stored in the json send to/from nodes, at the same level/scope as the message
@@ -135,6 +146,7 @@ will be stored in the json send to/from nodes, at the same level/scope as the me
 in their registered handlers to store additional metadata to extend the JSON-RPC protocol and
 support any custom subsystems (an auth subsystem for example)
 
+```ruby
     node.dispatcher.handle("login") do |*args|
       if $my_user_registry.find(:user => args.first, :pass => args.last)
         @headers['session-id'] = $my_user_registry.create_session.id
@@ -147,6 +159,7 @@ support any custom subsystems (an auth subsystem for example)
       end
       # ...
     end
+```
 
 Of course any custom headers set/used will only be of use to JSON-RPC nodes running
 RJR as this is not standard JSON-RPC.

data/lib/rjr/common.rb

@@ -212,6 +212,12 @@ module RJR
       if k == ::JSON.create_id &&
          validate_json_class(v)
         raise ArgumentError, "can't create json class #{v}"
+      elsif v.is_a?(Array)
+        v.each { |vi|
+          if vi.is_a?(Hash)
+            validate_json_hash(vi)
+          end
+        }
       elsif v.is_a?(Hash)
         validate_json_hash(v)
       end
@@ -220,7 +226,11 @@ module RJR
   
   def self.parse_json(js)
     jp = ::JSON.parse js, :create_additions => false
-    return jp unless jp.is_a?(Hash)
+    if jp.is_a?(Array)
+      jp.each { |jpi| parse_json(jpi.to_json) }
+    elsif !jp.is_a?(Hash)
+      return
+    end
     validate_json_hash(jp)
     ::JSON.parse js, :create_additions => true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjr
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.16.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec