surveyor 0.22.0 → 1.0.0

data/lib/generators/surveyor/templates/db/migrate/create_surveys.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class CreateSurveys < ActiveRecord::Migration
   def self.up
     create_table :surveys do |t|
@@ -15,12 +16,12 @@ class CreateSurveys < ActiveRecord::Migration
       # Expiry
       t.datetime :active_at
       t.datetime :inactive_at
-      
+
       # Display
       t.string :css_url
-      
+
       t.string :custom_class
-      
+
       t.timestamps
     end
   end

data/lib/generators/surveyor/templates/db/migrate/create_validation_conditions.rb

@@ -1,13 +1,14 @@
+# encoding: UTF-8
 class CreateValidationConditions < ActiveRecord::Migration
   def self.up
     create_table :validation_conditions do |t|
       # Context
       t.integer :validation_id
       t.string :rule_key
-      
-      # Conditional    
+
+      # Conditional
       t.string :operator
-      
+
       # Optional external reference
       t.integer :question_id
       t.integer :answer_id
@@ -21,7 +22,7 @@ class CreateValidationConditions < ActiveRecord::Migration
       t.string :string_value
       t.string :response_other
       t.string :regexp
-      
+
       t.timestamps
     end
   end

data/lib/generators/surveyor/templates/db/migrate/create_validations.rb

@@ -1,15 +1,16 @@
+# encoding: UTF-8
 class CreateValidations < ActiveRecord::Migration
   def self.up
     create_table :validations do |t|
       # Context
       t.integer :answer_id # the answer to validate
-      
+
       # Conditional
       t.string :rule
 
       # Message
       t.string :message
-      
+
       t.timestamps
     end
   end

data/lib/generators/surveyor/templates/db/migrate/drop_unique_index_on_access_code_in_surveys.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+class DropUniqueIndexOnAccessCodeInSurveys < ActiveRecord::Migration
+  def self.up
+    remove_index( :surveys, :name => 'surveys_ac_idx' )
+  end
+
+  def self.down
+    add_index(:surveys, :access_code, :name => 'surveys_ac_idx')
+  end
+end

data/lib/generators/surveyor/templates/db/migrate/update_blank_api_ids_on_question_group.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+class Survey < ActiveRecord::Base; end
+class Question < ActiveRecord::Base; end
+class QuestionGroup < ActiveRecord::Base; end
+class Answer < ActiveRecord::Base; end
+class Response < ActiveRecord::Base; end
+class ResponseSet < ActiveRecord::Base; end
+
+class UpdateBlankApiIdsOnQuestionGroup < ActiveRecord::Migration
+  def self.up
+    check = [Survey, Question, QuestionGroup, Answer, Response, ResponseSet]
+    check.each do |clazz|
+      clazz.where('api_id IS ?', nil).each do |c|
+        c.api_id = Surveyor::Common.generate_api_id
+        c.save!
+      end
+    end
+  end
+
+  def self.down
+  end
+end

data/lib/generators/surveyor/templates/db/migrate/update_blank_versions_on_surveys.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+class Survey < ActiveRecord::Base; end
+class UpdateBlankVersionsOnSurveys < ActiveRecord::Migration
+  def self.up
+    Survey.where('survey_version IS ?', nil).each do |s|
+      s.survey_version = 0
+      s.save!
+    end
+  end
+
+  def self.down
+  end
+end

data/lib/generators/surveyor/templates/surveys/date_survey.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 survey "Date Survey" do
 
   section "Simple date questions" do

data/lib/generators/surveyor/templates/surveys/kitchen_sink_survey.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 survey "Kitchen Sink survey" do
 
   section "Basic questions" do
@@ -21,7 +22,7 @@ survey "Kitchen Sink survey" do
     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?"
@@ -32,7 +33,7 @@ survey "Kitchen Sink survey" do
     condition_C :q_2, "==", :a_3
     condition_D :q_2, "==", :a_4
 
-    # A dependant question demonstrating the count operator. The 
+    # A dependant question demonstrating the count operator. The
     # dependency condition checks the answer count for the referenced question.
     # It understands conditions of the form count> count< count>= count<=
     # count!=
@@ -44,23 +45,41 @@ survey "Kitchen Sink survey" do
     # When :pick isn't specified, the default is :none (no checkbox or radio button)
     q_montypython3 "What... is your name? (e.g. It is 'Arthur', King of the Britons)"
     a_1 :string
-    
+
     # Dependency conditions can refer to any value, not just answer_id. An answer_reference still needs to be specified, to know which answer you would like to check
     q_montypython4 "What... is your quest? (e.g. To seek the Holy Grail)"
     a_1 :string
     dependency :rule => "A"
     condition_A :q_montypython3, "==", {:string_value => "It is 'Arthur', King of the Britons", :answer_reference => "1"}
-    
+
     # http://www.imdb.com/title/tt0071853/quotes
     q_montypython5 "What... is the air-speed velocity of an unladen swallow? (e.g. What do you mean? An African or European swallow?)"
     a_1 :string
     dependency :rule => "A"
     condition_A :q_montypython4, "==", {:string_value => "To seek the Holy Grail", :answer_reference => "1"}
-    
+
     label "Huh? I-- I don't know that! Auuuuuuuugh!"
     dependency :rule => "A"
     condition_A :q_montypython5, "==", {:string_value => "What do you mean? An African or European swallow?", :answer_reference => "1"}
-    
+
+    q_cooling_1 "How do you cool your home?", :pick => :one
+    a_1 "Fans"
+    a_2 "Window AC"
+    a_3 "Central AC"
+    a_4 "Passive"
+
+    # When using !=, also use count>0 if you want to make sure the user responds
+    q_cooling_2 "How much does it cost to run your non-passive cooling solutions? (This question hidden until you respond 'How do you cool your home?')"
+    dependency :rule => "A and B"
+    condition_A :q_cooling_1, "!=", :a_4
+    condition_B :q_cooling_1, "count>0"
+    a_1 "$", :float
+
+    # Using != alone means the dependent question is shown by default
+    label "Please consider passive cooling solutions (This question always shown, unless you respond 'Passive')"
+    dependency :rule => "A"
+    condition_A :q_cooling_1, "!=", :a_4
+
     # Surveys, sections, questions, groups, and answers all take the following reference arguments
     # :reference_identifier   # usually from paper
     # :data_export_identifier # data export
@@ -70,39 +89,39 @@ survey "Kitchen Sink survey" do
     a "who", :string
     a "what", :string
     a "where", :string
-    
+
     # Various types of responses can be accepted, and validated
     q "How many pets do you own?"
     a :integer
     validation :rule => "A"
     condition_A ">=", :integer_value => 0
-    
+
     # Surveys, sections, questions, groups, and answers also take a custom css class for covenience in custom styling
     q "What is your address?", :custom_class => 'address'
     a :text, :custom_class => 'mapper'
     # validations can use regexp values
     validation :rule => "A"
     condition_A "=~", :regexp => "[0-9a-zA-z\. #]"
-    
+
     # Questions, groups, and answers take a custom renderer (a partial in the application's views dir)
     # defaults are "/partials/question_group", "/partials/question", "/partials/answer", so the custom renderers should have a different name
     q "Pick your favorite date AND time" #, :custom_renderer => "/partials/custom_question"
     a :datetime
-    
+
     q_time_lunch "What time do you usually take a lunch break?"
     a_1 :time
-            
+
     q "When would you like to meet for dinner?"
     a :date
-    
+
     # Sliders deprecate to select boxes when javascript is off
-    # Valid Ruby code may be used to shorted repetitive tasks
+    # Valid Ruby code may be used to shorten repetitive tasks
     q "Adjust the slider to reflect your level of awesomeness", :pick => :one, :display_type => :slider
     (1..10).to_a.each{|num| a num.to_s}
 
     q "How much do you like Ruby?", :pick => :one, :display_type => :slider
     ["not at all", "a little", "some", "a lot", "a ton"].each{|level| a level}
-    
+
     # The "|" pipe is used to place labels before or after the input elements
     q "How much money do you want?"
     a "$|USD", :float
