houdini-rails3 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/houdini/postbacks_controller.rb

@@ -3,7 +3,7 @@ class Houdini::PostbacksController < ApplicationController
   def create
     object_class = params[:object_class].classify.constantize
     object = object_class.find(params[:object_id])
-    if object.process_postback(HashWithIndifferentAccess.new request.request_parameters)
+    if object.process_postback(params[:task_name], HashWithIndifferentAccess.new(request.request_parameters))
       render :json => {:success => true}
     else
       render :json => {:success => false}, :status => 422

data/houdini-rails3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{houdini-rails3}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Conley"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2011-01-24}
   s.description = %q{Rails 3 Engine for using the Houdini Mechanical Turk API}
   s.email = %q{chris@chrisconley.me}
   s.extra_rdoc_files = [

data/lib/houdini_rails/model.rb

@@ -1,39 +1,52 @@
 module Houdini
   module Model
-    def self.included(base)
-      base.extend ClassMethods
+    # def self.included(base)
+    #   base.extend ClassMethods
+    #   base.include Rails.application.routes.url_helpers
+    # end
+
+    extend ActiveSupport::Concern
+
+    included do
+      include Rails.application.routes.url_helpers
+      extend ClassMethods
     end
 
     module ClassMethods
       def houdini(name, options)
-        include Rails.application.routes.url_helpers
-        cattr_accessor :houdini_task
-        self.houdini_task = Houdini::Task.new(name, options)
+        houdini_tasks[name.to_sym] = Houdini::Task.new(name.to_sym, options)
       end
+
+      def houdini_tasks
+        @houdini_task ||= {}
+      end
+
     end
 
     def send_to_houdini(task_name)
-      # TODO: look up task when multiple tasks per model are implemented
+      houdini_task = self.class.houdini_tasks[task_name.to_sym]
       params = {
         :api_key => Houdini::KEY,
         :identifier => houdini_task.name,
         :price => houdini_task.price,
         :title => houdini_task.title,
         :form_html => generate_form_html(houdini_task.form_template),
-        :postback_url => houdini_postbacks_url(self.class.name, self.id, self.houdini_task.name, :host => Houdini::RAILS_HOST)
+        :postback_url => houdini_postbacks_url(self.class.name, self.id, houdini_task.name, :host => Houdini::RAILS_HOST)
       }
       params[:matched_answers_size] = houdini_task.matched_answers_size if houdini_task.matched_answers_size
 
       result = Houdini::Base.request(houdini_task.api, params)
 
-      call_after_submit
+      call_after_submit(task_name)
     end
 
-    def process_postback(answer)
+    def process_postback(task_name, answer)
+      houdini_task = self.class.houdini_tasks[task_name.to_sym]
       self.send(houdini_task.on_task_completion, answer)
     end
 
-    def call_after_submit
+    def call_after_submit(task_name)
+      houdini_task = self.class.houdini_tasks[task_name.to_sym]
       self.send(houdini_task.after_submit) if houdini_task.after_submit
     end
 

data/spec/requests/postbacks_spec.rb

@@ -7,7 +7,7 @@ describe "Postbacks" do
 
   it "should receive postback" do
     p = Post.create(:image_url => 'http://google.com', :flagged => nil)
-    post "houdini/post/#{p.id}/review_image/postbacks", :flagged => "yes"
+    post "houdini/post/#{p.id}/image_moderation/postbacks", :flagged => "yes"
 
     p.reload
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: houdini-rails3
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Chris Conley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2011-01-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency