typingpool 0.8.10 → 0.8.11

data/lib/typingpool/test/fixtures/vcr/tp_finish_8.yml

@@ -0,0 +1,51 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://mechanicalturk.amazonaws.com/
+    body:
+      encoding: UTF-8
+      base64_string: |
+        UGFnZVNpemU9MTAwJlBhZ2VOdW1iZXI9MSZPcGVyYXRpb249U2VhcmNoSElU
+        cyZTZXJ2aWNlPUFXU01lY2hhbmljYWxUdXJrUmVxdWVzdGVyJkFXU0FjY2Vz
+        c0tleUlkPTxBV1NfS0VZPiZUaW1lc3RhbXA9MjAxNi0xMi0zMVQwMiUzQTI1
+        JTNBMjlaJlZlcnNpb249MjAxMi0wMy0yNSZTaWduYXR1cmU9dkdBNWNpZU1v
+        cXFWWG8yVm9JOXpSeGdzekNFJTNE
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - rest-client/2.0.0 (darwin15.6.0 x86_64) ruby/2.0.0p353
+      Content-Length:
+      - '212'
+      Host:
+      - mechanicalturk.amazonaws.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/xml
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Sat, 31 Dec 2016 02:25:29 GMT
+      Server:
+      - MTurk
+    body:
+      encoding: UTF-8
+      base64_string: |
+        PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxTZWFyY2hISVRzUmVzcG9uc2U+PE9w
+        ZXJhdGlvblJlcXVlc3Q+PFJlcXVlc3RJZD4xNGE1MzhjNC01NWFlLTQyNjgt
+        YjljZC1mZmIwYzM5ODI3NWM8L1JlcXVlc3RJZD48L09wZXJhdGlvblJlcXVl
+        c3Q+PFNlYXJjaEhJVHNSZXN1bHQ+PFJlcXVlc3Q+PElzVmFsaWQ+VHJ1ZTwv
+        SXNWYWxpZD48L1JlcXVlc3Q+PE51bVJlc3VsdHM+MDwvTnVtUmVzdWx0cz48
+        VG90YWxOdW1SZXN1bHRzPjA8L1RvdGFsTnVtUmVzdWx0cz48UGFnZU51bWJl
+        cj4xPC9QYWdlTnVtYmVyPjwvU2VhcmNoSElUc1Jlc3VsdD48L1NlYXJjaEhJ
+        VHNSZXNwb25zZT4=
+    http_version: 
+  recorded_at: Sat, 31 Dec 2016 02:25:29 GMT
+recorded_with: VCR 3.0.3

data/lib/typingpool/test/script.rb

@@ -32,7 +32,6 @@ module Typingpool
       end
 
       def copy_readymade_project_into(config_path)
-        config = Typingpool::Config.file(config_path)
         FileUtils.cp_r(File.join(@@readymade_project_path, '.'), File.dirname(config_path))
       end
 
@@ -42,7 +41,6 @@ module Typingpool
         project = Project.new(project_default[:title], Config.file(config_path))
         File.delete(project.local.file('data', 'id.txt'))
         project.local.create_id
-        id = project.local.id
         reconfigure_project_csv_in(config_path)
       end
 
@@ -288,7 +286,7 @@ module Typingpool
 
       def make_fixture_project_dir(name)
         dir = fixture_project_dir(name)
-        if File.exists? dir
+        if File.exist? dir
           raise Error::Test, "Fixture project already exists for #{name} at #{dir}"
         end
         Dir.mkdir(dir)
@@ -312,7 +310,7 @@ module Typingpool
       def copy_fixtures_to_transcripts_dir(dir, fixture_prefix)
         copies = 0
         with_fixtures_in_transcripts_dir(dir, fixture_prefix) do |fixture_path, project_path|
-          if File.exists? project_path
+          if File.exist? project_path
             FileUtils.mv(project_path, File.join(File.dirname(project_path), "orig_#{File.basename(project_path)}"))
           end
           FileUtils.cp(fixture_path, project_path)
@@ -326,7 +324,7 @@ module Typingpool
         with_fixtures_in_transcripts_dir(dir, fixture_prefix) do |fixture_path, project_path|
           FileUtils.rm(project_path)
           path_to_orig = File.join(File.dirname(project_path), "orig_#{File.basename(project_path)}")
