rturk 2.0.5 → 2.1.0

data/Gemfile

@@ -0,0 +1,4 @@
+gem 'nokogiri'
+gem 'fakeweb'
+gem 'rest-client'
+gem 'rspec'

data/README.markdown

@@ -2,7 +2,7 @@
 
 ## What's it do?!?
 
-RTurk is designed to fire off Mechanical Turk tasks for pages that reside on a external site.
+RTurk is designed to fire off Mechanical Turk tasks for pages that reside on an external site.
 
 The pages could be a part of a rails app, or just a simple javascript enabled form.
 
@@ -11,7 +11,7 @@ You'd be better off with amazon's official library, in all its XML cruftiness.
 
 ## Installation
 
-    sudo gem install rturk --source http://gemcutter.org
+    gem install rturk
     
 ## Use
 

data/Rakefile

@@ -18,6 +18,8 @@ begin
     gem.email = "mark@mpercival.com"
     gem.homepage = "http://github.com/markpercival/rturk"
     gem.authors = ["Mark Percival"]
+    gem.add_dependency('rest-client', '>= 1.4.0')
+    gem.add_dependency('nokogiri', '>= 1.4.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.1.0

data/lib/rturk/builders/question_builder.rb

@@ -19,10 +19,11 @@ module RTurk
     def url
       unless querystring.empty?
         # slam the params onto url, if url already has params, add 'em with a &
-        @url.index('?') ? "#{@url}&#{querystring}" : "#{@url}?#{querystring}" 
+        u = @url.index('?') ? "#{@url}&#{querystring}" : "#{@url}?#{querystring}" 
       else
-        @url
+        u = @url
       end
+      CGI.escapeHTML(u) #URL should be XML/HTML escaped
     end
     
     def params

data/lib/rturk/parsers/response.rb

@@ -12,7 +12,7 @@ module RTurk
     attr_reader :xml, :raw_xml
     
     def initialize(response)
-      @raw_xml = response
+      @raw_xml = response.body
       @xml = Nokogiri::XML(@raw_xml)
       raise_errors
     end

data/lib/rturk/parsers/responses/get_hit_response.rb

@@ -49,7 +49,7 @@ module RTurk
                 :keywords
 
     def initialize(response)
-      @raw_xml = response
+      @raw_xml = response.body
       @xml = Nokogiri::XML(@raw_xml)
       raise_errors
       map_content(@xml.xpath('//HIT'),

data/rturk.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rturk}
-  s.version = "2.0.5"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Percival"]
-  s.date = %q{2010-01-05}
+  s.date = %q{2010-02-28}
   s.email = %q{mark@mpercival.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     ".gitignore",
      ".gitmodules",
      ".yardoc",
+     "Gemfile",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -216,7 +217,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/markpercival/rturk}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Mechanical Turk API Wrapper}
   s.test_files = [
     "spec/adapters/assignment_spec.rb",
@@ -259,8 +260,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])
     else
+      s.add_dependency(%q<rest-client>, [">= 1.4.0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
     end
   else
+    s.add_dependency(%q<rest-client>, [">= 1.4.0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
   end
 end
+

data/spec/builders/question_spec.rb

@@ -19,6 +19,12 @@ describe RTurk::Question do
     question.frame_height.should == 500
   end
   
+  it "should build a question " do
+    question = RTurk::Question.new('http://mpercival.com?myparam=true&anotherparam=12', :frame_height => 500)
+    question.url.should == 'http://mpercival.com?myparam=true&anotherparam=12'
+    question.frame_height.should == 500
+  end
+  
   it "should build a question with params" do
     params = RTurk::Question.new('http://google.com/', :id => 'foo').to_params
     CGI.unescape(params).should == 

data/spec/operations/notify_workers_spec.rb

@@ -26,7 +26,8 @@ describe RTurk::NotifyWorkers do
 
   it 'should successfully request the operation' do
     RTurk::Requester.should_receive(:request).once.with(
-      hash_including('Operation' => 'NotifyWorkers'))
+      hash_including('Operation' => 'NotifyWorkers')).and_return(
+      fake_response(''))
 
     @lambda.call
   end

data/spec/operations/send_test_event_notification_spec.rb

@@ -30,7 +30,8 @@ describe RTurk::SendTestEventNotification do
 
   it 'should successfully request the operation' do
     RTurk::Requester.should_receive(:request).once.with(
-      hash_including('Operation' => 'SendTestEventNotification'))
+      hash_including('Operation' => 'SendTestEventNotification')).and_return(
+      fake_response(''))
 
     @lambda.call
   end

data/spec/operations/set_hit_type_notification_spec.rb

@@ -31,7 +31,8 @@ describe RTurk::SetHITTypeNotification do
 
   it 'should successfully request the operation' do
     RTurk::Requester.should_receive(:request).once.with(
-      hash_including('Operation' => 'SetHITTypeNotification'))
+      hash_including('Operation' => 'SetHITTypeNotification')).and_return(
+      fake_response(''))
 
     @lambda.call
   end

data/spec/response_spec.rb

@@ -5,18 +5,17 @@ describe RTurk::Response do
   
   context "given an invalid response" do
   
-    before(:all) do
-      @invalid_credentials_xml = File.read(File.join(SPEC_ROOT,'fake_responses','invalid_credentials.xml'))
-      
+    before(:each) do
+      @bad_credentials_response = fake_response(File.read(File.join(SPEC_ROOT,'fake_responses','invalid_credentials.xml')))
     end
     
     it "should know it failed" do
-      lambda{RTurk::Response.new(@invalid_credentials_xml)}.should raise_error RTurk::InvalidRequest
+      lambda{RTurk::Response.new(@bad_credentials_response)}.should raise_error RTurk::InvalidRequest
     end
     
     it "should know why" do
       begin
-        RTurk::Response.new(@invalid_credentials_xml)
+        RTurk::Response.new(@bad_credentials_response)
       rescue RTurk::InvalidRequest => e
         e.message.should eql("AWS.NotAuthorized: The identity contained in the request is not authorized to use this AWSAccessKeyId")
       end
@@ -28,7 +27,7 @@ describe RTurk::Response do
   context "given a valid response" do
   
     before(:all) do
-      @response = RTurk::Response.new(File.read(File.join(SPEC_ROOT,'fake_responses','create_hit.xml')))
+      @response = RTurk::Response.new(fake_response(File.read(File.join(SPEC_ROOT,'fake_responses','create_hit.xml'))))
     end
     
     it "should know it succeded" do

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ $: << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require 'spec'
 require 'fakeweb'
+require 'yaml'
 module FakeWeb
   class Registry
     # Comment out this override if you're using a quantum computer 
@@ -30,6 +31,10 @@ def faker(response_name, opts = {})
   FakeWeb.register_uri(:get, match, :body => response)
 end
 
+def fake_response(xml)
+  mock('RestClientFakeResponse', :body => xml)
+end
+
 Spec::Runner.configure do |config|
   
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rturk
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Mark Percival
@@ -9,10 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -05:00
+date: 2010-02-28 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: mark@mpercival.com
 executables: []
@@ -26,6 +58,7 @@ files:
 - .gitignore
 - .gitmodules
 - .yardoc
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -232,18 +265,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mechanical Turk API Wrapper