houdini 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houdini (0.3.0)
+    houdini (0.3.1)
       rails (> 3.0.0)
 
 GEM
@@ -113,10 +113,10 @@ GEM
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.34)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/README.markdown

@@ -2,7 +2,7 @@
 
 This ruby gem is a Rails Engine for using the Houdini Mechanical Turk API. It provides easy integration into your models and sets up the necessary controllers to receive answers posted back to your app from Houdini.
 
-Check out the [Houdini Documentation](http://houdiniapi.com/documentation) for more info about the API.
+Check out the [Houdini Documentation](http://houdini.tenderapp.com/kb/developer-docs/api-v1) for more info about the API.
 
 # Installation (Rails 3.x)
 
@@ -47,7 +47,7 @@ Setup Houdini in your ActiveRecord model:
 * `options` - Hash of options to use.
 
 ## Options
-* `:input` - Rqeuired. Hash: any task specific info needed to populate your blueprint. Keys must match the blueprint's required input, and values must a `Symbol` of the method to call, a lambdas/procs to be called in the model's context, or just a value to send along.
+* `:input` - Required. Hash: any task specific info needed to populate your blueprint. Keys must match the blueprint's required input, and values must a `Symbol` of the method to call, a lambdas/procs to be called in the model's context, or just a value to send along.
 * `:on_task_completion` - Method that should be called when the answer is posted back to your app. Can by a symbol or a lambda/proc. The method will be called with a hash of the returned output from Houdini.
 * `:on` - Name of a callback to use in order to trigger the submission to Houdini. Must be a symbol/string. If you don't want to use a callback, call the model instance's `houdini_submit_#{blueprint}!` method, where `blueprint` is the first argument you provided for the `houdini` method.
 * `:after_submit` - Method that should be called after submitting the task to Houdini. Can by a symbol or a lambda/proc.

data/app/controllers/houdini/postbacks_controller.rb

@@ -1,10 +1,11 @@
+require 'cgi'
 class Houdini::PostbacksController < ApplicationController
   skip_before_filter :protect_from_forgery
 
   def create
     task_results = HashWithIndifferentAccess.new ActiveSupport::JSON.decode(request.raw_post)
 
-    Houdini::PostbackProcessor.process params[:object_class], params[:object_id], task_results
+    Houdini::PostbackProcessor.process CGI.unescape(params[:object_class]), params[:object_id], task_results
     render :json => { :success => true }
   end
 end

data/lib/houdini.rb

@@ -1,5 +1,6 @@
 require 'net/https'
 require 'uri'
+require 'cgi'
 
 require 'houdini/model'
 require 'houdini/task'
@@ -30,7 +31,7 @@ module Houdini
         :api_key      => api_key,
         :blueprint    => blueprint,
         :input        => input_params,
-        :postback_url => "#{app_uri.scheme}://#{app_uri.host}:#{app_uri.port}/houdini/#{class_name}/#{object_id}/postbacks"
+        :postback_url => "#{app_uri.scheme}://#{app_uri.host}:#{app_uri.port}/houdini/#{CGI.escape(class_name)}/#{object_id}/postbacks"
       )
     end
   end

data/lib/houdini/version.rb

@@ -1,3 +1,3 @@
 module Houdini
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

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

@@ -1,23 +1,25 @@
-class Article < ActiveRecord::Base
-  include Houdini::Model
+module DummyApp
+  class Article < ActiveRecord::Base
+    include Houdini::Model
 
-  houdini :edit_for_grammar,
-    :input => {
-      'input1' => :original_text,
-      'input2' => proc{ original_text },
-      'input3' => "some text"
-    },
-    :on                 => :after_create,
-    :after_submit       => :update_houdini_attributes,
-    :on_task_completion => :process_houdini_edited_text,
-    :finder             => lambda{|id| last },
-    :id_method          => lambda{ 'model-slug' }
+    houdini :edit_for_grammar,
+      :input => {
+        'input1' => :original_text,
+        'input2' => proc{ original_text },
+        'input3' => "some text"
+      },
+      :on                 => :after_create,
+      :after_submit       => :update_houdini_attributes,
+      :on_task_completion => :process_houdini_edited_text,
+      :finder             => lambda{|id| last },
+      :id_method          => lambda{ 'model-slug' }
 
-  def update_houdini_attributes
-    update_attribute(:houdini_request_sent_at, Date.today.to_time)
-  end
+    def update_houdini_attributes
+      update_attribute(:houdini_request_sent_at, Date.today.to_time)
+    end
 
-  def process_houdini_edited_text(output, verbose_output)
-    update_attribute(:edited_text, output[:edited_text])
+    def process_houdini_edited_text(output, verbose_output)
+      update_attribute(:edited_text, output[:edited_text])
+    end
   end
 end

data/spec/requests/integration_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 describe "End-to-end" do
   before do
     Houdini.setup 'production', :app_url => "http://my-app:3333/"
-    Article.delete_all
+    DummyApp::Article.delete_all
   end
 
   it "should send task to Houdini and properly receive the postback" do
-    article = Article.new :original_text => 'This is incorect.'
+    article = DummyApp::Article.new :original_text => 'This is incorect.'
 
     params = {
       "api_key"      => Houdini.api_key,
       "environment"  => Houdini.environment,
-      "postback_url" => "http://my-app:3333/houdini/Article/model-slug/postbacks",
+      "postback_url" => "http://my-app:3333/houdini/DummyApp%3A%3AArticle/model-slug/postbacks",
       "blueprint"    => "edit_for_grammar",
       "input"    => {
         "input1" => "This is incorect.",
@@ -29,7 +29,7 @@ describe "End-to-end" do
 
     output_params = {"edited_text"=>"This is incorrect."}
 
-    post "houdini/Article/model-slug/postbacks", params.merge("id" => "000000000000", "status"=>"complete", "output" => output_params, "verbose_output"=> output_params).to_json
+    post "houdini/DummyApp%3A%3AArticle/model-slug/postbacks", params.merge("id" => "000000000000", "status"=>"complete", "output" => output_params, "verbose_output"=> output_params).to_json
 
     article.reload
     article.edited_text.should == "This is incorrect."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: houdini
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2155252860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155252860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2155243400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2155243400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2155242160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2155242160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2155240700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155240700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155239280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2155239280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: Rails 3 Engine for using the Houdini Mechanical Turk API
 email: chris@houdiniapi.com
 executables: []
@@ -135,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 796620986588829082
+      hash: 2466568904906734971
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,10 +169,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 796620986588829082
+      hash: 2466568904906734971
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails 3 Engine for using the Houdini Mechanical Turk API