pipeline_toolkit 1.2.23 → 1.2.24

data/lib/pipeline_toolkit/handlers/message_handler.rb

@@ -45,9 +45,12 @@ module PipelineToolkit
 
       def receive_line(message_coded)
         DefaultLogger.debug("Raw message: #{message_coded}") if options[:env] == "development"
-        message = MessageCoder.decode(message_coded.chomp)
+        message = MessageCoder.decode(message_coded)
         DefaultLogger.debug("Message: #{message.inspect}") if options[:env] == "development"
         @target.process(message)
+      rescue MessagePack::UnpackError => e
+        DefaultLogger.error("Couldn't unpack message: #{message_coded.inspect}")
+        raise e
       end  
 
     end

data/lib/pipeline_toolkit/message_coder.rb

@@ -6,12 +6,6 @@ module PipelineToolkit
   #
   class MessageCoder
   
-    # Replace illegal chars (because we're using a line orientated procotol)
-    TRANSLATION = {
-      "\r" => "@@r",
-      "\n" => "@@n",
-    }
-  
     ##
     # Encode the hash message
     #
@@ -21,7 +15,8 @@ module PipelineToolkit
       # NB: Using Msgpack because it's 9-10x faster than altnatives
       # See http://gist.github.com/190849
       str = MessagePack.pack(message)
-      str.gsub!(/[#{TRANSLATION.keys.join}]/) { |c| TRANSLATION[c] }
+      str.gsub!(/\r/, "@@r")
+      str.gsub!(/\n/, "@@n")
       str
     end
 
@@ -32,7 +27,8 @@ module PipelineToolkit
     # 
     def self.decode(str)
       str.chomp!
-      str.gsub!(/#{TRANSLATION.values.join("|")}/) { |s| TRANSLATION.invert[s] }
+      str.gsub!(/@@r/, "\r")
+      str.gsub!(/@@n/, "\n")
       obj = MessagePack.unpack(str)
 
       obj = case obj

data/lib/pipeline_toolkit/message_command.rb

@@ -109,9 +109,6 @@ module PipelineToolkit
       else
         process_standard(message)
       end
-    rescue MessagePack::UnpackError => e
-      DefaultLogger.error("Couldn't unpack message: #{message.inspect}")
-      raise e
     end
   
     ##

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 23
-  version: 1.2.23
+  - 24
+  version: 1.2.24
 platform: ruby
 authors: 
 - Aisha Fenton