surveyor 0.22.0 → 1.0.0

data/features/surveyor_parser.feature

@@ -2,7 +2,8 @@ Feature: Survey parser
   As a developer
   I want to write out the survey in the DSL
   So that I can give it to survey participants
-  
+
+  @focus
   Scenario: Parsing basic questions
     Given I parse
     """
@@ -89,7 +90,7 @@ Feature: Survey parser
             a :string
           end
         end
-      end  
+      end
     """
     Then there should be 1 survey with:
       | title          |
@@ -113,17 +114,17 @@ Feature: Survey parser
         section "Conditionals" do
           q_montypython3 "What... is your name? (e.g. It is 'Arthur', King of the Britons)"
           a_1 :string
-    
+
           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"}
-    
+
           q "How many pets do you own?"
           a :integer
           validation :rule => "A"
           condition_A ">=", :integer_value => 0
-    
+
           q "What is your address?", :custom_class => 'address'
           a :text, :custom_class => 'mapper'
           validation :rule => "AC"
@@ -170,38 +171,38 @@ Feature: Survey parser
     """
       survey "dependency test" do
         section "section 1" do
-  
+
           q_copd_sh_1 "Have you ever smoked cigarettes?",:pick=>:one,:help_text=>"NO means less than 20 packs of cigarettes or 12 oz. of tobacco in a lifetime or less than 1 cigarette a day for 1 year."
           a_1 "Yes"
           a_2 "No"
-  
+
           q_copd_sh_1a "How old were you when you first started smoking cigarettes?", :help_text=>"age in years"
           a :integer
           dependency :rule => "A"
           condition_A :q_copd_sh_1, "==", :a_1
-  
+
           q_copd_sh_1b "Do you currently smoke cigarettes?",:pick=>:one, :help_text=>"as of 1 month ago"
           a_1 "Yes"
           a_2 "No"
           dependency :rule => "B"
           condition_B :q_copd_sh_1, "==", :a_1
-  
+
           q_copd_sh_1c "On the average of the entire time you smoked, how many cigarettes did you smoke per day?"
           a :integer
           dependency :rule => "C"
           condition_C :q_copd_sh_1, "==", :a_1
-  
+
           q_copd_sh_1bb "How many cigarettes do you smoke per day now?"
           a_2 "integer"
           dependency :rule => "D"
           condition_D :q_copd_sh_1b, "==", :a_1
-  
-  
+
+
           q_copd_sh_1ba "How old were you when you stopped?"
           a "Years", :integer
           dependency :rule => "E"
           condition_E :q_copd_sh_1b, "==", :a_2
-  
+
         end
       end
     """
@@ -210,7 +211,7 @@ Feature: Survey parser
     And question "copd_sh_1ba" should have a dependency with rule "E"
 
   Scenario: Parsing dependencies on questions inside of a group
-    Given the survey
+    Given I parse
     """
       survey "Phone Screen Questions" do
         section "Phone Screen" do
@@ -222,7 +223,7 @@ Feature: Survey parser
           a_yes "Yes"
           a_no "No"
 
-          group do 
+          group do
             dependency :rule => "A"
             condition_A :q_diabetes, "==", :a_yes
             label "It looks like you are not eligible for this specific study at the time"
@@ -248,9 +249,9 @@ Feature: Survey parser
     Then there should be 4 dependencies
     And 2 dependencies should depend on questions
     And 2 dependencies should depend on question groups
-  
+
   Scenario: Parsing dependencies with "a"
-    Given the survey
+    Given I parse
     """
       survey "Dependencies with 'a'" do
         section "First" do
@@ -272,9 +273,9 @@ Feature: Survey parser
     And there should be 1 resolved dependency_condition with:
       | rule_key |
       | A        |
-  
+
   Scenario: Parsing dependencies with "q"
-    Given the survey
+    Given I parse
     """
       survey "Dependencies with 'q'" do
         section "First" do
@@ -295,4 +296,97 @@ Feature: Survey parser
       | A    |
     And there should be 1 resolved dependency_condition with:
       | rule_key |
-      | A        |
+      | A        |
+
+  @quiz
+  Scenario: Parsing a quiz
+    Given I parse
+    """
+      survey "Quiz time" do
+        section "First" do
+          q_the_answer "What is the 'Answer to the Ultimate Question of Life, The Universe, and Everything'", :correct => "adams"
+          a_pi "3.14"
+          a_zero "0"
+          a_adams "42"
+        end
+      end
+    """
+    Then the question "the_answer" should have correct answer "adams"
+
+  @quiz
+  Scenario: Parsing a quiz for #365
+  Given I parse
+  """
+    survey "Arithmetic" do
+      section "Addtion" do
+        q_1 "What is one plus one?", :pick => :one, :correct => "2"
+        a_1 "1"
+        a_2 "2"
+        a_3 "3"
+        a_4 "4"
+
+        q_2 "What is five plus one?", :pick => :one, :correct => "6"
+        a_5 "five"
+        a_6 "six"
+        a_7 "seven"
+        a_8 "eight"
+      end
+    end
+  """
+  Then the question "1" should have correct answer "2"
+  Then the question "2" should have correct answer "6"
+
+  Scenario: Parsing typos in blocks
+    Given the survey
+    """
+      survey "Basics" do
+        sectionals "Typo" do
+        end
+      end
+
+    """
+    Then the parser should fail with "Dropping the Sectionals block like it's hot!"
+
+  Scenario: Parsing bad references
+    Given the survey
+    """
+      survey "Refs" do
+        section "Bad" do
+          q_watch "Do you watch football?", :pick => :one
+          a_1 "Yes"
+          a_2 "No"
+
+          q "Do you like the replacement refs?", :pick => :one
+          dependency :rule => "A or B"
+          condition_A :q_1, "==", :a_1
+          condition_B :q_watch, "==", :b_1
+          a "Yes"
+          a "No"
+        end
+      end
+
+    """
+    Then the parser should fail with "Bad references: q_1; q_1, a_1; q_watch, a_b_1"
+
+  Scenario: Parsing repeated references
+    Given the survey
+    """
+      survey "Refs" do
+        section "Bad" do
+          q_watch "Do you watch football?", :pick => :one
+          a_1 "Yes"
+          a_1 "No"
+
+          q_watch "Do you watch baseball?", :pick => :one
+          a_yes "Yes"
+          a_no  "No"
+
+          q "Do you like the replacement refs?", :pick => :one
+          dependency :rule => "A or B"
+          condition_A :q_watch, "==", :a_1
+          a "Yes"
+          a "No"
+        end
+      end
+    """
+    Then the parser should fail with "Duplicate references: q_watch, a_1; q_watch"

data/features/z_redcap_parser.feature

@@ -1,6 +1,5 @@
 # The redcap parser feature should run last. If it runs in between other features that use the surveyor parser,
 # it causes the DependencyCondition before_save :resolve_references hook to stop running, causing hard to trace failures.
-
 Feature: Survey import from REDCap
   As a developer
   I want to write out the survey in the DSL

data/lib/{generators/surveyor/templates/public → assets}/javascripts/surveyor/jquery-ui-timepicker-addon.js

@@ -3,12 +3,12 @@
 * By: Trent Richardson [http://trentrichardson.com]
 * Version 0.9.7
 * Last Modified: 10/02/2011
-* 
+*
 * Copyright 2011 Trent Richardson
 * Dual licensed under the MIT and GPL licenses.
 * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
 * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
-* 
+*
 * HERES THE CSS:
 * .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
 * .ui-timepicker-div dl { text-align: left; }
@@ -131,7 +131,7 @@ $.extend(Timepicker.prototype, {
 	_newInst: function($input, o) {
 		var tp_inst = new Timepicker(),
 			inlineSettings = {};
-			
+
 		for (var attrName in this._defaults) {
 			var attrValue = $input.attr('time:' + attrName);
 			if (attrValue) {
@@ -186,7 +186,7 @@ $.extend(Timepicker.prototype, {
 			tp_inst.$altInput = $(o.altField)
 				.css({ cursor: 'pointer' })
 				.focus(function(){ $input.trigger("focus"); });
-		
+
 		if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0)
 		{
 			tp_inst._defaults.minDate=new Date();
@@ -195,7 +195,7 @@ $.extend(Timepicker.prototype, {
 		{
 			tp_inst._defaults.maxDate=new Date();
 		}
-		
+
 		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
 		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
 			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
@@ -213,7 +213,7 @@ $.extend(Timepicker.prototype, {
 	//########################################################################
 	_addTimePicker: function(dp_inst) {
 		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
-				this.$input.val() + ' ' + this.$altInput.val() : 
+				this.$input.val() + ' ' + this.$altInput.val() :
 				this.$input.val();
 
 		this.timeDefined = this._parseTime(currDT);
@@ -247,7 +247,7 @@ $.extend(Timepicker.prototype, {
 			var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
 			regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator.replace(specials, "\\$&") + regstr;
 		}
-		
+
 		treg = timeString.match(new RegExp(regstr, 'i'));
 
 		if (treg) {
@@ -295,7 +295,7 @@ $.extend(Timepicker.prototype, {
 				}
 				this.timezone = tz;
 			}
-			
+
 			return true;
 
 		}
@@ -749,7 +749,7 @@ $.extend(Timepicker.prototype, {
 
 	},
 
-	
+
 	//########################################################################
 	// when a slider moves, set the internal time...
 	// on time change is also called when the time is updated in the text field
@@ -782,7 +782,7 @@ $.extend(Timepicker.prototype, {
 				|| (this.ampm.length > 0
 				    && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
 				|| timezone != this.timezone);
-		
+
 		if (hasChanged) {
 
 			if (hour !== false)this.hour = hour;
@@ -790,21 +790,21 @@ $.extend(Timepicker.prototype, {
 			if (second !== false) this.second = second;
 			if (millisec !== false) this.millisec = millisec;
 			if (timezone !== false) this.timezone = timezone;
-			
+
 			if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
-			
+
 			this._limitMinMaxDateTime(this.inst, true);
 		}
 		if (o.ampm) this.ampm = ampm;
-		
+
 		this._formatTime();
 		if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix);
 		this.timeDefined = true;
 		if (hasChanged) this._updateDateTime();
 	},
-    
+
 	//########################################################################
-	// call custom onSelect. 
+	// call custom onSelect.
 	// bind to sliders slidestop, and grid click.
 	//########################################################################
 	_onSelectHandler: function() {
@@ -888,7 +888,7 @@ $.extend(Timepicker.prototype, {
 		} else {
 			this.$input.val(formattedDateTime);
 		}
-		
+
 		this.$input.trigger("change");
 	}
 
@@ -918,9 +918,9 @@ $.fn.extend({
 		tmp_args = arguments;
 
 		if (typeof(o) == 'string'){
-			if(o == 'getDate') 
+			if(o == 'getDate')
 				return $.fn.datepicker.apply($(this[0]), tmp_args);
-			else 
+			else
 				return this.each(function() {
 					var $t = $(this);
 					$t.datepicker.apply($t, tmp_args);
@@ -972,9 +972,9 @@ $.datepicker._updateDatepicker = function(inst) {
 	}
 
 	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-				
+
 		this._base_updateDatepicker(inst);
-		
+
 		// Reload the time control when changing something in the input text field.
 		var tp_inst = this._get(inst, 'timepicker');
 		if(tp_inst) tp_inst._addTimePicker(inst);
@@ -1012,7 +1012,7 @@ $.datepicker._doKeyPress = function(event) {
 			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
 		}
 	}
-	
+
 	return $.datepicker._base_doKeyPress(event);
 };
 
@@ -1205,7 +1205,7 @@ $.datepicker._formatDate = function(inst, day, month, year){
 	{
 		if(day)
 			var b = this._base_formatDate(inst, day, month, year);
-		tp_inst._updateDateTime();	
+		tp_inst._updateDateTime();
 		return tp_inst.$input.val();
 	}
 	return this._base_formatDate(inst);
@@ -1242,7 +1242,7 @@ $.datepicker._optionDatepicker = function(target, name, value) {
 				min=new Date();
 			else
 				min= new Date(min);
-			
+
 			tp_inst._defaults.minDate = min;
 			tp_inst._defaults.minDateTime = min;
 		} else if (max){ //if max was set