turkee 2.0.0 → 2.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    turkee (2.0.0)
+    turkee (2.0.1)
       lockfile
       rails (>= 3.1.1)
       rturk (>= 2.4.0)

data/lib/helpers/turkee_forms_helper.rb

@@ -6,21 +6,21 @@ module Turkee
 
       options.merge!({:url => mturk_url})
 
-      buffer = ''
-      form_for record, options do |f|
-        params.each do |k,v|
-          unless ['action','controller'].include?(k) || !v.is_a?(String)
-            buffer << hidden_field_tag(k, v)
-            cookies[k] = v
+      capture do
+        form_for record, options do |f|
+          params.each do |k,v|
+            unless ['action','controller'].include?(k) || !v.is_a?(String)
+              concat hidden_field_tag(k, v)
+              cookies[k] = v
+            end
           end
-        end
 
-        ['assignmentId', 'workerId', 'hitId'].each do |k|
-          buffer << hidden_field_tag(k, cookies[k]) if !params.has_key?(k) && cookies.has_key?(k)
-        end
+          ['assignmentId', 'workerId', 'hitId'].each do |k|
+            concat hidden_field_tag(k, cookies[k]) if !params.has_key?(k) && cookies.has_key?(k)
+          end
 
-        buffer << yield(f)
-        buffer.html_safe
+          concat(yield(f))
+        end
       end
     end
 
@@ -33,21 +33,24 @@ module Turkee
         style =  "position: fixed; top: 120px; right: 30px; color: #FFF;"
         style << "width: 400px; height: 375px; z-index: 100; padding: 10px;"
         style << "background-color: rgba(0,0,0, 0.5); border: 1px solid #000;"
+
         div_for(task, :style => style) do
-          content = content_tag(:h3, "DIRECTIONS", :style => 'text-align: right; color:#FF0000;')
-          content << task.hit_description.html_safe
-          content << '<hr/>'.html_safe
-          content << turkee_form_for(study, params) do |f|
-            buffer =  f.label(:feedback, "Feedback?:")
-            buffer <<  f.text_area(:feedback, :rows => 3, :disabled => disabled)
-            buffer << f.label(:gold_response, "Enter the fourth word from your above feedback :")
-            buffer << f.text_field(:gold_response, :disabled => disabled)
-            buffer << f.hidden_field(:turkee_task_id, :value => task.id)
-            buffer << '<br/>'.html_safe
-            buffer << f.submit('Submit', :disabled => disabled)
-            buffer
-          end.html_safe
-          content
+          capture do
+            concat content_tag(:h3, "DIRECTIONS", :style => 'text-align: right; color:#FF0000;')
+            concat task.hit_description.html_safe
+            concat '<hr/>'.html_safe
+            concat(turkee_form_for(study, params) do |f|
+              capture do
+                concat f.label(:feedback, "Feedback?:")
+                concat f.text_area(:feedback, :rows => 3, :disabled => disabled)
+                concat f.label(:gold_response, "Enter the fourth word from your above feedback :")
+                concat f.text_field(:gold_response, :disabled => disabled)
+                concat f.hidden_field(:turkee_task_id, :value => task.id)
+                concat '<br/>'.html_safe
+                concat f.submit('Submit', :disabled => disabled)
+              end
+            end)
+          end
         end
       end
     end

data/spec/dummy/app/controllers/surveys_controller.rb

@@ -0,0 +1,7 @@
+class SurveysController < ApplicationController
+
+  def new
+
+  end
+
+end

data/spec/dummy/app/models/survey.rb

@@ -0,0 +1,3 @@
+class Survey < ActiveRecord::Base
+  attr_accessible :answer
+end

data/spec/dummy/config/routes.rb

@@ -1,6 +1,5 @@
 Dummy::Application.routes.draw do
-  resources :companies, :only => %w(new create)
-  resources :projects, :only => %w(new create)
+  resources :surveys, :only => %w(new)
   get '/:controller/:action'
 
   # The priority is based upon order of creation:

