typingpool 0.8.3 → 0.8.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 12d9537ae9deb2fdab3078afea4a69132658bf8e
+  data.tar.gz: 7a343081d80b50c26220e5701a3f4a6e758b7006
+SHA512:
+  metadata.gz: 6405ecd1a2744e022e45bb0e3dca0c1ca7a396e0633022c6a80aba676f0e6e02f8e9fc922f9683d9165f4cee25d3ed3f8904c1eaf9bfc24d6a1b39aaf8345954
+  data.tar.gz: 6c391f5f719098d40cd987dbe4de7e454f654b3cd2c65cdf99a21c82431d370a992d0a78844fd176ccc028331d289899367930a74f750612528f01522874c964

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

@@ -56,9 +56,17 @@ module Typingpool
           if @external_question.nil?
             if external_question_url && external_question_url.match(/^http/)
               #expensive, obviously:
-              @external_question = open(external_question_url).read
-            end
-          end
+              begin
+                @external_question = open(external_question_url).read
+              rescue OpenURI::HTTPError => e
+                #we don't worry about missing questions because those
+                #should only be attached to HITs that aren't ours. we
+                #take both 403 and 404 to mean missing because S3
+                #never returns 404, only 403.
+                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?
           @external_question
         end
 

data/lib/typingpool/version.rb

@@ -1,3 +1,3 @@
 module Typingpool
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end #Typingpool

data/test/test_unit_amazon.rb

@@ -129,6 +129,17 @@ class TestAmazon < Typingpool::Test
     refute(typingpool_hit.ours?)
   end
 
+  def test_handles_hits_with_broken_external_question
+    config = self.config
+    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)
+    with_dummy_typingpool_hit_or_skip('test_handles_hits_with_broken_external_question', url) do |hit, config|
+      assert_equal(hit.full.external_question_url, url)
+      refute(hit.full.external_question)
+    end #with_dummy....
+  end
+
   #Lacks test for HIT::Assignment - needs VCR fixture (TODO)
 
   def question_html
@@ -139,16 +150,16 @@ class TestAmazon < Typingpool::Test
     File.read(File.join(fixtures_dir, 'amazon-question-url.txt')).strip
   end
 
-  def dummy_question
-    Typingpool::Amazon::Question.new(question_url, question_html)
+  def dummy_question(url=question_url)
+    Typingpool::Amazon::Question.new(url, question_html)
   end
 
-  def dummy_hit(config)
-    Typingpool::Amazon::HIT.create(dummy_question, config.assign)
+  def dummy_hit(config, url=question_url)
+    Typingpool::Amazon::HIT.create(dummy_question(url), config.assign)
   end
 
 
-  def with_dummy_typingpool_hit_or_skip(skipping_what)
+  def with_dummy_typingpool_hit_or_skip(skipping_what, url=question_url)
     config = self.config
     skip_if_no_amazon_credentials(skipping_what, config)
     config.assign.reward = '0.01'
@@ -156,7 +167,7 @@ class TestAmazon < Typingpool::Test
     begin
       config.cache = cache.path
       Typingpool::Amazon.setup(:sandbox => true, :config => config)
-      hit = dummy_hit(config)
+      hit = dummy_hit(config, url)
       begin
         yield(hit, config)
       ensure

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: typingpool
 version: !ruby/object:Gem::Version
-  version: 0.8.3
-  prerelease: 
+  version: 0.8.4
 platform: ruby
 authors:
 - Ryan Tate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rturk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,33 +97,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An app for transcribing audio using Mechanical Turk
@@ -273,20 +256,19 @@ files:
 - typingpool.gemspec
 homepage: http://github.com/ryantate/typingpool
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
@@ -294,9 +276,9 @@ requirements:
 - mp3splt
 - mp3wrap
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An app for transcribing audio using Mechanical Turk
 test_files:
 - test/test_unit_amazon.rb