rturk 2.9.0 → 2.10.0

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+2.9.0
+---
+* Added 'approve_rejected' [chrisconley]
+* Add additional attributes to HIT's [seeingidog]
+* Fixed constant value bug [karimn]
+* Fix unescaped HTML in raw XML [seeingidog]
+
 2.8.0
 ----
 * Adding support for operation SearchQualificationTypes [hampei]

data/Gemfile

@@ -1,7 +1,2 @@
 source "http://rubygems.org"
-gem 'nokogiri'
-gem 'jeweler'
-gem 'webmock'
-gem 'fakeweb'
-gem 'rest-client'
-gem 'rspec', '~> 1.3.1'
+gemspec

data/lib/rturk/adapters/hit.rb

@@ -61,11 +61,14 @@ module RTurk
     end
 
     # memoing
-    def assignments
-      @assignments ||=
-        RTurk::GetAssignmentsForHIT(:hit_id => self.id).assignments.inject([]) do |arr, assignment|
+    def assignments(options={})
+      @assignments ||= begin
+        assignments_options = options.update(:hit_id => self.id)
+        
+        RTurk::GetAssignmentsForHIT(assignments_options).assignments.inject([]) do |arr, assignment|
           arr << RTurk::Assignment.new(assignment.assignment_id, assignment)
         end
+      end
     end
 
     def details

data/lib/rturk/operations/get_assignments_for_hit.rb

@@ -3,7 +3,7 @@ module RTurk
 
     require_params :hit_id
     
-    attr_accessor :hit_id, :page_size, :page_number
+    attr_accessor :hit_id, :page_size, :page_number, :status
     
     def parse(xml)
       GetAssignmentsForHITResponse.new(xml)
@@ -12,7 +12,8 @@ module RTurk
     def to_params
       {'HITId' => hit_id,
        'PageSize' => (page_size || 100),
-       'PageNumber' => page_number}
+       'PageNumber' => page_number,
+       'AssignmentStatus' => status}
     end
 
   end

data/lib/rturk/version.rb

@@ -1,3 +1,3 @@
 module RTurk
-  VERSION = "2.9.0"
+  VERSION = "2.10.0"
 end

data/rturk.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |s|
 
   # Development dependencies
   s.add_development_dependency('rspec', "~> 1.3.1")
+  s.add_development_dependency('rake')
   s.add_development_dependency('webmock')
 end

data/spec/adapters/hit_spec.rb

@@ -8,7 +8,19 @@ describe "HIT adapter" do
     faker('create_hit', :operation => 'CreateHIT')
     faker('get_hit', :operation => 'GetHIT')
     faker('get_reviewable_hits', :operation => 'GetReviewableHITs')
+
     faker('get_assignments', :operation => 'GetAssignments')
+
+    faker('get_rejected_assignments', 
+      :params => {"AssignmentStatus" => "Rejected"}
+    )
+    faker('get_submitted_assignments', 
+      :params => {"AssignmentStatus" => "Submitted"}
+    )
+    faker('get_approved_assignments', 
+      :params => {"AssignmentStatus" => "Approved"}
+    )
+
     faker('extend_hit', :operation => 'ExtendHIT')
     faker('force_expire_hit', :operation => 'ForceExpireHIT')
     faker('dispose_hit', :operation => 'DisposeHIT')
@@ -53,6 +65,23 @@ describe "HIT adapter" do
     hits = RTurk::Hit.all_reviewable
     hits.first.assignments.first.answers["tweet"].should eql('This is my tweet!')
   end
+
+  context "assignment state" do
+    it "finds approved", :focus => true do
+      hits = RTurk::Hit.all_reviewable
+      hits.first.assignments(:status => "Approved").first.answers["tweet"].should eql("I Was approved!")
+    end
+
+    it "finds rejected" do
+      hits = RTurk::Hit.all_reviewable
+      hits.first.assignments(:status => "Rejected").first.answers["tweet"].should eql("I was rejected!")
+    end
+
+    it "finds submitted" do
+      hits = RTurk::Hit.all_reviewable
+      hits.first.assignments(:status => "Submitted").first.answers["tweet"].should eql("I was submitted!")
+    end
+  end
   
   it "should add time to a hit" do 
     hits = RTurk::Hit.all_reviewable

data/spec/fake_responses/get_approved_assignments.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<GetAssignmentsForHITResponse>
+  <OperationRequest>
+    <RequestId>a964d1f8-d315-4bbb-9ab6-692625d662ff</RequestId>
+  </OperationRequest>
+  <GetAssignmentsForHITResult>
+    <Request>
+      <IsValid>True</IsValid>
+    </Request>
+    <NumResults>1</NumResults>
+    <TotalNumResults>1</TotalNumResults>
+    <PageNumber>1</PageNumber>
+    <Assignment>
+      <AssignmentId>32A8TDZQEZYRV84XKZ4ZBT6JT05DKJRZ1BC42YSZ</AssignmentId>
+      <WorkerId>ADOJP7RNRYAFG</WorkerId>
+      <HITId>32A8TDZQEZYRV84XKZ4Z</HITId>
+      <AssignmentStatus>Approved</AssignmentStatus>
+      <AutoApprovalTime>2009-11-25T05:17:32Z</AutoApprovalTime>
+      <AcceptTime>2009-10-26T05:17:18Z</AcceptTime>
+      <SubmitTime>2009-10-26T05:17:32Z</SubmitTime>
+      <Answer>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;QuestionFormAnswers xmlns="http://mechanicalturk.amazonaws.com/AWSMechanicalTurkDataSchemas/2005-10-01/QuestionFormAnswers.xsd"&gt;
+&lt;Answer&gt;
+&lt;QuestionIdentifier&gt;tweet&lt;/QuestionIdentifier&gt;
+&lt;FreeText&gt;I Was approved!&lt;/FreeText&gt;
+&lt;/Answer&gt;
+&lt;Answer&gt;
+&lt;QuestionIdentifier&gt;Submit&lt;/QuestionIdentifier&gt;
+&lt;FreeText&gt;Submit&lt;/FreeText&gt;
+&lt;/Answer&gt;
+&lt;/QuestionFormAnswers&gt;
+</Answer>
+    </Assignment>
+  </GetAssignmentsForHITResult>
+</GetAssignmentsForHITResponse>

data/spec/fake_responses/get_rejected_assignments.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<GetAssignmentsForHITResponse>
+  <OperationRequest>
+    <RequestId>a964d1f8-d315-4bbb-9ab6-692625d662ff</RequestId>
+  </OperationRequest>
+  <GetAssignmentsForHITResult>
+    <Request>
+      <IsValid>True</IsValid>
+    </Request>
+    <NumResults>1</NumResults>
+    <TotalNumResults>1</TotalNumResults>
+    <PageNumber>1</PageNumber>
+    <Assignment>
+      <AssignmentId>32A8TDZQEZYRV84XKZ4ZBT6JT05DKJRZ1BC42YSZ</AssignmentId>
+      <WorkerId>ADOJP7RNRYAFG</WorkerId>
+      <HITId>32A8TDZQEZYRV84XKZ4Z</HITId>
+      <AssignmentStatus>Rejected</AssignmentStatus>
+      <AutoApprovalTime>2009-11-25T05:17:32Z</AutoApprovalTime>
+      <AcceptTime>2009-10-26T05:17:18Z</AcceptTime>
+      <SubmitTime>2009-10-26T05:17:32Z</SubmitTime>
+      <Answer>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;QuestionFormAnswers xmlns="http://mechanicalturk.amazonaws.com/AWSMechanicalTurkDataSchemas/2005-10-01/QuestionFormAnswers.xsd"&gt;
+&lt;Answer&gt;
+&lt;QuestionIdentifier&gt;tweet&lt;/QuestionIdentifier&gt;
+&lt;FreeText&gt;I was rejected!&lt;/FreeText&gt;
+&lt;/Answer&gt;
+&lt;Answer&gt;
+&lt;QuestionIdentifier&gt;Submit&lt;/QuestionIdentifier&gt;
+&lt;FreeText&gt;Submit&lt;/FreeText&gt;
+&lt;/Answer&gt;
+&lt;/QuestionFormAnswers&gt;
+</Answer>
+    </Assignment>
+  </GetAssignmentsForHITResult>
+</GetAssignmentsForHITResponse>

data/spec/fake_responses/get_submitted_assignments.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<GetAssignmentsForHITResponse>
+  <OperationRequest>
+    <RequestId>a964d1f8-d315-4bbb-9ab6-692625d662ff</RequestId>
+  </OperationRequest>
+  <GetAssignmentsForHITResult>
+    <Request>
+      <IsValid>True</IsValid>
+    </Request>
+    <NumResults>1</NumResults>
+    <TotalNumResults>1</TotalNumResults>
+    <PageNumber>1</PageNumber>
+    <Assignment>
+      <AssignmentId>32A8TDZQEZYRV84XKZ4ZBT6JT05DKJRZ1BC42YSZ</AssignmentId>
+      <WorkerId>ADOJP7RNRYAFG</WorkerId>
+      <HITId>32A8TDZQEZYRV84XKZ4Z</HITId>
+      <AssignmentStatus>Submitted</AssignmentStatus>
+      <AutoApprovalTime>2009-11-25T05:17:32Z</AutoApprovalTime>
+      <AcceptTime>2009-10-26T05:17:18Z</AcceptTime>
+      <SubmitTime>2009-10-26T05:17:32Z</SubmitTime>
+      <Answer>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;QuestionFormAnswers xmlns="http://mechanicalturk.amazonaws.com/AWSMechanicalTurkDataSchemas/2005-10-01/QuestionFormAnswers.xsd"&gt;
+&lt;Answer&gt;
+&lt;QuestionIdentifier&gt;tweet&lt;/QuestionIdentifier&gt;
+&lt;FreeText&gt;I was submitted!&lt;/FreeText&gt;
+&lt;/Answer&gt;
+&lt;Answer&gt;
+&lt;QuestionIdentifier&gt;Submit&lt;/QuestionIdentifier&gt;
+&lt;FreeText&gt;Submit&lt;/FreeText&gt;
+&lt;/Answer&gt;
+&lt;/QuestionFormAnswers&gt;
+</Answer>
+    </Assignment>
+  </GetAssignmentsForHITResult>
+</GetAssignmentsForHITResponse>

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ $: << SPEC_ROOT
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require 'spec'
-require 'fakeweb'
 require 'yaml'
 require 'webmock'
 include WebMock::API
@@ -18,6 +17,12 @@ def faker(response_name, opts = {})
   response = File.read(File.join(SPEC_ROOT, 'fake_responses', "#{response_name.to_s}.xml"))
   if opts[:operation]
     stub_request(:post, /amazonaws.com/).with(:body => /Operation=#{opts[:operation]}/).to_return(:body => response)
+  elsif opts[:params]
+    stub_request(:post, /amazonaws.com/).with do |request|
+      opts[:params].reject do |key, value|
+        !(request.body =~ /#{key}=#{value}/)
+      end.length == opts[:params].length
+    end.to_return(:body => response)
   else
     stub_request(:post, /amazonaws.com/).to_return(:body => response)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rturk
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -62,6 +62,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +296,7 @@ files:
 - spec/fake_responses/extend_hit.xml
 - spec/fake_responses/force_expire_hit.xml
 - spec/fake_responses/get_account_balance.xml
+- spec/fake_responses/get_approved_assignments.xml
 - spec/fake_responses/get_assignment.xml
 - spec/fake_responses/get_assignments.xml
 - spec/fake_responses/get_assignments_multiple.xml
@@ -288,7 +305,9 @@ files:
 - spec/fake_responses/get_qualification_requests.xml
 - spec/fake_responses/get_qualification_type.xml
 - spec/fake_responses/get_qualifications_for_qualification_type.xml
+- spec/fake_responses/get_rejected_assignments.xml
 - spec/fake_responses/get_reviewable_hits.xml
+- spec/fake_responses/get_submitted_assignments.xml
 - spec/fake_responses/grant_bonus.xml
 - spec/fake_responses/grant_qualification.xml
 - spec/fake_responses/invalid_credentials.xml