surveyor 0.19.1 → 0.19.2

data/CHANGELOG

@@ -1,3 +1,14 @@
+0.19.2
+
+* quiz example
+* support correct answers for quizes through dsl. closes #105
+* test dependency issues. closes #73
+* fixing feature, section menu doens't appear until three sections exist
+* fixing default values to only appear when response is blank
+* fixing typo in specs. fixing cucumber on hudson due to residual objects in db from specs
+* tweak to check hudson cucumber issue
+* added dump rake task. thanks bnadav. closes #100
+
 0.19.1
 
 * require formtastic. closes #104

data/VERSION

@@ -1 +1 @@
-0.19.1
+0.19.2

data/app/views/partials/_answer.html.haml

@@ -14,6 +14,6 @@
   - when "none"
     - if %w(date datetime time float integer string text).include? a.response_class
       = ff.quiet_input :answer_id, :input_html => {:class => a.css_class, :value => a.id}
-      = ff.input rc_to_attr(a.response_class), :as => rc_to_as(a.response_class), :label => a.split_or_hidden_text(:pre).blank? ? false : a.split_or_hidden_text(:pre), :hint => a.split_or_hidden_text(:post), :input_html => {:value => a.default_value}
+      = ff.input rc_to_attr(a.response_class), :as => rc_to_as(a.response_class), :label => a.split_or_hidden_text(:pre).blank? ? false : a.split_or_hidden_text(:pre), :hint => a.split_or_hidden_text(:post), :input_html => (r.as(a.response_class).blank? ? {:value => a.default_value} : {})
     - else
       = a.text

data/features/step_definitions/parser_steps.rb

@@ -69,3 +69,9 @@ Then /^there should be (\d+) validation_condition(?:s?) with:$/ do |x, table|
     ValidationCondition.find(:first, :conditions => hash).should_not be_nil
   end
 end
