schleyfox-peach 0.1.2 → 0.2

data/Rakefile

@@ -0,0 +1,8 @@
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+end

data/lib/peach.rb

@@ -1,32 +1,37 @@
-class Array
+module Peach
   def peach(n = nil, &b)
-    peachrun(:each, b, n)
+    peach_run(:each, b, n)
   end
+
   def pmap(n = nil, &b)
-    peachrun(:map, b, n)
+    peach_run(:map, b, n)
   end
-  def pdelete_if(n = nil, &b)
-    peachrun(:delete_if, b, n)
+
+  def pselect(n = nil, &b)
+    peach_run(:select, b, n)
   end
 
+
+
   protected
-  def peachrun(meth, b, n = nil)
+  def peach_run(meth, b, n = nil)
     threads, results, result = [],[],[]
-    divvy(n).each_with_index do |x,i|
-      if x.size > 0
-        threads << Thread.new { results[i] = x.send(meth, &b)}
-      else
-        results[i] = []
-      end
+    peach_divvy(n).each_with_index do |x,i|
+      threads << Thread.new { results[i] = x.send(meth, &b)}
     end
     threads.each {|t| t.join }
     results.each {|x| result += x if x}
     result
   end
   
-  def divvy(n = nil)
+  def peach_divvy(n = nil)
+    return [] if size == 0
+
     n ||= $peach_default_threads || size
+    n = size if n > size
+
     lists = []
+
     div = (size/n).floor
     offset = 0
     for i in (0...n-1)
@@ -37,3 +42,5 @@ class Array
     lists
   end
 end
+
+Array.send(:include, Peach)

data/test/peach_test.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+require File.join(File.dirname(__FILE__), "..", "lib", "peach")
+
+class PeachTest < Test::Unit::TestCase
+  [:peach, :pmap, :pselect].each do |f|
+    context "Parallel function #{f}" do
+      normal_f = f.to_s[1..-1].to_sym
+
+      setup do
+        @data = [1, 2, 3, 5, 8]
+        @block = lambda{|i| i**2}
+      end
+      should "return the same result as #{normal_f}" do
+        assert_equal @data.send(normal_f, &@block),
+          @data.send(f, nil, &@block)
+      end
+    end
+  end
+
+  context "divvy" do
+    setup do
+      @data = [1, 2, 3, 4, 5]
+    end
+
+    context "on empty list" do
+      should "return empty list" do
+        assert_equal [], [].send(:peach_divvy)
+      end
+    end
+
+    context "when n is nil" do
+      should "put 1 element into each division" do
+        assert_equal @data.size, @data.send(:peach_divvy).size
+      end
+    end
+
+    context "when n is less than array size" do
+      should "put create n divisions" do
+        assert_equal 2, @data.send(:peach_divvy, 2).size
+      end
+
+      should "not lose any array elements" do
+        assert_equal @data.size, @data.send(:peach_divvy, 2).inject(0) {|sum, i| 
+          sum + i.size
+        }
+      end
+    end
+    
+    context "when n is greater than array size" do
+      should "only create 'array size' divisions" do
+        assert_equal @data.size, @data.send(:peach_divvy, 42).size
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__)) unless 
+  $:.include?(File.dirname(__FILE__)) || 
+    $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schleyfox-peach
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: "0.2"
 platform: ruby
 authors: 
 - Ben Hughes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-06 00:00:00 -07:00
+date: 2009-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,9 +24,12 @@ extra_rdoc_files: []
 files: 
 - README
 - LICENSE
+- Rakefile
 - lib/peach.rb
 - bn/peach_bn.rb
 - bn/peach_test.rb
+- test/test_helper.rb
+- test/peach_test.rb
 - web/index.html
 - web/Peach.sketch.png
 has_rdoc: false
@@ -51,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Parallel Each and other parallel things