rservicebus 0.0.66 → 0.0.68

data/lib/rservicebus/Config.rb

@@ -89,7 +89,7 @@ module RServiceBus
             @maxRetries = self.getValue( "MAX_RETRIES", "5" ).to_i
             @queueTimeout = self.getValue( "QUEUE_TIMEOUT", "5" ).to_i
             @statOutputCountdown = self.getValue( "STAT_OUTPUT_COUNTDOWN", "100" ).to_i
-            @subscriptionUri = self.getValue( "SUBSCRIPTION_URI", "marshal:///tmp/#{appName}_subscriptions.yaml" )
+            @subscriptionUri = self.getValue( "SUBSCRIPTION_URI", "file:///tmp/#{appName}_subscriptions.yaml" )
 
             auditQueueName = self.getValue( "AUDIT_QUEUE_NAME" )
             if auditQueueName.nil? then

data/lib/rservicebus/ConfigureSubscriptionStorage.rb

@@ -13,9 +13,9 @@ module RServiceBus
                 require "rservicebus/SubscriptionStorage/Redis"
                 s = SubscriptionStorage_Redis.new( appName, uri )
                 
-                when "marshal"
-                require "rservicebus/SubscriptionStorage/Marshal"
-                s = SubscriptionStorage_Marshal.new( appName, uri )
+                when "file"
+                require "rservicebus/SubscriptionStorage/File"
+                s = SubscriptionStorage_File.new( appName, uri )
                 
                 else
                 abort("Scheme, #{uri.scheme}, not recognised when configuring subscription storage, #{uri_string}");

data/lib/rservicebus/Monitor/CsvDir.rb

@@ -5,7 +5,7 @@ module RServiceBus
     
     class Monitor_CsvDir<Monitor_Dir
         
-        
+
         def checkPayloadForNumberOfColumns( payload )
             return if @QueryStringParts.nil?
             return unless @QueryStringParts.has_key?("cols")
@@ -18,10 +18,39 @@ module RServiceBus
             end
             
         end
+
+        def checkSendHash
+            if !@QueryStringParts.nil? && @QueryStringParts.has_key?("hash") then
+                flag = @QueryStringParts["hash"][0]
+                return flag == "Y"
+            end
+            
+            return false
+        end
+        
+        
+        def ProcessToHash( payload )
+            headLine = payload.shift
+            newPayload = Array.new
+            payload.each do |csvline|
+                hash = Hash.new
+                csvline.each_with_index do |v,idx|
+                    hash[headLine[idx]] = v
+                end
+                newPayload << hash
+            end
+            
+            return newPayload
+        end
         
         def ProcessContent( content )
             payload = CSV.parse( content )
             self.checkPayloadForNumberOfColumns( payload )
+            
+            if self.checkSendHash then
+                payload = self.ProcessToHash( payload )
+            end
+
             return payload
         end
         

data/lib/rservicebus/SubscriptionStorage/{Marshal.rb → File.rb}

@@ -1,7 +1,7 @@
 module RServiceBus
 
 #Implementation of Subscription Storage to Redis
-class SubscriptionStorage_Marshal<SubscriptionStorage
+class SubscriptionStorage_File<SubscriptionStorage
 
 	@path
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.66
+  version: 0.0.68
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -59,7 +59,7 @@ files:
 - lib/rservicebus/Saga.rb
 - lib/rservicebus/Stats.rb
 - lib/rservicebus/SubscriptionManager.rb
-- lib/rservicebus/SubscriptionStorage/Marshal.rb
+- lib/rservicebus/SubscriptionStorage/File.rb
 - lib/rservicebus/SubscriptionStorage/Redis.rb
 - lib/rservicebus/SubscriptionStorage.rb
 - lib/rservicebus/Test/Bus.rb