typingpool 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ecc40d0d0122f982e36b06f19bb8ce275784547
-  data.tar.gz: 979aa61071d97e8410185bd6c871fc3bf266f192
+  metadata.gz: 554974b6b35f179d3f50deb682ab0e5f9fd0964a
+  data.tar.gz: 0b67e2cdbb110c4f05bb820f2ad06241ead2fd7c
 SHA512:
-  metadata.gz: b621417575b0bf88370a300e71c99666377b11d39fb0ea89df4e364bc1997f8e6b38b6292d58c00a18b4fa5b2bb911d3d24957de7f1f27e016a0c99f9b74df57
-  data.tar.gz: 084b80ea0f4cdd5ad0d560e7dccdf71d1bd0aa0a85a5a63545e81e499995e3dc3008516a30feed050d81b8d123f8cae87213c0a2d831ef58324eb78e1d9e0866
+  metadata.gz: 8463b4059f24d13d4d6245e155a0db3d7d6dde459e1612d698b6a12a95a57c1fa15d240763530e9b883948fd7f04e2d41bab968675af6e25eb072b476b87bfb1
+  data.tar.gz: 4848802256545cb9b3149f57ef0d7f9a63b251fb3ed90d05db1b13f8a396353e0600fd3f65eb3be2ac9d1ffbc855c0b770d0ba8c7deffbe88a2308bfd2449f1c

data/.gitignore

@@ -0,0 +1,3 @@
+\#*#
+*~
+.DS_Store

data/bin/tp-assign

@@ -123,6 +123,12 @@ end.parse!
 
 config = Typingpool::App::CLI.config_from_arg(options[:config]) or abort "No config file at '#{options[:config]}'"
 
+begin
+  Typingpool::App.validate_sftp(config)
+rescue Typingpool::Error => e
+  abort e.message
+end
+
 if options[:keyword].count > 0
   config.assign.keywords = []
   config.assign.keywords.push(*options[:keyword])
@@ -217,17 +223,15 @@ end
 
 #Are there enough funds for this assignment?
 cost = 0
-amazon_minimum_fee = 0.005
-amazon_fee_per_assignment = config.assign.reward.to_f * 0.1
-amazon_fee_per_assignment = amazon_minimum_fee if amazon_fee_per_assignment < amazon_minimum_fee
-cost = (needed_assignments.count * (config.assign.reward.to_f + amazon_fee_per_assignment) * 100).ceil.to_f / 100
+#add in the Amazon commission
+cost_per_assignment = Typingpool::Amazon::HIT.reward_to_total_cost(config.assign.reward.to_f)
+cost = (needed_assignments.count * cost_per_assignment * 100).ceil.to_f / 100
 cost_string = sprintf("%.2f", cost)
 if options[:sandbox]
   STDERR.puts "(Cost is $0 (nothing) since you're in the sandbox. Outside the sandbox this assignment would cost $#{cost_string}.)"
 else
   STDERR.puts "Checking your balance"
   balance = RTurk.GetAccountBalance.amount
-  #"* 1.1" reflects 10% Amazon service surcharge
   abort "Anticipated assignment cost of $#{cost_string} would exceed available balance of $#{balance}" if cost > balance
   if options[:confirm] || config.assign.confirm
     begin

data/bin/tp-config

@@ -29,7 +29,7 @@ end.parse!
 config_path = ARGV.first || Typingpool::Config.default_file
 config_path_full = File.expand_path(config_path)
 config = nil
-if File.exists? config_path_full
+if File.exist? config_path_full
   abort "Not a file: #{config_path}" unless File.file? config_path_full
   STDERR.puts "Editing existing config file '#{config_path}'"
   begin
@@ -41,7 +41,7 @@ else
   abort "Invalid path '#{config_path}'" unless File.dirname(config_path_full) && File.directory?(File.dirname(config_path_full))
   STDERR.puts "Making a new config file at '#{config_path}'"
   config = Typingpool::Config.from_bundled_template
-end #if File.exists? config_path
+end #if File.exist? config_path
 
 config.amazon ||= {}
 config.amazon.key = ask('Your Amazon Web Services "Access Key ID"? '){|q| q.default = config.amazon.key if config.amazon.key }.to_s.chomp
@@ -65,7 +65,7 @@ end
 
 unless config.transcripts
   desktop_path = File.expand_path(File.join('~', 'Desktop'))
-  if File.exists?(desktop_path) && File.directory?(desktop_path)
+  if File.exist?(desktop_path) && File.directory?(desktop_path)
     config.transcripts = File.join(desktop_path, 'Transcripts')
   else
     config.transcripts = File.join('~', 'transcripts')
@@ -76,7 +76,7 @@ transcripts = nil
 loop do
   transcripts = ask('Working directory/folder for transcripts? '){|q| q.default = config['transcripts'] }.to_s.chomp
   abort "Cannot proceed without a transcripts directory" if transcripts.empty?
-  if File.exists?(File.expand_path(transcripts))
+  if File.exist?(File.expand_path(transcripts))
     if File.directory?(File.expand_path(transcripts))
       break
     else
@@ -85,7 +85,7 @@ loop do
   else
     FileUtils.mkdir(File.expand_path(transcripts))
     break
-  end #if File.exists?...
+  end #if File.exist?...
 end #loop do
 config.transcripts = transcripts
 
@@ -94,7 +94,7 @@ unless config.templates
   transcripts_dir_capitalized = (transcripts_dir[0].upcase == transcripts_dir[0])
   templates =  transcripts_dir_capitalized ? 'Templates' : 'templates'
   config.templates = File.join(config['transcripts'], templates)
-  FileUtils.mkdir(config.templates) unless File.exists? config.templates
+  FileUtils.mkdir(config.templates) unless File.exist? config.templates
 end
 
 unless config.cache

data/bin/tp-finish

@@ -110,7 +110,7 @@ end
 if project 
   #Don't want to delete audio if there's another assignments file
   #relying on it
-  delete_types = if (options[:sandbox] || (File.exists? project.local.file('data', 'sandbox-assignment.csv')))
+  delete_types = if (options[:sandbox] || (File.exist? project.local.file('data', 'sandbox-assignment.csv')))
                    ['assignment']
                  else
                    ['audio', 'assignment']

data/bin/tp-make

@@ -120,7 +120,7 @@ abort "No title specified\n\n#{options[:banner]}" if options[:title].to_s.empty?
 options[:files].sort!
 options[:files].each do |file|
   File.extname(file) or abort "You need a file extension on the file '#{file}'"
-  File.exists?(file) or abort "There is no file '#{file}'"
+  File.exist?(file) or abort "There is no file '#{file}'"
   File.file?(file) or abort "Not a file: '#{file}'"
 end
 options[:unusual].map!{|unusual| unusual.split(/\s*,\s*/)}.flatten!
@@ -138,6 +138,12 @@ project = with_friendly_exceptions('project title', options[:title]) do
   Typingpool::Project.new(options[:title], config) 
 end
 
+begin
+  Typingpool::App.validate_sftp(config)
+rescue Typingpool::Error => e
+  abort e.message
+end
+
 with_friendly_exceptions('--chunk argument', options[:chunk]) do
   project.interval = options[:chunk] if options[:chunk] 
 end
@@ -147,14 +153,14 @@ with_friendly_exceptions('--bitrate argument', options[:bitrate]) do
 end
 
 if project.local
-  if (File.exists?(project.local.file('data', 'assignment.csv')) &&
+  if (File.exist?(project.local.file('data', 'assignment.csv')) &&
       project.local.file('data', 'assignment.csv').as(:csv).read.select{|assignment| assignment['audio_uploaded'] == 'maybe' }.count > 0)
     #project where the upload died partway through
     STDERR.puts "Fixing incomplete project"
     STDERR.puts "Determining which mp3s need uploading"
   else
     abort "The title '#{options[:title]}' is taken"
-  end #if(File.exists(project.local.file('data', 'assignment.csv') &&...
+  end #if(File.exist?(project.local.file('data', 'assignment.csv') &&...
 else
   project.create_local
   project.local.subtitle = options[:subtitle] if options[:subtitle]

data/lib/typingpool/amazon/hit/full/fromsearchhits.rb

@@ -22,7 +22,8 @@ module Typingpool
             @assignments_completed = rturk_hit.completed_assignments
             @assignments_pending = rturk_hit.pending_assignments
             self.annotation = annotation
-         end
+            @checked_question = nil
+          end
 
           def external_question_url
             unless @checked_question

data/lib/typingpool/amazon/hit/full.rb

@@ -53,7 +53,8 @@ module Typingpool
         #return something. In first use, must make an HTTP request to
         #obtain the HTML.
         def external_question
-          if @external_question.nil?
+          @external_question ||= nil
+          unless @external_question
             if external_question_url && external_question_url.match(/^http/)
               #expensive, obviously:
               begin
@@ -66,7 +67,7 @@ module Typingpool
                 raise e unless e.message.match(/\b40[34]\b/)
               end #begin
             end #if external_question_url && external_question_url.match...
-          end #if @external_question.nil?
+          end #unless @external_question
           @external_question
         end
 

data/lib/typingpool/amazon/hit.rb

@@ -227,6 +227,21 @@ module Typingpool
             selected
           end
         end
+
+        def reward_to_total_cost(reward)
+          amazon_fee = reward.to_f * commission_rate
+          amazon_fee = minimum_commission if amazon_fee < minimum_commission
+          reward + amazon_fee
+        end
+
+        def minimum_commission
+          0.01
+        end
+
+        def commission_rate
+          0.2
+        end
+
       end #class << self
 
       #Corresponds to the Amazon Mechanical Turk HIT#HITId
@@ -235,6 +250,9 @@ module Typingpool
       #Constructor. Takes an RTurk::Hit instance.
       def initialize(rturk_hit)
         @id = rturk_hit.id
+        @full = nil
+        @assignment = nil
+        @ours = nil
       end
 
       #URL of the audio file associated with this HIT (the audio file
@@ -256,7 +274,7 @@ module Typingpool
       #by parsing the #url. May be dropped in a future release.
       def project_title_from_url(url=self.url)
         matches = Project.url_regex.match(url) or raise Error::Argument::Format, "Unexpected format to url '#{url}'"
-        URI.unescape(matches[2])
+        URI.decode_www_form_component(matches[2])
       end
 
       #Returns true if this HIT has an approved assignment associated

data/lib/typingpool/amazon.rb

@@ -51,8 +51,7 @@ module Typingpool
       #Amazon.setup (or the default).
       def cache
         @@cache ||= PStore.new(File.expand_path(@@cache_file))
-      end
-
+      end      
     end #class << self
   end #Amazon
 end #Typingpool

data/lib/typingpool/app/cli.rb

@@ -12,7 +12,7 @@ module Typingpool
         def config_from_arg(arg=nil)
           if arg
             path = File.expand_path(arg)
-            return unless File.exists?(path) && File.file?(path)
+            return unless File.exist?(path) && File.file?(path)
             Config.file(path)
           else
             Config.file
@@ -40,13 +40,13 @@ module Typingpool
         # ==== Returns
         # A Project instance.
         def project_from_arg_and_config(arg, config)
-          path = if (File.exists?(arg) && File.directory?(arg))
+          path = if (File.exist?(arg) && File.directory?(arg))
                    config.transcripts = File.dirname(arg)
                    arg
                  else
                    abort "No 'transcripts' dir specified in your config file and '#{arg}' is not a valid path" unless config.transcripts
                    path = File.join(config.transcripts, arg)
-                   abort "No such project '#{arg}' in dir '#{config.transcripts}'" unless File.exists? path
+                   abort "No such project '#{arg}' in dir '#{config.transcripts}'" unless File.exist? path
                    abort "'#{arg}' is not a directory at '#{path}'" unless File.directory? path
                    path
                  end

data/lib/typingpool/app/friendlyexceptions.rb

@@ -23,7 +23,7 @@ module Typingpool
           yield(*input)
         rescue Typingpool::Error::Argument => exception
           goodbye = "Could not make sense of #{name.to_s} "
-          goodbye += input.map{|input| "'#{input}'" }.join(', ')
+          goodbye += input.map{|input_chunk| "'#{input_chunk}'" }.join(', ')
           goodbye += ". #{exception.message}"
           goodbye += '.' unless goodbye.match(/\.$/)
           abort goodbye

data/lib/typingpool/app.rb

@@ -61,7 +61,7 @@ module Typingpool
         project.remote.put(files.to_streams, remote_files) do |file, as|
           yield(file, as) if block_given?
         end
-        assignments_files = [assignments_file]
+#        assignments_files = [assignments_file] #why did we make this var and never use?
         record_assignment_upload_status(assignments_file, uploading, ['audio'], 'yes')
         uploading.map{|assignment| assignment['audio_url'] }
       end
@@ -219,7 +219,7 @@ module Typingpool
             need[hit.project_id] = false
             project = Typingpool::Project.new(hit.project_title_from_url, config)
             next unless project.local && (project.local.id == hit.project_id)
-            next if File.exists? project.local.file(transcript_filename[:done])
+            next if File.exist? project.local.file(transcript_filename[:done])
             by_project_id[hit.project_id] = {
               :project => project,
               :hits => [hit]
@@ -271,7 +271,7 @@ module Typingpool
         rescue Error => e
           abort "There was a fatal error with the transcript template: #{e}"
         end #begin
-        File.delete(project.local.file(transcript_filename[:working])) if File.exists?(project.local.file(transcript_filename[:working]))
+        File.delete(project.local.file(transcript_filename[:working])) if File.exist?(project.local.file(transcript_filename[:working]))
         File.open(project.local.file(out_file), 'w') do |out|
           out << template.render({:transcript => transcript})
         end #File.open...
@@ -288,8 +288,8 @@ module Typingpool
       #sandbox-assignmens.csv.
       def ensure_sandbox_assignment_csv(project)
         csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
-        return csv if File.exists? csv
-        raise Error, "No assignment CSV to copy" unless File.exists? project.local.file('data', 'assignment.csv')
+        return csv if File.exist? csv
+        raise Error, "No assignment CSV to copy" unless File.exist? project.local.file('data', 'assignment.csv')
         csv.write(
                   project.local.file('data', 'assignment.csv').as(:csv).map do |assignment|
                     unrecord_hit_in_csv_row(assignment)
@@ -415,13 +415,31 @@ module Typingpool
         missing = []
         [['ffmpeg','-version'], ['mp3splt', '-v'], ['mp3wrap']].each do |cmdline|
           begin
-            out, err, status = Open3.capture3(*cmdline)
+            Open3.capture3(*cmdline)
           rescue
             missing.push(cmdline.first)
           end #begin
         end #...].each do |cmdline|
         yield(missing) unless missing.empty?
       end
+
+
+      #Checks if SFTP arguments are valid in case we want to abort
+      #before attempting upload
+      def validate_sftp(config)
+        if config.sftp
+          [:user, :host, :url].each do |param|
+            if (not(config.sftp.send(param)) || config.sftp.send(param).to_s.empty?)
+              raise Error, "Config file has an SFTP section but section is missing required parameter #{param}"
+            end
+          end #[:user, :host, :url].each...
+          unless config.sftp.url.match(/^https:\/\//i)
+            raise Error, "URL specified in the SFTP section of your config file must begin with 'https' per Amazon policy"
+          end
+        end #if config.sftp
+      end
+      
+
       #protected
 
       def with_abort_on_url_mismatch(url_type='')

data/lib/typingpool/config/root.rb

@@ -33,6 +33,7 @@ module Typingpool
         end
 
         def qualify
+          @qualify ||= nil
           self.qualify = (@param['qualify'] || []) unless @qualify
           @qualify
         end

data/lib/typingpool/config.rb

@@ -4,7 +4,7 @@ module Typingpool
   #often modified at runtime, for example in response to script flags.
   #
   #==Fields
-  #  All listed defaults are populated when you run tp-install.
+  #  All listed defaults are populated when you run tp-config.
   #===Required
   #  [transcripts] Unexpanded path to working directory for
   #                transcripts. This is where tp-make creates new
@@ -19,7 +19,7 @@ module Typingpool
   #  [bucket] The name of the "bucket" on Amazon S3 where your uploads
   #           will be stored. Not required if you specify SFTP config
   #           instead (see below). Default: Generated for you when you
-  #           run tp-install.
+  #           run tp-config.
   #
   #===Optional
   #  [cache]     Unexpanded path to the cache file (pstore). Default:
@@ -31,7 +31,8 @@ module Typingpool
   #====amazon
   #  [url] Base URL to use when linking to files uploaded to S3. You
   #        may want to use this if you do custom domain mapping on
-  #        S3. Default is https://$bucket.s3.amazonaws.com.
+  #        S3. Default is https://$bucket.s3.amazonaws.com. MUST BE
+  #        HTTPS URL PER AMAZON POLICY.
   #====sftp
   #If you provide SFTP config, the specified SFTP server will be used
   #to host remote mp3 and html files rather than Amazon S3. At
@@ -41,8 +42,8 @@ module Typingpool
   #  [user] SFTP username
   #  [host] SFTP server
   #  [path] Files will be uploaded into this path. Optional.
-  #  [url]  Base URL to use when linking to files uploaded using the
-  #         preceding config.
+  #  [url] Base URL to use when linking to files uploaded using the
+  #         preceding config. MUST BE HTTPS URL PER AMAZON POLICY.
   #====assign
   #Defaults for tp-assign.
   #  [reward]   Pay per transcription chunk in U.S. dollars. Default: 0.75.

data/lib/typingpool/filer/audio.rb

@@ -26,7 +26,7 @@ module Typingpool
       def to_mp3(dest=self.dir.file("#{File.basename(@path, '.*') }.mp3"), bitrate=nil)
         bitrate ||= self.bitrate || 192
         Utility.system_quietly('ffmpeg', '-i', @path, '-acodec', 'libmp3lame', '-ab', "#{bitrate}k", '-ac', '2', dest)
-        File.exists?(dest) or raise Error::Shell, "Could not found output from `ffmpeg` on #{path}"
+        File.exist?(dest) or raise Error::Shell, "Could not found output from `ffmpeg` on #{path}"
         self.class.new(dest.path)
       end
 
@@ -34,7 +34,7 @@ module Typingpool
       #integer corresponding to kb/s, or nil if the bitrate could not
       #be determined.
       def bitrate
-        out, err, status = Open3.capture3('ffmpeg', '-i', @path)
+        _, err, _ = Open3.capture3('ffmpeg', '-i', @path)
         bitrate = err.match(/(\d+) kb\/s/)
         return bitrate ? bitrate[1].to_i : nil
       end

data/lib/typingpool/filer/dir.rb

@@ -28,7 +28,7 @@ module Typingpool
         #the parent directory, returns it. If not, returns nil.
         def named(name, in_dir)
           path = File.join(in_dir, name)
-          if File.exists?(path) && File.directory?(path)
+          if File.exist?(path) && File.directory?(path)
             new(path)
           end
         end

data/lib/typingpool/filer.rb

@@ -28,7 +28,7 @@ module Typingpool
 
     #Returns contents of file or nil if the file does not exist. 
     def read
-      if File.exists? @path
+      if File.exist? @path
         IO.read(@path, :encoding => @encoding)
       end
     end

data/lib/typingpool/project/local.rb

@@ -51,7 +51,7 @@ module Typingpool
         #the file layout inside the dir indicates it is a
         #Project::Local instance.
         def ours?(dir)
-          File.exists?(dir.subdir('audio')) && File.exists?(dir.subdir('audio', 'originals'))
+          File.exist?(dir.subdir('audio')) && File.exist?(dir.subdir('audio', 'originals'))
         end
 
         #Takes the name of a project and returns true if it is a valid
@@ -63,7 +63,7 @@ module Typingpool
             rescue Errno::ENOENT
               return false
             end #begin
-            return File.exists?(File.join(dir, name))
+            return File.exist?(File.join(dir, name))
           end #Utility.in_temp_dir do...
         end
 
@@ -86,7 +86,7 @@ module Typingpool
               file('data',"#{sym.to_s}.txt").write(value)
             end
             define_method("delete_#{sym.to_s}".to_sym) do
-              if File.exists? file('data',"#{sym.to_s}.txt")
+              if File.exist? file('data',"#{sym.to_s}.txt")
                 File.delete(file('data',"#{sym.to_s}.txt"))
               end
             end

data/lib/typingpool/project/remote.rb

@@ -19,7 +19,8 @@ module Typingpool
     class Remote
       require 'typingpool/project/remote/s3'
       require 'typingpool/project/remote/sftp'
-
+      require 'erb'
+      
       #Constructor. Takes a Config
       #instance. Returns a Project::Remote::S3 or
       #Project::Remote::SFTP instance, depending on the particulars of
@@ -47,14 +48,14 @@ module Typingpool
       #Given a file path, returns the URL to the file path were it to
       #be uploaded by this instance.
       def file_to_url(file)
-        "#{url}/#{URI.escape(file)}"
+        "#{url}/#{ERB::Util.url_encode(file)}"
       end
 
       #Given an URL, returns the file portion of the path, given the
       #configuration of this instance.
       def url_basename(url)
         basename = url.split("#{self.url}/")[1] or raise Error, "Could not find base url '#{self.url}' within longer url '#{url}'"
-        URI.unescape(basename)
+        URI.decode_www_form_component(basename)
       end
 
 

data/lib/typingpool/project.rb

@@ -79,6 +79,7 @@ module Typingpool
         seconds = seconds.round(2)
       end
       min_dot_sec = "#{(@interval.to_i / 60).floor}.#{seconds}"
+      min_dot_sec
     end
 
     #Takes an integer for setting the project.bitrate. The integer
@@ -165,7 +166,7 @@ module Typingpool
     #Make this unneccesary.)
     def self.local_basename_from_url(url)
       matches = Project.url_regex.match(url) or raise Error::Argument::Format, "Unexpected format to url '#{url}'"
-      URI.unescape([matches[2..4].join('.'), matches[5]].join)
+      URI.decode_www_form_component([matches[2..4].join('.'), matches[5]].join)
     end
 
     protected

data/lib/typingpool/template.rb

@@ -25,7 +25,7 @@ module Typingpool
 
       def validate_config(config)
         if config.templates
-          File.exists?(config.templates) or raise Error::File::NotExists, "No such templates dir: #{config.templates}"
+          File.exist?(config.templates) or raise Error::File::NotExists, "No such templates dir: #{config.templates}"
           File.directory?(config.templates) or raise Error::File::NotExists, "Templates dir not a directory: #{config.templates}"
         end
       end
@@ -71,7 +71,7 @@ module Typingpool
       look_in.each do |dir|
         extensions.each do |ext| 
           path = File.join(dir, [@path, ext].join)
-          if File.exists?(path) && File.file?(path)
+          if File.exist?(path) && File.file?(path)
             return path
           end
         end

data/lib/typingpool/test/fixtures/amazon-question-url.txt

@@ -1 +1 @@
-http://example.com/assignments/101.html
+https://example.com/assignments/101.html

data/lib/typingpool/test/fixtures/config-2

@@ -5,7 +5,7 @@ sftp:
   user: ryan
   host: example.com
   path: public_html/transfer/
-  url: http://example.com/mturk/
+  url: https://example.com/mturk/
 transcripts: ~/Documents/Transcripts/
 cache: ~/.typingpool.cache3
 app: ~/Documents/Software/dist/ruby/typingpool

data/lib/typingpool/test/fixtures/test_amazon_hit_full_time.txt

@@ -1 +1 @@
-1378154308
+1483150167

data/lib/typingpool/test/fixtures/tp_assign_1_assignment.csv

@@ -1,7 +1,7 @@
 audio_url,project_id,unusual,chunk,chunk_hours,chunk_minutes,chunk_seconds,voices_count,voice1,voice1title,voice2,voice2title
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.00.fc401fe1c0baf74579292ae89965982b.RNGKOL.mp3,fc401fe1c0baf74579292ae89965982b,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.22.fc401fe1c0baf74579292ae89965982b.IDHROA.mp3,fc401fe1c0baf74579292ae89965982b,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.44.fc401fe1c0baf74579292ae89965982b.TBJUKH.mp3,fc401fe1c0baf74579292ae89965982b,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.06.fc401fe1c0baf74579292ae89965982b.SAXYYI.mp3,fc401fe1c0baf74579292ae89965982b,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.28.fc401fe1c0baf74579292ae89965982b.DLJPNF.mp3,fc401fe1c0baf74579292ae89965982b,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.50.fc401fe1c0baf74579292ae89965982b.NCUDLV.mp3,fc401fe1c0baf74579292ae89965982b,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.00.964909765946472311a24ef40288b4cc.EQUTOD.mp3,964909765946472311a24ef40288b4cc,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.22.964909765946472311a24ef40288b4cc.JOJQTX.mp3,964909765946472311a24ef40288b4cc,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.44.964909765946472311a24ef40288b4cc.SHAJNA.mp3,964909765946472311a24ef40288b4cc,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.06.964909765946472311a24ef40288b4cc.EQAINL.mp3,964909765946472311a24ef40288b4cc,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.28.964909765946472311a24ef40288b4cc.EUTSIT.mp3,964909765946472311a24ef40288b4cc,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.50.964909765946472311a24ef40288b4cc.QHVPEM.mp3,964909765946472311a24ef40288b4cc,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker

data/lib/typingpool/test/fixtures/tp_assign_1_id.txt

@@ -1 +1 @@
-fc401fe1c0baf74579292ae89965982b
+964909765946472311a24ef40288b4cc

data/lib/typingpool/test/fixtures/tp_assign_1_time.txt

@@ -1 +1 @@
-1378153645
+1387336464

data/lib/typingpool/test/fixtures/tp_assign_3_assignment.csv

@@ -1,7 +1,7 @@
 audio_url,project_id,unusual,chunk,chunk_hours,chunk_minutes,chunk_seconds,voices_count,voice1,voice1title,voice2,voice2title
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.00.22248e727c6a34f42d74d92faedf6446.FSJRKX.mp3,22248e727c6a34f42d74d92faedf6446,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.22.22248e727c6a34f42d74d92faedf6446.KVSGUH.mp3,22248e727c6a34f42d74d92faedf6446,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.44.22248e727c6a34f42d74d92faedf6446.JCJYIA.mp3,22248e727c6a34f42d74d92faedf6446,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.06.22248e727c6a34f42d74d92faedf6446.YXNIHX.mp3,22248e727c6a34f42d74d92faedf6446,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.28.22248e727c6a34f42d74d92faedf6446.MIKDSC.mp3,22248e727c6a34f42d74d92faedf6446,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.50.22248e727c6a34f42d74d92faedf6446.HJICFP.mp3,22248e727c6a34f42d74d92faedf6446,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.00.83c0903b4536978722782651e2a5396f.LGUMHC.mp3,83c0903b4536978722782651e2a5396f,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.22.83c0903b4536978722782651e2a5396f.BFFHKE.mp3,83c0903b4536978722782651e2a5396f,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.44.83c0903b4536978722782651e2a5396f.JJGXSM.mp3,83c0903b4536978722782651e2a5396f,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.06.83c0903b4536978722782651e2a5396f.KRAUEE.mp3,83c0903b4536978722782651e2a5396f,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.28.83c0903b4536978722782651e2a5396f.CXCPGN.mp3,83c0903b4536978722782651e2a5396f,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.50.83c0903b4536978722782651e2a5396f.HDDKDX.mp3,83c0903b4536978722782651e2a5396f,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker

data/lib/typingpool/test/fixtures/tp_assign_3_id.txt

@@ -1 +1 @@
-22248e727c6a34f42d74d92faedf6446
+83c0903b4536978722782651e2a5396f

data/lib/typingpool/test/fixtures/tp_assign_3_time.txt

@@ -1 +1 @@
-1378153549
+1387336426

data/lib/typingpool/test/fixtures/tp_assign_4_assignment.csv

@@ -1,7 +1,7 @@
 audio_url,project_id,unusual,chunk,chunk_hours,chunk_minutes,chunk_seconds,voices_count,voice1,voice1title,voice2,voice2title
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.00.df2be670a78167c6b9fedce030b898b9.GRHHBF.mp3,df2be670a78167c6b9fedce030b898b9,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.22.df2be670a78167c6b9fedce030b898b9.SGJJRK.mp3,df2be670a78167c6b9fedce030b898b9,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.44.df2be670a78167c6b9fedce030b898b9.HNXIIA.mp3,df2be670a78167c6b9fedce030b898b9,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.06.df2be670a78167c6b9fedce030b898b9.JDGOUW.mp3,df2be670a78167c6b9fedce030b898b9,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.28.df2be670a78167c6b9fedce030b898b9.XPXMQR.mp3,df2be670a78167c6b9fedce030b898b9,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
-https://typingpool-tokyo-test-ffa60-zzz.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.50.df2be670a78167c6b9fedce030b898b9.NSDVRD.mp3,df2be670a78167c6b9fedce030b898b9,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.00.4e27cfaef75990a462d514fb1144a6fe.YNAPWI.mp3,4e27cfaef75990a462d514fb1144a6fe,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.22.4e27cfaef75990a462d514fb1144a6fe.XHCIUL.mp3,4e27cfaef75990a462d514fb1144a6fe,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.00.44.4e27cfaef75990a462d514fb1144a6fe.MMPOHE.mp3,4e27cfaef75990a462d514fb1144a6fe,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.06.4e27cfaef75990a462d514fb1144a6fe.FHHCOU.mp3,4e27cfaef75990a462d514fb1144a6fe,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.28.4e27cfaef75990a462d514fb1144a6fe.CWKBFG.mp3,4e27cfaef75990a462d514fb1144a6fe,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker
+https://typingpool-tokyo-test-ffa60-zzzrt.s3.amazonaws.com/Typingpool's%20Test%20&%20Interview.01.50.4e27cfaef75990a462d514fb1144a6fe.XUAOTS.mp3,4e27cfaef75990a462d514fb1144a6fe,"Hack Day, Sunnyvale, Chad D",0:22,,,22,2,Ryan,"",Havi,hacker

data/lib/typingpool/test/fixtures/tp_assign_4_id.txt

@@ -1 +1 @@
-df2be670a78167c6b9fedce030b898b9
+4e27cfaef75990a462d514fb1144a6fe

data/lib/typingpool/test/fixtures/tp_assign_4_time.txt

@@ -1 +1 @@
-1378153603
+1387336366