data/spec/factories/survey_factory.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :survey do |s|
+    s.answer "The answer"
+    s.created_at Time.now
+    s.updated_at Time.now
+  end
+end

data/spec/helpers/turkee_forms_helper_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Turkee::TurkeeFormHelper, :type => :helper do
-  #include RSpec::Rails::HelperExampleGroup
   describe "mturk_url" do
     it "should return sandbox" do
       RTurk.stub(:sandbox?).and_return true
@@ -17,28 +16,60 @@ describe Turkee::TurkeeFormHelper, :type => :helper do
     before do
       @task = Factory(:turkee_task)
       RTurk.stub(:sandbox?).and_return true
+
+      helper.stub(:params).and_return({:assignmentId => '123456', :workerId => '987654'})
+      @study_form = helper.turkee_study
     end
 
-    it "includes the description" do
-      helper.stub(:params).and_return {}
-      study_form = turkee_study
-      study_form.should =~ /Test Desc/
-      study_form.should =~ /feedback/
-      study_form.should match /workersandbox.mturk.com/
+    it "includes the description, textarea" do
+      @study_form.should match(/Test Desc/)
+      @study_form.should match(/feedback/)
+      @study_form.should match(/textarea/)
+      @study_form.should match(/workersandbox.mturk.com/)
     end
 
-    it "saves the assignmentId to a cookie for later retrieval" do
-      helper.stub(:params).and_return({'assignmentId' => '123456'})
+    it "the form points to the sandbox" do
+      @study_form = turkee_study
+      @study_form.should match(/workersandbox.mturk.com/)
+    end
 
-      helper.turkee_study
+    it "still includes the necessary assignmentId and workerId" do
+      @study_form.should match(/assignmentId/)
+      @study_form.should match(/workerId/)
+    end
 
+  end
+
+  describe "turkee_form_for" do
+    before do
+      @survey = Factory(:survey)
+      RTurk.stub(:sandbox?).and_return true
+
+      params = {:assignmentId => '123456', :workerId => '987654'}
+      @survey_form = helper.turkee_form_for(@survey, params) do |f|
+        f.text_field :answer
+      end
+    end
+
+    it "displays the passed in assignmentId and workerId " do
+      @survey_form.should match(/answer/)
+      @survey_form.should match(/type=\"text\"/)
+      @survey_form.should match(/assignmentId/)
+      @survey_form.should match(/workerId/)
+    end
+
+    it "the intial turkee_form_for saved the assignmentId and workerId to a cookie for later retrieval" do
       helper.cookies['assignmentId'].should == '123456'
+      helper.cookies['workerId'].should == '987654'
 
       # Subsequent requests should still return form fields for assignmentId
-      helper.stub(:params).and_return({})
-      study_form = helper.turkee_study
-
-      study_form.should =~ /123456/
+      survey_form = helper.turkee_form_for(@survey, {}) do |f|
+        f.text_field :answer
+      end
+      survey_form.should match(/123456/)
+      survey_form.should match(/987654/)
+      survey_form.should match(/assignmentId/)
+      survey_form.should match(/workerId/)
     end
   end
 end

data/spec/spec_helper.rb

@@ -39,6 +39,8 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :surveys do |t|
     t.string :answer
+    t.datetime :created_at, :null => false
+    t.datetime :updated_at, :null => false
   end
 
   create_table :turkee_studies do |t|

data/turkee.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{turkee}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jim Jones}]
-  s.date = %q{2013-04-27}
+  s.date = %q{2013-05-14}
   s.description = %q{Turkee will help you to easily create usability studies, post HITs, and retrieve the user entered values from Mechanical Turk.}
   s.email = %q{jjones@aantix.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turkee
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lockfile
@@ -176,9 +176,11 @@ files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/surveys_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
+- spec/dummy/app/models/survey.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -206,6 +208,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/dummy/tmp/cache/.gitkeep
+- spec/factories/survey_factory.rb
 - spec/factories/turkee_task_factory.rb
 - spec/helpers/turkee_forms_helper_spec.rb
 - spec/models/turkee_study_spec.rb
@@ -233,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2965433502609428037
+      hash: 509377053887078608
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: