rjr 0.19.1 → 0.19.2

data/lib/rjr/util/json_parser.rb

@@ -16,31 +16,64 @@ class JSONParser
   # Returns the message and remaining portion of the data string,
   # if message is found, else nil
   #
-  # TODO efficiency can probably be optimized in the case closing '}'
-  # hasn't arrived yet
-  #
-  # FIXME if uneven brackets appears in string data (such as in params)
-  # this will break, detect when in string and ignore in counts
+  # TODO efficiency can probably be optimized in the case of multiple calls
+  # to this when the case closing '}' hasn't arrived yet
   def self.extract_json_from(data) 
     return nil if data.nil? || data.empty?
+    # start at beginning of data, find opening quote
     start  = 0
     start += 1 until start == data.length || data[start].chr == '{'
-    on = mi = 0 
+
+    escaped    = false
+    in_quotes  = false
+    quote_char = nil
+    open_brackets = mark = 0
+
+    # iterate over data stream
     start.upto(data.length - 1).each { |i|
-      if data[i].chr == '{'
-        on += 1
-      elsif data[i].chr == '}'
-        on -= 1
+
+      # toggle escaped flag in case of '\' or '\\'
+      if in_quotes && data[i].chr == '\\'
+        escaped = !escaped
+
+      else
+        # ignore escaped chars
+        if !escaped
+
+          # ignore brackets in quotes
+          if !in_quotes
+            if data[i].chr == '{'
+              open_brackets += 1
+
+            elsif data[i].chr == '}'
+              open_brackets -= 1
+            end
+          end
+
+          # track opening quote
+          if data[i].chr == "'" || data[i].chr == '"'
+            if !in_quotes
+              in_quotes  = true
+              quote_char = data[i]
+            elsif quote_char == data[i]
+              in_quotes = false
+            end
+          end
+        end
+
+        escaped = false
       end
 
-      if on == 0
-        mi = i
+
+      # finish at end of one json message
+      if open_brackets == 0
+        mark = i
         break
       end
     }
     
-    return nil if mi == 0
-    return data[start..mi], data[(mi+1)..-1]
+    return nil if mark == 0
+    return data[start..mark], data[(mark+1)..-1]
   end
 
   # Return bool indicating if json class is invalid in context

data/lib/rjr/util/logger.rb

@@ -52,15 +52,17 @@ class Logger
     def self.method_missing(method_id, *args)
        _instantiate_logger
        @logger_mutex.synchronize {
+         # TODO option to indent & prepend configurable prefix to extra log lines after first entry
          args = args.first if args.first.is_a?(Array)
+         shouldnt_log = args.any? { |a| @filters.any? { |f| !f.call a } }
          args.each { |a|
            # run highlights / filters against output before
            # sending formatted output to logger
            # TODO allow user to customize highlight mechanism/text
            na = @highlights.any? { |h| h.call a } ?
                   "\e[1m\e[31m#{a}\e[0m\e[0m" : a
-           @logger.send(method_id, na) if @filters.all? { |f| f.call a }
-         }
+           @logger.send(method_id, na)
+         } unless shouldnt_log
        }
     end
 

data/lib/rjr/version.rb

@@ -1,3 +1,3 @@
 module RJR
-  VERSION = '0.19.1'
+  VERSION = '0.19.2'
 end

data/specs/args_spec.rb

@@ -115,14 +115,14 @@ module RJR
       context "arguments includes tag" do
         it "returns true" do
           a = Arguments.new :args => ['with_id', 42]
-          a.specifies?('with_id').should be_true
+          a.specifies?('with_id').should be_truthy
         end
       end
 
       context "arguments does not include tag" do
         it "returns false" do
           a = Arguments.new :args => ['with_id', 42]
-          a.specifies?('with_name').should be_false
+          a.specifies?('with_name').should be_falsey
         end
       end
     end

data/specs/dispatcher_spec.rb

@@ -167,14 +167,14 @@ module RJR
           d = Dispatcher.new
           cb = proc {}
           d.handle 'foobar', cb
-          d.handles?('foobar').should be_true
+          d.handles?('foobar').should be_truthy
         end
       end
 
       context "dispatcher does not have handler" do
         it "returns false" do
           d = Dispatcher.new
-          d.handles?('foobar').should be_false
+          d.handles?('foobar').should be_falsey
         end
       end
     end
@@ -245,14 +245,14 @@ module RJR
         d.dispatch :rjr_method => 'foobar'
       end
 
-      it "extends request w/ method environment" do
+      it "sets request environment" do
         d = Dispatcher.new
         d.env 'foobar', 'fooenv'
         d.handle 'foobar', proc {}
 
         r = Request.new
         Request.should_receive(:new).and_return(r)
-        r.should_receive(:extend).with('fooenv')
+        r.should_receive(:set_env).with('fooenv')
         d.dispatch :rjr_method => 'foobar'
       end
 
@@ -337,7 +337,7 @@ module RJR
           h = proc {}
           d.handle('foobar', h)
           d.handlers['foobar'].should == h
-          d.handles?('foobar').should be_true
+          d.handles?('foobar').should be_truthy
         end
 
         it "should set handler from block param" do
@@ -345,7 +345,7 @@ module RJR
           h = proc {}
           d.handle('foobar', &h)
           d.handlers['foobar'].should == h
-          d.handles?('foobar').should be_true
+          d.handles?('foobar').should be_truthy
         end
 
         it "should register handler for multiple methods" do
@@ -354,8 +354,8 @@ module RJR
           d.handle(['foobar', 'barfoo'], &h)
           d.handlers['foobar'].should == h
           d.handlers['barfoo'].should == h
-          d.handles?('foobar').should be_true
-          d.handles?('barfoo').should be_true
+          d.handles?('foobar').should be_truthy
+          d.handles?('barfoo').should be_truthy
         end
       end
 
@@ -376,7 +376,7 @@ module RJR
             d.handle('foobar', &h)
 
             d.dispatch :rjr_method => 'foobar'
-            invoked.should be_true
+            invoked.should be_truthy
           end
 
           it "should pass params to handler" do

data/specs/em_adapter_spec.rb

@@ -14,7 +14,7 @@ module RJR
     describe "#start" do
       it "should start the reactor" do
         @em.start
-        @em.reactor_running?.should be_true
+        @em.reactor_running?.should be_truthy
         ['sleep', 'run'].should include(@em.reactor_thread.status)
       end
 
@@ -33,7 +33,7 @@ module RJR
 
         @em.halt
         @em.join
-        @em.reactor_running?.should be_false
+        @em.reactor_running?.should be_falsey
         @em.reactor_thread.should be_nil
       end
     end
@@ -65,7 +65,7 @@ module RJR
           m.synchronize { c.wait m, 0.5 }
         end
       end
-      invoked.should be_true
+      invoked.should be_truthy
     end
 
   end

data/specs/handles_methods_spec.rb

@@ -59,13 +59,13 @@ module RJR
 
       context "handler exists" do
         it "returns true" do
-          HandlesMethodsTest.has_handler_for?(:handle).should be_true
+          HandlesMethodsTest.has_handler_for?(:handle).should be_truthy
         end
       end
 
       context "handler does not exist" do
         it "returns false" do
-          HandlesMethodsTest.has_handler_for?(:foobar).should be_false
+          HandlesMethodsTest.has_handler_for?(:foobar).should be_falsey
         end
       end
     end

data/specs/json_parser_spec.rb

@@ -1,4 +1,5 @@
 require 'rjr/util/json_parser'
+require 'rjr/core_ext'
 
 module RJR
 describe JSONParser do
@@ -13,6 +14,31 @@ describe JSONParser do
       complete = "#{json}remaining"
       JSONParser.extract_json_from(complete).should == [json, 'remaining']
     end
+
+    it "handles brackets in quoted data" do
+      json = '{"foo":"val{"}'
+      JSONParser.extract_json_from(json).should == [json, '']
+    end
+
+    it "handles nested quotes" do
+      json = '{"foo":"val\'{\'"}'
+      JSONParser.extract_json_from(json).should == [json, '']
+    end
+
+    it "handles uneven quotes" do
+      json = '{"foo":"val\'"}'
+      JSONParser.extract_json_from(json).should == [json, '']
+    end
+
+    it "handles escaped quotes" do
+      json = '{"foo":"val\\""}'
+      JSONParser.extract_json_from(json).should == [json, '']
+    end
+
+    it "handles escaped chars" do
+      json = '{"foo":"val\\\\"}'
+      JSONParser.extract_json_from(json).should == [json, '']
+    end
   end
 
   describe "#invalid_json_class?" do
@@ -32,14 +58,14 @@ describe JSONParser do
       context "class not on permitted classes list" do
         it "returns true" do
           Class.should_receive(:permitted_json_classes).and_return([])
-          JSONParser.invalid_json_class?('foobar').should be_true
+          JSONParser.invalid_json_class?('foobar').should be_truthy
         end
       end
 
       context "class on permitted classes list" do
         it "returns false" do
           Class.should_receive(:permitted_json_classes).and_return(['foobar'])
