rservicebus 0.1.23 → 0.1.25

data/lib/rservicebus.rb

@@ -28,6 +28,8 @@ require "rservicebus/Message/Subscription"
 
 require "rservicebus/UserMessage/WithPayload"
 
+require "rservicebus/StateManager"
+
 require "rservicebus/AppResource"
 require "rservicebus/AppResource/Redis"
 

data/lib/rservicebus/AppResource/Smb.rb

@@ -5,14 +5,18 @@ require "net/smb"
     class AppResource_Smb<AppResource
 
 	def processUri
-		parts = uri.path.split( "/" )
+		host = @uri.host
+
+		parts = @uri.path.split( "/" )
 		parts.shift
-		@share = parts.shift
-		@path = parts.join( "/" )
+		share = parts.shift
+		path = parts.join( "/" )
+		
+		@clean_path = "smb://#{host}/#{share}/#{URI.decode(path)}"
 
 		@smb = Net::SMB.new
-		@smb.auth_callback {|@uri.host, share|
-			  [uri.user,uri.password]
+		@smb.auth_callback {|host, share|
+			  [@uri.user,@uri.password]
 		}
 	end
     end 

data/lib/rservicebus/AppResource/SmbDir.rb

@@ -1,5 +1,6 @@
 module RServiceBus
 
+require "rservicebus/AppResource/Smb"
 
     class AppResource_SmbDir<AppResource_Smb
 

data/lib/rservicebus/AppResource/SmbFile.rb

@@ -1,11 +1,13 @@
 module RServiceBus
 
+require "rservicebus/AppResource/Smb"
 
     class AppResource_SmbFile<AppResource_Smb
 
 	def connect(uri)
 		self.processUri
-                remote = SMB.open( s, "b" )
+puts "@clean_path: #{@clean_path}"
+                remote = @smb.open( @clean_path  )
 		return remote	
 	end
 

data/lib/rservicebus/ConfigureAppResource.rb

@@ -51,12 +51,9 @@ module RServiceBus
                         when "scpupload"
                         require "rservicebus/AppResource/ScpUpload"
                         resources[k.sub( "RSB_", "" )] = AppResource_ScpUpload.new( host, uri )
-                        when "smb"
-                        require "rservicebus/AppResource/Smb"
-                        resources[k.sub( "RSB_", "" )] = AppResource_Smb.new( host, uri )
-                        when "state"
-                        require "rservicebus/AppResource/State"
-                        resources[k.sub( "RSB_", "" )] = AppResource_State.new( host, uri )
+                        when "smbfile"
+                        require "rservicebus/AppResource/SmbFile"
+                        resources[k.sub( "RSB_", "" )] = AppResource_SmbFile.new( host, uri )
                         else
 						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
                     end

data/lib/rservicebus/HandlerManager.rb

@@ -10,9 +10,10 @@ module RServiceBus
         #
         # @param [RServiceBus::Host] host instance
         # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-        def initialize( host, appResources )
+        def initialize( host, appResources, stateManager )
             @host = host
             @appResources = appResources
+            @stateManager = stateManager
             
             @handlerList = Hash.new
             @resourceListByHandlerName = Hash.new
@@ -31,6 +32,27 @@ module RServiceBus
             return self
         end
 
+        # setStateAttributeIfRequested
+        #
+        # @param [RServiceBus::Handler] handler
+        def setStateAttributeIfRequested( handler )
+            if defined?( handler.State ) then
+                handler.State = @stateManager.Get( handler )
+                @host.log "Bus attribute set for: " + handler.class.name
+            end
+            
+            return self
+        end
+        
+        # checkIfStateAttributeRequested
+        #
+        # @param [RServiceBus::Handler] handler
+        def checkIfStateAttributeRequested( handler )
+            @stateManager.Required if defined?( handler.State )
+            
+            return self
+        end
+        
         def interrogateHandlerForAppResources( handler )
             @host.log "Checking app resources for: #{handler.class.name}", true
             @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
@@ -52,6 +74,7 @@ module RServiceBus
 
             @handlerList[msgName] << handler
             self.setBusAttributeIfRequested( handler )
+            self.checkIfStateAttributeRequested( handler )
             self.interrogateHandlerForAppResources( handler )
         end
         
@@ -86,6 +109,8 @@ module RServiceBus
         
         def setResourcesForHandlersNeededToProcessMsg( msgName )
             @handlerList[msgName].each do |handler|
+                self.setStateAttributeIfRequested( handler )
+
                 next if @resourceListByHandlerName[handler.class.name].nil?
                 @resourceListByHandlerName[handler.class.name].each do |k|
                     handler.instance_variable_set( "@#{k}", @appResources[k].getResource() )
@@ -98,6 +123,7 @@ module RServiceBus
         def getHandlerListForMsg( msgName )
             raise NoHandlerFound.new( msgName ) if @handlerList[msgName].nil?
 
+            @stateManager.Begin
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
             list.each do |resourceName|
                 r = @appResources[resourceName]
@@ -120,6 +146,7 @@ module RServiceBus
                     r.Commit
                     r.finished
             end
+            @stateManager.Commit
         end
         
         def rollbackResourcesUsedToProcessMsg( msgName )

data/lib/rservicebus/Host.rb

@@ -51,6 +51,15 @@ module RServiceBus
             return self;
         end
         
+        #Thin veneer for Configuring external resources
+        #
+        def configureStateManager
+            @stateManager = StateManager.new
+            return self;
+        end
+        
+        
+        
         #Thin veneer for Configuring external resources
         #
         def configureMonitors
@@ -80,7 +89,7 @@ module RServiceBus
         #
         def loadHandlers()
             log "Load Message Handlers"
-            @handlerManager = HandlerManager.new( self, @appResources )
+            @handlerManager = HandlerManager.new( self, @appResources, @stateManager )
             @handlerLoader = HandlerLoader.new( self, @handlerManager )
             
             @config.handlerPathList.each do |path|
@@ -148,6 +157,7 @@ module RServiceBus
             .loadContracts()
             .loadLibs()
 			.configureAppResource()
+            .configureStateManager()
 			.configureMonitors()
 			.loadHandlers()
 			.connectToMq()
@@ -309,7 +319,7 @@ module RServiceBus
                 log "Handler found for: " + msgName, true
                 begin
                     @queueForMsgsToBeSentOnComplete = Array.new
-                    
+
                     handlerList.each do |handler|
                         begin
                             log "Handler, #{handler.class.name}, started processing msg, #{msgName}"

data/lib/rservicebus/StateManager.rb

@@ -0,0 +1,78 @@
+module RServiceBus
+    
+    class StateManager
+        
+        
+        def Required
+            #Check if the State Dir has been specified
+            #If it has, make sure it exists, and is writable
+            
+            workingDir = RServiceBus.getValue( "WORKING_DIR" )
+            defaultDir = "#{workingDir}/state"
+            specifiedStateDir = RServiceBus.getValue( "STATE_DIR" )
+            @stateDir = specifiedStateDir || defaultDir
+            
+            inputDir = Dir.new( @stateDir )
+            if !File.writable?( @stateDir ) then
+                puts "***** Directory is not writable, #{@stateDir}."
+                puts "***** Make the directory, #{@stateDir}, writable and try again."
+                puts "***** Or, set the State Directory explicitly by, STATE_DIR=</path/to/state>" if  specifiedStateDir.nil?
+                abort();
+            end
+            rescue Errno::ENOENT => e
+            puts "***** Directory does not exist, #{@stateDir}."
+            puts "***** Create the directory, #{@stateDir}, and try again."
+            puts "***** eg, mkdir #{@stateDir}"
+            puts "***** Or, set the State Directory explicitly by, STATE_DIR=</path/to/state>" if  specifiedStateDir.nil?
+            abort();
+            rescue Errno::ENOTDIR => e
+            puts "***** The specified path does not point to a directory, #{@stateDir}."
+            puts "***** Either repoint path to a directory, or remove, #{@stateDir}, and create it as a directory."
+            puts "***** eg, rm #{@stateDir} && mkdir #{@stateDir}"
+            puts "***** Or, set the State Directory explicitly by, STATE_DIR=</path/to/state>" if  specifiedStateDir.nil?
+            abort();
+        end
+        
+        #Start
+        def Begin
+            @list = Array.new
+        end
+
+        #Get
+        def Get( handler )
+            path = self.getPath( handler )
+            hash = self.load( path )
+            @list << Hash["path", path, "hash", hash]
+            
+            return hash
+        end
+        
+        #Finish
+        def Commit
+            @list.each do |e|
+                IO.write( e['path'], YAML::dump( e['hash'] ) )
+            end
+        end
+        
+        #Detail Functions
+        def getPath( handler )
+            path = "#{@stateDir}/#{handler.class.name}"
+            
+            return path
+        end
+
+        def load( path )
+            return Hash.new if !File.exists?( path )
+            
+            content = IO.read( path )
+            
+            return Hash.new if content == ""
+            
+            return YAML::load( content )
+        end
+        
+        
+    end
+    
+    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -38,7 +38,6 @@ files:
 - lib/rservicebus/AppResource/Smb.rb
 - lib/rservicebus/AppResource/SmbDir.rb
 - lib/rservicebus/AppResource/SmbFile.rb
-- lib/rservicebus/AppResource/State.rb
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Audit.rb
 - lib/rservicebus/Config.rb
@@ -64,6 +63,7 @@ files:
 - lib/rservicebus/MQ/Beanstalk.rb
 - lib/rservicebus/MQ.rb
 - lib/rservicebus/Saga.rb
+- lib/rservicebus/StateManager.rb
 - lib/rservicebus/Stats.rb
 - lib/rservicebus/SubscriptionManager.rb
 - lib/rservicebus/SubscriptionStorage/File.rb

data/lib/rservicebus/AppResource/State.rb

@@ -1,68 +0,0 @@
-module RServiceBus
-    
-    class State
-        
-        def initialize( path )
-            @path = path
-        end
-        
-        def get( name )
-            return -1 unless @state.has_key?(name)
-            
-            return @state[name]
-        end
-        
-        def set( name, value )
-            @state[name] = value
-        end
-        
-        def load
-            if !File.exists?( @path ) then
-                @state = Hash.new if !File.exists?( @path )
-                return
-            end
-            
-            content = IO.read( @path )
-            if content == "" then
-                @state = Hash.new
-            end
-            
-            
-            @state = YAML::load( content )
-        end
-        
-        def save
-            content = YAML::dump( @state )
-            IO.write( @path, content )
-        end
-        
-        def close
-            
-        end
-        
-    end
-    
-    
-    class AppResource_State<AppResource
-        
-        def connect(uri)
-            return State.new( uri.path )
-        end
-
-        # Transaction Semantics
-        def Begin
-            @connection.load
-        end
-
-        # Transaction Semantics
-        def Commit
-            @connection.save
-        end
-        
-        # Transaction Semantics
-        def Rollback
-            @connection.load
-        end
-    end
-    
-end