surveyor 0.18.2 → 0.19.0

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

@@ -1,6 +1,9 @@
 #surveyor
-  #header
-    .title= t ('surveyor.take_these_surveys')
+  - unless (types = flash.keys.select{|k| [:notice, :error, :warning].include?(k)}).blank?
+    .surveyor_flash
+      = flash_messages(types)
+      .close
+  .survey_title= t('surveyor.take_these_surveys')
   %br
   #survey_list
     %ul
@@ -10,7 +13,7 @@
             - form_tag(take_survey_path(:survey_code => survey.access_code)) do 
               = survey.title
                
-              = submit_tag( t ('surveyor.take_it') )
+              = submit_tag( t('surveyor.take_it') )
       - else
         %li
           No surveys

data/features/step_definitions/parser_steps.rb

@@ -0,0 +1,71 @@
+Given /^I parse$|^the survey$/ do |string|
+  Surveyor::Parser.parse(string)
+end
+
+Given /^I parse redcap file "([^"]*)"$/ do |name|
+  Surveyor::RedcapParser.parse File.read(File.join(RAILS_ROOT, '..', 'features', 'support', name)), name
+end
+
+Then /^there should be (\d+) survey(?:s?) with:$/ do |x, table|
+  Survey.count.should == x.to_i
+  table.hashes.each do |hash|
+    Survey.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
+Then /^there should be (\d+) question groups with:$/ do |x, table|
+  QuestionGroup.count.should == x.to_i
+  table.hashes.each do |hash|
+    QuestionGroup.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
+Then /^there should be (\d+) question(?:s?) with:$/ do |x, table|
+  Question.count.should == x.to_i
+  table.hashes.each do |hash|
+    hash["reference_identifier"] = nil if hash["reference_identifier"] == "nil"
+    hash["custom_class"] = nil if hash["custom_class"] == "nil"
+    Question.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
+Then /^there should be (\d+) answer(?:s?) with:$/ do |x, table|
+  Answer.count.should == x.to_i
+  table.hashes.each do |hash|
+    hash["reference_identifier"] = nil if hash["reference_identifier"] == "nil"
+    Answer.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
+Then /^there should be (\d+) dependenc(?:y|ies) with:$/ do |x, table|
+  Dependency.count.should == x.to_i
+  table.hashes.each do |hash|
+    Dependency.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
+Then /^there should be (\d+) resolved dependency_condition(?:s?) with:$/ do |x, table|
+  DependencyCondition.count.should == x.to_i
+  table.hashes.each do |hash|
+    d = DependencyCondition.find(:first, :conditions => hash)
+    d.should_not be_nil
+    d.question.should_not be_nil
+    d.answer.should_not be_nil unless d.operator.match(/^count[<>=!]{1,2}\d+/) 
+  end
+end
+
+
+Then /^there should be (\d+) validation(?:s?) with:$/ do |x, table|
+  Validation.count.should == x.to_i
+  table.hashes.each do |hash|
+    Validation.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
+Then /^there should be (\d+) validation_condition(?:s?) with:$/ do |x, table|
+  ValidationCondition.count.should == x.to_i
+  table.hashes.each do |hash|
+    hash["integer_value"] = nil if hash["integer_value"] == "nil"
+    ValidationCondition.find(:first, :conditions => hash).should_not be_nil
+  end
+end

data/features/step_definitions/surveyor_steps.rb

@@ -1,81 +1,11 @@
-Given /^I parse$/ do |string|
-  Surveyor::Parser.parse(string)
+When /^I start the "([^"]*)" survey$/ do |name|
+  When "I go to the surveys page"
+  Then "I should see \"#{name}\""
+  click_button "Take it"
 end
 
-Given /^I parse redcap file "([^"]*)"$/ do |name|
-  Surveyor::RedcapParser.parse File.read(File.join(RAILS_ROOT, '..', 'features', 'support', name)), name
-end
-
-Then /^there should be (\d+) survey(?:s?) with:$/ do |x, table|
-  Survey.count.should == x.to_i
-  table.hashes.each do |hash|
-    Survey.find(:first, :conditions => hash).should_not be_nil
-  end
-end
-
-Then /^there should be (\d+) question groups with:$/ do |x, table|
-  QuestionGroup.count.should == x.to_i
-  table.hashes.each do |hash|
-    QuestionGroup.find(:first, :conditions => hash).should_not be_nil
-  end
-end
-
-Then /^there should be (\d+) question(?:s?) with:$/ do |x, table|
-  Question.count.should == x.to_i
-  table.hashes.each do |hash|
-    hash["reference_identifier"] = nil if hash["reference_identifier"] == "nil"
-    hash["custom_class"] = nil if hash["custom_class"] == "nil"
-    Question.find(:first, :conditions => hash).should_not be_nil
-  end
-end
-
-Then /^there should be (\d+) answer(?:s?) with:$/ do |x, table|
-  Answer.count.should == x.to_i
-  table.hashes.each do |hash|
-    hash["reference_identifier"] = nil if hash["reference_identifier"] == "nil"
-    Answer.find(:first, :conditions => hash).should_not be_nil
-  end
-end
-
-Then /^there should be (\d+) dependenc(?:y|ies) with:$/ do |x, table|
-  Dependency.count.should == x.to_i
-  table.hashes.each do |hash|
-    Dependency.find(:first, :conditions => hash).should_not be_nil
-  end
-end
-
-Then /^there should be (\d+) group dependenc(?:y|ies) with:$/ do |x, table|
-  Dependency.count(:conditions => ["question_group_id NOT NULL"]).should == x.to_i
-  table.hashes.each do |hash|
-    (d = Dependency.find(:first, :conditions => hash)).should_not be_nil
-    d.question_group_id.should_not be_nil
-    d.question_id.should be_nil
-  end
-end
-
-
-Then /^there should be (\d+) resolved dependency_condition(?:s?) with:$/ do |x, table|
-  DependencyCondition.count.should == x.to_i
-  table.hashes.each do |hash|
-    d = DependencyCondition.find(:first, :conditions => hash)
-    d.should_not be_nil
-    d.question.should_not be_nil
-    d.answer.should_not be_nil unless d.operator.match(/^count[<>=!]{1,2}\d+/) 
-  end
-end
-
-
-Then /^there should be (\d+) validation(?:s?) with:$/ do |x, table|
-  Validation.count.should == x.to_i
-  table.hashes.each do |hash|
-    Validation.find(:first, :conditions => hash).should_not be_nil
-  end
-end
-
-Then /^there should be (\d+) validation_condition(?:s?) with:$/ do |x, table|
-  ValidationCondition.count.should == x.to_i
-  table.hashes.each do |hash|
-    hash["integer_value"] = nil if hash["integer_value"] == "nil"
-    ValidationCondition.find(:first, :conditions => hash).should_not be_nil
-  end
+Then /^there should be (\d+) response set with (\d+) responses with:$/ do |rs_num, r_num, table|
+  ResponseSet.count.should == rs_num.to_i
+  Response.count.should == r_num.to_i
+  # table is a Cucumber::Ast::Table
 end

data/features/support/paths.rb

@@ -10,6 +10,8 @@ module NavigationHelpers
 
     when /the home\s?page/
       '/'
+    when /the surveys page/
+      '/surveys'
     
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:

data/features/surveyor.feature

@@ -1,14 +1,14 @@
 Feature: Survey creation
-  As a 
-  I want to write out the survey in the DSL
-  So that I can give it to survey participants
+  As a survey participant
+  I want to take a survey
+  So that I can get paid
 
   Scenario: Basic questions
-    Given I parse
+    Given the survey
     """
-      survey "Simple survey" do
-        section "Basic questions" do
-          label "These questions are examples of the basic supported input types"
+      survey "Favorites" do
+        section "Colors" do
+          label "You with the sad eyes don't be discouraged"
 
           question_1 "What is your favorite color?", :pick => :one
           answer "red"
@@ -24,168 +24,30 @@ Feature: Survey creation
         end
       end
     """
-    Then there should be 1 survey with:
-      | title         |
-      | Simple survey |
-    And there should be 3 questions with:
-      | reference_identifier | text                                                            | pick | display_type |
-      | nil                  | These questions are examples of the basic supported input types | none | label        |
-      | 1                    | What is your favorite color?                                    | one  | default      |
-      | 2b                   | Choose the colors you don't like                                | any  | default      |
-    And there should be 8 answers with:
-      | reference_identifier | text   | response_class |
-      | nil                  | red    | answer         |
-      | nil                  | blue   | answer         |
-      | nil                  | green  | answer         |
-      | nil                  | Other  | answer         |
-      | 1                    | orange | answer         |
-      | 2                    | purple | answer         |
-      | 3                    | brown  | answer         |
-      | nil                  | Omit   | answer         |
-
-  Scenario: More complex questions
-    Given I parse
-    """
-      survey "Complex survey" do
-        section "Complicated questions" do
-          grid "Tell us how you feel today" do
-            a "-2"
-            a "-1"
-            a "0"
-            a "1"
-            a "2"
-            q "down|up" , :pick => :one
-            q "sad|happy", :pick => :one
-            q "limp|perky", :pick => :one
-          end
-
-          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
-
-          repeater "Tell us about the cars you own" do
-            q "Make", :pick => :one, :display_type => :dropdown
-            a "Toyota"
-            a "Ford"
-            a "GMChevy"
-            a "Ferrari"
-            a "Tesla"
-            a "Honda"
-            a "Other weak brand"
-            q "Model"
-            a :string
-            q "Year"
-            a :string
-          end
-        end
-      end  
-    """
-    Then there should be 1 survey with:
-      | title          |
-      | Complex survey |
-    And there should be 2 question groups with:
-      | text                           | display_type |
-      | Tell us how you feel today     | grid         |
-      | Tell us about the cars you own | repeater     |
-    And there should be 7 questions with:
-      | text    | pick | display_type |
-      | Make    | one  | dropdown     |
-    And there should be 28 answers with:
-      | text  | response_class |
-      | -2    | answer         |
-      | Other | string         |
-
-  Scenario: Dependencies and validations
-    Given I parse
-    """
-      survey "Dependency and validation survey" do
-        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"
-          vcondition_AC "=~", :regexp => /[0-9a-zA-z\. #]/
-
-          q_2 "Which colors do you loathe?", :pick => :any
-          a_1 "red"
-          a_2 "blue"
-          a_3 "green"
-          a_4 "yellow"
-
-          q_2a "Please explain why you hate so many colors?"
-          a_1 "explanation", :text
-          dependency :rule => "Z"
-          condition_Z :q_2, "count>2"
-        end
-      end
-    """
-    Then there should be 1 survey with:
-      | title                            |
-      | Dependency and validation survey |
-    And there should be 6 questions with:
-      | text                                                             | pick | display_type | custom_class |
-      | What... is your name? (e.g. It is 'Arthur', King of the Britons) | none | default      | nil          |
-      | What is your address?                                            | none | default      | address      |
-    And there should be 2 dependency with:
-      | rule |
-      | A    |
-      | Z    |
-    And there should be 2 resolved dependency_condition with:
-      | rule_key |
-      | A        |
-      | Z        |
-    And there should be 2 validations with:
-      | rule |
-      | A    |
-      | AC   |
-    And there should be 2 validation_conditions with:
-      | rule_key | integer_value |
-      | A        | 0             |
-  Scenario: Group dependencies
-    Given I parse
+    When I start the "Favorites" survey
+    And I choose "red"
+    And I choose "blue"
+    And I check "orange"
+    And I check "brown"
+    And I press "Click here to finish"
+    Then there should be 1 response set with 3 responses with:
+      | to_s   |
+      | blue   |
+      | orange |
+      | brown  |
+      
+  Scenario: Default answers
+    Given the survey
     """
-      survey "Group dependencies" do
-        section "Meds" do
-          repeater "Medication regimen (PPI)" do
-            dependency :rule => "A"
-            condition_A :q_dayone_1, "==", :a_2
-              q_dayone_2 "Medication", :pick=> :one, :display_type => :dropdown
-                a_0 "None"
-                a_1 "Dexlansoprazole (Kapidex)"
-                a_2 "Esomeprazole (Nexium)"
-                a_3 "Lansoprazole (Prevacid)"
-                a_4 "Omeprazole (Prilosec)"
-                a_5 "Omeprazole, Sodium Bicarbonate (Zegerid)"
-                a_6 "Pantoprazole (Protonix)"
-                a_7 "Rabeprazole (Aciphex)"
-                a_8 "Other", :string
-
-              q_dayone_3 "Dose (mg)"
-                a :string
-              q_dayone_4 "Frequency", :pick => :one, :display_type => :dropdown
-                a_1 "Daily (AM)"
-                a_2  "Daily (PM)"
-                a_3 "Twice daily"
-          end
+      survey "Favorites" do
+        section "Foods" do
+          question_1 "What is your favorite food?"
+          answer :string, :default_value => "beef"
         end
       end
     """
-    And there should be 1 group dependency with:
-      | rule |
-      | A    |
-      
-    
+    When I start the "Favorites" survey
+    And I press "Click here to finish"
+    Then there should be 1 response set with 1 responses with:
+      | to_s   |
+      | clear   |

data/features/surveyor_parser.feature

@@ -0,0 +1,157 @@
+Feature: Survey creation
+  As a 
+  I want to write out the survey in the DSL
+  So that I can give it to survey participants
+
+  Scenario: Basic questions
+    Given I parse
+    """
+      survey "Simple survey" do
+        section "Basic questions" do
+          label "These questions are examples of the basic supported input types"
+
+          question_1 "What is your favorite color?", :pick => :one
+          answer "red"
+          answer "blue"
+          answer "green"
+          answer :other
+
+          q_2b "Choose the colors you don't like", :pick => :any
+          a_1 "orange"
+          a_2 "purple"
+          a_3 "brown"
+          a :omit
+        end
+      end
+    """
+    Then there should be 1 survey with:
+      | title         |
+      | Simple survey |
+    And there should be 3 questions with:
+      | reference_identifier | text                                                            | pick | display_type |
+      | nil                  | These questions are examples of the basic supported input types | none | label        |
+      | 1                    | What is your favorite color?                                    | one  | default      |
+      | 2b                   | Choose the colors you don't like                                | any  | default      |
+    And there should be 8 answers with:
+      | reference_identifier | text   | response_class |
+      | nil                  | red    | answer         |
+      | nil                  | blue   | answer         |
+      | nil                  | green  | answer         |
+      | nil                  | Other  | answer         |
+      | 1                    | orange | answer         |
+      | 2                    | purple | answer         |
+      | 3                    | brown  | answer         |
+      | nil                  | Omit   | answer         |
+
+  Scenario: More complex questions
+    Given I parse
+    """
+      survey "Complex survey" do
+        section "Complicated questions" do
+          grid "Tell us how you feel today" do
+            a "-2"
+            a "-1"
+            a "0"
+            a "1"
+            a "2"
+            q "down|up" , :pick => :one
+            q "sad|happy", :pick => :one
+            q "limp|perky", :pick => :one
+          end
+
+          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
+
+          repeater "Tell us about the cars you own" do
+            q "Make", :pick => :one, :display_type => :dropdown
+            a "Toyota"
+            a "Ford"
+            a "GMChevy"
+            a "Ferrari"
+            a "Tesla"
+            a "Honda"
+            a "Other weak brand"
+            q "Model"
+            a :string
+            q "Year"
+            a :string
+          end
+        end
+      end  
+    """
+    Then there should be 1 survey with:
+      | title          |
+      | Complex survey |
+    And there should be 2 question groups with:
+      | text                           | display_type |
+      | Tell us how you feel today     | grid         |
+      | Tell us about the cars you own | repeater     |
+    And there should be 7 questions with:
+      | text    | pick | display_type |
+      | Make    | one  | dropdown     |
+    And there should be 28 answers with:
+      | text  | response_class |
+      | -2    | answer         |
+      | Other | string         |
+
+  Scenario: Dependencies and validations
+    Given I parse
+    """
+      survey "Dependency and validation survey" do
+        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"
+          vcondition_AC "=~", :regexp => /[0-9a-zA-z\. #]/
+
+          q_2 "Which colors do you loathe?", :pick => :any
+          a_1 "red"
+          a_2 "blue"
+          a_3 "green"
+          a_4 "yellow"
+
+          q_2a "Please explain why you hate so many colors?"
+          a_1 "explanation", :text
+          dependency :rule => "Z"
+          condition_Z :q_2, "count>2"
+        end
+      end
+    """
+    Then there should be 1 survey with:
+      | title                            |
+      | Dependency and validation survey |
+    And there should be 6 questions with:
+      | text                                                             | pick | display_type | custom_class |
+      | What... is your name? (e.g. It is 'Arthur', King of the Britons) | none | default      | nil          |
+      | What is your address?                                            | none | default      | address      |
+    And there should be 2 dependency with:
+      | rule |
+      | A    |
+      | Z    |
+    And there should be 2 resolved dependency_condition with:
+      | rule_key |
+      | A        |
+      | Z        |
+    And there should be 2 validations with:
+      | rule |
+      | A    |
+      | AC   |
+    And there should be 2 validation_conditions with:
+      | rule_key | integer_value |
+      | A        | 0             |