rturk 2.0.3 → 2.0.4

data/README.markdown

@@ -25,7 +25,8 @@ Let's say you have a form at "http://myapp.com/turkers/add_tags" where Turkers c
     hit = RTurk::Hit.create(:title => "Add some tags to a photo") do |hit|
       hit.assignments = 2
       hit.description = 'blah'
-      hit.question("http://myapp.com/turkers/add_tags")
+      hit.question("http://myapp.com/turkers/add_tags",
+                   :frame_height => 1000)  # pixels for iframe
       hit.reward = 0.05
       hit.qualifications.add :approval_rate, { :gt => 80 }
     end

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/lib/rturk/adapters/assignment.rb

@@ -15,7 +15,7 @@ module RTurk
     end
 
     def reject!(reason)
-      RTurk::ApproveAssignment(:assignment_id => self.id, :feedback => reason)
+      RTurk::RejectAssignment(:assignment_id => self.id, :feedback => reason)
     end
 
     def bonus!(amount, reason)

data/lib/rturk/operation.rb

@@ -73,12 +73,14 @@ module RTurk
     end
 
     def check_params
+      missing_parameters = []
       self.class.required_params.each do |param|
         if self.respond_to?(param)
-          raise MissingParameters, "Parameter '#{param.to_s}' cannot be blank" if self.send(param).nil?
+          missing_parameters << param.to_s if self.send(param).nil?
         else
           raise MissingParameters, "The parameter '#{param.to_s}' was required and not available"
         end
+        raise MissingParameters, "Parameters '#{missing_parameters.join(', ')}' cannot be blank" unless missing_parameters.empty?
       end
     end
 

data/lib/rturk/operations/create_hit.rb

@@ -2,27 +2,49 @@ require File.join(File.dirname(__FILE__), 'register_hit_type')
 
 module RTurk
   class CreateHIT < RegisterHITType
-    attr_accessor :hit_type_id
-
+    attr_accessor :hit_type_id, :assignments, :lifetime, :note
+    
     def parse(response)
       RTurk::CreateHITResponse.new(response)
     end
 
+    # Gives us access to a question builder attached to this HIT
+    #
+    # @param [String, Hash] URL Params, if none is passed, simply returns the question
+    # @return [RTurk::Question] The question if instantiated or nil
+    def question(*args)
+      unless args.empty?
+        @question ||= RTurk::Question.new(*args)
+      else
+        @question
+      end
+    end
+
     def to_params
-      super.merge('HITTypeId' => hit_type_id)
+      super.merge(
+        'HITTypeId'           => hit_type_id, 
+        'MaxAssignments'      => (assignments || 1),
+        'Question'            => question.to_params,
+        'LifetimeInSeconds'   => (lifetime || 3600),
+        'RequesterAnnotation' => note
+      )
     end
 
     # More complicated validation run before request
     #
     def validate
       if hit_type_id
-        unless question && lifetime
-          raise RTurk::MissingParameters, "When you specify a HitTypeID, you must incude a question and lifetime length"
+        unless question
+          raise RTurk::MissingParameters, "When you specify a HitTypeID, you must incude a question"
         end
       else
         super # validate as RegisterHitType
       end
     end
+    
+    def required_fields
+      super << :question
+    end
   end
 
   def self.CreateHIT(*args, &blk)

data/lib/rturk/operations/register_hit_type.rb

@@ -1,8 +1,8 @@
 module RTurk
   class RegisterHITType < Operation
 
-    attr_accessor :title, :keywords, :description, :reward, :currency, :assignments
-    attr_accessor :lifetime, :duration, :auto_approval, :note
+    attr_accessor :title, :description, :reward, :currency, :duration, :keywords, :auto_approval
+
 
     # @param [Symbol, Hash] qualification_key opts The unique qualification key
     # @option opts [Hash] :comparator A comparator and value e.g. :gt => 80
@@ -13,18 +13,6 @@ module RTurk
       @qualifications ||= RTurk::Qualifications.new
     end
 
-    # Gives us access to a question builder attached to this HIT
-    #
-    # @param [String, Hash] URL Params, if none is passed, simply returns the question
-    # @return [RTurk::Question] The question if instantiated or nil
-    def question(*args)
-      unless args.empty?
-        @question ||= RTurk::Question.new(*args)
-      else
-        @question
-      end
-    end
-
     # Returns parameters specific to this instance
     #
     # @return [Hash]
@@ -41,27 +29,30 @@ module RTurk
     # More complicated validation run before request
     #
     def validate
-      unless  title && reward && question && description
-        raise RTurk::MissingParameters, "You're missing some required parameters"
+      missing_parameters = []
+      required_fields.each do |param|
+        missing_parameters << param.to_s unless self.send(param)
       end
+      raise RTurk::MissingParameters, "Parameters: '#{missing_parameters.join(', ')}'" unless missing_parameters.empty?
     end
-
-    private
-
+    
+    def required_fields
+      [:title, :description, :reward]
+    end
+    
+    protected
+      
       def map_params
-        {'Title'=>self.title,
-         'MaxAssignments' => (self.assignments || 1),
-         'LifetimeInSeconds'=> (self.lifetime || 3600),
-         'AssignmentDurationInSeconds' => (self.duration || 86400),
-         'Reward.Amount' => self.reward,
-         'Reward.CurrencyCode' => (self.currency || 'USD'),
-         'Keywords' => self.keywords,
-         'Description' => self.description,
-         'Question' => self.question.to_params,
-         'RequesterAnnotation' => note}
+        {'Title'=>title,
+         'Description' => description,
+         'AssignmentDurationInSeconds' => (duration || 86400),
+         'Reward.Amount' => reward,
+         'Reward.CurrencyCode' => (currency || 'USD'),
+         'Keywords' => keywords,
+         'AutoApprovalDelayInSeconds' => auto_approval}
       end
-
   end
+  
   def self.RegisterHITType(*args, &blk)
     RTurk::RegisterHITType.create(*args, &blk)
   end

data/rturk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rturk}
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Percival"]
-  s.date = %q{2009-11-01}
+  s.date = %q{2009-12-07}
   s.email = %q{mark@mpercival.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/operations/disable_hit_spec.rb

@@ -9,7 +9,7 @@ describe RTurk::DisableHIT do
   end
 
   it "should ensure required params" do
-    lambda{RTurk::DisableHIT()}.should raise_error RTurk::MissingParameters
+    lambda{RTurk::DisableHIT()}.should raise_error(RTurk::MissingParameters)
   end
   
   it "should successfully request the operation" do

data/spec/operations/register_hit_type_spec.rb

@@ -11,9 +11,7 @@ describe RTurk::RegisterHITType do
 
   it "should rerturn a CreateHITResponse after the request" do
     response = RTurk::RegisterHITType(:title => "Look at some pictures from 4Chan") do |hit|
-      hit.assignments = 5
       hit.description = "foo"
-      hit.question("http://mpercival.com", :test => 'b')
       hit.reward = 0.05
       hit.qualifications.add(:adult, true)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rturk
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Mark Percival
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -04:00
+date: 2009-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: []