surveyor 0.22.0 → 1.0.0

data/lib/assets/stylesheets/surveyor/ui.slider.extras.css

@@ -0,0 +1,110 @@
+/*NEW SLIDER STYLES FOR SCALE, ETC*/
+/* slider widget */
+.ui-slider  {
+	text-decoration: none !important;
+}
+.ui-slider .ui-slider-handle  {
+	overflow: visible !important;
+}
+.ui-slider .ui-slider-tooltip {
+	display: none;
+}
+.ui-slider .screenReaderContext {
+	position: absolute;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+	left: -999999999px;
+}
+.ui-slider .ui-state-active .ui-slider-tooltip, .ui-slider .ui-state-focus .ui-slider-tooltip, .ui-slider .ui-state-hover .ui-slider-tooltip {
+	display: block;
+	position: absolute;
+	bottom: 2.5em;
+	text-align: center;
+	padding: .3em .2em .4em;
+	font-size: .9em;
+	width: 8em;
+	margin-left: -3.7em;
+}
+.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down, .ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
+	position: absolute;
+	display: block;
+	width:0;
+	height:0;
+	border-bottom-width: 0;
+	background: none;
+}
+.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down {
+	border-left: 7px dashed transparent;
+	border-right: 7px dashed transparent;
+	border-top-width: 8px;
+	bottom:	-8px;
+	right: auto;
+	left: 50%;
+	margin-left: -7px;
+}
+.ui-slider .ui-slider-tooltip .ui-tooltip-pointer-down-inner {
+	border-left: 6px dashed transparent;
+	border-right: 6px dashed transparent;
+	border-top: 7px solid #fff;
+	bottom:	auto;
+	top: -9px;
+	left: -6px;
+}
+.ui-slider a {
+	text-decoration: none;
+}
+.ui-slider ol, .ui-slider li, .ui-slider dl, .ui-slider dd, .ui-slider dt {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+.ui-slider ol, .ui-slider dl {
+	position: relative;
+	top: 1.3em;
+	width: 100%;
+}
+.ui-slider dt {
+	top: 1.5em;
+	position: absolute;
+	padding-top: .2em;
+	text-align: center;
+	border-bottom: 1px dotted #ddd;
+	height: .7em;
+	color: #999;
+}
+.ui-slider dt span {
+	background: #fff;
+	padding: 0 .5em;
+}
+.ui-slider li, .ui-slider dd {
+	position: absolute;
+	overflow: visible;
+	color: #666;
+}
+.ui-slider span.ui-slider-label {
+	position: absolute;
+}
+.ui-slider li span.ui-slider-label, .ui-slider dd span.ui-slider-label {
+	display: none;
+}
+.ui-slider li span.ui-slider-label-show, .ui-slider dd span.ui-slider-label-show {
+	display: block;
+}
+.ui-slider span.ui-slider-tic {
+	position: absolute;
+	left: 0;
+	height: .8em;
+	top: -1.3em;
+}
+.ui-slider li span.ui-widget-content, .ui-slider dd span.ui-widget-content {
+	border-right: 0;
+	border-left-width: 1px;
+	border-left-style: solid;
+	border-top: 0;
+	border-bottom: 0;
+}
+.ui-slider .first .ui-slider-tic, .ui-slider .last .ui-slider-tic {
+	display: none;
+}
+

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

@@ -6,7 +6,7 @@
 
 $background_color:#EEEEEE
 $surveyor_flash_background_color:#FFF1A8
-$surveyor_color:#FFFFF1 
+$surveyor_color:#FFFFF1
 $surveyor_text_color:#333333
 $surveyor_dependent_color:#FFFFDF
 $surveyor_menus_active_color:#EBEBCC
@@ -49,7 +49,7 @@ body
         :background-color $surveyor_menus_active_color
   .previous_section
   .next_section
-    :float right  
+    :float right
   .survey_section
     span.title
       :display block
@@ -71,11 +71,11 @@ body
     ol fieldset
       :display inline
     input[type="submit"].add_row
-      :font-size 0.7em    
-  
+      :font-size 0.7em
+
   // question groups and questions
   .survey_section>fieldset>ol
-    :padding-left 1em  
+    :padding-left 1em
   fieldset
     :padding-top 5px
     :margin-bottom 10px
@@ -102,7 +102,7 @@ body
     input[type="text"], textarea
       :font-size 0.8em
 
-  fieldset.q_hidden, fieldset.g_hidden
+  fieldset.q_hidden, fieldset.g_hidden, fieldset.g_grid tr.q_hidden
     :display none !important
   fieldset.q_dependent, fieldset.g_dependent
     :background-color $surveyor_dependent_color
@@ -112,7 +112,15 @@ body
   fieldset.q_dropdown, fieldset.q_inline_dropdown, fieldset.q_default_dropdown, fieldset.q_slider, fieldset.q_repeater_dropdown
     label
       :display none
-    
+  fieldset.q_slider
+    :margin-bottom 3em
+    li.select
+      :width 50%
+      :font-size .8em
+    .ui-slider span.ui-slider-label-show
+      :position relative
+      :display inline
+
   // buttons
   input[type="submit"]
     :font-size 1em

data/lib/generators/surveyor/custom_generator.rb

@@ -1,8 +1,9 @@
+# encoding: UTF-8
 require 'rails/generators'
 module Surveyor
   class CustomGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
-    
+
     def readme
       copy_file "surveys/EXTENDING_SURVEYOR.md"
     end
@@ -12,6 +13,6 @@ module Surveyor
     def layout
       copy_file "app/views/layouts/surveyor_custom.html.erb"
     end
-    
+
   end
 end

data/lib/generators/surveyor/install_generator.rb

@@ -1,18 +1,64 @@
+# encoding: UTF-8
 require 'rails/generators'
+require 'surveyor/helpers/asset_pipeline'
+
 module Surveyor
   class InstallGenerator < Rails::Generators::Base
+    include Surveyor::Helpers::AssetPipeline
+
     source_root File.expand_path("../templates", __FILE__)
     desc "Generate surveyor README, migrations, assets and sample survey"
     class_option :skip_migrations, :type => :boolean, :desc => "skip migrations, but generate everything else"
 
+    MIGRATION_ORDER = %w(
+      create_surveys
+      create_survey_sections
+      create_questions
+      create_question_groups create_answers
+      create_response_sets
+      create_responses
+      create_dependencies
+      create_dependency_conditions
+      create_validations
+      create_validation_conditions
+      add_display_order_to_surveys
+      add_correct_answer_id_to_questions
+      add_index_to_response_sets
+      add_index_to_surveys
+      add_unique_indicies
+      add_section_id_to_responses
+      add_default_value_to_answers
+      add_api_ids
+      add_display_type_to_answers
+      add_api_id_to_question_groups
+      add_api_ids_to_response_sets_and_responses
+      update_blank_api_ids_on_question_group
+      drop_unique_index_on_access_code_in_surveys
+      add_version_to_surveys
+      add_unique_index_on_access_code_and_version_in_surveys
+      update_blank_versions_on_surveys
+      api_ids_must_be_unique
+    )
+
     def readme
       copy_file "../../../../README.md", "surveys/README.md"
     end
     def migrations
       unless options[:skip_migrations]
+        migration_files = Dir[File.join(self.class.source_root, 'db/migrate/*.rb')]
+        migrations_not_in_order =
+          migration_files.collect { |f| File.basename(f).sub(/\.rb$/, '') } - MIGRATION_ORDER
+        unless migrations_not_in_order.empty?
+          fail "%s migration%s not added to MIGRATION_ORDER: %s" % [
+            migrations_not_in_order.size,
+            migrations_not_in_order.size == 1 ? '' : 's',
+            migrations_not_in_order.join(', ')
+          ]
+        end
+
         # because all migration timestamps end up the same, causing a collision when running rake db:migrate
         # copied functionality from RAILS_GEM_PATH/lib/rails_generator/commands.rb
-        %w(create_surveys create_survey_sections create_questions create_question_groups create_answers create_response_sets create_responses create_dependencies create_dependency_conditions create_validations create_validation_conditions add_display_order_to_surveys add_correct_answer_id_to_questions add_index_to_response_sets add_index_to_surveys add_unique_indicies add_section_id_to_responses add_default_value_to_answers add_api_ids add_display_type_to_answers add_api_id_to_question_groups add_api_ids_to_response_sets_and_responses).each_with_index do |model, i|
+        MIGRATION_ORDER.each_with_index do |model, i|
           unless (prev_migrations = Dir.glob("db/migrate/[0-9]*_*.rb").grep(/[0-9]+_#{model}.rb$/)).empty?
             prev_migration_timestamp = prev_migrations[0].match(/([0-9]+)_#{model}.rb$/)[1]
           end
@@ -20,32 +66,28 @@ module Surveyor
         end
       end
     end
+
     def assets
-      asset_directory = "public"
-      if Rails.application.config.respond_to?(:assets) && Rails.application.config.assets.enabled == true
-        asset_directory = "vendor/assets"
+      if asset_pipeline_enabled?
+        directory "app/assets"
+        copy_file "vendor/assets/stylesheets/custom.sass"
+      else
+        directory "../../../assets/javascripts", "public/javascripts"
+        directory "../../../assets/images", "public/images"
+        directory "../../../assets/stylesheets/surveyor", "public/stylesheets/surveyor"
+        copy_file "../../../assets/stylesheets/surveyor.sass", "public/stylesheets/sass/surveyor.sass"
+        copy_file "vendor/assets/stylesheets/custom.sass", "public/stylesheets/sass/custom.sass"
       end
-      %w( templates/public/images/surveyor templates/public/javascripts/surveyor templates/public/stylesheets/surveyor templates/public/stylesheets/sass ).each do |path|
-        asset_path = File.expand_path("../#{path}", __FILE__)
-        Dir.foreach(asset_path) do |f|
-          next if File.directory?(f)
-
-          from_path = "#{path.gsub('templates/public', 'public')}/#{f}"
-          to_path = "#{path.gsub('templates/public', asset_directory)}/#{f}"
-          to_path = to_path.gsub("/sass", "") if asset_directory == "vendor/assets"
-          copy_file(from_path, to_path)
-        end
-      end
-
     end
+
     def surveys
       copy_file "surveys/kitchen_sink_survey.rb"
       copy_file "surveys/quiz.rb"
       copy_file "surveys/date_survey.rb"
     end
+
     def locales
       directory "config/locales"
     end
-
   end
 end

data/lib/generators/surveyor/templates/app/assets/javascripts/surveyor_all.js

@@ -0,0 +1,5 @@
+//= require surveyor/jquery.tools.min
+//= require surveyor/jquery-ui
+//= require surveyor/jquery-ui-timepicker-addon
+//= require surveyor/jquery.surveyor
+//= require surveyor/jquery.selectToUISlider

data/lib/generators/surveyor/templates/app/assets/stylesheets/surveyor_all.css

@@ -0,0 +1,9 @@
+/*
+*= require surveyor/reset
+*= require surveyor/dateinput
+*= require surveyor/jquery-ui.custom
+*= require surveyor/jquery-ui-timepicker-addon
+*= require surveyor/ui.slider.extras
+*= require surveyor
+*= require custom
+*/

data/lib/generators/surveyor/templates/app/controllers/surveyor_controller.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module SurveyorControllerCustomMethods
   def self.included(base)
     # base.send :before_filter, :require_user   # AuthLogic
@@ -22,7 +23,7 @@ module SurveyorControllerCustomMethods
   def update
     super
   end
-  
+
   # Paths
   def surveyor_index
     # most of the above actions redirect to this method

data/lib/generators/surveyor/templates/app/views/layouts/surveyor_custom.html.erb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

data/lib/generators/surveyor/templates/config/locales/surveyor_es.yml

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Sample localization file for Spanish. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 

data/lib/generators/surveyor/templates/config/locales/surveyor_he.yml

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Localization file for Hebrew. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddApiIdToQuestionGroups < ActiveRecord::Migration
   def self.up
     add_column :question_groups, :api_id, :string

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddApiIds < ActiveRecord::Migration
   def self.up
     add_column :surveys, :api_id, :string

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddApiIdsToResponseSetsAndResponses < ActiveRecord::Migration
   def self.up
     add_column :response_sets, :api_id, :string

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddCorrectAnswerIdToQuestions < ActiveRecord::Migration
   def self.up
     add_column :questions, :correct_answer_id, :integer

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddDefaultValueToAnswers < ActiveRecord::Migration
   def self.up
     add_column :answers, :default_value, :string

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddDisplayOrderToSurveys < ActiveRecord::Migration
   def self.up
     add_column :surveys, :display_order, :integer

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddDisplayTypeToAnswers < ActiveRecord::Migration
   def self.up
     add_column :answers, :display_type, :string

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddIndexToResponseSets < ActiveRecord::Migration
   def self.up
     add_index(:response_sets, :access_code, :name => 'response_sets_ac_idx')

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddIndexToSurveys < ActiveRecord::Migration
   def self.up
     add_index(:surveys, :access_code, :name => 'surveys_ac_idx')

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class AddSectionIdToResponses < ActiveRecord::Migration
   def self.up
     add_column :responses, :survey_section_id, :integer

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

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+class AddUniqueIndexOnAccessCodeAndVersionInSurveys < ActiveRecord::Migration
+  def self.up
+    add_index(:surveys, [ :access_code, :survey_version], :name => 'surveys_access_code_version_idx', :unique => true)
+  end
+
+  def self.down
+    remove_index( :surveys, :name => 'surveys_access_code_version_idx' )
+  end
+end

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

@@ -1,8 +1,9 @@
+# encoding: UTF-8
 class AddUniqueIndicies < ActiveRecord::Migration
   def self.up
     remove_index(:response_sets, :name => 'response_sets_ac_idx')
     add_index(:response_sets, :access_code, :name => 'response_sets_ac_idx', :unique => true)
-    
+
     remove_index(:surveys, :name => 'surveys_ac_idx')
     add_index(:surveys, :access_code, :name => 'surveys_ac_idx', :unique => true)
   end
@@ -10,7 +11,7 @@ class AddUniqueIndicies < ActiveRecord::Migration
   def self.down
     remove_index(:response_sets, :name => 'response_sets_ac_idx')
     add_index(:response_sets, :access_code, :name => 'response_sets_ac_idx')
-    
+
     remove_index(:surveys, :name => 'surveys_ac_idx')
     add_index(:surveys, :access_code, :name => 'surveys_ac_idx')
   end

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

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+class AddVersionToSurveys < ActiveRecord::Migration
+  def self.up
+    add_column :surveys, :survey_version, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :surveys, :survey_version
+  end
+end

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

@@ -0,0 +1,23 @@
+class ApiIdsMustBeUnique < ActiveRecord::Migration
+  API_ID_TABLES = %w(surveys questions question_groups answers responses response_sets)
+
+  class << self
+    def up
+      API_ID_TABLES.each do |table|
+        add_index table, 'api_id', :unique => true, :name => api_id_index_name(table)
+      end
+    end
+
+    def down
+      API_ID_TABLES.each do |table|
+        remove_index table, :name => api_id_index_name(table)
+      end
+    end
+
+    private
+
+    def api_id_index_name(table)
+      "uq_#{table}_api_id"
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class CreateAnswers < ActiveRecord::Migration
   def self.up
     create_table :answers do |t|
@@ -10,24 +11,24 @@ class CreateAnswers < ActiveRecord::Migration
       t.text :help_text
       t.integer :weight # Used to assign a weight to an answer object (used for computing surveys that have numerical results) (I added this to support the Urology questionnaire -BLC)
       t.string :response_class # What kind of additional data does this answer accept?
-      
+
       # Reference
       t.string :reference_identifier # from paper
       t.string :data_export_identifier # data export
       t.string :common_namespace # maping to a common vocab
       t.string :common_identifier # maping to a common vocab
-    
+
       # Display
       t.integer :display_order
       t.boolean :is_exclusive # If set it causes some UI trigger to remove (and disable) all the other answer choices selected for a question (needed for the WHR)
       t.boolean :hide_label
       t.integer :display_length # if smaller than answer.length the html input length will be this value
-      
+
       t.string :custom_class
       t.string :custom_renderer
-      
+
       t.timestamps
-      
+
     end
   end
 

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

@@ -1,10 +1,11 @@
+# encoding: UTF-8
 class CreateDependencies < ActiveRecord::Migration
   def self.up
     create_table :dependencies do |t|
       # Context
       t.integer :question_id # the dependent question
       t.integer :question_group_id
-      
+
       # Conditional
       t.string :rule
 

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

@@ -1,10 +1,11 @@
+# encoding: UTF-8
 class CreateDependencyConditions < ActiveRecord::Migration
   def self.up
     create_table :dependency_conditions do |t|
       # Context
       t.integer :dependency_id
       t.string :rule_key
-      
+
       # Conditional
       t.integer :question_id # the conditional question
       t.string :operator

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

@@ -1,22 +1,23 @@
+# encoding: UTF-8
 class CreateQuestionGroups < ActiveRecord::Migration
   def self.up
     create_table :question_groups do |t|
       # Content
       t.text :text
       t.text :help_text
-      
+
       # Reference
       t.string :reference_identifier # from paper
       t.string :data_export_identifier # data export
       t.string :common_namespace # maping to a common vocab
       t.string :common_identifier # maping to a common vocab
-            
+
       # Display
       t.string :display_type
-      
+
       t.string :custom_class
       t.string :custom_renderer
-      
+
       t.timestamps
     end
   end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class CreateQuestions < ActiveRecord::Migration
   def self.up
     create_table :questions do |t|
@@ -16,16 +17,16 @@ class CreateQuestions < ActiveRecord::Migration
       t.string :data_export_identifier # data export
       t.string :common_namespace # maping to a common vocab
       t.string :common_identifier # maping to a common vocab
-      
+
       # Display
       t.integer :display_order
       t.string :display_type
       t.boolean :is_mandatory
       t.integer :display_width # used only for slider component (if needed)
-      
+
       t.string :custom_class
       t.string :custom_renderer
-      
+
       t.timestamps
     end
   end

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class CreateResponseSets < ActiveRecord::Migration
   def self.up
     create_table :response_sets do |t|

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class CreateResponses < ActiveRecord::Migration
   def self.up
     create_table :responses do |t|
@@ -5,15 +6,15 @@ class CreateResponses < ActiveRecord::Migration
       t.integer :response_set_id
       t.integer :question_id
 
-      # Content                    
-      t.integer :answer_id         
+      # Content
+      t.integer :answer_id
       t.datetime :datetime_value # handles date, time, and datetime (segregate by answer.response_class)
-      
-      #t.datetime :time_value      
-      t.integer :integer_value  
-      t.float :float_value      
-      t.string :unit               
-      t.text :text_value           
+
+      #t.datetime :time_value
+      t.integer :integer_value
+      t.float :float_value
+      t.string :unit
+      t.text :text_value
       t.string :string_value
       t.string :response_other #used to hold the string entered with "Other" type answers in multiple choice questions
 
@@ -22,7 +23,7 @@ class CreateResponses < ActiveRecord::Migration
       # group 1: Ford/Focus/2007
       # group 2: Toyota/Prius/2006
       t.string :response_group
-      
+
       t.timestamps
     end
   end

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

@@ -1,22 +1,23 @@
+# encoding: UTF-8
 class CreateSurveySections < ActiveRecord::Migration
   def self.up
     create_table :survey_sections do |t|
       # Context
       t.integer :survey_id
-      
+
       # Content
       t.string :title
       t.text :description
-      
+
       # Reference
       t.string :reference_identifier # from paper
       t.string :data_export_identifier # data export
       t.string :common_namespace # maping to a common vocab
       t.string :common_identifier # maping to a common vocab
-      
+
       # Display
       t.integer :display_order
-      
+
       t.string :custom_class
 
       t.timestamps