thread 0.0.6 → 0.0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06775ef0519c05357d40793c690e1d920d6986fd
-  data.tar.gz: b99341b499d3f242c89a9e34dc1e5709475a309f
+  metadata.gz: d3ff37def7bb5f33d4edbfe721d2fd4ed76736c8
+  data.tar.gz: da06d07f29d4da2ad5ae0c965dd3b857ea2f4693
 SHA512:
-  metadata.gz: af5195c38784de4e8e8053abd2aa1a9d6aa0769504ddb1eb9b7f985956a9d2a0d1a607ed2582f33612085a93a1213ae3113237170bd52f6f012b75c722b72468
-  data.tar.gz: 8ceab0a43ed94525654db0d74f77b7902ada06248b58b011ff16e003ca454a871ff9ec54eccee7a1214e7d574dac60955f0f82ff32e8d5172ef6bea0a426201a
+  metadata.gz: ee229921f532e80cdcbccd1c3f68222b61b262e2bb46ecd0c47a149a5a37d43015705066108ca8a190b7d400b63a9b8be4ac1479669817e02e735cad876c77a0
+  data.tar.gz: 905962ca00d67d8acbc8eaefcc5be048da9fe799fb0a7f8cc1aa4fbd3c0e52dd88b61a30e9bf175c83dd7625a6bab3428978adb5fb0e9ea4661724185f281a82

data/lib/thread/pipe.rb

@@ -14,25 +14,37 @@ require 'thread'
 # each datum inserted in the pipe is passed along through queues to the various
 # functions composing the pipe, the final result is inserted in the final queue.
 class Thread::Pipe
+	# A task incapsulates a part of the pipe.
 	class Task
 		attr_accessor :input, :output
 
+		# Create a Task which will call the passed function and get input
+		# from the optional parameter and put output in the optional parameter.
 		def initialize (func, input = Queue.new, output = Queue.new)
-			@input  = input
-			@output = output
+			@input    = input
+			@output   = output
+			@handling = false
 
 			@thread = Thread.new {
 				while true
+					value = @input.deq
+
+					@handling = true
 					begin
-						value = @input.deq
 						value = func.call(value)
-
 						@output.enq value
 					rescue Exception; end
+					@handling = false
 				end
 			}
 		end
 
+		# Check if the task has nothing to do.
+		def empty?
+			!@handling && @input.empty? && @output.empty?
+		end
+
+		# Stop the task.
 		def kill
 			@thread.raise
 		end
@@ -51,21 +63,13 @@ class Thread::Pipe
 		ObjectSpace.define_finalizer(self, self.class.finalize(@tasks))
 	end
 
+	# @private
 	def self.finalize (tasks)
 		proc {
 			tasks.each(&:kill)
 		}
 	end
 
-	# Insert data in the pipe.
-	def << (data)
-		return if @tasks.empty?
-
-		@input.enq data
-
-		self
-	end
-
 	# Add a task to the pipe, it must respond to #call and #arity,
 	# and #arity must return 1.
 	def | (func)
@@ -81,13 +85,30 @@ class Thread::Pipe
 		self
 	end
 
+	# Check if the pipe is empty.
+	def empty?
+		@input.empty? && @output.empty? && @tasks.all?(&:empty?)
+	end
+
+	# Insert data in the pipe.
+	def enq (data)
+		return if @tasks.empty?
+
+		@input.enq data
+
+		self
+	end
+
+	alias push enq
+	alias <<   enq
+
 	# Get an element from the output queue.
-	def pop (non_block = false)
+	def deq (non_block = false)
 		@output.deq(non_block)
 	end
 	
-	alias deq pop
-	alias ~   pop
+	alias pop deq
+	alias ~   deq
 end
 
 class Thread

data/tests/pipe_spec.rb

@@ -12,4 +12,14 @@ describe Thread::Pipe do
 		p.deq.should == 16
 		p.deq.should == 32
 	end
+
+	it 'empty works properly' do
+		p = Thread |-> d { sleep 0.2; d * 2 } |-> d { d * 4 }
+
+		p.empty?.should == true
+		p.enq 42
+		p.empty?.should == false
+		p.deq
+		p.empty?.should == true
+	end
 end

data/thread.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'thread'
-	s.version      = '0.0.6'
+	s.version      = '0.0.6.1'
 	s.author       = 'meh.'
 	s.email        = 'meh@schizofreni.co'
 	s.homepage     = 'http://github.com/meh/ruby-thread'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thread
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.6.1
 platform: ruby
 authors:
 - meh.