app/models/quiz.rb @@ -6,19 +6,15 @@ class QuizController < ApplicationController def create page = Page.find(params[:page_id]) config = config(page) - required = config[:questions] - results = config[:results].collect{|k,v| [k.to_i,"#{page.url}#{v}"]}.sort_by{|e| e.first} - if params[:questions] and required.size == params[:questions].size - total = params[:questions].collect{|k,v| v.to_i}.sum - result = (results.detect{|k,v| k >= total} || results.last) - redirect_to result.last + quiz = Quiz.new(config, params[:questions]) + if quiz.valid? + redirect_to "#{page.url}#{quiz.result}" + elsif page.published? + page.last_quiz = quiz + page.request, page.response = request, response + render :text => page.render else - if page.published? - page.request, page.response = request, response - render :text => page.render - else - render :text => %(Quiz not found.) - end + render :text => %(Quiz not found.) end end app/controllers/quiz_controller.rb @@ -50,7 +50,7 @@ module QuizTags tag "quiz:questions:each" do |tag| result = [] tag.locals.quiz_config['questions'].each_with_index do |q,i| - tag.locals.question_name = "question_#{i}" + tag.locals.question_name = "question_#{i+1}" tag.locals.question_text = q[0] tag.locals.question_options = q[1..-1] result << tag.expand @@ -59,26 +59,26 @@ module QuizTags end tag "quiz:error" do |tag| - result = nil - params = tag.locals.page.request.parameters - if required = params['required'] - if tag.locals.question_name - if !params['questions'] or !params['questions'][tag.locals.question_name] - result = tag.expand - end - else - if !params['questions'] or params['questions'].size != required.size - result = tag.expand + quiz = tag.locals.page.last_quiz + if quiz + if name = tag.locals.question_name + if quiz.errors.on(name) + tag.expand end + elsif !quiz.valid? + result = tag.expand end end - result end tag "quiz:question" do |tag| tag.locals.question_text end + tag "quiz:question_name" do |tag| + tag.locals.question_name + end + tag "quiz:options" do |tag| tag.expand end lib/quiz_tags.rb @@ -8,7 +8,10 @@ class QuizExtension < Radiant::Extension end def activate - Page.send :include, QuizTags + Page.class_eval do + include QuizTags + attr_accessor :last_quiz + end end def deactivate quiz_extension.rb @@ -1,42 +1,68 @@ require File.dirname(__FILE__) + '/../test_helper' class QuizTest < ActionController::IntegrationTest - def test_quiz_basics - page = Page.create!(:title => 'Quiz!', :slug => '/', :breadcrumb => 'home', :status => Status[:published]) + def setup + @page = Page.create!(:title => 'Quiz!', :slug => '/', :breadcrumb => 'home', :status => Status[:published]) + PagePart.create!(:name => 'quiz', :page => @page, :content => quiz_config) + PagePart.create!(:name => 'body', :page => @page, :content => quiz_body) - quiz_part = PagePart.create!(:name => 'quiz', :page => page, :content => quiz_config) - body_part = PagePart.create!(:name => 'body', :page => page, :content => quiz_body) - + @url = %(/pages/#{@page.id}/quiz) + end + + def test_quiz_basics get '/' - assert_select %(form[action=/pages/#{page.id}/quiz][method=post]) do - assert_select %(input[name='questions[question_0]'][value=1]) - assert_select %(input[name='questions[question_0]'][value=2]) - assert_select %(input[name='questions[question_0]'][value=3]) + assert_select %(form[action=#{@url}][method=post]) do + assert_select %(input[name='questions[question_1]'][value=1]) + assert_select %(input[name='questions[question_1]'][value=2]) + assert_select %(input[name='questions[question_1]'][value=3]) end - url = %(/pages/#{page.id}/quiz) - post url, :questions => {:question_0 => '1', :question_1 => '1', :question_2 => '1'} - puts html_document.root + post @url, :questions => {:question_1 => '1', :question_2 => '1', :question_3 => '1'} assert_redirected_to '/result1' - post url, :questions => {:question_0 => '1', :question_1 => '1', :question_2 => '2'} + post @url, :questions => {:question_1 => '1', :question_2 => '1', :question_3 => '2'} assert_redirected_to '/result2' - post url, :questions => {:question_0 => '1', :question_1 => '2', :question_2 => '2'} + post @url, :questions => {:question_1 => '1', :question_2 => '2', :question_3 => '2'} assert_redirected_to '/result2' - post url, :questions => {:question_0 => '1', :question_1 => '2', :question_2 => '3'} + post @url, :questions => {:question_1 => '1', :question_2 => '2', :question_3 => '3'} assert_redirected_to '/result3' - post url, :questions => {:question_0 => '3', :question_1 => '3', :question_2 => '3'} + post @url, :questions => {:question_1 => '3', :question_2 => '3', :question_3 => '3'} assert_redirected_to '/result3' end + def test_error_handling + post @url + assert_response :success + assert_select '#error' + assert_select '#error_on_question_1' + assert_select '#error_on_question_2' + assert_select '#error_on_question_3' + + post @url, :questions => {:question_1 => '1'} + assert_response :success + assert_select '#error' + assert_select '#error_on_question_1', false + assert_select '#error_on_question_2' + assert_select '#error_on_question_3' + + post @url, :questions => {:question_1 => '1', :question_2 => '1', :question_3 => '1'} + assert_response :redirect + assert_select '#error', false + assert_select '#error_on_question_1', false + assert_select '#error_on_question_2', false + assert_select '#error_on_question_3', false + end + def quiz_body return <<-BODY.chomp <r:quiz:form> + <r:error><p id="error"></p></r:error> <r:questions:each> <h2><r:question /></h2> + <r:error><p id="error_on_<r:question_name />"></p></r:error> <ol> <r:options:each> <li><r:option_radio /> <r:option_label /></li> test/integration/quiz_test.rb 30230d941afa61605f63f920f62dfe6915582734 Nathaniel Talbott nathaniel@terralien.com http://github.com/ntalbott/radiant-quiz-extension/commit/00d07d8b319dc58b1ca712564106f67bb2f0dfa7 00d07d8b319dc58b1ca712564106f67bb2f0dfa7 2008-06-11T14:19:01-07:00 2008-06-11T14:19:01-07:00 Added test for error handling, and refactored how it is handled. e1c5772d7b957e16a8dbb220d8827c9f02095ec0 Nathaniel Talbott nathaniel@terralien.com