crowdflower 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/crowdflower.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crowdflower}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian P O'Rourke", "Chris Van Pelt"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-03-17}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software. Have fun!
@@ -30,6 +30,7 @@ This is alpha software. Have fun!
      "VERSION",
      "bindev/cl_skel.rb",
      "bindev/crowdflower.rb",
+     "crowdflower-0.2.3.gem",
      "crowdflower.gemspec",
      "lib/crowdflower.rb",
      "lib/crowdflower/base.rb",

data/lib/crowdflower/base.rb

@@ -33,7 +33,7 @@ module CrowdFlower
   end
   
   def self.connect!(key, development = false)
-    @@domain = development ? "http://api.tsujigiri.local:4000/v1" : "https://api.crowdflower.com/v1"
+    @@domain = development ? "http://api.localhost.com:4000/v1" : "https://api.crowdflower.com/v1"
     @@key = key
   end
 

data/lib/crowdflower/job.rb

@@ -109,7 +109,7 @@ module CrowdFlower
     end
 
     def update(data)
-      res = Job.put("#{resource_uri}/#{@id}.json", {:query => { :job => data }, :headers => { "Content-Length" => "0" } } )
+      res = Job.put("#{resource_uri}/#{@id}.json", {:body => { :job => data }, :headers => { "Content-Length" => "0" } } )
       if res["error"]
         raise CrowdFlower::APIError.new(res["error"])
       end

data/lib/crowdflower/order.rb

@@ -9,11 +9,11 @@ module CrowdFlower
     end
 
     def resource_uri
-      "/jobs/#{@job.id}/orders"
+      "/jobs/#{@job.id}/orders.json"
     end
     
-    def debit(percentage = 100, channels = ["amt"])
-      Order.post(resource_uri, {:body => {:percentage => percentage, :channels => channels}})
+    def debit(units_count = 1, channels = ["amt"])
+      Order.post(resource_uri, {:query => {:debit => {:units_count => units_count}, :channels => channels}})
     end
   end
 end

data/lib/crowdflower/unit.rb

@@ -35,5 +35,9 @@ module CrowdFlower
     def split(on, with = " ")
       Unit.get("#{resource_uri}/split", {:query => {:on => on, :with => with}})
     end
+    
+    def cancel(unit_id)
+      Unit.post("#{resource_uri}/#{unit_id}/cancel.json")
+    end
   end
 end

data/test/integration_tests.rb

@@ -1,7 +1,7 @@
 $: << File.dirname(__FILE__) + "/../lib"
 
 require 'rubygems'
-require 'ruby-crowdflower'
+require 'crowdflower'
 require 'json'
 
 API_KEY   = ENV["API_KEY"]
@@ -88,6 +88,22 @@ assert job.status["tainted_judgments"] == 0
 say "Registering a webhook."
 job.update :webhook_uri => "http://localhost:8080/crowdflower"
 
+say "Adding title, instructions, and problem to the job."
+job.update({:title => 'testtt', :instructions => 'testttt fdsf sfds fsdfs fesfsdf', :problem => '<cml:text label="Text" class="unmodified"/>' })
+
+say "Ordering the job."
+order = CrowdFlower::Order.new(job)
+unit_count = 8
+order.debit(8)
+wait_until { job.status["needed_judgments"] == 24}
+
+say "Canceling the unit."
+unit_id = job.units.all.to_a[0][0]
+unit = CrowdFlower::Unit.new(job)
+assert unit.get(unit_id)['state'] == 'judgable'
+puts unit.cancel(unit_id).inspect
+assert unit.get(unit_id)['state'] == 'new'
+
 say "Webhook test needs to be written."
 #job.test_webhook
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -08:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - VERSION
 - bindev/cl_skel.rb
 - bindev/crowdflower.rb
+- crowdflower-0.2.3.gem
 - crowdflower.gemspec
 - lib/crowdflower.rb
 - lib/crowdflower/base.rb