surveyor 0.18.2 → 0.19.0

data/generators/surveyor/templates/migrate/add_default_value_to_answers.rb

@@ -0,0 +1,9 @@
+class AddDefaultValueToAnswers < ActiveRecord::Migration
+  def self.up
+    add_column :answers, :default_value, :string
+  end
+
+  def self.down
+    remove_column :answers, :default_value
+  end
+end

data/lib/formtastic/surveyor_builder.rb

@@ -0,0 +1,83 @@
+module Formtastic
+  class SurveyorBuilder < SemanticFormBuilder
+    def quiet_input(method, options = {})
+      html_options = options.delete(:input_html) || strip_formtastic_options(options)
+      html_options[:id] ||= generate_html_id(method, "")
+      hidden_field(method, html_options)
+    end
+    def surveyor_check_boxes_input(method, options)
+      collection = find_collection_for_column(method, options)
+      html_options = options.delete(:input_html) || {}
+
+      input_name      = generate_association_input_name(method)
+      hidden_fields   = options.delete(:hidden_fields)
+      value_as_class  = options.delete(:value_as_class)
+      unchecked_value = options.delete(:unchecked_value) || ''
+      html_options    = { :name => "#{@object_name}[#{input_name}][]" }.merge(html_options)
+      input_ids       = []
+
+      selected_values = find_selected_values_for_column(method, options)
+      disabled_option_is_present = options.key?(:disabled)
+      disabled_values = [*options[:disabled]] if disabled_option_is_present
+
+      li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+
+      list_item_content = collection.map do |c|
+        label = c.is_a?(Array) ? c.first : c
+        value = c.is_a?(Array) ? c.last : c
+        input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
+        input_ids << input_id
+
+        html_options[:checked] = selected_values.include?(value)
+        html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
+        html_options[:id] = input_id
+        
+        li_content = create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
+        li_content << template.content_tag(:label,
+          Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
+          :for => input_id
+        )
+        li_content << basic_input_helper(:text_field, :string, :string_value, options) if options[:response_class] == "other_and_string"
+        li_content << basic_input_helper(:text_field, :string, :string_value, options) if %w(string other_and_string).include?(options[:response_class])
+
+        # li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+        Formtastic::Util.html_safe(li_content)
+      end
+
+      Formtastic::Util.html_safe(list_item_content.join)
+    end
+    def surveyor_radio_input(method, options)
+      collection   = find_collection_for_column(method, options)
+      html_options = strip_formtastic_options(options).merge(options.delete(:input_html) || {})
+
+      input_name = generate_association_input_name(method)
+      value_as_class = options.delete(:value_as_class)
+      input_ids = []
+
+      list_item_content = collection.map do |c|
+        label = c.is_a?(Array) ? c.first : c
+        value = c.is_a?(Array) ? c.last  : c
+        input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
+        input_ids << input_id
+
+        html_options[:id] = input_id
+
+        li_content = template.content_tag(:label,
+          Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
+          :for => input_id
+        )
+        
+        li_content << basic_input_helper(:text_field, :string, :integer_value, options) if options[:response_class] == 'integer'
+        li_content << basic_input_helper(:text_field, :string, :string_value, options) if options[:response_class] == 'string'
+
+        # li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+        Formtastic::Util.html_safe(li_content)
+      end
+
+      Formtastic::Util.html_safe(list_item_content.join)
+    end
+    def date_input(method, options)
+      string_input(method, options)
+    end
+  end
+end

data/lib/surveyor.rb

@@ -1,2 +1,7 @@
 require 'surveyor/common'
 require 'surveyor/acts_as_response'
+require 'formtastic/surveyor_builder'
+Formtastic::SemanticFormHelper.builder = Formtastic::SurveyorBuilder
+Formtastic::SemanticFormBuilder.default_text_area_height = 5
+Formtastic::SemanticFormBuilder.default_text_area_width = 50
+Formtastic::SemanticFormBuilder.all_fields_required_by_default = false

data/lib/surveyor/models/answer_methods.rb

@@ -35,10 +35,15 @@ module Surveyor
         self.data_export_identifier ||= Surveyor::Common.normalize(text)
       end
       