-          if File.exists?(path_to_orig)
+          if File.exist?(path_to_orig)
             FileUtils.mv(path_to_orig, project_path)
           end
         end
@@ -334,7 +332,7 @@ module Typingpool
 
       def assert_has_transcript(dir, transcript_file='transcript.html')
         transcript_path = File.join(transcripts_dir_project(dir).local, transcript_file)
-        assert(File.exists?(transcript_path))
+        assert(File.exist?(transcript_path))
         assert(not((transcript = IO.read(transcript_path)).empty?))
         transcript
       end

data/lib/typingpool/test.rb

@@ -1,6 +1,7 @@
 module Typingpool
   require 'minitest'
   require 'typingpool/app/test'
+
   class Test < Minitest::Test 
     class << self
       attr_accessor :live
@@ -29,7 +30,7 @@ module Typingpool
 
     def delete_vcr_fixture(fixture_name)
       fixture_path = File.join(vcr_dir, [fixture_name, '.yml'].join)
-      File.delete(fixture_path) if File.exists? fixture_path
+      File.delete(fixture_path) if File.exist? fixture_path
     end
 
     def cleared_vcr_fixture_path_for(fixture_name)
@@ -54,7 +55,7 @@ module Typingpool
     end
 
     def config
-      if File.exists?(File.expand_path(Config.default_file))
+      if File.exist?(File.expand_path(Config.default_file))
         Config.file
       else
         Config.from_bundled_template

data/lib/typingpool/utility.rb

@@ -5,7 +5,8 @@ module Typingpool
     require 'tmpdir'
     require 'set'
     require 'net/http'
-
+    require 'fcntl'
+    
     class << self
       #Much like Kernel#system, except it doesn't spew STDERR and
       #STDOUT all over your screen (when called with multiple args,
@@ -158,8 +159,8 @@ module Typingpool
       #following redirects). False if the HTTP response code indicates
       #an error (e.g. 4XX and 5XX response codes).
       def working_url?(url, max_redirects=6)
-        response = request_url_with(url, max_redirects) do |url, http|
-          http.request_head(url.path)
+        response = request_url_with(url, max_redirects) do |current_url, http|
+          http.request_head(current_url.path)
         end #request_url_with... do |url|
         response.kind_of?(Net::HTTPSuccess)
       end
@@ -177,8 +178,8 @@ module Typingpool
       # ==== Returns
       #A Net::HTTPResponse instance, if the request was successful.
       def fetch_url(url, max_redirects=6)
-        response = request_url_with(url, max_redirects) do |url, http|
-          http.request_get(url.path)
+        response = request_url_with(url, max_redirects) do |current_url, http|
+          http.request_get(current_url.path)
         end
         if response.kind_of?(Net::HTTPSuccess)
           return response

data/lib/typingpool/version.rb

@@ -1,3 +1,3 @@
 module Typingpool
-  VERSION = '0.8.10'
+  VERSION = '0.8.11'
 end #Typingpool

data/test/test_integration_script_1_tp_config.rb

@@ -17,7 +17,7 @@ end
 
 def test_abort_with_directory_path
   dir = File.join(fixtures_dir, 'vcr')
-  assert(File.exists? dir)
+  assert(File.exist? dir)
   assert(File.directory? dir)
   exception = assert_raises(Typingpool::Error::Shell) do
     tp_config(dir)
@@ -27,7 +27,7 @@ end
 
 def test_abort_with_invalid_path
   path = '/jksdljs/euwiroeuw'
-  refute(File.exists? path)
+  refute(File.exist? path)
   exception = assert_raises(Typingpool::Error::Shell) do
     tp_config(path)
   end
@@ -35,7 +35,7 @@ def test_abort_with_invalid_path
 end
 
 def test_usage_message
-  out, err = tp_config('--help')
+  out, _ = tp_config('--help')
   assert(out)
   assert_match(/\bUSAGE:/, out)
 end
@@ -46,10 +46,10 @@ def test_new_config_creation
       :config => File.join(dir, 'config.yml'),
       :transcript_dir => File.join(dir, 'transcriptionz')
     }
-    path.values.each{|path| refute(File.exists? path) }
+    path.values.each{|a_path| refute(File.exist? a_path) }
     assert(output = tp_config_with_input([path[:config], '--test'], ['keykey', 'secretsecret', path[:transcript_dir]]))
     assert_match(/wrote config to/i, output[:err])
-    path.values.each{|path| assert(File.exists? path) }
+    path.values.each{|a_path| assert(File.exist? a_path) }
     assert(File.file? path[:config] )
     assert(File.directory? path[:transcript_dir] )
     assert(config = Typingpool::Config.file(path[:config]))
@@ -68,14 +68,14 @@ def test_config_editing
       :fixture => File.join(fixtures_dir, 'config-1'),
       :transcript_dir => File.join(dir, 'transcriptionz')
     }
-    assert(File.exists? path[:fixture])
-    refute(File.exists? path[:config])
+    assert(File.exist? path[:fixture])
+    refute(File.exist? path[:config])
     FileUtils.cp(path[:fixture], path[:config])
-    assert(File.exists? path[:config])
+    assert(File.exist? path[:config])
     assert(original_config = Typingpool::Config.file(path[:config]))
     [:key, :secret, :bucket].each{|param| refute_empty(original_config.amazon.send(param).to_s) }
     [:transcripts, :templates, :cache].each{|param| refute_empty(original_config.send(param).to_s) } 
-    assert(output = tp_config_with_input([path[:config], '--test'], ['keykey', 'secretsecret', path[:transcript_dir]]))
+    assert(tp_config_with_input([path[:config], '--test'], ['keykey', 'secretsecret', path[:transcript_dir]]))
     assert(edited_config = Typingpool::Config.file(path[:config]))
     [:key, :secret].each{|param| refute_equal(original_config.amazon.send(param), edited_config.amazon.send(param)) }
     assert_equal(original_config.amazon.bucket, edited_config.amazon.bucket)
@@ -94,10 +94,10 @@ def test_skips_bucket_when_sftp_params_exist
       :fixture => File.join(fixtures_dir, 'config-2'),
       :transcript_dir => File.join(dir, 'transcriptionz')
     }
-    assert(File.exists? path[:fixture])
-    refute(File.exists? path[:config])
+    assert(File.exist? path[:fixture])
+    refute(File.exist? path[:config])
     FileUtils.cp(path[:fixture], path[:config])
-    assert(File.exists? path[:config])
+    assert(File.exist? path[:config])
     assert(original_config = Typingpool::Config.file(path[:config]))
     assert_empty(original_config.amazon.bucket.to_s)
     assert(output = tp_config_with_input([path[:config], '--test'], ['keykey', 'secretsecret', path[:transcript_dir]]))

data/test/test_integration_script_2_tp_make.rb

@@ -24,10 +24,26 @@ class TestTpMake < Typingpool::Test::Script
     assert_tp_make_abort_match([], /\bUSAGE:/)
   end
 
+  def test_abort_with_sftp_http_url
+    with_temp_transcripts_dir do |dir|
+      config = Typingpool::Config.file(config_path(dir))
+      config.to_hash['sftp'] = {
+        'user' => 'test',
+        'host' => 'example.com',
+        'url' => 'http://example.com/foobar'
+      }
+      write_config(config, dir)
+      exception = assert_raises(Typingpool::Error::Shell) do
+        call_tp_make('--file', audio_files[0], '--title', 'Foo', '--config', config_path(dir), '--testnoupload')
+      end
+      assert_match(/must begin with 'https'/i, exception.message)
+    end #with_temp_transcripts_dir do...
+  end
+  
   def assert_tp_make_abort_match(args, regex)
     args.push('--testnoupload')
-    assert_script_abort_match(args, regex) do |args|
-      call_tp_make(*args)
+    assert_script_abort_match(args, regex) do |new_args|
+      call_tp_make(*new_args)
     end
   end
 
@@ -90,7 +106,7 @@ class TestTpMake < Typingpool::Test::Script
       assert_all_assets_have_upload_status(project.local.file('data', 'assignment.csv').as(:csv), 'audio', 'no') 
     end #with_temp_transcripts_dir do...
   end
