floormanager 0.1.0 → 0.2.0

data/README.rdoc

@@ -17,6 +17,10 @@
 
 See the examples for more advanced usage.
 
+== TODO
+
+* Write the tests and examples
+
 == Copyright
 
 Copyright (c) 2010 Inge Jørgensen. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/floormanager.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{floormanager}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Inge J\303\270rgensen"]
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
      "floormanager.gemspec",
      "lib/floormanager.rb",
      "lib/floormanager/queue.rb",
+     "lib/floormanager/result.rb",
+     "lib/floormanager/states.rb",
      "lib/floormanager/workers.rb",
      "spec/floormanager_spec.rb",
      "spec/spec.opts",

data/lib/floormanager/queue.rb

@@ -2,12 +2,6 @@ module FloorManager
 	class Queue
 		include Enumerable
 
-		# States
-		PENDING     = 0
-		CHECKED_OUT = 1
-		FAILED      = 2
-		SUCCESS     = 3
-	
 		def initialize(*args)
 			@queue = []
 			args.each{|a| self << a} if (args = *args)
@@ -20,7 +14,7 @@ module FloorManager
 				@queue << {
 					:item  => item,
 					:value => nil,
-					:state => PENDING
+					:state => States::PENDING
 				}
 			end
 			alias :<< :add
@@ -45,7 +39,7 @@ module FloorManager
 			def checkout
 				if pending?
 					item = pending_items.first
-					item[:state] = CHECKED_OUT
+					item[:state] = States::CHECKED_OUT
 					item[:item]
 				else
 					nil
@@ -54,7 +48,7 @@ module FloorManager
 
 			# Check in an item with a new value, optionally with a state
 			# (which defaults to SUCCESS)
-			def checkin(item, value, state=SUCCESS)
+			def checkin(item, value, state=States::SUCCESS)
 				if keys.include?(item)
 					item = get_item(item)
 					item[:value] = value
@@ -111,27 +105,27 @@ module FloorManager
 
 			# Is this item processed?
 			def processed?(key)
-				state(key) > PENDING
+				state(key) > States::PENDING
 			end
 		
 			# Is this item checked out?
 			def checked_out?(key)
-				state(key) == CHECKED_OUT
+				state(key) == States::CHECKED_OUT
 			end
 
 			# Did this item fail?
 			def failed?(key)
-				state(key) == FAILED
+				state(key) == States::FAILED
 			end
 
 			# Did this item succeed?
 			def success?(key)
-				state(key) == SUCCESS
+				state(key) == States::SUCCESS
 			end
 
 			# Is this item completed?
 			def completed?(key)
-				state(key) >= FAILED
+				state(key) >= States::FAILED
 			end
 
 		private
@@ -149,27 +143,27 @@ module FloorManager
 
 			# Get all pending items
 			def pending_items
-				@queue.select{|i| i[:state] == PENDING}
+				@queue.select{|i| i[:state] == States::PENDING}
 			end
 
 			# Get all items which are checked out
 			def checked_out_items
-				@queue.select{|i| i[:state] == CHECKED_OUT}
+				@queue.select{|i| i[:state] == States::CHECKED_OUT}
 			end
 
 			# Get all completed items (both failed and successed)
 			def completed_items
-				@queue.select{|i| i[:state] >= FAILED}
+				@queue.select{|i| i[:state] >= States::FAILED}
 			end
 
 			# Get all failed items
 			def failed_items
-				@queue.select{|i| i[:state] == FAILED}
+				@queue.select{|i| i[:state] == States::FAILED}
 			end
 
 			# Get all successed items
 			def successed_items
-				@queue.select{|i| i[:state] == SUCCESS}
+				@queue.select{|i| i[:state] == States::SUCCESS}
 			end
 
 	end

data/lib/floormanager/result.rb

@@ -0,0 +1,28 @@
+module FloorManager
+	class Result < FloorManager::BasicObject
+		attr_accessor :result, :state
+		attr_reader :delegate
+
+		def initialize(delegate, result, state=States::SUCCESS)
+			@delegate = delegate
+			@result = result
+			@state = state
+		end
+		
+		def method_missing(name, *args, &block)
+			@delegate.send(name, *args, &block)
+		end
+		
+		def state
+			@state
+		end
+	
+		def failed?
+			@state == States::FAILED
+		end
+	    
+		def success?
+			@state == States::SUCCESS
+		end
+	end
+end

data/lib/floormanager/states.rb

@@ -0,0 +1,8 @@
+module FloorManager
+	module States
+		PENDING     = 0
+		CHECKED_OUT = 1
+		FAILED      = 2
+		SUCCESS     = 3
+	end
+end

data/lib/floormanager/workers.rb

@@ -14,8 +14,9 @@ module FloorManager
 				Thread.new do
 					until queue.done?
 						if item = checkout
-							value = yield(item)
-							checkin(item, value)
+							result = yield(item)
+							result = Result.new(result, result, (result.state rescue States::SUCCESS))
+							checkin(item, result, result.state)
 						else
 							Thread.pass
 						end
@@ -38,5 +39,17 @@ module FloorManager
 			@mutex.synchronize{yield}
 		end
 		alias :exclusively :synchronize
+		
+		def result(result, state=States::SUCCESS)
+			Result.new(result, result, state)
+		end
+		
+		def success(result)
+			result(result, States::SUCCESS)
+		end
+
+		def fail(result)
+			result(result, States::FAILED)
+		end
 	end
 end

data/lib/floormanager.rb

@@ -1,3 +1,15 @@
+module FloorManager
+	if defined?(::BasicObject)
+		BasicObject = ::BasicObject #:nodoc:
+	else
+		class BasicObject #:nodoc:
+			instance_methods.each{|m| undef_method m unless m =~ /^__|instance_eval/}
+		end
+	end
+end
+
 require 'thread'
+require 'floormanager/states'
 require 'floormanager/queue'
-require 'floormanager/workers'
+require 'floormanager/workers'
+require 'floormanager/result'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Inge J\xC3\xB8rgensen"
@@ -50,6 +50,8 @@ files:
 - floormanager.gemspec
 - lib/floormanager.rb
 - lib/floormanager/queue.rb
+- lib/floormanager/result.rb
+- lib/floormanager/states.rb
 - lib/floormanager/workers.rb
 - spec/floormanager_spec.rb
 - spec/spec.opts