cloud-crowd 0.2.9 → 0.3.0

data/cloud-crowd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'cloud-crowd'
-  s.version   = '0.2.9'         # Keep version in sync with cloud-cloud.rb
-  s.date      = '2009-11-03'
+  s.version   = '0.3.0'         # Keep version in sync with cloud-cloud.rb
+  s.date      = '2009-11-06'
 
   s.homepage    = "http://wiki.github.com/documentcloud/cloud-crowd"
   s.summary     = "Parallel Processing for the Rest of Us"

data/lib/cloud-crowd.rb

@@ -44,7 +44,7 @@ module CloudCrowd
   autoload :WorkUnit,     'cloud_crowd/models'
   
   # Keep this version in sync with the gemspec.
-  VERSION        = '0.2.9'
+  VERSION        = '0.3.0'
   
   # Increment the schema version when there's a backwards incompatible change.
   SCHEMA_VERSION = 3

data/lib/cloud_crowd/models/job.rb

@@ -45,7 +45,7 @@ module CloudCrowd
       return unless all_work_units_complete?
       set_next_status    
       outs = gather_outputs_from_work_units
-      return queue_for_workers(outs) if merging?
+      return queue_for_workers([outs]) if merging?
       if complete?
         update_attributes(:outputs => outs, :time => time_taken)
         Thread.new { fire_callback } if callback_url
@@ -177,7 +177,7 @@ module CloudCrowd
     # away.
     def queue_for_workers(input=nil)
       input ||= JSON.parse(self.inputs)
-      [input].flatten.each {|i| WorkUnit.start(self, action, i, status) }        
+      input.each {|i| WorkUnit.start(self, action, i, status) }        
       self
     end
     

data/lib/cloud_crowd/models/work_unit.rb

@@ -87,6 +87,7 @@ module CloudCrowd
     
     # Convenience method for starting a new WorkUnit.
     def self.start(job, action, input, status)
+      input = input.to_json unless input.is_a? String
       self.create(:job => job, :action => action, :input => input, :status => status)
     end
     
@@ -97,7 +98,6 @@ module CloudCrowd
     def finish(result, time_taken)
       if splitting?
         [parsed_output(result)].flatten.each do |new_input|
-          new_input = new_input.to_json unless new_input.is_a? String
           WorkUnit.start(job, action, new_input, PROCESSING)
         end
         self.destroy

data/test/unit/test_job.rb

@@ -65,6 +65,11 @@ class JobTest < Test::Unit::TestCase
       assert job.splitting?
     end
     
+    should "not accidentally flatten array inputs" do
+      job = Job.create_from_request({'inputs' => [[1,2], [3,4]], 'action' => 'process_pdfs'})
+      assert JSON.parse(job.work_units.first.input) == [1,2]
+    end
+    
     should "fire a callback when a job has finished, successfully or not" do
       @job.update_attribute(:callback_url, 'http://example.com/callback')
       Job.any_instance.stubs(:fire_callback).returns(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloud-crowd
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -05:00
+date: 2009-11-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency