crowdflower 0.4.2 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.5

data/crowdflower.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crowdflower}
-  s.version = "0.4.2"
+  s.version = "0.4.5"
 
   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-11-17}
+  s.date = %q{2010-12-03}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software. Have fun!

data/lib/crowdflower/base.rb

@@ -32,8 +32,9 @@ module CrowdFlower
     end
   end
   
-  def self.connect!(key, development = false)
-    @@domain = development ? "http://api.localhost.com:4000/v1" : "https://api.crowdflower.com/v1"
+  def self.connect!(key, development = false, version = 1)
+    @@version = version
+    @@domain = development ? "http://api.localhost.com:4000/v#{version}" : "https://api.crowdflower.com/v#{version}"
     @@key = key
     begin # pass yaml file
       key = YAML.load_file(key)

data/lib/crowdflower/job.rb

@@ -82,14 +82,14 @@ module CrowdFlower
       Job.get("#{resource_uri}/#{@id}/legend")
     end
     
-    def download_csv(full = true, filename = nil)
-      filename ||= "#{full ? "f" : "a"}#{@id}.csv"
-      res = Job.get("#{resource_uri}/#{@id}.csv", {:format => :csv, :query => {:full => full}})
+    def download_csv(type = :full, filename = nil)
+      filename ||= "#{type.to_s[0].chr}#{@id}.csv"
+      res = Job.get("#{resource_uri}/#{@id}.csv", {:format => :csv, :query => {:type => type}})
       puts "Status... #{res.code.inspect}"
       if res.code == 202
         puts "CSV Generating... Trying again in 10 seconds."
         Kernel.sleep 10
-        download_csv(full, filename)
+        download_csv(type, filename)
       else
         puts "CSV written to: #{File.expand_path(filename)}"
         File.open(filename, "w") {|f| f.puts res.body }
@@ -118,6 +118,14 @@ module CrowdFlower
     def delete
       Job.delete("#{resource_uri}/#{@id}.json")
     end
+    
+    def channels
+      Job.get("#{resource_uri}/#{@id}/channels")
+    end
+    
+    def enable_channels(channels)
+      Job.post("#{resource_uri}/#{@id}/channels", {:body => { :channels => channels } } )
+    end
 
     private
     def self.custom_content_type(content_type)

data/lib/crowdflower/judgment.rb

@@ -14,7 +14,8 @@ module CrowdFlower
     
     #Pull every judgment
     def all(page = 1, limit = 100, latest = true)#full = true
-      Judgment.get(resource_uri, {:query => {:limit => limit, :page => page, :latest => latest}})
+      opts = @@version == 2 ? {:unseen => latest} : {:latest => latest}
+      Judgment.get(resource_uri, {:query => {:limit => limit, :page => page}.merge(opts)})
     end
     
     def get(id)

data/test/integration_tests.rb

@@ -93,20 +93,33 @@ 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"/>' })
+job.update({:title => 'testtt',
+            :instructions => 'testttt fdsf sfds fsdfs fesfsdf', 
+            :cml => '<cml:text label="Text" class="unmodified" validates="required"/>'})
+            
+say "Checking channels"
+assert !job.channels['available_channels'].empty?
+assert job.channels['enabled_channels'].empty?
+job.enable_channels ['amt']
+assert job.channels['enabled_channels'] == ['amt']
+job.enable_channels ['mob']
+assert job.channels['enabled_channels'].sort == ['amt', 'mob']
+job.enable_channels ['mob']
+assert job.channels['enabled_channels'].sort == ['amt', 'mob']
+
 
 say "Ordering the job."
 order = CrowdFlower::Order.new(job)
 unit_count = 8
 order.debit(8)
-wait_until { job.status["needed_judgments"] == 24}
+wait_until { job.get["state"].casecmp('running') == 0}
 
 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'
+wait_until { unit.get(unit_id)['state'] == 'judgable' }
 puts unit.cancel(unit_id).inspect
-assert unit.get(unit_id)['state'] == 'new'
+assert unit.get(unit_id)['state'] == 'canceled'
 
 say "Webhook test needs to be written."
 #job.test_webhook

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crowdflower
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-12-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency