surveyor 0.6.1 → 0.6.2

data/README.md

@@ -7,13 +7,15 @@ Surveyor is a rails (gem) plugin, that brings surveys to your rails app. Before
 As a plugin:
 
     sudo gem install haml
-    script/plugin install git://github.com/breakpointer/surveyor.git
+    script/plugin install git://github.com/breakpointer/surveyor.git -r 'tag v0.6.2'
 
 Or as a gem plugin:
   
   # in environment.rb
-  config.gem "surveyor", :version => '>=0.4.1', :lib => false
+  config.gem "surveyor", :version => '>=0.6.1', :source => 'http://gemcutter.org'
   
+    sudo gem install gemcutter
+    gem tumble
     sudo rake gems:install
 
 Generate assets, run migrations:

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/app/helpers/surveyor_helper.rb

@@ -53,11 +53,9 @@ module SurveyorHelper
   end
 
   # Answers
-  def fields_for_response(response, &block)
-    fields_for("responses[#{response.question_id}][#{response.answer_id}]", response, :builder => SurveyFormBuilder, &block)
-  end
-  def fields_for_repeater_response(response, response_group, &block) # Changes the response hash to accept response groups for repeater elements
-    fields_for("response_groups[#{response.question_id}][#{response_group}][#{response.answer_id}]", response, :builder => SurveyFormBuilder, &block)
+  def fields_for_response(response, response_group = nil, &block)
+    name = response_group.nil? ? "responses[#{response.question_id}][#{response.answer_id}]" : "response_groups[#{response.question_id}][#{response_group}][#{response.answer_id}]"
+    fields_for(name, response, :builder => SurveyFormBuilder, &block)
   end
   def fields_for_radio(response, &block)
     fields_for("responses[#{response.question_id}]", response, :builder => SurveyFormBuilder, &block)

data/app/models/response_set.rb

@@ -29,38 +29,16 @@ class ResponseSet < ActiveRecord::Base
   end
   
   def response_for(question_id, answer_id, group = nil)
-    response_group = group.nil? ? nil : group.to_s # for PostgreSql 8.3 compatibility - response_group is a string
-    # found = responses.find_by_question_id_and_answer_id_and_response_group(question_id, answer_id, response_group)
-    found = responses.detect{|r| r.question_id == question_id && r.answer_id == answer_id && r.response_group == response_group}
-    found.blank? ? responses.new(:question_id => question_id, :answer_id => answer_id, :response_group => response_group) : found
+    found = responses.detect{|r| r.question_id == question_id && r.answer_id == answer_id && r.response_group.to_s == group.to_s}
+    found.blank? ? responses.new(:question_id => question_id, :answer_id => answer_id, :response_group => group) : found
   end
   
   def clear_responses
     question_ids = Question.find_all_by_survey_section_id(current_section_id).map(&:id)
-    # logger.warn "responses: #{responses.inspect}\n"
     responses.select{|r| question_ids.include? r.question_id}.map(&:destroy)
     responses.reload
-    # logger.warn "responses: #{responses.inspect}\n"
   end
   
-  # "responses"=>{
-  #string   "6"=>{"question_id"=>"6", "20"=>{"string_value"=>"saf"}}, 
-  #text   "7"=>{"question_id"=>"7", "21"=>{"text_value"=>""}}, 
-  #radio+txt   "1"=>{"question_id"=>"1", "answer_id"=>"1", "4"=>{"string_value"=>""}}, 
-  #radio   "2"=>{"answer_id"=>"6"}, 
-  #radio   "3"=>{"answer_id"=>"10"}, 
-  #check   "4"=>{"question_id"=>"4", "answer_id"=>"15"}, 
-  #check+txt   "5"=>{"question_id"=>"5", "16"=>{"selected"=>"1"}, "19"=>{"string_value"=>""}}
-  #   },
-  # "survey_code"=>"test_survey", 
-  # "commit"=>"Next Section (Utensiles and you!) >>", 
-  # "authenticity_token"=>"8bee21081eea820ab1c658358c0baaa2e46de5d1", 
-  # "_method"=>"put", 
-  # "action"=>"update", 
-  # "controller"=>"app", 
-  # "response_set_code"=>"T2x8HhCQej", 
-  # "section"=>"2"
-
   def response_attributes=(response_attributes)
     response_attributes.each do |question_id, responses_hash|
       # Response.delete_all(["response_set_id =? AND question_id =?", self.id, question_id])
@@ -80,39 +58,7 @@ class ResponseSet < ActiveRecord::Base
       end
     end
   end
-  
-  # "24"=>{
-  #   "0"=>{"response_group"=>"0", "question_id"=>"24", "answer_id"=>"172"}, "1"=>{"response_group"=>"1", "question_id"=>"24", "answer_id"=>"173"}, 
-  #   "2"=>{"response_group"=>"2", "question_id"=>"24", "answer_id"=>""}, "3"=>{"response_group"=>"3", "question_id"=>"24", "answer_id"=>""}, 
-  #   "4"=>{"response_group"=>"4", "question_id"=>"24", "answer_id"=>""}},
- #  where "24" is the question id
- 
- # Some other examples:
- # "25"=>{
- # "0"=>{"response_group"=>"0", "question_id"=>"25", "179"=>{"string_value"=>"camry"}}, 
- # "1"=>{"response_group"=>"1", "question_id"=>"25", "179"=>{"string_value"=>"f150"}},
- #  "2"=>{"response_group"=>"2", "question_id"=>"25", "179"=>{"string_value"=>""}}, 
- #  "3"=>{"response_group"=>"3", "question_id"=>"25", "179"=>{"string_value"=>""}}, 
- #  "4"=>{"response_group"=>"4", "question_id"=>"25", "179"=>{"string_value"=>""}}}, 
- # 
- # "26"=>{
- # "0"=>{"response_group"=>"0", "question_id"=>"26", "180"=>{"string_value"=>"1999"}},
- #  "1"=>{"response_group"=>"1", "question_id"=>"26", "180"=>{"string_value"=>"2004"}}, 
- #  "2"=>{"response_group"=>"2", "question_id"=>"26", "180"=>{"string_value"=>""}}, 
- #  "3"=>{"response_group"=>"3", "question_id"=>"26", "180"=>{"string_value"=>""}}, 
- #  "4"=>{"response_group"=>"4", "question_id"=>"26", "180"=>{"string_value"=>""}}}, 
- # 
- # "27"=>{
- # "0"=>{"182"=>{"integer_value"=>""}, "response_group"=>"0", "question_id"=>"27", "181"=>{"string_value"=>""}}, 
- # "1"=>{"182"=>{"integer_value"=>""}, "response_group"=>"1", "question_id"=>"27", "181"=>{"string_value"=>""}},
- #  "2"=>{"182"=>{"integer_value"=>""}, "response_group"=>"2", "question_id"=>"27", "181"=>{"string_value"=>""}}, 
- #  "3"=>{"182"=>{"integer_value"=>""}, "response_group"=>"3", "question_id"=>"27", "181"=>{"string_value"=>""}}, 
- #  "4"=>{"182"=>{"integer_value"=>""}, "response_group"=>"4", "question_id"=>"27", "181"=>{"string_value"=>""}}}},
- 
- # 0,1,2,3,4 are the response group numbers
- # and anything else in the response group hash is handled normally 
-  
-  # method to process responses in response groups
+
   def response_group_attributes=(response_attributes)
     response_attributes.each do |question_id, responses_group_hash|
       # Response.delete_all(["response_set_id =? AND question_id =?", self.id, question_id])
@@ -136,41 +82,27 @@ class ResponseSet < ActiveRecord::Base
     end
   end
   
-  def find_response(answer_id)
-     self.responses.find_by_answer_id(answer_id)
-  end
-  
   def save_responses
-    responses.each do |response|
-      response.save(false)
-    end
-  end
-
-  # ResponseSet has an awareness of its internal state
-  def empty?
-    self.responses.empty?
+    responses.each{|response| response.save(false)}
   end
 
   def complete!
     self.completed_at = Time.now
   end
   
