rturk 2.1.0 → 2.1.1

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/rturk/builders/notification_builder.rb

@@ -1,5 +1,6 @@
 module RTurk
   Notification = Struct.new(:Destination, :Transport, :Version, :EventType) do
+    # EventType can be a single string or an array of strings
     extend RTurk::Utilities
 
     members.each do |member|
@@ -15,7 +16,13 @@ module RTurk
       missing = []
       each_pair do |k, v|
         raise MissingParameters, "Missing parameter for #{k}" if v.nil?
-        hash["Notification.1.#{k}"] = v
+        if (k == :EventType) && (v.is_a? Array)
+            v.each_index do |i|
+              hash["Notification.1.#{k}.#{i+1}"] = v[i]
+            end
+        else
+          hash["Notification.1.#{k}"] = v
+        end
       end
       hash
     end

data/lib/rturk/operations/extend_hit.rb

@@ -0,0 +1,23 @@
+module RTurk
+  class RTurk::ExtendHIT < RTurk::Operation
+    
+    attr_accessor :hit_id, :max_assignments_increment, :expiration_increment_in_seconds 
+    require_params :hit_id
+
+    def to_params
+      if max_assignments_increment.nil? && expiration_increment_in_seconds.nil?
+        raise MissingParameters, 'Must add to either the HIT assignment count or expiration time.'
+      end
+      
+      {'HITId' => self.hit_id,
+       'MaxAssignmentsIncrement' => self.max_assignments_increment,
+       'ExpirationIncrementInSeconds' => self.expiration_increment_in_seconds}
+    end
+
+  end
+
+  def self.ExtendHIT(*args, &blk)
+    RTurk::ExtendHIT.create(*args, &blk)
+  end
+
+end

data/lib/rturk/requester.rb

@@ -33,18 +33,18 @@ module RTurk
         RTurk.logger.debug "Sending request:\n\t #{credentials.host}?#{querystring}"
         RestClient.get("#{credentials.host}?#{querystring}")
       end
-
+      
+      def sign(secret_key, service,method,time)
+        msg = "#{service}#{method}#{time}"
+        return hmac_sha1(secret_key, msg )
+      end
+      
       private
       
         def credentials
           RTurk
         end
 
-        def sign(secret_key, service,method,time)
-          msg = "#{service}#{method}#{time}"
-          return hmac_sha1(secret_key, msg )
-        end
-
         def hmac_sha1(key, s)
           ipad = [].fill(0x36, 0, 64)
           opad = [].fill(0x5C, 0, 64)

data/rturk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rturk}
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Percival"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-06-26}
   s.email = %q{mark@mpercival.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -134,6 +134,7 @@ Gem::Specification.new do |s|
      "lib/rturk/operations/create_hit.rb",
      "lib/rturk/operations/disable_hit.rb",
      "lib/rturk/operations/dispose_hit.rb",
+     "lib/rturk/operations/extend_hit.rb",
      "lib/rturk/operations/force_expire_hit.rb",
      "lib/rturk/operations/get_account_balance.rb",
      "lib/rturk/operations/get_assignments_for_hit.rb",
@@ -174,6 +175,7 @@ Gem::Specification.new do |s|
      "spec/fake_responses/create_hit.xml",
      "spec/fake_responses/disable_hit.xml",
      "spec/fake_responses/dispose_hit.xml",
+     "spec/fake_responses/extend_hit.xml",
      "spec/fake_responses/force_expire_hit.xml",
      "spec/fake_responses/get_account_balance.xml",
      "spec/fake_responses/get_assignments.xml",
@@ -193,6 +195,7 @@ Gem::Specification.new do |s|
      "spec/operations/create_hit_spec.rb",
      "spec/operations/disable_hit_spec.rb",
      "spec/operations/dispose_hit_spec.rb",
+     "spec/operations/extend_hit_spec.rb",
      "spec/operations/force_expire_hit_spec.rb",
      "spec/operations/get_account_balance_spec.rb",
      "spec/operations/get_assignments_spec.rb",
@@ -231,6 +234,7 @@ Gem::Specification.new do |s|
      "spec/operations/create_hit_spec.rb",
      "spec/operations/disable_hit_spec.rb",
      "spec/operations/dispose_hit_spec.rb",
+     "spec/operations/extend_hit_spec.rb",
      "spec/operations/force_expire_hit_spec.rb",
      "spec/operations/get_account_balance_spec.rb",
      "spec/operations/get_assignments_spec.rb",

data/spec/builders/notification_builder_spec.rb

@@ -30,5 +30,17 @@ describe RTurk::Notification do
           "Notification.1.Version" => RTurk::OLD_API_VERSION,
           "Notification.1.EventType" => 'mumble' }
     end
+    
+    it "should allow multiple event types" do
+      @notification.destination = 'foo'
+      @notification.transport = 'bar'
+      @notification.event_type = ['mumble', 'bumble']
+      @notification.to_param_hash.should ==
+        { "Notification.1.Destination" => 'foo',
+          "Notification.1.Transport" => 'bar',
+          "Notification.1.Version" => RTurk::OLD_API_VERSION,
+          "Notification.1.EventType.1" => 'mumble',
+          "Notification.1.EventType.2" => 'bumble' }
+    end
   end
 end

data/spec/fake_responses/extend_hit.xml

@@ -0,0 +1,5 @@
+<ExtendHITResult>
+  <Request>
+    <IsValid>True</IsValid>
+  </Request>
+</ExtendHITResult>

data/spec/operations/extend_hit_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe RTurk::ExtendHIT do
+
+  before(:all) do
+    aws = YAML.load(File.open(File.join(SPEC_ROOT, 'mturk.yml')))
+    RTurk.setup(aws['AWSAccessKeyId'], aws['AWSAccessKey'], :sandbox => true)
+    faker('extend_hit', :operation => 'ExtendHIT')
+  end
+
+  it "should ensure required params" do
+    lambda{RTurk::ExtendHIT(:hit_id => "123456789")}.should raise_error RTurk::MissingParameters
+  end
+  
+  it "should successfully request the operation" do
+    RTurk::Requester.should_receive(:request).once.with(
+      hash_including('Operation' => 'ExtendHIT'))
+    RTurk::ExtendHIT(:hit_id => "123456789", :max_assignments_increment => 1) rescue RTurk::InvalidRequest
+  end
+  
+  it "should parse and return the result" do
+    RTurk::ExtendHIT(:hit_id => "123456789", :expiration_increment_in_seconds => 3600).should
+      be_a_kind_of RTurk::Response
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Mark Percival
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -05:00
+date: 2010-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,6 +173,7 @@ files:
 - lib/rturk/operations/create_hit.rb
 - lib/rturk/operations/disable_hit.rb
 - lib/rturk/operations/dispose_hit.rb
+- lib/rturk/operations/extend_hit.rb
 - lib/rturk/operations/force_expire_hit.rb
 - lib/rturk/operations/get_account_balance.rb
 - lib/rturk/operations/get_assignments_for_hit.rb
@@ -213,6 +214,7 @@ files:
 - spec/fake_responses/create_hit.xml
 - spec/fake_responses/disable_hit.xml
 - spec/fake_responses/dispose_hit.xml
+- spec/fake_responses/extend_hit.xml
 - spec/fake_responses/force_expire_hit.xml
 - spec/fake_responses/get_account_balance.xml
 - spec/fake_responses/get_assignments.xml
@@ -232,6 +234,7 @@ files:
 - spec/operations/create_hit_spec.rb
 - spec/operations/disable_hit_spec.rb
 - spec/operations/dispose_hit_spec.rb
+- spec/operations/extend_hit_spec.rb
 - spec/operations/force_expire_hit_spec.rb
 - spec/operations/get_account_balance_spec.rb
 - spec/operations/get_assignments_spec.rb
@@ -294,6 +297,7 @@ test_files:
 - spec/operations/create_hit_spec.rb
 - spec/operations/disable_hit_spec.rb
 - spec/operations/dispose_hit_spec.rb
+- spec/operations/extend_hit_spec.rb
 - spec/operations/force_expire_hit_spec.rb
 - spec/operations/get_account_balance_spec.rb
 - spec/operations/get_assignments_spec.rb