crowdflower 0.6.3 → 0.6.7

data/.gitignore

@@ -0,0 +1,8 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+tags/.loadpath
+/.project
+/.loadpath

data/Rakefile

@@ -15,7 +15,7 @@ EOF
     gem.email = "brian@doloreslabs.com"
     gem.homepage = "http://github.com/dolores/ruby-crowdflower"
     gem.authors = ["Brian P O'Rourke", "Chris Van Pelt"]
-    gem.add_dependency 'httparty', '>= 0.4.3'
+    gem.add_dependency 'httparty', '>= 0.7.4'
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.6.0

data/crowdflower.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{crowdflower}
-  s.version = "0.6.3"
+  s.version = "0.6.7"
 
   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{2011-03-08}
+  s.date = %q{2011-03-24}
   s.description = %q{A toolkit for interacting with CrowdFlower via the REST API.
 
 This is alpha software. Have fun!
@@ -18,32 +18,34 @@ This is alpha software. Have fun!
   s.email = %q{brian@doloreslabs.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.md"
+     "README.md"
   ]
   s.files = [
     ".document",
-    "CONTRIBUTORS",
-    "HISTORY.md",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bindev/cl_skel.rb",
-    "bindev/crowdflower.rb",
-    "crowdflower.gemspec",
-    "lib/crowdflower.rb",
-    "lib/crowdflower/base.rb",
-    "lib/crowdflower/job.rb",
-    "lib/crowdflower/judgment.rb",
-    "lib/crowdflower/order.rb",
-    "lib/crowdflower/unit.rb",
-    "lib/crowdflower/worker.rb",
-    "test/integration_tests.rb",
-    "test/sample.csv"
+     ".gitignore",
+     "CONTRIBUTORS",
+     "HISTORY.md",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "bindev/cl_skel.rb",
+     "bindev/crowdflower.rb",
+     "crowdflower.gemspec",
+     "lib/crowdflower.rb",
+     "lib/crowdflower/base.rb",
+     "lib/crowdflower/job.rb",
+     "lib/crowdflower/judgment.rb",
+     "lib/crowdflower/order.rb",
+     "lib/crowdflower/unit.rb",
+     "lib/crowdflower/worker.rb",
+     "test/integration_tests.rb",
+     "test/sample.csv"
   ]
   s.homepage = %q{http://github.com/dolores/ruby-crowdflower}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{a toolkit for the CrowdFlower API}
   s.test_files = [
     "test/integration_tests.rb"
@@ -53,12 +55,11 @@ This is alpha software. Have fun!
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.4.3"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.7.4"])
     else
-      s.add_dependency(%q<httparty>, [">= 0.4.3"])
+      s.add_dependency(%q<httparty>, [">= 0.7.4"])
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0.4.3"])
+    s.add_dependency(%q<httparty>, [">= 0.7.4"])
   end
 end
-

data/lib/crowdflower/base.rb

@@ -4,12 +4,15 @@ module CrowdFlower
 
   class UsageError < StandardError ; end
 
+  class APIWarning < StandardError ; end
+
   class APIError < StandardError
     attr_reader :details
 
     def initialize(hash)
       @details = hash
-      super @details.inspect
+      
+      super(hash.inspect)
     end
   end
   
@@ -163,11 +166,17 @@ module CrowdFlower
       end
     end
 
-   def self.verify_response(response)
-      if response["errors"]
-        raise CrowdFlower::APIError.new(response["errors"])
+    def self.verify_response(response)
+      if response.respond_to?(:[])
+        if error = (response["errors"] || response["error"])
+          raise CrowdFlower::APIError.new(error)
+        elsif warning = response["warning"]
+          raise CrowdFlower::APIWarning.new(warning)
+        end
       elsif response.response.kind_of? Net::HTTPUnauthorized
         raise CrowdFlower::APIError.new('message' => response.to_s)
+      elsif (500...600).include?(response.code)
+        raise CrowdFlower::APIError.new('message' => response.to_s)
       end
     end
     

data/lib/crowdflower/job.rb

@@ -1,5 +1,6 @@
 module CrowdFlower
   class Job < Base
+    attr_accessor :res
     attr_reader :id
     
     def initialize(job_id, connection = nil)

data/lib/crowdflower/judgment.rb

@@ -27,8 +27,8 @@ module CrowdFlower
     # *Admin-only && MTurk-only*
     # 
     # @param [String,Integer] id The CrowdFlower id for the judgment to reject.
-    def reject( id, reedo = false )
-      connection.put( "#{resource_uri}/#{id}/reject", :headers => { "Content-Length" => "0" }, :body => { :redo => reedo ? "true" : "false" } )
+    def reject( id, reedo = false, do_amt_reject = false )
+      connection.put( "#{resource_uri}/#{id}/reject", :headers => { "Content-Length" => "0" }, :body => { :redo => reedo ? "true" : "false", :do_amt_reject => do_amt_reject ? "true" : "false" } )
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crowdflower
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -08:00
+date: 2011-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 11
         segments: 
         - 0
+        - 7
         - 4
-        - 3
-        version: 0.4.3
+        version: 0.7.4
   type: :runtime
   version_requirements: *id001
 description: |+
@@ -50,6 +50,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- .gitignore
 - CONTRIBUTORS
 - HISTORY.md
 - LICENSE
@@ -73,8 +74,8 @@ homepage: http://github.com/dolores/ruby-crowdflower
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement