From 47ab93730ffc69ff837f20d47990b6c5107103fe Mon Sep 17 00:00:00 2001 From: Juergen Fesslmeier Date: Thu, 14 May 2015 18:07:10 -0700 Subject: [PATCH 1/4] Make hit duration in seconds --- lib/models/turkee_task.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/models/turkee_task.rb b/lib/models/turkee_task.rb index fb4a233..860738f 100644 --- a/lib/models/turkee_task.rb +++ b/lib/models/turkee_task.rb @@ -77,7 +77,7 @@ def self.create_hit(host, hit_title, hit_description, typ, num_assignments, rewa hit.description = hit_description hit.reward = reward hit.lifetime = lifetime.to_i.days.seconds.to_i - hit.duration = duration.to_i.hours.seconds.to_i if duration + hit.duration = duration.to_i if duration # duration in seconds hit.question(f_url, :frame_height => HIT_FRAMEHEIGHT) unless qualifications.empty? qualifications.each do |key, value| @@ -204,7 +204,8 @@ def completed_assignments? end def expired? - Time.now >= (created_at + hit_lifetime.days) + # Time.now >= (created_at + hit_lifetime.days) + Time.zone.now >= (self.created_at + hit_duration.seconds) end def self.task_items(turkee_task) From 136f4e844a307faf8371081f48dbd00ec8a9a4e0 Mon Sep 17 00:00:00 2001 From: Juergen Fesslmeier Date: Thu, 14 May 2015 18:59:57 -0700 Subject: [PATCH 2/4] Lifetime and duration in seconds * Ignore rvm settings * Convert lifetime to seconds --- .gitignore | 2 ++ lib/models/turkee_task.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 347ec59..7d97cea 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ pkg .idea ## PROJECT::SPECIFIC +.ruby-version +.ruby-gemset diff --git a/lib/models/turkee_task.rb b/lib/models/turkee_task.rb index 860738f..528738b 100644 --- a/lib/models/turkee_task.rb +++ b/lib/models/turkee_task.rb @@ -76,7 +76,7 @@ def self.create_hit(host, hit_title, hit_description, typ, num_assignments, rewa hit.description = hit_description hit.reward = reward - hit.lifetime = lifetime.to_i.days.seconds.to_i + hit.lifetime = lifetime.to_i # duration in seconds hit.duration = duration.to_i if duration # duration in seconds hit.question(f_url, :frame_height => HIT_FRAMEHEIGHT) unless qualifications.empty? From 6fd44899a5c9abcf2c4b9c30b3b63178f81f4958 Mon Sep 17 00:00:00 2001 From: Juergen Fesslmeier Date: Fri, 15 May 2015 08:50:08 -0700 Subject: [PATCH 3/4] Have :frame_height option in create_hit * indentation change --- lib/models/turkee_task.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/models/turkee_task.rb b/lib/models/turkee_task.rb index 528738b..39b6c6b 100644 --- a/lib/models/turkee_task.rb +++ b/lib/models/turkee_task.rb @@ -67,6 +67,7 @@ def self.save_imported_values(model, param_hash) # Creates a new Mechanical Turk task on AMZN with the given title, desc, etc def self.create_hit(host, hit_title, hit_description, typ, num_assignments, reward, lifetime, duration = nil, qualifications = {}, params = {}, opts = {}) + opts = opts.reverse_merge(:frame_height => HIT_FRAMEHEIGHT) model = typ.to_s.constantize f_url = build_url(host, model, params, opts) @@ -78,7 +79,7 @@ def self.create_hit(host, hit_title, hit_description, typ, num_assignments, rewa hit.reward = reward hit.lifetime = lifetime.to_i # duration in seconds hit.duration = duration.to_i if duration # duration in seconds - hit.question(f_url, :frame_height => HIT_FRAMEHEIGHT) + hit.question(f_url, :frame_height => opts[:frame_height]) unless qualifications.empty? qualifications.each do |key, value| hit.qualifications.add key, value From 465f6af2d8f29549caa2597c720d9d3761d2d931 Mon Sep 17 00:00:00 2001 From: Juergen Fesslmeier Date: Fri, 15 May 2015 13:41:39 -0700 Subject: [PATCH 4/4] Adding keywords option --- lib/models/turkee_task.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/models/turkee_task.rb b/lib/models/turkee_task.rb index 39b6c6b..0ae3de0 100644 --- a/lib/models/turkee_task.rb +++ b/lib/models/turkee_task.rb @@ -79,6 +79,7 @@ def self.create_hit(host, hit_title, hit_description, typ, num_assignments, rewa hit.reward = reward hit.lifetime = lifetime.to_i # duration in seconds hit.duration = duration.to_i if duration # duration in seconds + hit.keywords = opts[:keywords] if opts[:keywords] hit.question(f_url, :frame_height => opts[:frame_height]) unless qualifications.empty? qualifications.each do |key, value|