pipeline_toolkit 1.3.0 → 1.4.0

data/README.markdown

@@ -1,10 +1,10 @@
 # Pipeline Toolkit #
-by VisFleet
+by [vWorkApp](http://www.vworkapp.com)
 
     
      ===============                       
      |^^:^^^^:Mw^^^|    Pipeline Toolkit   
-     |  :   .:Mw;  |    By VisFleet        
+     |  :   .:Mw;  |    By vWorkApp        
      \-------------/    (c) 2009           
       |^:^^^^:Mw^^|                        
       | :    :Mw; |                        

data/lib/pipeline_toolkit/handlers/message_handler.rb

@@ -38,7 +38,7 @@ module PipelineToolkit
           receive_line(line)
         end
             
-      rescue StandardError => e # rescued here because main thread does not seem to see it
+      rescue Exception => e # rescued here because main thread does not seem to see it
         DefaultLogger.error("#{e.class.name}: #{e.message}\n" << e.backtrace.join("\n"))
         raise e
       end

data/lib/pipeline_toolkit/message_coder.rb

@@ -5,6 +5,9 @@ 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
@@ -15,9 +18,9 @@ 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!(/\r/, "@@r")
-      str.gsub!(/\n/, "@@n")
-      str
+      
+      # escape newlines. order is important.
+      str.gsub(/@/, "@@").gsub(/\n/, "@n").gsub(/\r/, "@r")
     end
 
     ##
@@ -27,8 +30,13 @@ module PipelineToolkit
     # 
     def self.decode(str)
       str.chomp!
-      str.gsub!(/@@r/, "\r")
-      str.gsub!(/@@n/, "\n")
+      
+      # unescape newlines
+      
+      str.gsub(/#{regex}/) do |m|
+        UNESCAPE_MAP[m]
+      end
+
       obj = MessagePack.unpack(str)
 
       obj = case obj

data/lib/pipeline_toolkit/message_command.rb

@@ -72,7 +72,7 @@ module PipelineToolkit
           # must call this to setup callback to notify_readable
           conn.notify_readable = true
         end
-      rescue StandardError => e
+      rescue Exception => e
         DefaultLogger.error("#{e.class.name}: #{e.message}\n" << e.backtrace.join("\n"))
         raise e
       ensure

data/lib/pipeline_toolkit/message_pusher.rb

@@ -59,9 +59,11 @@ module PipelineToolkit
     # @param message<Hash> The message to write to the exchange.
     # 
     def process_standard(message)
-      DefaultLogger.debug("MessagePusher#process_standard(message)") 
+      DefaultLogger.error("MessagePusher#process_standard(message)") 
       publish(message.except_keys(:ack_id))
       acknowledge(message) if options[:ack] && message[:ack_id]
+    rescue Exception => e
+      DefaultLogger.error("msg_push bad message: START|#{message}|END\nbecause: #{e.class.name}: #{e.message}")
     end
 
   end

data/lib/pipeline_toolkit/message_subscriber.rb

@@ -76,7 +76,7 @@ module PipelineToolkit
             EM.add_periodic_timer(5) { calculate_message_statistics }
           end
         end
-      rescue StandardError => e
+      rescue Exception => e
         DefaultLogger.error "#{e.class.name}: #{e.message}\n" << e.backtrace.join("\n")
         raise e
       ensure
@@ -175,6 +175,9 @@ module PipelineToolkit
       end
       store_acknowledgement(message, header) if options[:ack]
       write(message)
+    rescue MessagePack::UnpackError => e
+      DefaultLogger.error("msg_subscribe couldn't unpack: #{body.inspect}")
+      header.ack
     end
   
     private

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pipeline_toolkit
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Aisha Fenton
@@ -16,18 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +13:00
+date: 2011-09-02 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 6
@@ -39,11 +36,9 @@ dependencies:
   name: trollop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 1
         - 16
@@ -54,11 +49,9 @@ dependencies:
   name: eventmachine
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 12
@@ -70,11 +63,9 @@ dependencies:
   name: eventmachine_httpserver
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
@@ -86,11 +77,9 @@ dependencies:
   name: msgpack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 4
@@ -102,11 +91,9 @@ dependencies:
   name: log4r
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 1
@@ -118,11 +105,9 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -132,11 +117,9 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
         - 8
@@ -148,11 +131,9 @@ dependencies:
   name: bunny
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -164,11 +145,9 @@ dependencies:
   name: background_process
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
@@ -221,10 +200,6 @@ files:
 - lib/pipeline_toolkit/util/socket_util.rb
 - LICENSE.markdown
 - README.markdown
-- bin/msg_subscribe
-- bin/msg_push
-- bin/msg_sink
-- bin/msg_generator
 has_rdoc: true
 homepage: http://github.com/visfleet/pipeline_toolkit
 licenses: []
@@ -235,27 +210,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Toolkit for building processing pipelines using Unix Pipes and AMQP messages