+
+Then /^question "([^"]*)" should have correct answer "([^"]*)"$/ do |qr, ar|
+  (q = Question.find_by_reference_identifier(qr)).should_not be_nil
+  q.correct_answer.should == q.answers.find_by_reference_identifier(ar)
+end
+

data/features/step_definitions/surveyor_steps.rb

@@ -7,5 +7,28 @@ end
 Then /^there should be (\d+) response set with (\d+) responses with:$/ do |rs_num, r_num, table|
   ResponseSet.count.should == rs_num.to_i
   Response.count.should == r_num.to_i
-  # table is a Cucumber::Ast::Table
+  table.hashes.each do |hash|
+    if hash.keys == ["answer"]
+      a = Answer.find_by_text(hash["answer"])
+      a.should_not be_nil
+      Response.first(:conditions => {:answer_id => a.id}).should_not be_nil
+    else
+      if !(a = hash.delete("answer")).blank? and !(answer = Answer.find_by_text(a)).blank?
+        Response.first(:conditions => hash.merge({:answer_id => answer.id})).should_not be_nil
+      elsif
+        Response.first(:conditions => hash).should_not be_nil
+      end      
+    end
+  end
+end
+
+Then /^there should be (\d+) dependencies$/ do |x|
+  Dependency.count.should == x.to_i
+end
+
+Then /^question "([^"]*)" should have a dependency with rule "([^"]*)"$/ do |qr, rule|
+  q = Question.find_by_reference_identifier(qr)
+  q.should_not be_blank
+  q.dependency.should_not be_nil
+  q.dependency.rule.should == rule
 end

data/features/surveyor.feature

@@ -25,13 +25,14 @@ Feature: Survey creation
       end
     """
     When I start the "Favorites" survey
+    Then I should see "You with the sad eyes don't be discouraged"
     And I choose "red"
     And I choose "blue"
     And I check "orange"
     And I check "brown"
     And I press "Click here to finish"
     Then there should be 1 response set with 3 responses with:
-      | to_s   |
+      | answer |
       | blue   |
       | orange |
       | brown  |
@@ -42,12 +43,40 @@ Feature: Survey creation
       survey "Favorites" do
         section "Foods" do
           question_1 "What is your favorite food?"
-          answer :string, :default_value => "beef"
+          answer "food", :string, :default_value => "beef"
+        end
+        section "Section 2" do
+        end
+        section "Section 3" do
         end
       end
     """
     When I start the "Favorites" survey
+    And I press "Section 3"
     And I press "Click here to finish"
     Then there should be 1 response set with 1 responses with:
-      | to_s   |
-      | clear   |
+      | string_value |
+      | beef |
+
+    When I start the "Favorites" survey
+    And I fill in "food" with "chicken"
+    And I press "Foods"
+    And I press "Section 3"
+    And I press "Click here to finish"
+    Then there should be 2 response set with 2 responses with:
+      | string_value    |
+      | chicken |
+
+  Scenario: Quiz time
+    Given the survey
+    """
+      survey "Favorites" do
+        section "Foods" do
+          question_1 "What is the best meat?", :pick => :one, :correct => "oink"
+          a_oink "bacon"
+          a_tweet "chicken"
+          a_moo "beef"
+        end
+      end
+    """
+    Then question "1" should have correct answer "oink"

data/features/surveyor_parser.feature

@@ -155,3 +155,47 @@ Feature: Survey creation
     And there should be 2 validation_conditions with:
       | rule_key | integer_value |
       | A        | 0             |
+
+  Scenario: Dependencies and validations
+    Given I parse
+    """
+      survey "dependency test" do
+        section "section 1" do
+  
+          q_copd_sh_1 "Have you ever smoked cigarettes?",:pick=>:one,:help_text=>"NO means less than 20 packs of cigarettes or 12 oz. of tobacco in a lifetime or less than 1 cigarette a day for 1 year."
+          a_1 "Yes"
+          a_2 "No"
+  
+          q_copd_sh_1a "How old were you when you first started smoking cigarettes?", :help_text=>"age in years"
+          a :integer
+          dependency :rule => "A"
+          condition_A :q_copd_sh_1, "==", :a_1
+  
+          q_copd_sh_1b "Do you currently smoke cigarettes?",:pick=>:one, :help_text=>"as of 1 month ago"
+          a_1 "Yes"
+          a_2 "No"
+          dependency :rule => "B"
+          condition_B :q_copd_sh_1, "==", :a_1
+  
+          q_copd_sh_1c "On the average of the entire time you smoked, how many cigarettes did you smoke per day?"
+          a :integer
+          dependency :rule => "C"
+          condition_C :q_copd_sh_1, "==", :a_1
+  
+          q_copd_sh_1bb "How many cigarettes do you smoke per day now?"
+          a_2 "integer"
+          dependency :rule => "D"
+          condition_D :q_copd_sh_1b, "==", :a_1
+  
+  
+          q_copd_sh_1ba "How old were you when you stopped?"
+          a "Years", :integer
+          dependency :rule => "E"
+          condition_E :q_copd_sh_1b, "==", :a_2
+  
+        end
+      end
+    """
+    Then there should be 5 dependencies
+    And question "copd_sh_1a" should have a dependency with rule "A"
+    And question "copd_sh_1ba" should have a dependency with rule "E"

data/generators/surveyor/surveyor_generator.rb

@@ -54,8 +54,8 @@ class SurveyorGenerator < Rails::Generator::Base
       end
       
       # Surveys
-      m.directory "surveys/fixtures"
       m.file "surveys/kitchen_sink_survey.rb", "surveys/kitchen_sink_survey.rb"
+      m.file "surveys/quiz.rb", "surveys/quiz.rb"
       
       m.readme "README"
       

data/generators/surveyor/templates/surveys/quiz.rb

@@ -0,0 +1,10 @@
+survey "Favorites" do
+  section "Foods" do
+    # In a quiz, both the questions and the answers need to have reference identifiers
+    # Here, the question has reference_identifier: "1", and the answers: "oint", "tweet", and "moo"
+    question_1 "What is the best meat?", :pick => :one, :correct => "oink"
+    a_oink "bacon"
+    a_tweet "chicken"
+    a_moo "beef"
+  end
+end

data/lib/surveyor/models/question_methods.rb

@@ -7,6 +7,7 @@ module Surveyor
         base.send :belongs_to, :question_group, :dependent => :destroy
         base.send :has_many, :answers, :order => "display_order ASC", :dependent => :destroy # it might not always have answers
         base.send :has_one, :dependency, :dependent => :destroy
+        base.send :has_one, :correct_answer, :class_name => "Answer", :dependent => :destroy
 
         # Scopes
         base.send :default_scope, :order => "display_order ASC"

data/lib/surveyor/models/response_set_methods.rb

@@ -58,15 +58,15 @@ module Surveyor
         super
       end
 
-      def to_csv
+      def to_csv(access_code = false, print_header = true)
         qcols = Question.content_columns.map(&:name) - %w(created_at updated_at)
         acols = Answer.content_columns.map(&:name) - %w(created_at updated_at)
         rcols = Response.content_columns.map(&:name)
         require 'fastercsv'
         FCSV(result = "") do |csv|
-          csv << qcols.map{|qcol| "question.#{qcol}"} + acols.map{|acol| "answer.#{acol}"} + rcols.map{|rcol| "response.#{rcol}"}
+          csv << (access_code ? ["response set access code"] : []) + qcols.map{|qcol| "question.#{qcol}"} + acols.map{|acol| "answer.#{acol}"} + rcols.map{|rcol| "response.#{rcol}"} if print_header
           responses.each do |response|
-            csv << qcols.map{|qcol| response.question.send(qcol)} + acols.map{|acol| response.answer.send(acol)} + rcols.map{|rcol| response.send(rcol)}
+            csv << (access_code ? [self.access_code] : []) + qcols.map{|qcol| response.question.send(qcol)} + acols.map{|acol| response.answer.send(acol)} + rcols.map{|rcol| response.send(rcol)}
           end
         end
         result
@@ -130,4 +130,4 @@ module Surveyor
       end
     end
   end
-end
+end

data/lib/surveyor/parser.rb

@@ -73,7 +73,7 @@ class Survey < ActiveRecord::Base
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
-    context.delete_if{|k,v| true}
+    context.delete_if{|k,v| true }
     context[:question_references] = {}
     context[:answer_references] = {}
     
@@ -83,7 +83,7 @@ class Survey < ActiveRecord::Base
                               :reference_identifier => reference_identifier}.merge(args[1] || {}))
   end
   def clear(context)
