rservicebus 0.0.28 → 0.0.29

data/lib/rservicebus/AppResource.rb

@@ -7,35 +7,50 @@ module RServiceBus
     #
     class AppResource
         @uri
-        
+        @connection
+
+        # The method which actually connects to the resource.
+        #
+        def connect(uri)
+            raise "Method, connect, needs to be implemented for resource"
+        end
+
+        def _connect
+            @connection = self.connect(@uri)
+            puts "#{self.class.name}. Connected to, #{@uri.to_s}" unless !ENV["QUIET"].nil?
+        end
+
         # Resources are attached resources, and can be specified using the URI syntax.
         #
         # @param [String] uri a location for the resource to which we will attach, eg redis://127.0.0.1/foo
         def initialize( uri )
             @uri = uri
+            self._connect
         end
 
         # The method which actually configures the resource.
         #
         # @return [Object] the configured object.
         def getResource
-            raise "Method, getResource, needs to be implemented for resource"
+            return @connection
         end
-        
+
         # A notification that ocurs after getResource, to allow cleanup
         def finished
-            raise "Method, getResource, needs to be implemented for resource"
+            @connection.close
         end
-        
+
         # At least called in the Host rescue block, to ensure all network links are healthy
         def reconnect
             begin
-                @connection.close
-                rescue
-                puts "AppResource. An error was raised while closing connection to, " + @uri.to_s
+                self.finished
+                rescue Exception => e
+                puts "** AppResource. An error was raised while closing connection to, " + @uri.to_s
+                puts "Message: " + e.message
+                puts e.backtrace
             end
-            
-            self.connect
+
+            self._connect
         end
         
     end

data/lib/rservicebus/AppResource/Dir.rb

@@ -2,21 +2,8 @@ module RServiceBus
     
     class AppResource_Dir<AppResource
         
-        @dir
-        
-        def connect()
-            @dir = Dir.new( @uri.path )
-            
-            puts "AppResource_Dir. Connected to, " + @uri.to_s
-        end
-        
-        def initialize( uri )
-            super(uri)
-            self.connect
-        end
-        
-        def getResource
-            return @dir
+        def connect(uri)
+            return Dir.new( uri.path )
         end
         
     end

data/lib/rservicebus/AppResource/File.rb

@@ -2,21 +2,8 @@ module RServiceBus
     
     class AppResource_File<AppResource
         
-        @file
-        
-        def connect()
-            @file = File.new( @uri.path )
-            
-            puts "AppResource_File. Connected to, " + @uri.to_s
-        end
-        
-        def initialize( uri )
-            super(uri)
-            self.connect
-        end
-        
-        def getResource
-            return @file
+        def connect(uri)
+            return File.new( uri.path )
         end
         
     end

data/lib/rservicebus/AppResource/FluidDbMysql.rb

@@ -5,20 +5,8 @@ module RServiceBus
     #Implementation of an AppResource - Redis
     class AppResource_FluidDbMysql<AppResource
         
-        @connection
-        
-        def initialize( uri )
-            super(uri)
-            host = uri.host
-            database = uri.path.sub( "/", "" )
-            
-            
-            @connection = FluidDb::Mysql.new( uri )
-            puts "AppResource_Mysql. Connected to, " + uri.to_s
-        end
-        
-        def getResource
-            return @connection
+        def connect(uri)
+            return FluidDb::Mysql.new( uri )
         end
         
     end

data/lib/rservicebus/AppResource/FluidDbMysql2.rb

@@ -5,22 +5,10 @@ module RServiceBus
     #Implementation ofF an AppResource - Redis
     class AppResource_FluidDbMysql2<AppResource
         
-        @connection
-
-        def initialize( uri )
-            super(uri)
-            host = uri.host
-            database = uri.path.sub( "/", "" )
-            
-            
-            @connection = FluidDb::Mysql2.new( uri )
-            puts "AppResource_Mysql. Connected to, " + uri.to_s
+        def connect(uri)
+            return FluidDb::Mysql2.new( uri )
         end
 
-        def getResource
-            return @connection
-        end
-        
     end
     
 end

data/lib/rservicebus/AppResource/FluidDbPgsql.rb

@@ -5,22 +5,8 @@ module RServiceBus
     #Implementation of an AppResource - Redis
     class AppResource_FluidDbPgsql<AppResource
         
-        @connection
-
-        def initialize( uri )
-            super(uri)
-            host = uri.host
-            database = uri.path.sub( "/", "" )
-            
-            
-            @connection = FluidDb::Pgsql.new( uri )
-            puts "AppResource_Mysql. Connected to, " + uri.to_s
+        def connect(uri)
+            return FluidDb::Pgsql.new( uri )
         end
-
-        def getResource
-            return @connection
-        end
-        
     end
-    
 end

data/lib/rservicebus/AppResource/Mysql.rb

@@ -5,27 +5,10 @@ module RServiceBus
     #Implementation of an AppResource - Redis
     class AppResource_Mysql<AppResource
         
-        @connection
-        
-        def connect()
-            uri = self.uri
-            host = uri.host
-            database = uri.path.sub( "/", "" )
-
-
-            @connection = Mysql2::Client.new(:host => uri.host,
+        def connect(uri)
+            return Mysql2::Client.new(:host => uri.host,
                                              :database => uri.path.sub( "/", "" ),
                                              :username => uri.user )
-            puts "AppResource_Mysql. Connected to, " + uri.to_s
-        end
-
-        def initialize( uri )
-            super(uri)
-            self.connect
-        end
-
-        def getResource
-            return @connection
         end
 
     end

data/lib/rservicebus/AppResource/Redis.rb

@@ -1,21 +1,19 @@
 module RServiceBus
+    
+    require "redis"
+    
+    #Implementation of an AppResource - Redis
+    class AppResource_Redis<AppResource
+        
+        def connect(uri)
+            port = uri.port || 6379
 
-require "redis"
-
-#Implementation of an AppResource - Redis
-class AppResource_Redis<AppResource
-
-	@connection
-
-	def initialize( uri )
-		super(uri)
-		@connection = Redis.new
-	end
-
-	def getResource
-		return @connection
-	end
-
-end
+            return Redis.new( :host=>uri.host, :port=>port )
+        end
 
+        def finished
+            @connection.quit
+        end
+    end
+    
 end

data/lib/rservicebus/HandlerLoader.rb

@@ -92,11 +92,12 @@ class HandlerLoader
 # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
 	def setAppResources( handler, appResources )
 		@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
 		appResources.each do |k,v|
-			if handler.class.method_defined?( k ) then 
+			if handler.class.method_defined?( k ) then
 				handler.instance_variable_set( "@#{k}", v.getResource() )
                 @resourceList[handler.class.name] = Array.new if @resourceList[handler.class.name].nil?
-                @resourceList[handler.class.name] << v.getResource()
+                @resourceList[handler.class.name] << v
 				@host.log "App resource attribute, #{k}, set for: " + handler.class.name
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com