-  def has_answered_question?(question)
-   !has_not_answered_question?(question)
-  end
-  
   def has_not_answered_question?(question)
     self.responses.find_all_by_question_id(question.id).empty?
   end
     
   # Returns the number of response groups (count of group responses enterted) for this question group
   def count_group_responses(questions)
-    questions.map{|q| responses.select{|r| r.question_id == q.id && !r.response_group.nil?}.size }.max
+    questions.map{|q| responses.select{|r| (r.question_id.to_i == q.id.to_i) && !r.response_group.nil?}.group_by(&:response_group).size }.max
   end
   
   def unanswered_dependencies
     dependencies.select{|d| d.met?(self) and self.has_not_answered_question?(d.question)}.map(&:question)
   end
+  
   def all_dependencies
     arr = dependencies.partition{|d| d.met?(self) }
     {:show => arr[0].map{|d| "question_#{d.question_id}"}, :hide => arr[1].map{|d| "question_#{d.question_id}"}}
@@ -183,3 +115,56 @@ class ResponseSet < ActiveRecord::Base
     Dependency.depending_on_questions(question_ids)
   end
 end
+
+# responses
+
+# "responses"=>{
+#string   "6"=>{"question_id"=>"6", "20"=>{"string_value"=>"saf"}}, 
+#text   "7"=>{"question_id"=>"7", "21"=>{"text_value"=>""}}, 
+#radio+txt   "1"=>{"question_id"=>"1", "answer_id"=>"1", "4"=>{"string_value"=>""}}, 
+#radio   "2"=>{"answer_id"=>"6"}, 
+#radio   "3"=>{"answer_id"=>"10"}, 
+#check   "4"=>{"question_id"=>"4", "answer_id"=>"15"}, 
+#check+txt   "5"=>{"question_id"=>"5", "16"=>{"selected"=>"1"}, "19"=>{"string_value"=>""}}
+#   },
+# "survey_code"=>"test_survey", 
+# "commit"=>"Next Section (Utensiles and you!) >>", 
+# "authenticity_token"=>"8bee21081eea820ab1c658358c0baaa2e46de5d1", 
+# "_method"=>"put", 
+# "action"=>"update", 
+# "controller"=>"app", 
+# "response_set_code"=>"T2x8HhCQej", 
+# "section"=>"2"
+
+# response groups
+
+# "24"=>{
+#   "0"=>{"response_group"=>"0", "question_id"=>"24", "answer_id"=>"172"}, "1"=>{"response_group"=>"1", "question_id"=>"24", "answer_id"=>"173"}, 
+#   "2"=>{"response_group"=>"2", "question_id"=>"24", "answer_id"=>""}, "3"=>{"response_group"=>"3", "question_id"=>"24", "answer_id"=>""}, 
+#   "4"=>{"response_group"=>"4", "question_id"=>"24", "answer_id"=>""}},
+#  where "24" is the question id
+
+# Some other examples:
+# "25"=>{
+# "0"=>{"response_group"=>"0", "question_id"=>"25", "179"=>{"string_value"=>"camry"}}, 
+# "1"=>{"response_group"=>"1", "question_id"=>"25", "179"=>{"string_value"=>"f150"}},
+#  "2"=>{"response_group"=>"2", "question_id"=>"25", "179"=>{"string_value"=>""}}, 
+#  "3"=>{"response_group"=>"3", "question_id"=>"25", "179"=>{"string_value"=>""}}, 
+#  "4"=>{"response_group"=>"4", "question_id"=>"25", "179"=>{"string_value"=>""}}}, 
+# 
+# "26"=>{
+# "0"=>{"response_group"=>"0", "question_id"=>"26", "180"=>{"string_value"=>"1999"}},
+#  "1"=>{"response_group"=>"1", "question_id"=>"26", "180"=>{"string_value"=>"2004"}}, 
+#  "2"=>{"response_group"=>"2", "question_id"=>"26", "180"=>{"string_value"=>""}}, 
+#  "3"=>{"response_group"=>"3", "question_id"=>"26", "180"=>{"string_value"=>""}}, 
+#  "4"=>{"response_group"=>"4", "question_id"=>"26", "180"=>{"string_value"=>""}}}, 
+# 
+# "27"=>{
+# "0"=>{"182"=>{"integer_value"=>""}, "response_group"=>"0", "question_id"=>"27", "181"=>{"string_value"=>""}}, 
+# "1"=>{"182"=>{"integer_value"=>""}, "response_group"=>"1", "question_id"=>"27", "181"=>{"string_value"=>""}},
+#  "2"=>{"182"=>{"integer_value"=>""}, "response_group"=>"2", "question_id"=>"27", "181"=>{"string_value"=>""}}, 
+#  "3"=>{"182"=>{"integer_value"=>""}, "response_group"=>"3", "question_id"=>"27", "181"=>{"string_value"=>""}}, 
+#  "4"=>{"182"=>{"integer_value"=>""}, "response_group"=>"4", "question_id"=>"27", "181"=>{"string_value"=>""}}}},
+
+# 0,1,2,3,4 are the response group numbers
+# and anything else in the response group hash is handled normally

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