-      def renderer(q = question)  
-        r = [q.pick.to_s, self.response_class].compact.map(&:downcase).join("_")
-        r.blank? ? :default : r.to_sym
+      def css_class
+        [(is_exclusive ? "exclusive" : nil), custom_class].compact.join(" ")
       end
+      
+      def split_or_hidden_text(part = nil)
+        return "" if hide_label.to_s == "true"
+        part == :pre ? text.split("|",2)[0] : (part == :post ? text.split("|",2)[1] : text)
+      end
+      
     end
   end
 end

data/lib/surveyor/models/question_group_methods.rb

@@ -32,7 +32,7 @@ module Surveyor
         dependent? ? self.dependency.is_met?(response_set) : true
       end
       def css_class(response_set)
-        [(dependent? ? "dependent" : nil), (triggered?(response_set) ? nil : "hidden"), custom_class].compact.join(" ")
+        [(dependent? ? "g_dependent" : nil), (triggered?(response_set) ? nil : "g_hidden"), custom_class].compact.join(" ")
       end
     end
   end

data/lib/surveyor/models/question_methods.rb

@@ -56,7 +56,7 @@ module Surveyor
         dependent? ? self.dependency.is_met?(response_set) : true
       end
       def css_class(response_set)
-        [(dependent? ? "dependent" : nil), (triggered?(response_set) ? nil : "hidden"), custom_class].compact.join(" ")
+        [(dependent? ? "q_dependent" : nil), (triggered?(response_set) ? nil : "q_hidden"), custom_class].compact.join(" ")
       end
 
       def part_of_group?
@@ -65,7 +65,11 @@ module Surveyor
       def solo?
         self.question_group.nil?
       end
-
+      
+      def split_text(part = nil)
+        (part == :pre ? text.split("|",2)[0] : (part == :post ? text.split("|",2)[1] : text)).to_s
+      end
+      
       def renderer(g = question_group)
         r = [g ? g.renderer.to_s : nil, display_type].compact.join("_")
         r.blank? ? :default : r.to_sym

data/lib/surveyor/models/response_methods.rb

@@ -6,7 +6,6 @@ module Surveyor
         base.send :belongs_to, :response_set
         base.send :belongs_to, :question
         base.send :belongs_to, :answer
-        
         @@validations_already_included ||= nil
         unless @@validations_already_included
           # Validations
@@ -14,22 +13,13 @@ module Surveyor
           
           @@validations_already_included = true
         end
-        
         base.send :include, Surveyor::ActsAsResponse # includes "as" instance method
-
       end
 
       # Instance Methods
-      def selected
-        !self.new_record?
+      def answer_id=(val)
+        write_attribute :answer_id, (val.is_a?(Array) ? val.detect{|x| !x.to_s.blank?} : val)
       end
-
-      alias_method :selected?, :selected
-
-      def selected=(value)
-        true
-      end
-
       def correct?
         question.correct_answer_id.nil? or self.answer.response_class != "answer" or (question.correct_answer_id.to_i == answer_id.to_i)
       end

data/lib/surveyor/models/response_set_methods.rb

@@ -6,6 +6,7 @@ module Surveyor
         base.send :belongs_to, :survey
         base.send :belongs_to, :user
         base.send :has_many, :responses, :dependent => :destroy
+        base.send :accepts_nested_attributes_for, :responses, :allow_destroy => true
         
         @@validations_already_included ||= nil
         unless @@validations_already_included
@@ -16,13 +17,27 @@ module Surveyor
           
           @@validations_already_included = true
         end
-        
+
         # Attributes
         base.send :attr_protected, :completed_at
-        base.send :attr_accessor, :current_section_id
-
-        # Callbacks
-        base.send :after_update, :save_responses
+        
+        # Class methods
+        base.instance_eval do
+          def reject_or_destroy_blanks(hash_of_hashes)
+            result = {}
+            (hash_of_hashes || {}).each_pair do |k, hash|
+              if has_blank_value?(hash)
+                result.merge!({k => hash.merge("_destroy" => "true")}) if hash.has_key?("id")
+              else
+                result.merge!({k => hash})
+              end
+            end
+            result
+          end
+          def has_blank_value?(hash)
+            hash["answer_id"].blank? or hash.any?{|k,v| v.is_a?(Array) ? v.all?{|x| x.to_s.blank?} : v.to_s.blank?}
+          end
+        end
       end
 
       # Instance methods
@@ -56,65 +71,6 @@ module Surveyor
         end
         result
       end
-
-      def response_for(question_id, answer_id, group = nil)
-        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)
-        responses.select{|r| question_ids.include? r.question_id}.map(&:destroy)
-        responses.reload
-      end
-
-      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])
-          if (answer_id = responses_hash[:answer_id]) 
-            if (!responses_hash[:answer_id].empty?) # Dropdowns return answer id but have an empty value if they are not set... ignoring those.
-              #radio or dropdown - only one response
-              responses.build({:question_id => question_id, :answer_id => answer_id, :survey_section_id => current_section_id}.merge(responses_hash[answer_id] || {}))
-            end
-          else
-            #possibly multiples responses - unresponded radios end up here too
-            # we use the variable question_id, not the "question_id" in the response_hash
-            responses_hash.delete_if{|k,v| k == "question_id"}.each do |answer_id, response_hash|
-              unless response_hash.delete_if{|k,v| v.blank?}.empty?
-                responses.build({:question_id => question_id, :answer_id => answer_id, :survey_section_id => current_section_id}.merge(response_hash))
-              end
-            end
-          end
-        end
-      end
-
-      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])
-          responses_group_hash.each do |response_group_number, group_hash|
-            if (answer_id = group_hash[:answer_id]) # if group_hash has an answer_id key we treat it differently 
-              if (!group_hash[:answer_id].empty?) # dropdowns return empty values in answer_ids if they are not selected
-                #radio or dropdown - only one response
-                responses.build({:question_id => question_id, :answer_id => answer_id, :response_group => response_group_number, :survey_section_id => current_section_id}.merge(group_hash[answer_id] || {}))
-              end
-            else
-              #possibly multiples responses - unresponded radios end up here too
-              # we use the variable question_id in the key, not the "question_id" in the response_hash... same with response_group key
-              group_hash.delete_if{|k,v| (k == "question_id") or (k == "response_group")}.each do |answer_id, inner_hash|
-                unless inner_hash.delete_if{|k,v| v.blank?}.empty?
-                  responses.build({:question_id => question_id, :answer_id => answer_id, :response_group => response_group_number, :survey_section_id => current_section_id}.merge(inner_hash))
-                end
-              end
-            end
-
-          end
-        end
-      end
-
-      def save_responses
-        responses.each{|response| response.save(false)}
-      end
-
       def complete!
         self.completed_at = Time.now
       end
@@ -157,22 +113,20 @@ module Surveyor
         dependencies.select{|d| d.is_met?(self) and self.is_unanswered?(d.question)}.map(&:question)
       end
 
-      def all_dependencies
-        arr = dependencies.partition{|d| d.is_met?(self) }
-        {:show => arr[0].map{|d| d.question_group_id.nil? ? "question_#{d.question_id}" : "question_group_#{d.question_group_id}"}, :hide => arr[1].map{|d| d.question_group_id.nil? ? "question_#{d.question_id}" : "question_group_#{d.question_group_id}"}}
+      def all_dependencies(question_ids = nil)
+        arr = dependencies(question_ids).partition{|d| d.is_met?(self) }
+        {:show => arr[0].map{|d| d.question_group_id.nil? ? "q_#{d.question_id}" : "qg_#{d.question_group_id}"}, :hide => arr[1].map{|d| d.question_group_id.nil? ? "q_#{d.question_id}" : "qg_#{d.question_group_id}"}}
       end
 
       # Check existence of responses to questions from a given survey_section
       def no_responses_for_section?(section)
-        self.responses.count(:conditions => {:survey_section_id => section.id}) == 0
+        !responses.any?{|r| r.survey_section_id == section.id}
       end
 
       protected
 
       def dependencies(question_ids = nil)
-        question_ids ||= Question.find_all_by_survey_section_id(current_section_id).map(&:id)
-        depdendecy_ids = DependencyCondition.all(:conditions => {:question_id => question_ids}).map(&:dependency_id)
-        Dependency.find(depdendecy_ids, :include => :dependency_conditions)
+        Dependency.all(:include => :dependency_conditions, :conditions => {:dependency_conditions => {:question_id => question_ids || responses.map(&:question_id)}})
       end
     end
   end

data/lib/surveyor/surveyor_controller_methods.rb

@@ -50,7 +50,6 @@ module Surveyor
         else
           @section = @sections.with_includes.first
         end
-        @questions = @section.questions
         @dependents = (@response_set.unanswered_dependencies - @section.questions) || []
       else
         flash[:notice] = t('surveyor.unable_to_find_your_responses')
@@ -59,38 +58,28 @@ module Surveyor
     end
 
     def update
-      saved = nil
-      ActiveRecord::Base.transaction do 
-        if @response_set = ResponseSet.find_by_access_code(params[:response_set_code], :include => {:responses => :answer},:lock => true)
-          @response_set.current_section_id = params[:current_section_id]
-        else
-          flash[:notice] = t('surveyor.unable_to_find_your_responses')
-          redirect_to(available_surveys_path) and return
-        end
-
-        if params[:responses] or params[:response_groups]
-          @response_set.clear_responses
-          saved = @response_set.update_attributes(:response_attributes => (params[:responses] || {}).dup ,
-                                                  :response_group_attributes => (params[:response_groups] || {}).dup) #copy (dup) to preserve params because we manipulate params in the response_set methods
-          if (saved && params[:finish])
-            @response_set.complete!
-            saved = @response_set.save!
-          end
-        end
+      @response_set = ResponseSet.find_by_access_code(params[:response_set_code], :include => {:responses => :answer}, :lock => true)
+      return redirect_with_message(available_surveys_path, :notice, t('surveyor.unable_to_find_your_responses')) if @response_set.blank?
+      saved = false
+      ActiveRecord::Base.transaction do
+        saved = @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks(params[:r]))
+        saved = @response_set.complete! if saved && params[:finish]
       end
+      return redirect_with_message(surveyor_finish, :notice, t('surveyor.completed_survey')) if saved && params[:finish]
+
       respond_to do |format|
         format.html do
-          if saved && params[:finish]
-            flash[:notice] = t('surveyor.completed_survey')
-            redirect_to surveyor_finish
-          else
-            flash[:notice] = t('surveyor.unable_to_update_survey') if !saved #and !saved.nil? # saved.nil? is true if there are no questions on the page (i.e. if it only contains a label)
-            redirect_to :action => "edit", :anchor => anchor_from(params[:section]), :params => {:section => section_id_from(params[:section])}
-          end
+          flash[:notice] = t('surveyor.unable_to_update_survey') unless saved
+          redirect_to :action => "edit", :anchor => anchor_from(params[:section]), :params => {:section => section_id_from(params[:section])}
         end
-        # No redirect needed if we're talking to the page via json
         format.js do
-          render :json => @response_set.all_dependencies.to_json
+          ids, remove, question_ids = {}, {}, []
+          ResponseSet.reject_or_destroy_blanks(params[:r]).each do |k,v|
+            ids[k] = @response_set.responses.find(:first, :conditions => v).id if !v.has_key?("id")
+            remove[k] = v["id"] if v.has_key?("id") && v.has_key?("_destroy")
+            question_ids << v["question_id"]
+          end
+          render :json => {"ids" => ids, "remove" => remove}.merge(@response_set.reload.all_dependencies(question_ids))
         end
       end
     end
@@ -118,5 +107,17 @@ module Surveyor
     def surveyor_finish
       available_surveys_path
     end
+    
+    def redirect_with_message(path, message_type, message)
+      respond_to do |format|
+        format.html do
+          flash[message_type] = message if !message.blank? and !message_type.blank?
+          redirect_to path
+        end
+        format.js do
+          render :text => message, :status => 403
+        end
+      end
+    end
   end
 end

data/lib/tasks/surveyor_tasks.rake

@@ -60,18 +60,4 @@ namespace :surveyor do
       puts "There are no surveys without response sets"      
     end
   end