-    context.delete_if{|k,v| true}
+    context.delete_if{|k,v| true }
     context[:question_references] = {}
     context[:answer_references] = {}
   end
@@ -93,14 +93,14 @@ class SurveySection < ActiveRecord::Base
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
-    context.delete_if{|k,v| k != :survey && k != :question_references && k != :answer_references}
+    context.delete_if{|k,v| !%w(survey question_references answer_references).map(&:to_sym).include?(k)}
     
     # build and set context
     title = args[0]
     context[:survey_section] = context[:survey].sections.build({ :title => title }.merge(args[1] || {}))
   end
   def clear(context)
-    context.delete_if{|k,v| k != :survey && k != :question_references && k != :answer_references}
+    context.delete_if{|k,v| !%w(survey question_references answer_references).map(&:to_sym).include?(k)}
   end
 end
 class QuestionGroup < ActiveRecord::Base
@@ -108,7 +108,7 @@ class QuestionGroup < ActiveRecord::Base
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
-    context.delete_if{|k,v| k != :survey && k != :survey_section && k != :question_references && k != :answer_references}
+    context.delete_if{|k,v| !%w(survey survey_section question_references answer_references).map(&:to_sym).include?(k)}
     
     # build and set context
     context[:question_group] = context[:question_group] = new({  :text => args[0] || "Question Group",
@@ -116,12 +116,16 @@ class QuestionGroup < ActiveRecord::Base
 
   end
   def clear(context)
-    context.delete_if{|k,v| k != :survey && k != :survey_section && k != :question_references && k != :answer_references}
+    context.delete_if{|k,v| !%w(survey survey_section question_references answer_references).map(&:to_sym).include?(k)}
   end
 end
 class Question < ActiveRecord::Base
   # nonblock
   
+  # attributes
+  attr_accessor :correct, :context_reference
+  before_save :resolve_correct_answers
+  
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
     context.delete_if{|k,v| %w(question dependency dependency_condition answer validation validation_condition).map(&:to_sym).include? k}
@@ -129,6 +133,7 @@ class Question < ActiveRecord::Base
     # build and set context
     text = args[0] || "Question"
     context[:question] = context[:survey_section].questions.build({
+      :context_reference => context,
       :question_group => context[:question_group],
       :reference_identifier => reference_identifier,
       :text => text,
@@ -146,6 +151,14 @@ class Question < ActiveRecord::Base
       end
     end
   end
+  
+  def resolve_correct_answers
+    unless correct.blank? or reference_identifier.blank? or context_reference.blank?
+      # Looking up references for quiz answers
+      context_reference[:answer_references][reference_identifier] ||= {}
+      print (self.correct_answer = context_reference[:answer_references][reference_identifier][correct]) ? "found correct answer:#{correct} " : "lost! correct answer:#{correct} "
+    end
+  end
 end
 class Dependency < ActiveRecord::Base
   # nonblock

data/lib/tasks/surveyor_tasks.rake

@@ -60,4 +60,17 @@ namespace :surveyor do
       puts "There are no surveys without response sets"      
     end
   end
-end
+  desc "dump all responses to a given survey"
+  task :dump => :environment do
+    require 'fileutils.rb'
+    raise "USAGE: rake surveyor:dump SURVEY_ACCESS_CODE=<access_code> [OUTPUT_DIR=<dir>]" unless ENV["SURVEY_ACCESS_CODE"] 
+    survey = Survey.find_by_access_code(ENV["SURVEY_ACCESS_CODE"])
+    raise "No Survey found with code " + ENV["SURVEY_ACCESS_CODE"] unless survey
+    dir = ENV["OUTPUT_DIR"] || Rails.root
+    mkpath(dir) # Create all non-existent directories
+    full_path = File.join(dir,"#{survey.access_code}_#{Time.now.to_i}.csv")
+    File.open(full_path, 'w') do |f|
+      survey.response_sets.each_with_index{|r,i| f.write(r.to_csv(true, i == 0)) } # print access code every time, print_header first time
+    end
+  end
+end

data/spec/models/dependency_spec.rb

@@ -79,11 +79,13 @@ describe Dependency, "when evaluating dependency conditions of a question in a r
   end
 end
 describe Dependency, "with conditions" do
-  @dependency = Dependency.new(:rule => "A and B and C", :question_id => 1)
-  Factory(:dependency_condition, :dependency => @dependency, :rule_key => "A")
-  Factory(:dependency_condition, :dependency => @dependency, :rule_key => "B")
-  Factory(:dependency_condition, :dependency => @dependency, :rule_key => "C")
-  dc_ids = @dependency.dependency_conditions.map(&:id)
-  @dependency.destroy
-  dc_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
+  it "should destroy conditions when destroyed" do
+    @dependency = Dependency.new(:rule => "A and B and C", :question_id => 1)
+    Factory(:dependency_condition, :dependency => @dependency, :rule_key => "A")
+    Factory(:dependency_condition, :dependency => @dependency, :rule_key => "B")
+    Factory(:dependency_condition, :dependency => @dependency, :rule_key => "C")
+    dc_ids = @dependency.dependency_conditions.map(&:id)
+    @dependency.destroy
+    dc_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
+  end
 end

data/spec/models/validation_spec.rb

@@ -50,20 +50,15 @@ describe Validation, "reporting its status" do
   it "should validate a response by regexp" do
     test_var({}, [{:operator => "=~", :regexp => /^[a-z]{1,6}$/}], {:response_class => "string"}, {:string_value => ""}).should be_false
   end
-  it "should validate a response by (in)equality" do
-    # test_var({:operator => "!=", :datetime_value => Date.today + 1}, {:response_class => "date"}, {:datetime_value => Date.today}).should be_true
-    # test_var({:operator => "==", :answer_id => 2}, {:response_class => "answer"}, {:answer_id => 2}).should be_false
-  end
-  it "should validate a response by lookup" do
-    
-  end
 end
 describe Validation, "with conditions" do
-  @validation = Factory(:validation)
-  Factory(:validation_condition, :validation => @validation, :rule_key => "A")
-  Factory(:validation_condition, :validation => @validation, :rule_key => "B")
-  Factory(:validation_condition, :validation => @validation, :rule_key => "C")
-  v_ids = @validation.validation_conditions.map(&:id)
-  @validation.destroy
-  v_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
+  it "should destroy conditions when destroyed" do
+    @validation = Factory(:validation)
+    Factory(:validation_condition, :validation => @validation, :rule_key => "A")
+    Factory(:validation_condition, :validation => @validation, :rule_key => "B")
+    Factory(:validation_condition, :validation => @validation, :rule_key => "C")
+    v_ids = @validation.validation_conditions.map(&:id)
+    @validation.destroy
+    v_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
+  end
 end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.19.1"
+  s.version = "0.19.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-02-09}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -98,6 +98,7 @@ Gem::Specification.new do |s|
      "generators/surveyor/templates/migrate/create_validation_conditions.rb",
      "generators/surveyor/templates/migrate/create_validations.rb",
      "generators/surveyor/templates/surveys/kitchen_sink_survey.rb",
+     "generators/surveyor/templates/surveys/quiz.rb",
      "generators/surveyor/templates/tasks/surveyor.rb",
      "hudson.rakefile",
      "init_testbed.rakefile",
@@ -149,7 +150,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/breakpointer/surveyor}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A rails (gem) plugin to enable surveys in your application}
   s.test_files = [
     "spec/controllers/surveyor_controller_spec.rb",
@@ -174,6 +175,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 81
-  prerelease: 
+  hash: 87
+  prerelease: false
   segments: 
   - 0
   - 19
-  - 1
-  version: 0.19.1
+  - 2
+  version: 0.19.2
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -06:00
+date: 2011-02-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,6 +167,7 @@ files:
 - generators/surveyor/templates/migrate/create_validation_conditions.rb
 - generators/surveyor/templates/migrate/create_validations.rb
 - generators/surveyor/templates/surveys/kitchen_sink_survey.rb
+- generators/surveyor/templates/surveys/quiz.rb
 - generators/surveyor/templates/tasks/surveyor.rb
 - hudson.rakefile
 - init_testbed.rakefile
@@ -244,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A rails (gem) plugin to enable surveys in your application