-
+  
   def test_tp_make_s3
     with_temp_transcripts_dir do |dir|
       skip_if_no_s3_credentials('tp-make S3 integration test', config)
@@ -119,9 +135,9 @@ class TestTpMake < Typingpool::Test::Script
       end
       assert(project = transcripts_dir_project(dir))
       project_dir = project.local.path
-      assert(File.exists? project_dir)
+      assert(File.exist? project_dir)
       assert(File.directory? project_dir)
-      assert(File.exists? File.join(project_dir, 'data', 'assignment.csv'))
+      assert(File.exist? File.join(project_dir, 'data', 'assignment.csv'))
       originals_dir = File.join(project_dir, 'audio', 'originals')
       refute_empty(Dir.entries(originals_dir).reject{|entry| entry.match(/^\./) }.map{|entry| File.join(originals_dir, entry) }.select{|path| File.file? path })
       assert(assignment_csv = project.local.file('data', 'assignment.csv').as(:csv))
@@ -156,20 +172,20 @@ class TestTpMake < Typingpool::Test::Script
       assert(project = transcripts_dir_project(dir))
       check_project_files(project)
       assert(merged_audio_file = project.local.subdir('audio','originals').files.detect{|filer| filer.path.match(/.\.all\../)})
-      assert(File.exists? merged_audio_file)
+      assert(File.exist? merged_audio_file)
       actually_ordered_paths = originals_from_merged_audio_file(merged_audio_file)
       assert_equal(correctly_ordered_paths.map{|path| File.basename(path) }, actually_ordered_paths.map{|path| File.basename(path) })
     end #with_temp_transcripts_dir
   end
 
   def originals_from_merged_audio_file(path)
-    out, err, status = Open3.capture3('mp3splt', '-l', path)
+    out, _, _ = Open3.capture3('mp3splt', '-l', path)
     refute_nil(out)
     refute_empty(out)
     paths = out.scan(/^\/.+\.mp3$/i)
     refute_empty(paths)
     assert(paths.count > 1)
-    paths.each{|path| assert(File.exists? path) }
+    paths.each{|a_path| assert(File.exist? a_path) }
     paths
   end
 

data/test/test_integration_script_3_tp_assign.rb

@@ -32,9 +32,26 @@ class TestTpAssign < Typingpool::Test::Script
     assert_tp_assign_abort_match([project_default[:title], assign_default[:template], '--reward', 'foo'], /sense of --reward/i)
   end
 
+  
+  def test_abort_with_sftp_http_url
+    with_temp_readymade_project do |dir|
+      config = Typingpool::Config.file(config_path(dir))
+      config.to_hash['sftp'] = {
+        'user' => 'test',
+        'host' => 'example.com',
+        'url' => 'http://example.com/foobar'
+      }
+      write_config(config, dir)
+      exception = assert_raises(Typingpool::Error::Shell) do
+        call_tp_assign(project_default[:title], assign_default[:template], '--config', config_path(dir))
+      end
+      assert_match(/must begin with 'https'/i, exception.message)
+    end #with_temp_readymade_project do |dir|
+  end
+  
   def assert_tp_assign_abort_match(args, regex)
-    assert_script_abort_match(args, regex) do |args|
-      call_tp_assign(*args)
+    assert_script_abort_match(args, regex) do |new_args|
+      call_tp_assign(*new_args)
     end
   end
 
@@ -45,7 +62,6 @@ class TestTpAssign < Typingpool::Test::Script
       project = transcripts_dir_project(dir)
       vcr_names = ['tp_assign_1', 'tp_assign_2']
       copy_tp_assign_fixtures(dir, vcr_names[0])
-      assign_time = (Typingpool::Test.record || Typingpool::Test.live) ? Time.now : project_time(project)
       config = Typingpool::Config.file(config_path(dir))
       Typingpool::Amazon.setup(:sandbox => true, :config => Typingpool::Config.file(config_path(dir)))
       with_vcr(vcr_names[1], config, {
@@ -53,6 +69,7 @@ class TestTpAssign < Typingpool::Test::Script
                  :match_requests_on => [:method, Typingpool::App.vcr_core_host_matcher]
                }) do
         begin
+          assign_time = (Typingpool::Test.record || Typingpool::Test.live) ? Time.now : project_time(project)
           tp_assign_with_vcr(dir, vcr_names[0])
           results = nil
           refute_empty(results = Typingpool::Amazon::HIT.all_for_project(project.local.id))
@@ -60,7 +77,7 @@ class TestTpAssign < Typingpool::Test::Script
           assert_equal(Typingpool::Utility.timespec_to_seconds(assign_default[:deadline]), results[0].full.assignments_duration.to_i)
           #These numbers will be apart due to clock differences and
           #timing vagaries of the assignment.
-          assert_in_delta((assign_time + Typingpool::Utility.timespec_to_seconds(assign_default[:lifetime])).to_f, results[0].full.expires_at.to_f, 60) if Typingpool::Test.live
+          assert_in_delta((assign_time + Typingpool::Utility.timespec_to_seconds(assign_default[:lifetime])).to_f, results[0].full.expires_at.to_f, 360) if Typingpool::Test.live
           keywords = results[0].at_amazon.keywords
           assign_default[:keyword].each{|keyword| assert_includes(keywords, keyword)}
           sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
@@ -68,10 +85,10 @@ class TestTpAssign < Typingpool::Test::Script
           assert(assignment_html = fetch_url(assignment_urls.first).body)
           assert_match(/\b22[\s-]+second\b/, assignment_html)
           assert_all_assets_have_upload_status(sandbox_csv, 'assignment', 'yes')
-      ensure
-        tp_finish(dir) if (Typingpool::Test.record || Typingpool::Test.live)
-      end #begin
-      assert_empty(Typingpool::Amazon::HIT.all_for_project(project.local.id))
+        ensure
+          tp_finish(dir) if (Typingpool::Test.record || Typingpool::Test.live)
+        end #begin
+        assert_empty(Typingpool::Amazon::HIT.all_for_project(project.local.id))
       end #with_vcr do...
     end #with_temp_readymade_project do...
   end
@@ -114,7 +131,7 @@ class TestTpAssign < Typingpool::Test::Script
       csv = project.local.file('data', 'assignment.csv').as(:csv)
       csv.each!{|a| a['audio_uploaded'] = 'yes'}
       bad_config_path = setup_s3_config_with_bad_password(dir)
-      get_assignment_urls = lambda{|csv| csv.map{|assignment| assignment['assignment_url'] }.select{|url| url } }
+      get_assignment_urls = lambda{|assignments| assignments.map{|assignment| assignment['assignment_url'] }.select{|url| url } }
       assert_empty(get_assignment_urls.call(csv))
       begin
         exception = assert_raises(Typingpool::Error::Shell) do
@@ -178,16 +195,14 @@ class TestTpAssign < Typingpool::Test::Script
                  :match_requests_on => [:method, Typingpool::App.vcr_core_host_matcher]
                }) do
         begin
-          out, err = tp_assign_with_vcr(dir, vcr_names[0])
-          assert_match(/would cost \$((0\.40)||(0\.47))\./, err)
+          _, err = tp_assign_with_vcr(dir, vcr_names[0])
+          assert_match(/would cost \$((0\.44)||(0\.51))\./, err)
           refute_empty(results = Typingpool::Amazon::HIT.all_for_project(project.local.id))
           assert_equal('0.06', results.first.at_amazon.reward_amount.to_s)
-      ensure
-        tp_finish(dir) if (Typingpool::Test.record || Typingpool::Test.live)
-      end #begin
-    end #with_temp_readymade_project do...
-  end #with_vcr...
-end
-
-
+        ensure
+          tp_finish(dir) if (Typingpool::Test.record || Typingpool::Test.live)
+        end #begin
+      end #with_temp_readymade_project do...
+    end #with_vcr...
+  end
 end #TestTpAssign

data/test/test_integration_script_4_tp_review.rb

@@ -14,7 +14,7 @@ class TestTpReview < Typingpool::Test::Script
       skip_if_no_amazon_credentials('tp-review integration test')
       copy_fixtures_to_transcripts_dir(dir, 'tp_review_')
       project = transcripts_dir_project(dir)
-      assert(File.exists? File.join(project.local, 'data','sandbox-assignment.csv'))
+      assert(File.exist? File.join(project.local, 'data','sandbox-assignment.csv'))
       assert_equal(7, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
       begin
         output = nil

data/test/test_integration_script_6_tp_finish.rb

@@ -60,15 +60,15 @@ class TestTpFinish < Typingpool::Test::Script
   end
 
   def tp_finish_with_vcr(*args)
-    script_with_vcr(*args){|args| tp_finish(*args) }
+    script_with_vcr(*args){|new_args| tp_finish(*new_args) }
   end
 
   def tp_finish_outside_sandbox_with_vcr(*args)
-    script_with_vcr(*args){|args| tp_finish_outside_sandbox(*args) }
+    script_with_vcr(*args){|new_args| tp_finish_outside_sandbox(*new_args) }
   end
 
   def tp_finish_inside_sandbox_with_vcr(*args)
-    script_with_vcr(*args){|args| tp_finish_inside_sandbox(*args) }
+    script_with_vcr(*args){|new_args| tp_finish_inside_sandbox(*new_args) }
   end
 
   def test_tp_finish_on_amazon_hits
@@ -111,7 +111,7 @@ class TestTpFinish < Typingpool::Test::Script
           end #begin
         end #results.each...
       end #with_vcr do...
-      refute(File.exists? sandbox_csv)
+      refute(File.exist? sandbox_csv)
       assert_all_assets_have_upload_status(csv, 'audio', 'no')
     end #with_temp_readymade_project do...
   end
@@ -163,7 +163,7 @@ class TestTpFinish < Typingpool::Test::Script
       config.amazon.bucket = new_bucket
       bad_config_path = setup_s3_config(dir, config, '.config_s3_bad')
       exception = assert_raises(Typingpool::Error::Shell) do
-        tp_finish_outside_sandbox(dir, bad_config_path)
+        tp_finish_outside_sandbox_with_vcr(dir, 'tp_finish_8', bad_config_path)
       end #assert_raises...
       assert_match(/\burls don't look right\b/i, exception.message)
     end #with_temp_readymade_project do...

data/test/test_unit_amazon.rb

@@ -112,7 +112,7 @@ class TestAmazon < Typingpool::Test
     if Typingpool::Test.record
       File.write(time_path, Time.now.to_i.to_s)
     elsif not(Typingpool::Test.live)
-      File.exists? time_path or raise Typingpool::Error, "No time file at '#{time_path}'"
+      File.exist? time_path or raise Typingpool::Error, "No time file at '#{time_path}'"
       Timecop.travel(Time.at(File.read(time_path).to_i))
     end
   end
@@ -153,13 +153,21 @@ class TestAmazon < Typingpool::Test
     dummy_project = Typingpool::Project.new('dummy', config)
     url = dummy_project.remote.file_to_url(Typingpool::Project::Remote::S3.random_bucket_name(16,'dummy-missing-file-'))
     refute(working_url? url) if (Typingpool::Test.live || Typingpool::Test.record)
-    with_dummy_typingpool_hit_or_skip('test_handles_hits_with_broken_external_question', url) do |hit, config|
+    with_dummy_typingpool_hit_or_skip('test_handles_hits_with_broken_external_question', url) do |hit, dummy_config|
       assert_equal(hit.full.external_question_url, url) if (Typingpool::Test.live || Typingpool::Test.record)
       refute(hit.full.external_question)
       refute(hit.full.external_question_param(hit.class.url_at))
    end #with_dummy....
   end
 
+
+  def test_calculates_hit_commission
+    assert_equal(0.072, Typingpool::Amazon::HIT.reward_to_total_cost(0.06))
+    assert_equal(0.02, Typingpool::Amazon::HIT.reward_to_total_cost(0.01))
+    assert_equal(1.212, Typingpool::Amazon::HIT.reward_to_total_cost(1.01))
+    assert_equal(1.2, Typingpool::Amazon::HIT.reward_to_total_cost(1))
+  end
+  
   #Lacks test for HIT::Assignment - needs VCR fixture (TODO)
 
   def question_html
@@ -183,8 +191,8 @@ class TestAmazon < Typingpool::Test
     config = self.config
     skip_if_no_amazon_credentials(test_handle, config)
     config.assign.reward = '0.01'
-    config.assign.deadline = '1m'
-    config.assign.lifetime = '2m'
+    config.assign.deadline = '10m'
+    config.assign.lifetime = '20m'
     cache = Tempfile.new('typingpool_cache')
     with_vcr(test_handle, config, {
                :match_requests_on => [:method, Typingpool::App.vcr_core_host_matcher]

data/test/test_unit_config.rb

@@ -36,8 +36,8 @@ class TestConfig < Typingpool::Test
     assert_equal('ryan', config.sftp.user)
     assert_equal('public_html/transfer/', config.sftp['path'])
     assert_equal('public_html/transfer', config.sftp.path)
-    assert_equal('http://example.com/mturk/', config.sftp['url'])
-    assert_equal('http://example.com/mturk', config.sftp.url)
+    assert_equal('https://example.com/mturk/', config.sftp['url'])
+    assert_equal('https://example.com/mturk', config.sftp.url)
   end
 
   def test_config_screwy_file

data/test/test_unit_filer.rb

@@ -28,7 +28,7 @@ class TestFiler < Typingpool::Test
       assert(filer.write(data))
       assert_equal(data, filer.read)
       assert(path = filer.mv!(File.join(dir, 'filer-temp-2')))
-      assert(File.exists? filer.path)
+      assert(File.exist? filer.path)
       assert_equal('filer-temp-2', File.basename(filer.path))
     end #in_temp_dir
   end
@@ -110,7 +110,7 @@ class TestFiler < Typingpool::Test
       assert(chunks = mp3.split('0.25', 'filer-temp', Typingpool::Filer::Dir.new(dir)))
       assert(not(chunks.to_a.empty?))
       assert_equal(3, chunks.count)
-      chunks.each{|chunk| assert(File.exists? chunk) }
+      chunks.each{|chunk| assert(File.exist? chunk) }
       assert(chunks.first.offset)
       assert_match(/0\.00\b/, chunks.first.offset)
       assert_match(/0\.25\b/, chunks.to_a[1].offset)
@@ -149,7 +149,7 @@ class TestFiler < Typingpool::Test
       dest_filer = Typingpool::Filer::Dir.new(dir)
       assert(filer_conversion = filer_wma.to_mp3(dest_filer))
       assert_equal(filer_wma.files.count, filer_conversion.files.count)
-      assert_equal(filer_wma.files.count, filer_conversion.select{|file| File.exists? file }.count)
+      assert_equal(filer_wma.files.count, filer_conversion.select{|file| File.exist? file }.count)
       assert_equal(filer_wma.files.count, filer_conversion.select{|file|  file.mp3? }.count)
       assert_equal(filer_conversion.files.count, dest_filer.files.count)
       temp_path = File.join(dir, 'temp.mp3')
@@ -165,39 +165,39 @@ class TestFiler < Typingpool::Test
     assert(dir = Typingpool::Filer::Dir.new(fixtures_dir))
     assert_equal(fixtures_dir, dir.path)
     dir2_path = File.join(fixtures_dir, 'doesntexist')
-    assert(not(File.exists? dir2_path))
+    assert(not(File.exist? dir2_path))
     assert(dir2 = Typingpool::Filer::Dir.new(dir2_path))
-    in_temp_dir do |dir|
-      dir3_path = File.join(dir, 'filer-dir-temp')
-      assert(not(File.exists? dir3_path))
+    in_temp_dir do |temp_dir|
+      dir3_path = File.join(temp_dir, 'filer-dir-temp')
+      assert(not(File.exist? dir3_path))
       assert(dir3 = Typingpool::Filer::Dir.create(dir3_path))
-      assert(File.exists? dir3_path)
+      assert(File.exist? dir3_path)
       assert_instance_of(Typingpool::Filer::Dir, dir3)
       assert_nil(dir2 = Typingpool::Filer::Dir.named(File.basename(dir2_path), File.dirname(dir2_path)))
       assert(dir3 = Typingpool::Filer::Dir.named(File.basename(dir3_path), File.dirname(dir3_path)))
       assert_instance_of(Typingpool::Filer::Dir, dir3)
       assert_equal(dir3_path, dir3.to_s)
       assert_equal(dir3_path, dir3.to_str)
-      assert(filer = dir3.file('doesntexist'))
+      assert(dir3.file('doesntexist'))
     end #in_temp_dir
     assert(filer = dir.file('vcr', 'tp-collect-1.yml'))
-    assert(File.exists? filer.path)
+    assert(File.exist? filer.path)
     assert_instance_of(Typingpool::Filer, filer)
     assert(csv = dir.file('tp_collect_sandbox-assignment.csv').as(:csv))
-    assert(File.exists? csv.path)
+    assert(File.exist? csv.path)
     assert_instance_of(Typingpool::Filer::CSV, csv)
     dir4 = Typingpool::Filer::Dir.new(audio_dir)
     assert(audio = dir4.file('mp3', 'interview.1.mp3').as(:audio))
-    assert(File.exists? audio.path)
+    assert(File.exist? audio.path)
     assert_instance_of(Typingpool::Filer::Audio, audio)
     assert(filers = dir.files)
     assert(not(filers.empty?))
     assert_kind_of(Typingpool::Filer, filers.first)
-    assert(File.exists? filers.first.path)
+    assert(File.exist? filers.first.path)
     dir_files = Dir.entries(dir.path).map{|entry| File.join(dir.path, entry)}.select{|path| File.file?(path) }.reject{|path| File.basename(path).match(/^\./) }
     assert_equal(dir_files.count, filers.count)
     assert(dir5 = dir.subdir('vcr'))
-    assert(File.exists? dir5.path)
+    assert(File.exist? dir5.path)
     assert_instance_of(Typingpool::Filer::Dir, dir5)
   end
 end #TestFiler

data/test/test_unit_project.rb

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
-require 'uri'
+require 'erb'
 
 class TestProject < Typingpool::Test
   def test_project_base_new
@@ -131,7 +131,7 @@ class TestProject < Typingpool::Test
       assert(result = project.create_assignment_csv(:path => relative_path, :urls => dummy_remote_files, :unusual => project_default[:unusual], :voices => voices, ))
       assert_includes(result, dir)
       csv_file = File.join(dir, project_default[:title], *relative_path)
-      assert(File.exists? csv_file)
+      assert(File.exist? csv_file)
       assert(File.file? csv_file)
       assert(parsed = CSV.read(csv_file))
       assignment_headers = parsed.shift
@@ -150,7 +150,7 @@ class TestProject < Typingpool::Test
   end
 
   def test_local_basename_from_url
-    url = ['http://example.com/dir/', URI.escape('Example Title With Spaces & Ampersand.html')].join
+    url = ['http://example.com/dir/', ERB::Util.url_encode('Example Title With Spaces & Ampersand.html')].join
     assert_match(/%20/, url)
 #assert(basename = Typingpool::Project.local_basename_from_url.u)
   end

data/test/test_unit_project_local.rb

@@ -8,16 +8,16 @@ require 'typingpool/test'
 
 class TestProjectLocal < Typingpool::Test
   def test_project_local_ours
-    assert(File.exists?(non_project_dir))
+    assert(File.exist?(non_project_dir))
     assert(File.directory?(non_project_dir))
     refute(Typingpool::Project::Local.ours?(Typingpool::Filer::Dir.new(non_project_dir)))
-    assert(File.exists?(project_template_dir))
+    assert(File.exist?(project_template_dir))
     assert(Typingpool::Project::Local.ours?(Typingpool::Filer::Dir.new(project_template_dir)))
   end
 
   def test_project_local_named
     assert_nil(Typingpool::Project::Local.named(project_default[:title], fixtures_dir))
-    assert_kind_of(Typingpool::Project::Local, local = Typingpool::Project::Local.named('project', project_template_dir_parent))
+    assert_kind_of(Typingpool::Project::Local, Typingpool::Project::Local.named('project', project_template_dir_parent))
   end
 
   def test_project_local_valid_name
@@ -28,7 +28,7 @@ class TestProjectLocal < Typingpool::Test
   def test_project_local_create
     in_temp_dir do |dir|
       assert(local = create_project_local(dir))
-      assert(File.exists?(local.path))
+      assert(File.exist?(local.path))
       assert(File.directory?(local.path))
       assert_kind_of(Typingpool::Project::Local, local)
       refute_nil(local.id)