rjr 0.16.1 → 0.16.2

data/Rakefile

@@ -3,11 +3,8 @@
 # Copyright (C) 2010-2012 Mohammed Morsi <mo@morsi.org>
 # Licensed under the Apache License, Version 2.0
 
-require "yard"
 require "rspec/core/rake_task"
 
-# TODO CI - jenkins/travis/other (also test rjr on jruby)
-
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'specs/**/*_spec.rb'
@@ -28,12 +25,15 @@ task :integration do
   system("tests/integration/runner")
 end
 
-YARD::Rake::YardocTask.new do |t|
-  #t.files   = ['lib/**/*.rb', OTHER_PATHS]   # optional
-  #t.options = ['--any', '--extra', '--opts'] # optional
+begin
+  require "yard"
+  YARD::Rake::YardocTask.new do |t|
+    #t.files   = ['lib/**/*.rb', OTHER_PATHS]   # optional
+    #t.options = ['--any', '--extra', '--opts'] # optional
+  end
+rescue LoadError
 end
 
-
 desc "build the rjr gem"
 task :build do
   system "gem build rjr.gemspec"

data/lib/rjr/message.rb

@@ -295,12 +295,12 @@ class MessageUtil
   def self.retrieve_json(data) 
     return nil if data.nil? || data.empty?
     start  = 0
-    start += 1 until start == data.length || data[start] == '{'
+    start += 1 until start == data.length || data[start].chr == '{'
     on = mi = 0 
     start.upto(data.length - 1).each { |i|
-      if data[i] == '{'
+      if data[i].chr == '{'
         on += 1
-      elsif data[i] == '}'
+      elsif data[i].chr == '}'
         on -= 1
       end
 

data/lib/rjr/nodes/easy.rb

@@ -37,11 +37,9 @@ module Nodes
 #   # => sent via amqp
 #
 class Easy < RJR::Node
-  private
-
-  # Internal helper, retrieved the registered node type depending on
-  # the dst. If matching node type can't be found, nil is returned
-  def get_node(dst)
+  # Publically available helper, retrieve the rjr node type
+  # based on dst format
+  def self.node_type_for(dst)
     type = nil
     if dst.is_a?(String)
       if /tcp:\/\/.*/      =~ dst ||
@@ -64,7 +62,21 @@ class Easy < RJR::Node
       end
     end
 
+    type
+  end
+
+  private
+
+  # Internal helper, retrieved the registered node depending on
+  # the type retrieved from the dst. If matching node type can't
+  # be found, nil is returned
+  def get_node(dst)
+    type = self.class.node_type_for(dst)
+
+    # TODO also add optional mechanism to class to load nodes of
+    # new types on the fly as they are needed
     return @multi_node.nodes.find { |n| n.is_a?(type) } unless type.nil?
+
     nil
   end
 
@@ -79,7 +91,7 @@ class Easy < RJR::Node
   def initialize(args = {})
      super(args)
 
-     nodes = []
+     nodes = args[:nodes] || []
      args.keys.each { |n|
        node = 
        case n

data/lib/rjr/nodes/web.rb

@@ -42,6 +42,7 @@ class WebConnection < EventMachine::Connection
   #
   # specify the web node establishing the connection
   def initialize(args = {})
+    super
     @rjr_node = args[:rjr_node]
   end
 
@@ -115,12 +116,14 @@ class Web < RJR::Node
     # are not persistant, we should be sending a
     # response message here
 
-    resp = EventMachine::DelegatedHttpResponse.new(connection)
-    #resp.status  = response.result.success ? 200 : 500
-    resp.status = 200
-    resp.content = data.to_s
-    resp.content_type "application/json"
-    resp.send_response
+    @@em.schedule  do
+      resp = EventMachine::DelegatedHttpResponse.new(connection)
+      #resp.status  = response.result.success ? 200 : 500
+      resp.status = 200
+      resp.content = data.to_s
+      resp.content_type "application/json"
+      resp.send_response
+    end
   end
 
   # Instruct Node to start listening for and dispatching rpc requests
@@ -154,7 +157,8 @@ class Web < RJR::Node
     }
 
     @@em.schedule do
-      http = EventMachine::HttpRequest.new(uri).post :body => message.to_s
+      http = EventMachine::HttpRequest.new(uri).post :body => message.to_s,
+                                                     :head => {'content-type' => 'application/json'}
       http.errback  &cb
       http.callback &cb
     end
@@ -187,7 +191,8 @@ class Web < RJR::Node
                                       :headers => @message_headers
     cb = lambda { |arg| published_l.synchronize { invoked = true ; published_c.signal }}
     @@em.schedule do
-      http = EventMachine::HttpRequest.new(uri).post :body => message.to_s
+      http = EventMachine::HttpRequest.new(uri).post :body => message.to_s,
+                                                     :head => {'content-type' => 'application/json'}
       http.errback  &cb
       http.callback &cb
     end

data/specs/em_adapter_spec.rb

@@ -43,7 +43,15 @@ module RJR
         invoked = true
         m.synchronize { c.signal }
       }
-      m.synchronize { c.wait m, 0.5 } if !invoked
+      if !invoked
+        if RUBY_VERSION < "1.9"
+          # XXX ruby 1.8 didn't support timeout via cv.wait
+          Thread.new { sleep 0.5 ; c.signal }
+          m.synchronize { c.wait m }
+        else
+          m.synchronize { c.wait m, 0.5 }
+        end
+      end
       invoked.should be_true
     end
 

data/specs/node_spec.rb

@@ -3,6 +3,12 @@ require 'rjr/node'
 
 module RJR
   describe Node do
+    before(:all) do
+      # was made public in ruby 1.9
+      if RUBY_VERSION < "1.9"
+        RJR::Node.public_class_method(:class_variable_get)
+      end
+    end
 
     it "should initialize properly from params" do
       d = Dispatcher.new

data/specs/nodes/amqp_spec.rb

@@ -5,6 +5,8 @@ if RJR::Nodes::AMQP == RJR::Nodes::Missing
 puts "Missing AMQP node dependencies, skipping amqp tests"
 
 else
+# TODO stub out calls to external rabbitmq server
+
 module RJR::Nodes
   describe AMQP do
     describe "#send_msg" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjr
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-22 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: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,8 @@ files:
 - bin/rjr-client
 - bin/rjr-client-launcher
 homepage: http://github.com/movitto/rjr
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: