shared_workforce 0.2.0 → 0.2.1

data/README.markdown

@@ -91,11 +91,7 @@ Advanced definition options
 
 ### Task types
 
-SharedWorkforce currently supports 2 types of task. :tags (multiple select) and :choice (single answer from a list of options).  Free-form input is planned in the near future.
-
-    SharedWorkforce::Task.define |t|
-      t.answer_type = #:tags or :choice
-    end
+SharedWorkforce currently supports 3 types of task. `:tags` (multiple select), `:choice` (single answer from a list of options), or `:edit` (edit text).
 
 ###Multiple responses
 

data/lib/shared_workforce.rb

@@ -6,9 +6,11 @@ require 'shared_workforce/task'
 require 'shared_workforce/task_request/task_request'
 require 'shared_workforce/task_request/black_hole'
 require 'shared_workforce/task_request/http'
+require 'shared_workforce/task_request/http_with_poller'
 require 'shared_workforce/task_result'
 require 'shared_workforce/task_response'
 require 'shared_workforce/end_point'
+require 'shared_workforce/response_poller'
 require 'shared_workforce/frameworks/rails' if defined?(Rails)
 require 'active_support/inflector'
 require 'active_support/core_ext/hash/indifferent_access'

data/lib/shared_workforce/configuration.rb

@@ -9,7 +9,7 @@ module SharedWorkforce
     
     def initialize
       @http_end_point = "http://api.sharedworkforce.com"
-      @request_class = TaskRequest::Http
+      @request_class = default_request_class
     end
     
     def callback_url
@@ -18,7 +18,23 @@ module SharedWorkforce
     
     def callback_path
       @callback_path ||= "hci_task_result"
-    end 
+    end
+
+    private
+
+    def default_request_class
+      if defined?(Rails)
+        if Rails.env.development?
+          TaskRequest::HttpWithPoller
+        elsif Rails.env.test?
+          TaskRequest::BlackHole
+        else
+          TaskRequest::Http
+        end
+      else
+        TaskRequest::Http
+      end
+    end
     
   end
 end

data/lib/shared_workforce/response_poller.rb

@@ -0,0 +1,29 @@
+module SharedWorkforce
+  class ResponsePoller
+    def self.start(task_id)
+      Thread.new do
+        puts "SharedWorkforce: Checking every 20 seconds for responses for task #{task_id}."
+        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
+        end
+      end
+    end
+  end
+end

data/lib/shared_workforce/task_request/http_with_poller.rb

@@ -0,0 +1,14 @@
+require 'rest_client'
+module SharedWorkforce
+  class TaskRequest::HttpWithPoller < TaskRequest
+
+    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
+  end
+end

data/lib/shared_workforce/version.rb

@@ -1,4 +1,4 @@
 module SharedWorkforce
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
 end

metadata

@@ -1,83 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shared_workforce
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Sam Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-02 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70198918375060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70198918375060
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70198918374600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70198918374600
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70198918374120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70198918374120
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70198918373500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70198918373500
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70198918366780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70198918366780
 description: Shared Workforce is a service and simple API for human intelligence tasks
-email: 
+email:
 - sam@samoliver.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -89,9 +84,11 @@ files:
 - lib/shared_workforce/end_point.rb
 - lib/shared_workforce/exceptions.rb
 - lib/shared_workforce/frameworks/rails.rb
+- lib/shared_workforce/response_poller.rb
 - lib/shared_workforce/task.rb
 - lib/shared_workforce/task_request/black_hole.rb
 - lib/shared_workforce/task_request/http.rb
+- lib/shared_workforce/task_request/http_with_poller.rb
 - lib/shared_workforce/task_request/task_request.rb
 - lib/shared_workforce/task_response.rb
 - lib/shared_workforce/task_result.rb
@@ -107,35 +104,31 @@ files:
 - spec/task_result_spec.rb
 - spec/task_spec.rb
 - spec/tasks/approve_photo.rb
-has_rdoc: true
 homepage: http://github.com/sharedworkforce/sharedworkforce
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shared_workforce
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Shared Workforce Client
-test_files: 
+test_files:
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration_helper.rb