Three bug fixes

.gitignore

@@ -24,3 +24,5 @@ testbed/db/*
 testbed/.bundle
 testbed/*
 surveys/fixtures/*.yml
+.rvmrc
+Gemfile.lock

Gemfile

@@ -0,0 +1,5 @@
+# -*- mode: ruby -*-
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in newever.gemspec
+gemspec

README.md

@@ -13,19 +13,19 @@ The Surveyor DSL defines questions, answers, question groups, survey sections, d
 The Surveyor DSL supports a wide range of question types (too many to list here) and complex dependency logic. Here are the first few questions of the "kitchen sink" survey which should give you and idea of how it works. The full example with all the types of questions available if you follow the installation instructions below.
 
     survey "Kitchen Sink survey" do
-    
+
       section "Basic questions" do
         # A label is a question that accepts no answers
         label "These questions are examples of the basic supported input types"
-    
+
         # A basic question with radio buttons
         question_1 "What is your favorite color?", :pick => :one
         answer "red"
         answer "blue"
         answer "green"
         answer "yellow"
         answer :other
-    
+
         # A basic question with checkboxes
         # "question" and "answer" may be abbreviated as "q" and "a"
         q_2 "Choose the colors you don't like", :pick => :any
@@ -34,8 +34,8 @@ The Surveyor DSL supports a wide range of question types (too many to list here)
         a_3 "green"
         a_4 "yellow"
         a :omit
-    
-        # A dependent question, with conditions and rule to logically join them  
+
+        # A dependent question, with conditions and rule to logically join them
         # the question's reference identifier is "2a", and the answer's reference_identifier is "1"
         # question reference identifiers used in conditions need to be unique on a survey for the lookups to work
         q_2a "Please explain why you don't like this color?"
@@ -45,24 +45,27 @@ The Surveyor DSL supports a wide range of question types (too many to list here)
         condition_B :q_2, "==", :a_2
         condition_C :q_2, "==", :a_3
         condition_D :q_2, "==", :a_4
-    
+
         # ... other question, sections and such. See surveys/kitchen_sink_survey.rb for more.
-     end 
-    
+     end
+
     end
-   
+
 The first question is "pick one" (radio buttons) with "other". The second question is "pick any" (checkboxes) with the option to "omit". It also features a dependency with a follow up question. Notice the dependency rule is defined as a string. We support complex dependency such as "A and (B or C) and D" or "A or ((B and C) or D)". The conditions are evaluated separately using the operators "==","!=","<>", ">=","<" the substituted by letter into to the dependency rule and evaluated.
 
 # Installation
 
-1. Add it to your bundler Gemfile:
+1. Add surveyor to your Gemfile (add add haml too if you haven't already):
 
 gem "surveyor"
+gem "haml"
+
+Then run:
 
 `bundle install`
 
 2. Generate assets, run migrations:
-    
+
 `script/rails generate surveyor:install`
 `rake db:migrate`
 
@@ -91,7 +94,14 @@ and read surveys/EXTENDING\_SURVEYOR
 
 # Requirements
 
-Surveyor depends on Ruby (1.8.7 - 1.9.1), Rails 3 and HAML/SASS http://haml.hamptoncatlin.com/. It also depends on fastercsv for csv exports.
+Surveyor depends on:
+
+* Ruby (1.8.7 - 1.9.1)
+* Rails 2.3
+* HAML/SASS
+* formtastic
+* fastercsv for csv exports
+* UUID
 
 # Contributing, testing
 

Rakefile

@@ -11,7 +11,12 @@ begin
     gem.authors = ["Brian Chamberlain", "Mark Yoon"]
     gem.add_dependency 'haml'
     gem.add_dependency 'fastercsv'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency 'formtastic'
+    gem.add_dependency 'uuid'
+    gem.add_development_dependency "yard", ">= 0"
+    gem.add_development_dependency "rake"
+    gem.add_development_dependency "rspec"
+    gem.add_development_dependency "jeweler"
   end
   Jeweler::GemcutterTasks.new
 

VERSION

@@ -1 +1 @@
-0.16.1
+0.16.16

app/controllers/results_controller.rb

@@ -1,6 +1,6 @@
 class ResultsController < ApplicationController
   helper 'surveyor'
-  layout 'results' 
+  layout 'results'
   def index
     @surveys = Survey.all
   end
@@ -10,4 +10,4 @@ def show
     @response_sets = @survey.response_sets
     @questions = @survey.sections_with_questions.map(&:questions).flatten
   end
-end
+end

app/helpers/results_helper.rb

@@ -1,20 +1,19 @@
 module ResultsHelper
-  def display_response(r_set,question)
-    sets = r_set.responses.select{|r| r.question.display_order == question.display_order}
-	  	if sets.size == 0
-  			return "-"
-  		elsif sets.size == 1
-  			return (sets.first.string_value || sets.first.text_value || show_answer(sets.first))
-  		else
-  		  txt = ""
-        sets.each do |set|
-          txt << show_answer(set) + "<br/>"
-        end
-        return txt
-		  end
+  def display_response(r_set, question)
+    sets = r_set.responses.select do |r|
+      r.question == question && r.question.display_order == question.display_order
+    end
+
+    if sets.size == 0
+      "-"
+    elsif sets.size == 1
+      (sets.first.string_value || sets.first.text_value || show_answer(sets.first))
+    else
+      sets.map{|s| show_answer(s) }.join(", ")
+    end
   end
-  
+
   def show_answer(set)
-     set.answer.text
+    set.answer.text
   end
-end
+end

app/helpers/surveyor_helper.rb

@@ -1,13 +1,13 @@
 module SurveyorHelper
   # Layout: stylsheets and javascripts
   def surveyor_includes
-    surveyor_stylsheets + surveyor_javascripts    
+    surveyor_stylsheets + surveyor_javascripts
   end
   def surveyor_stylsheets
-    stylesheet_link_tag 'surveyor/reset', 'surveyor/dateinput', 'surveyor'
+    stylesheet_link_tag 'surveyor/reset', 'surveyor/dateinput', 'surveyor/demo_table', 'surveyor'
   end
   def surveyor_javascripts
-    javascript_include_tag 'surveyor/jquery.tools.min', 'surveyor/jquery.surveyor'
+    javascript_include_tag 'surveyor/jquery.tools.min', 'surveyor/jquery.surveyor', 'surveyor/jquery.dataTables.min'
   end
   # Helper for displaying warning/notice/error flash messages
   def flash_messages(types)
@@ -34,7 +34,7 @@ def next_section
     # use copy in memory instead of making extra db calls
     @sections.last == @section ? submit_tag(t('surveyor.click_here_to_finish').html_safe, :name => "finish") : submit_tag(t('surveyor.next_section').html_safe, :name => "section[#{@sections[@sections.index(@section)+1].id}]")
   end
-  
+
   # Questions
   def q_text(obj)
     @n ||= 0
@@ -48,7 +48,7 @@ def q_text(obj)
   # def question_help_helper(question)
   #   question.help_text.blank? ? "" : %Q(<span class="question-help">#{question.help_text}</span>)
   # end
-  
+
   # Answers
   def rc_to_attr(type_sym)
     case type_sym.to_s
@@ -69,7 +69,7 @@ def generate_pick_none_input_html(response_class, default_value, css_class)
     html[:value] = default_value if response_class.blank?
     html
   end
-  
+
   # Responses
   def response_for(response_set, question, answer = nil, response_group = nil)
     return nil unless response_set && question && question.id
@@ -79,5 +79,5 @@ def response_for(response_set, question, answer = nil, response_group = nil)
   def response_idx(increment = true)
     @rc ||= 0
     (increment ? @rc += 1 : @rc).to_s
-  end  
+  end
 end

app/views/layouts/results.html.haml

@@ -0,0 +1,9 @@
+!!!
+%html{:lang => "en", "xml:lang" => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "text/html;charset=UTF-8", "http-equiv" => "content-type"}/
+    %title Survey: Result Sets
+    = surveyor_includes
+  %body
+    #flash= flash[:notice]
+    = yield

app/views/layouts/surveyor_default.html.haml

@@ -0,0 +1,9 @@
+!!!
+%html{:lang => "en", "xml:lang" => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "text/html;charset=UTF-8", "http-equiv" => "content-type"}/
+    %title
+      Survey: #{controller.action_name}
+    = surveyor_includes
+  %body
+    = yield

app/views/partials/_answer.html.haml

@@ -1,13 +1,15 @@
 -# TODO: disabled
 - rg ||= nil
+- part_of_grid ||= false
 - r = response_for(@response_set, q, a, rg)
 - i = response_idx(q.pick != "one") # argument will be false (don't increment i) if we're on radio buttons
 = f.semantic_fields_for i, r do |ff|
-  = ff.quiet_input :question_id unless q.pick == "one" # don't repeat question_id if we're on radio buttons
+  = ff.quiet_input :question_id unless q.pick == "one" && !part_of_grid # don't repeat question_id if we're on radio buttons
   = ff.quiet_input :id unless q.pick == "one" or r.new_record?
   = ff.quiet_input :response_group, :value => rg if q.pick != "one" && g && g.display_type == "repeater"
   - case q.pick
   - when "one"
+    = ff.quiet_input :id if r.id
     = ff.input :answer_id, :as => :surveyor_radio, :collection => [[a.text, a.id]], :label => false, :input_html => {:class => a.css_class}, :response_class => a.response_class
   - when "any"
     = ff.input :answer_id, :as => :surveyor_check_boxes, :collection => [[a.text, a.id]], :label => false, :input_html => {:class => a.css_class}, :response_class => a.response_class

app/views/partials/_question.html.haml

@@ -1,14 +1,15 @@
 -# TODO: js for slider
 - rg ||= nil
 - renderer = q.renderer(g ||= nil)
-= f.inputs q_text(q), :id => rg ? "q_#{q.id}_#{rg.id}" : "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}" do
+= f.inputs q_text(q), :id => rg ? "q_#{q.id}_#{rg}" : "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}" do
   %span.help= q.help_text
   - case renderer
   - when :image, :label
-  - when :dropdown, :inline_dropdown, :slider
+  - when :dropdown, :inline_dropdown, :slider, :repeater_dropdown
     - r = response_for(@response_set, q, nil, rg)
     - i = response_idx
     = f.semantic_fields_for i, r do |ff|
+      = ff.quiet_input :id if r.id
       = ff.quiet_input :question_id
       = ff.quiet_input :response_group, :value => rg if g && g.display_type == "repeater"
       = ff.input :answer_id, :as => :select, :collection => q.answers.map{|a| [a.text, a.id]}, :label => false

app/views/partials/_question_group.html.haml

@@ -1,12 +1,12 @@
 - renderer = g.renderer
+%span.help= g.help_text
 = f.inputs q_text(g), :id => "g_#{g.id}", :class => "g_#{renderer} #{g.css_class(@response_set)}" do
-  %li.help= g.help_text
   - case renderer
     - when :grid
       %li
         %table
           %col.pre
-          - qs.first.answers.each do |a| 
+          - qs.first.answers.each do |a|
             %col{:class => cycle("odd", "even")}
           %col.post
           %tbody
@@ -21,7 +21,7 @@
                   %th= q.split_text(:pre)
                   - response_idx if q.pick == "one" # increment the response index since the answer partial skips for q.pick == one
                   - q.answers.each do |a|
-                    %td= render a.custom_renderer || '/partials/answer', :g => g, :q => q, :a => a, :f => f
+                    %td= render a.custom_renderer || '/partials/answer', :g => g, :q => q, :a => a, :f => f, :part_of_grid => true
                   %th= q.split_text(:post)
     - when :repeater
       - (@response_set.count_group_responses(qs) + 1).times do |rg|
@@ -31,4 +31,4 @@
       = submit_tag("+ add row", :name => "section[#{@section.id}][g_#{g.id}]", :class => "add_row")
     - else # :inline
       - qs.each do |q|
-        = render q.custom_renderer || "/partials/question", :g => g, :q => q, :f => f
+        = render q.custom_renderer || "/partials/question", :g => g, :q => q, :f => f

app/views/results/index.html.haml

@@ -0,0 +1,11 @@
+%h1 Listing Surveys
+%table.list_table
+  %tr
+    %th ID
+    %th Name
+    %th Operation
+  - @surveys.each do |survey|
+    %tr
+      %td= h survey.id
+      %td= h survey.title
+      %td= link_to "show results list (#{survey.response_sets.count})", result_path(survey.access_code)