@@ -121,7 +140,7 @@ survey "Kitchen Sink survey" do
     q "Choose your Illinois county", :pick => :one, :display_type => :dropdown
     ["Adams","Alexander","Bond", "Boone",
         "Brown","Bureau","Calhoun","Carroll","Cass",
-        "Champaign", "Christian", "Clark","Clay", 
+        "Champaign", "Christian", "Clark","Clay",
         "Clinton", "Coles", "Cook", "Crawford","Cumberland","DeKalb",
         "De Witt","Douglas","DuPage","Edgar", "Edwards",
         "Effingham","Fayette", "Ford","Franklin","Fulton",
@@ -139,7 +158,7 @@ survey "Kitchen Sink survey" do
         "St. Clair","Stark", "Stephenson","Tazewell","Union",
         "Vermilion","Wabash","Warren","Washington","Wayne",
         "White","Whiteside","Will","Williamson","Winnebago","Woodford"].each{ |county| a county}
-    
+
     # When an is_exclusive answer is checked, it unchecks all other options and disables them (using Javascript)
     q "Choose your favorite meats", :display_type => :inline, :pick => :any
     a "Chicken"
@@ -157,7 +176,7 @@ survey "Kitchen Sink survey" do
   end
 
   section "Complicated questions" do
-    
+
     # Grids are useful for repeated questions with the same set of answers, which are specified before the questions
     grid "Tell us how often do you cover these each day" do
       a "1"
@@ -167,7 +186,7 @@ survey "Kitchen Sink survey" do
       q "Knees", :pick => :one
       q "Toes", :pick => :one
     end
-    
+
     # "grid" is a shortcut for group with :display_type => :grid
     # The answers will be repeated every 10 rows, but long grids aren't recommended as they are generally tedious
     grid "Tell us how you feel today day" do
@@ -180,7 +199,7 @@ survey "Kitchen Sink survey" do
       q "sad|happy", :pick => :one
       q "limp|perky", :pick => :one
     end
-    
+
     grid "For each of the car types checked, what type of options would you prefer?" do
       a "Leather seats"
       a "Shiny rims"
@@ -196,25 +215,36 @@ survey "Kitchen Sink survey" do
       q "Wagon", :pick => :any
       q "Other", :pick => :any
     end
-    
+
     q "Please rank the following foods based on how much you like them"
     a "|pizza", :integer
     a "|salad", :integer
     a "|sushi", :integer
     a "|ice cream", :integer
     a "|breakfast ceral", :integer
-    
+
     # :other, :string allows someone to specify both the "other" and some other information
     q "Choose your favorite utensils and enter frequency of use (daily, weekly, monthly, etc...)", :pick => :any
     a "spoon", :string
     a "fork", :string
     a "knife", :string
     a :other, :string
-    
+
+    q "What is your birth date?", :pick => :one
+    a "I was born on", :date
+    a "Refused"
+
+    q "At what time were you born?", :pick => :any
+    a "I was born at", :time
+    a "This time is approximate"
+
+    q "When would you like to schedule your next appointment?"
+    a :datetime
+
     q_car "Do you own a car?", :pick => :one
     a_y "Yes"
     a_n "No"
-    
+
     # Repeaters allow multiple responses to a question or set of questions
     repeater "Tell us about the cars you own" do
       dependency :rule => "A"
@@ -232,7 +262,7 @@ survey "Kitchen Sink survey" do
       q "Year"
       a :string
     end
-    
+
     repeater "Tell us the name and age of your siblings" do
       q "Sibling"
       a "Name", :string

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 survey "Favorites" do
   section "Foods" do
     # In a quiz, both the questions and the answers need to have reference identifiers

data/lib/generators/surveyor/templates/{public/stylesheets/sass → vendor/assets/stylesheets}/custom.sass

@@ -1,5 +1,5 @@
 /* Add custom styles here. They will be
  * loaded after the surveyor stylesheets */
- 
+
 #surveyor
  :font-family "Century Gothic"

data/lib/surveyor/common.rb

@@ -1,16 +1,23 @@
+require 'securerandom'
 require 'uuidtools'
 
 module Surveyor
   class Common
-    RAND_CHARS = [('a'..'z'), ('A'..'Z'), (0..9)].map{|r| r.to_a}.flatten.join
     OPERATORS = %w(== != < > <= >= =~)
-    
+
     class << self
-      def make_tiny_code(len = 10)
-        if RUBY_VERSION < "1.8.7"
-          (1..len).to_a.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.join
-        else
-          len.times.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.join
+      if SecureRandom.respond_to?(:urlsafe_base64)
+        def make_tiny_code
+          # 7 random bytes is increased to ~10 characters (sans padding) by
+          # base64 encoding
+          SecureRandom.urlsafe_base64(7)
+        end
+      else
+        def make_tiny_code
+          s = [SecureRandom.random_bytes(7)].pack("m*")
+          s.delete!("\n")
+          s.tr!("+/", "-_")
+          s.delete!("=")
         end
       end
 
@@ -20,35 +27,13 @@ module Surveyor
         col_text.downcase!                            # Remove capitalization
         col_text.gsub!(/\"|\'/u, '')                   # Remove potential problem characters
         col_text.gsub!(/\(.*?\)/u,'')                  # Remove text inside parens
-        col_text.gsub!(/\W/u, ' ')                     # Remove all other non-word characters      
+        col_text.gsub!(/\W/u, ' ')                     # Remove all other non-word characters
         cols = (col_text.split(' ') - words_to_omit)
         (cols.size > 5 ? cols[-5..-1] : cols).join("_")
       end
-      
-      def equal_json_excluding_wildcards(a,b)
-        return false if a.nil? or b.nil?
-        a = a.is_a?(String) ? JSON.load(a) : JSON.load(a.to_json)
-        b = b.is_a?(String) ? JSON.load(b) : JSON.load(b.to_json)
-        deep_compare_excluding_wildcards(a,b)
-      end
-      def deep_compare_excluding_wildcards(a,b)
-        return false if a.class != b.class
-        if a.is_a?(Hash)
-          return false if a.size != b.size
-          a.each do |k,v|
-            return false if deep_compare_excluding_wildcards(v,b[k]) == false
-          end
-        elsif a.is_a?(Array)
-          return false if a.size != b.size
-          a.each_with_index{|e,i| return false if deep_compare_excluding_wildcards(e,b[i]) == false }
-        else
-          return (a == "*") || (b == "*") || (a == b)
-        end
-        true
-      end
 
       alias :normalize :to_normalized_string
-      
+
       def generate_api_id
         UUIDTools::UUID.random_create.to_s
       end

data/lib/surveyor/engine.rb

@@ -4,9 +4,7 @@ require 'haml' # required for view resolution
 
 module Surveyor
   class Engine < Rails::Engine
-    config.autoload_paths << File.expand_path("../../", __FILE__)
-    # rake_tasks do
-    #   load "tasks/surveyor_tasks.rake"
-    # end
+    root = File.expand_path('../../', __FILE__)
+    config.autoload_paths << root
   end
 end

data/lib/surveyor/helpers/asset_pipeline.rb

@@ -0,0 +1,13 @@
+module Surveyor
+  module Helpers
+    module AssetPipeline
+      ##
+      # Returns whether or not the asset pipeline is present and enabled.
+      #
+      # The detection scheme used here was ripped from jquery-rails.
+      def asset_pipeline_enabled?
+        ::Rails.version >= "3.1" && ::Rails.application.config.assets.enabled
+      end
+    end
+  end
+end

data/lib/surveyor/helpers/formtastic_custom_input.rb

@@ -0,0 +1,17 @@
+module Surveyor
+  module Helpers
+    module FormtasticCustomInput
+      def input_html_options_with(choice, response_class)
+        input_html_options.merge(choice_html_options(choice)).merge({:id => (input_html_options[:id] || "answer_id").gsub("answer_id", response_class_to_method(response_class).to_s), :class => [input_html_options[:class], response_class].join(" ")})
+      end
+      def response_class_to_method(response_class)
+        # doesn't handle response_class == answer, and doesn't have to
+        case response_class.to_s
+        when /^other_and_string$/ then :string_value
+        when /^date|time$/ then :datetime_value
+        else "#{response_class}_value".to_sym
+        end
+      end      
+    end
+  end
+end

data/lib/surveyor/helpers/surveyor_helper_methods.rb

@@ -1,15 +1,17 @@
+require 'surveyor/helpers/asset_pipeline'
+
 module Surveyor
   module Helpers
     module SurveyorHelperMethods
+      include AssetPipeline
+
       # Layout: stylsheets and javascripts
       def surveyor_includes
-        surveyor_stylsheets + surveyor_javascripts
-      end
-      def surveyor_stylsheets
-        stylesheet_link_tag 'surveyor/reset', 'surveyor/dateinput', 'surveyor/jquery-ui.custom', 'surveyor/jquery-ui-timepicker-addon', 'surveyor', 'custom'
-      end
-      def surveyor_javascripts
-        javascript_include_tag 'surveyor/jquery.tools.min', 'surveyor/jquery-ui', 'surveyor/jquery-ui-timepicker-addon', 'surveyor/jquery.surveyor', 'surveyor/jquery.blockUI'
+        if asset_pipeline_enabled?
+          stylesheet_link_tag('surveyor_all') + javascript_include_tag('surveyor_all')
+        else
+          stylesheet_link_tag('surveyor/reset', 'surveyor/dateinput', 'surveyor/jquery-ui.custom', 'surveyor/jquery-ui-timepicker-addon', 'surveyor', 'custom') + javascript_include_tag('surveyor/jquery.tools.min', 'surveyor/jquery-ui', 'surveyor/jquery-ui-timepicker-addon', 'surveyor/jquery.surveyor')
+        end
       end
       # Helper for displaying warning/notice/error flash messages
       def flash_messages(types)
@@ -96,4 +98,4 @@ module Surveyor
       end
     end
   end
-end
+end

data/lib/surveyor/models/answer_methods.rb

@@ -20,6 +20,9 @@ module Surveyor
           # base.send :validates_numericality_of, :question_id, :allow_nil => false, :only_integer => true
           @@validations_already_included = true
         end
+        
+        # Whitelisting attributes
+        base.send :attr_accessible, :question, :question_id, :text, :short_text, :help_text, :weight, :response_class, :reference_identifier, :data_export_identifier, :common_namespace, :common_identifier, :display_order, :is_exclusive, :display_length, :custom_class, :custom_renderer, :default_value, :display_type
       end
       
       include RenderText      

data/lib/surveyor/models/dependency_condition_methods.rb

@@ -7,7 +7,7 @@ module Surveyor
         base.send :belongs_to, :dependency
         base.send :belongs_to, :dependent_question, :foreign_key => :question_id, :class_name => :question
         base.send :belongs_to, :question
-        
+
         @@validations_already_included ||= nil
         unless @@validations_already_included
           # Validations
@@ -16,12 +16,15 @@ module Surveyor
           base.send :validates_uniqueness_of, :rule_key, :scope => :dependency_id
           # this causes issues with building and saving
           # base.send :validates_numericality_of, :question_id, :dependency_id
-          
+
           @@validations_already_included = true
         end
-                
+
         base.send :include, Surveyor::ActsAsResponse # includes "as" instance method
 
+        # Whitelisting attributes
+        base.send :attr_accessible, :dependency, :question, :answer, :dependency_id, :rule_key, :question_id, :operator, :answer_id, :datetime_value, :integer_value, :float_value, :unit, :text_value, :string_value, :response_other
+
         # Class methods
         base.instance_eval do
           def operators
@@ -34,33 +37,29 @@ module Surveyor
       def to_hash(response_set)
         # all responses to associated question
         responses = question.blank? ? [] : response_set.responses.where("responses.answer_id in (?)", question.answer_ids).all
-        {rule_key.to_sym => (!responses.empty? and self.is_met?(responses))}
-      end
-
-      # Checks to see if the responses passed in meet the dependency condition
-      def is_met?(responses)
-        # response to associated answer if available, or first response
-        response = if self.answer_id
-                     responses.detect do |r| 
-                       r.answer == self.answer
-                     end 
-                   end || responses.first
-        klass = response.answer.response_class
-        klass = "answer" if self.as(klass).nil?
-        return case self.operator
-        when "==", "<", ">", "<=", ">="
-          response.as(klass).send(self.operator, self.as(klass))
-        when "!="
-          !(response.as(klass) == self.as(klass))
-        when /^count[<>=]{1,2}\d+$/
-          op, i = self.operator.scan(/^count([<>!=]{1,2})(\d+)$/).flatten
-          responses.count.send(op, i.to_i)
-        when /^count!=\d+$/
-          !(responses.count == self.operator.scan(/\d+/).first.to_i)
-        else
-          false
+        if self.operator.match /^count(>|>=|<|<=|=|!=)\d+$/
+          op, i = self.operator.scan(/^count(>|>=|<|<=|=|!=)(\d+)$/).flatten
+          # logger.warn({rule_key.to_sym => responses.count.send(op, i.to_i)})
+          return {rule_key.to_sym => (op == "!=" ? !responses.count.send("==", i.to_i) : responses.count.send(op, i.to_i))}
+        elsif operator == "!=" and (responses.blank? or responses.none?{|r| r.answer.id == self.answer.id})
+          # logger.warn( {rule_key.to_sym => true})
+          return {rule_key.to_sym => true}
+        elsif response = responses.detect{|r| r.answer.id == self.answer.id}
+          klass = response.answer.response_class
+          klass = "answer" if self.as(klass).nil?
+          case self.operator
+          when "==", "<", ">", "<=", ">="
+            # logger.warn( {rule_key.to_sym => response.as(klass).send(self.operator, self.as(klass))})
+            return {rule_key.to_sym => response.as(klass).send(self.operator, self.as(klass))}
+          when "!="
+            # logger.warn( {rule_key.to_sym => !response.as(klass).send("==", self.as(klass))})
+            return {rule_key.to_sym => !response.as(klass).send("==", self.as(klass))}
+          end
         end
+        # logger.warn({rule_key.to_sym => false})
+        {rule_key.to_sym => false}
       end
+
     protected
 
       def validates_operator

data/lib/surveyor/models/dependency_methods.rb

@@ -18,6 +18,9 @@ module Surveyor
           @@validations_already_included = true
         end
         
+        # Whitelisting attributes
+        base.send :attr_accessible, :question, :question_group, :question_id, :question_group_id, :rule
+        
         # Attribute aliases
         base.send :alias_attribute, :dependent_question_id, :question_id
       end

data/lib/surveyor/models/question_group_methods.rb

@@ -7,6 +7,9 @@ module Surveyor
         # Associations
         base.send :has_many, :questions
         base.send :has_one, :dependency
+        
+        # Whitelisting attributes
+        base.send :attr_accessible, :text, :help_text, :reference_identifier, :data_export_identifier, :common_namespace, :common_identifier, :display_type, :custom_class, :custom_renderer
       end
 
       include RenderText

data/lib/surveyor/models/question_methods.rb

@@ -9,11 +9,11 @@ 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
+        base.send :belongs_to, :correct_answer, :class_name => "Answer", :dependent => :destroy
 
         # Scopes
         base.send :default_scope, :order => "display_order ASC"
-        
+
         @@validations_already_included ||= nil
         unless @@validations_already_included
           # Validations
@@ -21,10 +21,13 @@ module Surveyor
           # this causes issues with building and saving
           #, :survey_section_id
           base.send :validates_inclusion_of, :is_mandatory, :in => [true, false]
-          
+
           @@validations_already_included = true
-          
+
         end
+
+        # Whitelisting attributes
+        base.send :attr_accessible, :survey_section, :question_group, :survey_section_id, :question_group_id, :text, :short_text, :help_text, :pick, :reference_identifier, :data_export_identifier, :common_namespace, :common_identifier, :display_order, :display_type, :is_mandatory, :display_width, :custom_class, :custom_renderer, :correct_answer_id
       end
 
       include RenderText
@@ -43,7 +46,7 @@ module Surveyor
         self.short_text ||= text
         self.api_id ||= Surveyor::Common.generate_api_id
       end
-      
+
       def pick=(val)
         write_attribute(:pick, val.nil? ? nil : val.to_s)
       end
@@ -71,11 +74,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