-          JSONParser.invalid_json_class?('foobar').should be_false
+          JSONParser.invalid_json_class?('foobar').should be_falsey
         end
       end
     end
@@ -51,13 +77,13 @@ describe JSONParser do
 
       context "class not on ruby heirarchy" do
         it "returns true" do
-          JSONParser.invalid_json_class?('Foobar').should be_true
+          JSONParser.invalid_json_class?('Foobar').should be_truthy
         end
       end
 
       context "class on ruby heirarchy" do
         it "returns false" do
-          JSONParser.invalid_json_class?('Integer').should be_false
+          JSONParser.invalid_json_class?('Integer').should be_falsey
         end
       end
     end

data/specs/messages/intermediate_spec.rb

@@ -0,0 +1,58 @@
+require 'rjr/common'
+require 'rjr/messages/intermediate'
+
+module RJR
+module Messages
+  describe Intermediate do
+    describe "#keys" do
+      it "returns extracted data keys" do
+        msg = Intermediate.new :data => {:foo => :bar, :mo => :money}
+        msg.keys.should == [:foo, :mo]
+      end
+    end
+
+    describe "#[]" do
+      it "returns value from extracted data" do
+        msg = Intermediate.new :data => {'foo' => 'bar'}
+        msg['foo'].should == 'bar'
+        msg[:foo].should == 'bar'
+      end
+    end
+
+    describe "#has?" do
+      context "data has key" do
+        it "returns true" do
+          msg = Intermediate.new :data => {'foo' => 'bar'}
+          msg.has?('foo').should be_truthy
+        end
+      end
+
+      context "data does not have key" do
+        it "returns false" do
+          msg = Intermediate.new
+          msg.has?('foo').should be_falsey
+        end
+      end
+    end
+
+    describe "::parse" do
+      it "returns new intermediate instance with original message and parsed data" do
+        json = '{"foo":"bar"}'
+        msg = Intermediate.parse json
+        msg.json.should == json
+        msg.data.should == {"foo" => "bar"}
+      end
+
+      describe "error parsing json" do
+        it "propagates err" do
+          json = '{"foo":"bar"}'
+          JSONParser.should_receive(:parse).with(json).and_raise(RuntimeError)
+          lambda {
+            Intermediate.parse json
+          }.should raise_error(RuntimeError)
+        end
+      end
+    end
+  end # describe Intermediate
+end # module Messages
+end # module RJR

data/specs/messages/notification_spec.rb

@@ -1,4 +1,5 @@
 require 'rjr/messages/notification'
+require 'rjr/messages/intermediate'
 
 module RJR
 module Messages
@@ -16,9 +17,9 @@ module Messages
     it "should return bool indicating if string is a notification msg"
   
     it "should produce valid json" do
-      msg = Notification.new :method => 'test',
-                                    :args   => ['a', 1],
-                                    :headers => {:h => 2}
+      msg = Notification.new :method  => 'test',
+                             :args    => ['a', 1],
+                             :headers => {:h => 2}
   
       msg_string = msg.to_s
       msg_string.should include('"h":2')
@@ -31,8 +32,10 @@ module Messages
     it "should parse notification message string" do
       msg_string = '{"jsonrpc": "2.0", ' +
                    '"method": "test", "params": ["a", 1]}'
-      msg = Notification.new :message => msg_string
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Notification.new :message => inter
+      msg.message.should == inter
       msg.jr_method.should == 'test'
       msg.jr_args.should =~ ['a', 1]
     end
@@ -41,19 +44,15 @@ module Messages
       msg_string = '{"jsonrpc": "2.0", ' +
                    '"method": "test", "params": ["a", 1], ' +
                    '"h": 2}'
-      msg = Notification.new :message => msg_string, :headers => {'f' => 'g'}
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Notification.new :message => inter, :headers => {'f' => 'g'}
+      msg.message.should == inter
       msg.headers.should have_key 'h'
       msg.headers.should have_key 'f'
       msg.headers['h'].should == 2
       msg.headers['f'].should == 'g'
     end
-  
-    it "should fail if parsing invalid message string" do
-      lambda {
-        msg = Notification.new :message => 'foobar'
-      }.should raise_error JSON::ParserError
-    end
   end # describe Notification
 end # module Messages
 end # module RJR

data/specs/messages/request_spec.rb

@@ -1,13 +1,15 @@
 require 'rjr/common'
 require 'rjr/messages/request'
+require 'rjr/messages/intermediate'
 
 module RJR
 module Messages
   describe Request do
     it "should accept request parameters" do
-      msg = Request.new :method => 'test',
-                               :args   => ['a', 1],
-                               :headers => {:h => 2}
+      msg = Request.new :method  => 'test',
+                        :args    => ['a', 1],
+                        :headers => {:h => 2}
+
       msg.jr_method.should == "test"
       msg.jr_args.should =~ ['a', 1]
       msg.headers.should have_key(:h)
@@ -18,9 +20,9 @@ module Messages
     it "should return bool indicating if string is a request msg"
 
     it "should produce valid json" do
-      msg = Request.new :method => 'test',
-                               :args   => ['a', 1],
-                               :headers => {:h => 2}
+      msg = Request.new :method  => 'test',
+                        :args    => ['a', 1],
+                        :headers => {:h => 2}
 
       msg_string = msg.to_s
       msg_string.should include('"h":2')
@@ -35,8 +37,10 @@ module Messages
       msg_string = '{"jsonrpc": "2.0", ' +
                    '"id": "' + msg_uuid + '", ' +
                    '"method": "test", "params": ["a", 1]}'
-      msg = Request.new :message => msg_string
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Request.new :message => inter
+      msg.message.should == inter
       msg.jr_method.should == 'test'
       msg.jr_args.should =~ ['a', 1]
       msg.msg_id.should == msg_uuid
@@ -48,19 +52,15 @@ module Messages
                    '"id": "' + msg_uuid + '", ' +
                    '"method": "test", "params": ["a", 1], ' +
                    '"h": 2}'
-      msg = Request.new :message => msg_string, :headers => {'f' => 'g'}
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Request.new :message => inter, :headers => {'f' => 'g'}
+      msg.message.should == inter
       msg.headers.should have_key 'h'
       msg.headers.should have_key 'f'
       msg.headers['h'].should == 2
       msg.headers['f'].should == 'g'
     end
-
-    it "should fail if parsing invalid message string" do
-      lambda {
-        msg = Request.new :message => 'foobar'
-      }.should raise_error JSON::ParserError
-    end
   end # describe Request
 end # module Messages
 end # module RJR

data/specs/messages/response_spec.rb

@@ -1,6 +1,7 @@
 require 'rjr/common'
 require 'rjr/result'
 require 'rjr/messages/response'
+require 'rjr/messages/intermediate'
 
 module RJR
 module Messages
@@ -21,8 +22,8 @@ module Messages
     it "should produce valid result response json" do
       msg_id = gen_uuid
       msg = Response.new :id      => msg_id,
-                                :result  => RJR::Result.new(:result => 'success'),
-                                :headers => {:h => 2}
+                         :result  => RJR::Result.new(:result => 'success'),
+                         :headers => {:h => 2}
       msg_string = msg.to_s
       msg_string.should include('"id":"'+msg_id+'"')
       msg_string.should include('"result":"success"')
@@ -52,8 +53,10 @@ module Messages
       msg_id = gen_uuid
       msg_string = '{"id":"' + msg_id + '", ' +
                     '"result":"success","jsonrpc":"2.0"}'
-      msg = Response.new :message => msg_string
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Response.new :message => inter
+      msg.message.should == inter
       msg.msg_id.should == msg_id
       msg.result.success.should == true
       msg.result.failed.should == false
@@ -64,8 +67,10 @@ module Messages
       msg_id = gen_uuid
       msg_string = '{"id":"' + msg_id + '", ' +
                     '"error":{"code":404,"message":"not found","class":"ArgumentError"}, "jsonrpc":"2.0"}'
-      msg = Response.new :message => msg_string
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Response.new :message => inter
+      msg.message.should == inter
       msg.msg_id.should == msg_id
       msg.result.success.should == false
       msg.result.failed.should == true
@@ -78,17 +83,13 @@ module Messages
       msg_id = gen_uuid
       msg_string = '{"id":"' + msg_id + '", ' +
                     '"result":"success","h":2,"jsonrpc":"2.0"}'
-      msg = Response.new :message => msg_string
-      msg.json_message.should == msg_string
+      inter = Intermediate.parse msg_string
+
+      msg = Response.new :message => inter
+      msg.message.should == inter
       msg.headers.should have_key 'h'
       msg.headers['h'].should == 2
     end
-
-    it "should fail if parsing invalid message string" do
-      lambda {
-        msg = Response.new :message => 'foobar'
-      }.should raise_error JSON::ParserError
-    end
   end # describe Response
 end # module Messages
 end # module RJR