@@ -1,8 +1,8 @@
 - renderer = answer.renderer(question)
+- response_group ||= nil
 - hide_label ||= false
 - disabled ||= false
-
-- fields_for_response(response_obj) do |response_form|
+- fields_for_response(response_obj, response_group) do |response_form|
   - case renderer
   - when :any_answer
     = response_form.survey_check_box(:selected)

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

@@ -1,6 +1,5 @@
 - renderer = question.renderer(question_group ||= nil)
 - dep_class = question.dep_class(response_set)
-
 - case renderer
 - when :label
   - div_for question, :class => "label #{dep_class}" do
@@ -45,11 +44,11 @@
       - if renderer == :repeater_default  
         - question.answers.each do |answer|
           - content_tag_for :li, answer do
-            = render(:partial => "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id), :response_group => response_group, :hide_label => true, :disabled => disabled})
+            = render(:partial => "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id, response_group), :response_group => response_group, :hide_label => true, :disabled => disabled})
       - else
         %li.answer
-          - options = question.answers.collect{|a| "<option #{ (response_set.response_for(question.id, a.id).selected?)? "selected='selected'" : nil } value ='#{a.id}'>#{a.text}</option>" }
-          = select_tag("responses[#{question.id}][answer_id]", ["<option value=''>Select one...</option>"].concat(options))
+          - options = question.answers.collect{|a| "<option #{ (response_set.response_for(question.id, a.id, response_group).selected?)? "selected='selected'" : nil } value ='#{a.id}'>#{a.text}</option>" }
+          = select_tag("response_groups[#{question.id}][#{response_group}][answer_id]", ["<option value=''>Select one...</option>"].concat(options), :disabled => disabled)
 - when :inline_default, :inline_dropdown
   - div_for question, :class => "inline #{dep_class}" do
     = hidden_field_tag("responses[#{question.id}][question_id]", question.id)

data/app/views/surveyor/edit.html.haml

@@ -19,11 +19,12 @@
     - div_for @section do
       %span.title= @section.title
       .questions
+        - group_questions ||= []
         - @section.questions.each_with_index do |question, index|
           - unless question.part_of_group?
             = render(:partial => "/partials/question", :locals => {:question => question, :response_set => @response_set})
           - else # gather up the group questions
-            - (group_questions ||= []) << question
+            - group_questions << question
             - if (index + 1 >= @section.questions.size) or (question.question_group_id != @section.questions[index + 1].question_group_id)
               - # this is the last question of the section, or the group
               = render(:partial => "/partials/question_group", :locals => {:question_group => question.question_group, :response_set => @response_set, :group_questions => group_questions})

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.6.1"
+  s.version = "0.6.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{2009-10-12}
+  s.date = %q{2009-10-13}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -05:00
+date: 2009-10-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency