shared_workforce 0.2.9 → 0.2.10

data/lib/shared_workforce/frameworks/rails.rb

@@ -2,6 +2,7 @@ if defined?(ActionController::Metal)
   class Railtie < Rails::Railtie
     initializer 'shared_workforce' do |app|      
       app.config.middleware.use SharedWorkforce::EndPoint
+      SharedWorkforce::ResponsePoller.start if Rails.env.development?
     end
   end
 end

data/lib/shared_workforce/response_poller.rb

@@ -1,30 +1,53 @@
 module SharedWorkforce
   class ResponsePoller
-    def self.start(task_id)
+
+    def self.start(interval=60)
+      new.start(interval)
+    end
+
+    def initialize
+      $stdout.sync = true
+    end
+
+    def start(interval)
       Thread.abort_on_exception = true
       Thread.new do
-        puts "SharedWorkforce: Checking every 20 seconds for responses for task #{task_id}."
+        puts "SharedWorkforce: Checking every #{interval} seconds for new responses."
+        
         while true
-          sleep 20
-          puts "SharedWorkforce: Checking for task responses for task #{task_id} (development mode)"
-          task = JSON.parse(RestClient.get("#{SharedWorkforce.configuration.http_end_point}/tasks/#{task_id}", {
-            'X-API-Key'=>SharedWorkforce.configuration.api_key,
-            :content_type => :json,
-            :accept => :json
-          }))
-          if task['state'] == "completed"
-            puts "SharedWorkforce: Task complete. Getting responses."
-            responses = JSON.parse(RestClient.get("#{SharedWorkforce.configuration.http_end_point}/tasks/#{task_id}/responses", {
-              'X-API-Key'=>SharedWorkforce.configuration.api_key,
-              :content_type => :json,
-              :accept => :json
-            }))
-            puts "SharedWorkforce: Processing responses."
-            SharedWorkforce::TaskResult.new(responses).process!
-            break;
-          end
+          puts "SharedWorkforce: Checking for new task responses."
+          process_tasks completed_tasks
+          sleep interval
         end
       end
     end
+
+    private
+
+    def process_tasks(tasks)
+      tasks.each do |task|
+        if task['state'] == "completed"
+          puts "SharedWorkforce: Task complete. Getting responses."
+          responses = collect_responses(task['id'])
+          SharedWorkforce::TaskResult.new(responses).process!
+        end
+      end
+    end
+
+    def completed_tasks
+      JSON.parse(RestClient.get("#{SharedWorkforce.configuration.http_end_point}/tasks/unreturned", {
+        'X-API-Key'=>SharedWorkforce.configuration.api_key,
+        :content_type => :json,
+        :accept => :json
+      }))
+    end
+
+    def collect_responses(id)
+      JSON.parse(RestClient.get("#{SharedWorkforce.configuration.http_end_point}/tasks/#{id}/responses/collect", {
+        'X-API-Key'=>SharedWorkforce.configuration.api_key,
+        :content_type => :json,
+        :accept => :json
+      }))
+    end
   end
 end

data/lib/shared_workforce/task_request/http_with_poller.rb

@@ -4,11 +4,14 @@ module SharedWorkforce
 
     def create
       task = JSON.parse(RestClient.post("#{http_end_point}/tasks", *request_params))
-      ResponsePoller.start(task['id'])
     end
   
     def cancel
       RestClient.post("#{http_end_point}/tasks/cancel", *request_params)
     end
+
+    def request_params
+      [{:task=>@task.to_hash.merge(@params).merge(:callback_url=>callback_url, :callback_enabled=>false), :api_key=>api_key}.to_json, {:content_type => :json, :accept => :json}]
+    end
   end
 end

data/lib/shared_workforce/version.rb

@@ -1,4 +1,4 @@
 module SharedWorkforce
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 
 end

data/spec/task_request/http_with_poller_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "TaskRequest::HttpWithPoller" do
+  describe "#create" do
+    it "should disable callbacks" do
+    	task = ApprovePhotoTask.new
+      task_request = SharedWorkforce::TaskRequest::HttpWithPoller.new(task,
+      	:image_url=>"http://www.google.com/logo.png",
+      	:image_crop_ratio=>1.7,
+      	:callback_params=>{:resource_id=>'1234'}
+      )
+
+			stub_request(:post, "api.sharedworkforce.com/tasks").to_return(:body=>{:id=>123}.to_json)
+
+			task_request.create
+
+			a_request(:post, "http://api.sharedworkforce.com/tasks").with(:body=>{'task'=>
+        {
+          'title'=>"Approve Photo",
+          'instruction'=>"Please classify this photo by choosing the appropriate tickboxes.",
+          'image_url'=>"http://www.google.com/logo.png",
+          'image_crop_ratio'=>1.7,
+          'answer_options'=> ['Obscenity', 'Nudity', 'Blurry', 'Upside down or sideways', 'Contains more than one person in the foreground', 'Has people in the background', 'Contains children'],
+          'responses_required'=>3,
+          'answer_type'=>'tags',
+          'callback_url'=>"#{SharedWorkforce.configuration.callback_host}/shared_workforce/task_response",
+          'callback_params'=>{'resource_id'=>'1234'},
+          'replace'=>true,
+          'callback_enabled'=>false,
+        }, :api_key=>'test-api-key'}).should have_been_made.once
+    end
+  end
+end

data/spec/task_spec.rb

@@ -255,7 +255,7 @@ describe "Task" do
       a_request(:post, "http://api.sharedworkforce.com/tasks/cancel").should have_been_made.once
     end
 
-    it "should raise a ConfigurationError if a callback host is not set" do
+    it "should not raise a ConfigurationError if a callback host is not set" do
       task = Class.new { include SharedWorkforce::Task }
       with_configuration do |config|
         config.callback_host = nil
@@ -341,6 +341,24 @@ describe "Task" do
       task.image_crop_ratio = 0.5
       task.to_hash[:image_crop_ratio].should == 0.5
     end
+
+    it "should include the callback url" do
+      with_configuration do |config|
+        config.callback_host = 'http://callback.example.com'
+        task = ApprovePhotoTask.new(@resource_class.new)
+        task.image_crop_ratio = 0.5
+        task.to_hash[:callback_url].should =~ %r{^http://callback.example.com/}
+      end
+    end
+
+    it "should set a nil callback url" do
+      with_configuration do |config|
+        config.callback_host = 'http://callback.example.com'
+        task = ApprovePhotoTask.new(@resource_class.new)
+        task.image_crop_ratio = 0.5
+        task.to_hash[:callback_url].should =~ %r{^http://callback.example.com/}
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shared_workforce
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70337624682520 !ruby/object:Gem::Requirement
+  requirement: &70320585942740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337624682520
+  version_requirements: *70320585942740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70337624682100 !ruby/object:Gem::Requirement
+  requirement: &70320585942320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337624682100
+  version_requirements: *70320585942320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70337624681680 !ruby/object:Gem::Requirement
+  requirement: &70320585941900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337624681680
+  version_requirements: *70320585941900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337624681180 !ruby/object:Gem::Requirement
+  requirement: &70320585941400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70337624681180
+  version_requirements: *70320585941400
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70337624680760 !ruby/object:Gem::Requirement
+  requirement: &70320585940980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337624680760
+  version_requirements: *70320585940980
 description: Shared Workforce is a service and simple API for human intelligence tasks
 email:
 - sam@samoliver.com
@@ -102,6 +102,7 @@ files:
 - spec/support/configuration_helper.rb
 - spec/task_request/black_hole_spec.rb
 - spec/task_request/http_spec.rb
+- spec/task_request/http_with_poller_spec.rb
 - spec/task_response_spec.rb
 - spec/task_result_spec.rb
 - spec/task_spec.rb
@@ -138,6 +139,7 @@ test_files:
 - spec/support/configuration_helper.rb
 - spec/task_request/black_hole_spec.rb
 - spec/task_request/http_spec.rb
+- spec/task_request/http_with_poller_spec.rb
 - spec/task_response_spec.rb
 - spec/task_result_spec.rb
 - spec/task_spec.rb