pipeline_toolkit 1.4.1 → 1.4.2

data/lib/pipeline_toolkit/message_coder.rb

@@ -1,13 +1,11 @@
 require 'msgpack'
+require 'base64'
 
 module PipelineToolkit 
   ##
   # Encode and decode messages using Marshal
   #
   class MessageCoder
-
-    UNESCAPE_MAP = {"@@" => "@","@r" => "\r","@n" => "\n"}
-    REGEX = UNESCAPE_MAP.keys.join "|"
   
     ##
     # Encode the hash message
@@ -17,10 +15,8 @@ module PipelineToolkit
     def self.encode(message)
       # NB: Using Msgpack because it's 9-10x faster than altnatives
       # See http://gist.github.com/190849
-      str = MessagePack.pack(message)
-      
-      # escape newlines. order is important.
-      str.gsub(/@/, "@@").gsub(/\n/, "@n").gsub(/\r/, "@r")
+      # Using Base64 because ASCII is friendly to pipes.
+      Base64.encode64(MessagePack.pack(message)).delete("\r\n")
     end
 
     ##
@@ -30,14 +26,7 @@ module PipelineToolkit
     # 
     def self.decode(str)
       str.chomp!
-      
-      # unescape newlines
-      
-      str.gsub(/#{REGEX}/) do |m|
-        UNESCAPE_MAP[m]
-      end
-
-      obj = MessagePack.unpack(str)
+      obj = MessagePack.unpack(Base64.decode64(str))
 
       obj = case obj
         when Hash
@@ -50,4 +39,4 @@ module PipelineToolkit
   
   end
 
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Aisha Fenton