-end
-
-namespace :spec do
-  namespace :plugins do
-    begin
-      require 'spec/rake/spectask'
-      desc "Runs the examples for surveyor"    
-      Spec::Rake::SpecTask.new(:surveyor) do |t|
-        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-        t.spec_files = FileList['vendor/plugins/surveyor/spec/**/*_spec.rb']
-      end
-    rescue MissingSourceFile
-    end
-  end  
-end
+end

data/spec/controllers/surveyor_controller_spec.rb

@@ -151,15 +151,15 @@ describe SurveyorController do
     end
     def do_put_with_finish
       responses = {
-         "6"=>{"question_id"=>"6", "20"=>{"string_value"=>"saf"}}, #string
-         "7"=>{"question_id"=>"7", "21"=>{"text_value"=>""}}, #text
-         "1"=>{"question_id"=>"1", "answer_id"=>"1", "4"=>{"string_value"=>""}}, #radio+txt
-         "2"=>{"answer_id"=>"6"}, #radio
-         "3"=>{"answer_id"=>"10"}, #radio
+         "6"=>{"question_id"=>"6", "answer_id" => "6", "string_value"=>"saf"}, #string
+         "7"=>{"question_id"=>"7", "answer_id" => "11", "text_value"=>"foo"}, #text
+         "1"=>{"question_id"=>"1", "answer_id"=>"1", "string_value"=>"bar"}, #radio+txt
+         "2"=>{"question_id"=>"2", "answer_id"=>"6"}, #radio
+         "3"=>{"question_id"=>"3", "answer_id"=>"10"}, #radio
          "4"=>{"question_id"=>"4", "answer_id"=>"15"}, #check
-         "5"=>{"question_id"=>"5", "16"=>{"selected"=>"1"}, "19"=>{"string_value"=>""}} #check+txt
+         "5"=>{"question_id"=>"5", "answer_id"=>"16", "string_value"=>""} #check+txt
       }
-      put :update, :survey_code => "XYZ", :response_set_code => "PDQ", :finish => "finish", :responses => responses
+      put :update, :survey_code => "XYZ", :response_set_code => "PDQ", :finish => "finish", :r => responses
     end
     
     it "should find the response set requested" do
@@ -169,7 +169,6 @@ describe SurveyorController do
     it "should redirect to 'edit' without params" do
       do_put
       response.should redirect_to(:action => :edit)
-      flash[:notice].should == "Unable to update survey"
     end
     it "should complete the found response set on finish" do      
       do_put_with_finish
@@ -182,4 +181,37 @@ describe SurveyorController do
     end
 
   end
+  
+  describe "update my survey with ajax" do
+    before(:each) do
+      @survey = Factory(:survey, :title => "XYZ", :access_code => "XYZ")
+      @section = Factory(:survey_section, :survey => @survey)
+      @response_set = Factory(:response_set, :access_code => "PDQ", :survey => @survey)
+      ResponseSet.stub!(:find_by_access_code).and_return(@response_set)
+    end
+    def do_ajax_put(r)
+      xhr :put, :update, :survey_code => "XYZ", :response_set_code => "PDQ", :r => r
+    end
+    it "should return an id for new responses" do
+      do_ajax_put({
+         "2"=>{"question_id"=>"4", "answer_id"=>"14"}, #check
+         "4"=>{"question_id"=>"4", "answer_id"=>"15"} #check
+      })
+      JSON.parse(response.body).should == {"ids" => {"2" => 1, "4" => 2}, "remove" => {}, "show" => [], "hide" => []}
+    end
+    it "should return a delete for when responses are removed" do
+      r = @response_set.responses.create(:question_id => 4, :answer_id => 14)
+      do_ajax_put({
+         "2"=>{"question_id"=>"4", "answer_id"=>"", "id" => r.id} # uncheck
+      })
+      JSON.parse(response.body).should == {"ids" => {}, "remove" => {"2" => r.id}, "show" => [], "hide" => []}
+    end
+    it "should return dependencies" do
+      @response_set.should_receive(:all_dependencies).and_return({"show" => ['q_1'], "hide" => ['q_2']})
+      do_ajax_put({
+        "4"=>{"question_id"=>"9", "answer_id"=>"12"} #check
+      })
+      JSON.parse(response.body).should == {"ids" => {"4" => 1}, "remove" => {}, "show" => ['q_1'], "hide" => ["q_2"]}
+    end
+  end
 end