rservicebus 0.1.33 → 0.1.34

data/lib/rservicebus/StateManager.rb

@@ -1,77 +1,40 @@
 module RServiceBus
     
+    require 'rservicebus/StateStorage'
+    
     class StateManager
-        
-        
+
+
         def Required
             #Check if the State Dir has been specified
             #If it has, make sure it exists, and is writable
+
+            string = RServiceBus.getValue( "STATE_URI" )
+            if string.nil? then
+                string = "dir:///tmp"
+            end
             
-            workingDir = RServiceBus.getValue( "WORKING_DIR" )
-            defaultDir = "#{workingDir}/state"
-            specifiedStateDir = RServiceBus.getValue( "STATE_DIR" )
-            @stateDir = specifiedStateDir || defaultDir
+            uri = URI.parse( string )
+            @stateStorage = StateStorage.Get( uri )
             
-            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
+            @stateStorage.Begin
         end
 
         #Get
         def Get( handler )
-            path = self.getPath( handler )
-            hash = self.load( path )
-            @list << Hash["path", path, "hash", hash]
-            
-            return hash
+            return @stateStorage.Get( handler )
         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
+            @stateStorage.Commit
         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
     
     

data/lib/rservicebus/StateStorage/Dir.rb

@@ -0,0 +1,70 @@
+module RServiceBus
+    
+    class StateStorage_Dir
+        
+        def initialize( uri )
+            @stateDir = uri.path
+            
+            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_URI=<dir://path/to/state>"
+                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_URI=<dir://path/to/state>"
+            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_URI=<dir://path/to/state>"
+            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

data/lib/rservicebus/StateStorage.rb

@@ -0,0 +1,19 @@
+module RServiceBus
+
+    class StateStorage
+
+        def StateStorage.Get( uri )
+            case uri.scheme
+                when "dir"
+                    require 'rservicebus/StateStorage/Dir.rb'
+                    return StateStorage_Dir.new( uri )
+                else
+                    abort("Scheme, #{uri.scheme}, not recognised when configuring StateStorage, #{uri.to_s}");
+            end
+            
+        end
+        
+        
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70168920560860 !ruby/object:Gem::Requirement
+  requirement: &70247617650940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168920560860
+  version_requirements: *70247617650940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70168920555700 !ruby/object:Gem::Requirement
+  requirement: &70247617650040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168920555700
+  version_requirements: *70247617650040
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70168920924560 !ruby/object:Gem::Requirement
+  requirement: &70247617649240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168920924560
+  version_requirements: *70247617649240
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70168920923940 !ruby/object:Gem::Requirement
+  requirement: &70247617648580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168920923940
+  version_requirements: *70247617648580
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70168920923200 !ruby/object:Gem::Requirement
+  requirement: &70247617648160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168920923200
+  version_requirements: *70247617648160
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -121,6 +121,8 @@ files:
 - lib/rservicebus/MQ.rb
 - lib/rservicebus/Saga.rb
 - lib/rservicebus/StateManager.rb
+- lib/rservicebus/StateStorage/Dir.rb
+- lib/rservicebus/StateStorage.rb
 - lib/rservicebus/Stats.rb
 - lib/rservicebus/SubscriptionManager.rb
 - lib/rservicebus/SubscriptionStorage/File.rb