surveyor 1.2.0 → 1.3.0

data/app/views/surveyor/export.json.rabl

@@ -12,7 +12,7 @@ child :sections => :sections do
   child :questions_and_groups => :questions_and_groups do
     # both questions and question_groups have uuid, text, help_text, reference_identifier, and type
     attribute :api_id                   => :uuid
-    node(:text,                     :if => lambda { |q| q.is_a?(Question)}){ |q| q.split_text(:pre) }
+    node(:text,                     :if => lambda { |q| q.is_a?(Question)}){ |q| q.split(q.text, :pre) }
     node(:text,                     :if => lambda { |q| q.is_a?(QuestionGroup)}){ |q| q.text }
     node(:help_text,                :if => lambda { |q| !q.help_text.blank? }){ |q| q.help_text }
     node(:reference_identifier,     :if => lambda { |q| !q.reference_identifier.blank? }){ |q| q.reference_identifier }
@@ -21,17 +21,19 @@ child :sections => :sections do
 
     # only questions
     node(:pick,                     :if => lambda { |q| q.is_a?(Question) && q.pick != "none" }){ |q| q.pick }
-    node(:post_text,                :if => lambda { |q| q.is_a?(Question) && !q.split_text(:post).blank? }){ |q| q.split_text(:post) }
+    node(:post_text,                :if => lambda { |q| q.is_a?(Question) && !q.split(q.text, :post).blank? }){ |q| q.split(q.text, :post) }
 
     child :answers, :if => lambda { |q| q.is_a?(Question) && !q.answers.blank? } do
       attribute :api_id                 => :uuid
       node(:help_text,              :if => lambda { |a| !a.help_text.blank? }){ |a| a.help_text }
       node(:exclusive,              :if => lambda { |a| a.is_exclusive }){ |a| a.is_exclusive }
-      node(:text){ |a| a.split_or_hidden_text(:pre) }
-      node(:post_text,              :if => lambda { |a| !a.split_or_hidden_text(:post).blank? }){ |a| a.split_or_hidden_text(:post) }
+      node(:text){ |a| a.split(a.text, :pre) }
+      node(:post_text,              :if => lambda { |a| !a.split(a.text, :post).blank? }){ |a| a.split(a.text, :post) }
       node(:type,                   :if => lambda { |a| a.response_class != "answer" }){ |a| a.response_class }
       node(:reference_identifier,   :if => lambda { |a| !a.reference_identifier.blank? }){ |a| a.reference_identifier }
       node(:data_export_identifier, :if => lambda { |a| !a.data_export_identifier.blank? }){ |a| a.data_export_identifier }
+      node(:input_mask, :if => lambda { |a| !a.input_mask.blank? }){ |a| a.input_mask }
+      node(:input_mask_placeholder, :if => lambda { |a| !a.input_mask_placeholder.blank? }){ |a| a.input_mask_placeholder }
     end
 
     # both questions and question_groups have dependencies
@@ -47,8 +49,8 @@ child :sections => :sections do
 
     child(:questions, :if => lambda{|x| x.is_a?(QuestionGroup)}) do
       attributes :api_id => :uuid
-      node(:text){ |q| q.split_text(:pre) }
-      node(:post_text, :if => lambda { |q| !q.split_text(:post).blank? }){ |q| q.split_text(:post) }
+      node(:text){ |q| q.split(q.text, :pre) }
+      node(:post_text, :if => lambda { |q| !q.split(q.text, :post).blank? }){ |q| q.split(q.text, :post) }
       node(:help_text, :if => lambda { |q| !q.help_text.blank? }){ |q| q.help_text }
       node(:reference_identifier, :if => lambda { |q| !q.reference_identifier.blank? }){ |q| q.reference_identifier }
       node(:data_export_identifier,   :if => lambda { |q| !q.data_export_identifier.blank? }){ |q| q.data_export_identifier }
@@ -59,11 +61,13 @@ child :sections => :sections do
         attributes :api_id => :uuid
         node(:help_text, :if => lambda { |a| !a.help_text.blank? }){ |a| a.help_text }
         node(:is_exclusive, :if => lambda { |a| a.is_exclusive }){ |a| a.is_exclusive }
-        node(:text){ |a| a.split_or_hidden_text(:pre) }
-        node(:post_text, :if => lambda { |a| !a.split_or_hidden_text(:post).blank? }){ |a| a.split_or_hidden_text(:post) }
+        node(:text){ |a| a.split(a.text, :pre) }
+        node(:post_text, :if => lambda { |a| !a.split(a.text, :post).blank? }){ |a| a.split(a.text, :post) }
         node(:type, :if => lambda { |a| a.response_class != "answer" }){ |a| a.response_class }
         node(:reference_identifier,   :if => lambda { |a| !a.reference_identifier.blank? }){ |a| a.reference_identifier }
         node(:data_export_identifier, :if => lambda { |a| !a.data_export_identifier.blank? }){ |a| a.data_export_identifier }
+        node(:input_mask, :if => lambda { |a| !a.input_mask.blank? }){ |a| a.input_mask }
+        node(:input_mask_placeholder, :if => lambda { |a| !a.input_mask_placeholder.blank? }){ |a| a.input_mask_placeholder }
       end
 
       child :dependency, :if => lambda { |q| q.dependency } do

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

@@ -7,21 +7,16 @@
   %br
   #survey_list
     %ul
-      - unless @codes.empty?
-        - @codes.each do |access_code, values|
-          %li
-            = form_tag take_survey_path(:survey_code => access_code) do 
-              = hidden_field_tag :surveyor_javascript_enabled, false              
-        
-              = values[:title]
-               
-              = label_tag :survey_version, 'version:'
-              = select_tag(:survey_version, options_for_select([["-- Current version --", ""]] + values[:survey_versions]))
-               
-              = submit_tag( t('surveyor.take_it') )
-      - else
+      - @surveys_by_access_code.each do |access_code, surveys|
         %li
-          No surveys
+          = form_tag take_survey_path(:survey_code => access_code) do
+            = hidden_field_tag :surveyor_javascript_enabled, false
+            = surveys.first.translation(I18n.locale)[:title]
+             
+            = label_tag :survey_version, 'version:'
+            = select_tag(:survey_version, options_for_select([["-- Current version --", ""]] + (surveys.map(&:survey_version) || [])))
+             
+            = submit_tag( t('surveyor.take_it'), :default => "Take it" )
 
 :javascript
   $(document).ready(function() {

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

@@ -48,10 +48,10 @@
                                   - if q.pick == "one"
                                     - r = response_for(@response_set, q, nil, g)
                                     - j = response_idx  # increment the response index since the answer partial skips for q.pick == one
-                                  %th= q.split_text(:pre)
+                                  %th= q.split(q.text, :pre)
                                   - q.answers.each do |a|
                                     %td= render a.custom_renderer || '/partials/answer', :g => g, :q => q, :a => a, :f => f, :disableFlag => true
-                                  %th= q.split_text(:post)
+                                  %th= q.split(q.text, :post)
                     - when :repeater
                       - (@response_set.count_group_responses(group_questions) + 1).times do |rg|
                         %li

data/features/export_to_json.feature

@@ -146,6 +146,43 @@ Feature: Survey export
     }
   """
 
+  Scenario: Exporting input mask and mask placeholder
+  Given I parse
+  """
+    survey "Personal" do
+      section "Guy" do
+        q "What is your phone number?"
+        a :string, :input_mask => '(999)999-9999', :input_mask_placeholder => '#'
+      end
+    end
+  """
+  And I visit "/surveys/personal.json"
+  Then the JSON should be:
+    """
+    {
+      "title": "Personal",
+      "uuid": "*",
+      "sections": [{
+        "display_order": 0,
+        "title": "Guy",
+        "questions_and_groups": [
+          { 
+            "uuid": "*", 
+            "text": "What is your phone number?",
+            "answers": [
+              {
+                "input_mask": "(999)999-9999",
+                "input_mask_placeholder": "#",
+                "text": "String",
+                "type": "string", 
+                "uuid": "*"
+              }
+            ]
+          }]
+        }]
+      }
+    """
+
   Scenario: Exporting response sets
   Given I parse
   """
@@ -243,6 +280,65 @@ Feature: Survey export
   And the JSON response at "responses/0/value" should be "blueish"
   And the JSON response at "responses/0/answer_id" should correspond to an answer with text "most favorite color"
 
+  Scenario: Exporting null datetime response
+  Given I parse
+  """
+    survey "Health" do
+      section "Doctor" do
+        question "When did you visit?", :pick => :one
+        a "Date", :date
+        a "Not sure"
+      end
+    end
+  """
+  And I start the "Health" survey
+  And I choose "Date"
+  And I press "Click here to finish"
+  And I export the response set
+  Then the JSON at "responses" should have 1 entry
+  And the JSON response at "responses/0/value" should be null
+
   Scenario: Exporting non-existent surveys
     When I visit "/surveys/simple-json.json"
-    Then I should get a "404" response
+    Then I should get a "404" response
+
+  Scenario: Exporting with survey modifications
+  Given I parse
+  """
+    survey "Simple" do
+      section "Colors" do
+        question "What is your least favorite color?"
+        a "least favorite color", :string
+      end
+    end
+  """
+  When I prefix the titles of exported surveys with "NUBIC - "
+  Then the JSON representation for "Simple" should be:
+  """
+  {
+    "title": "NUBIC - Simple",
+    "uuid": "*",
+    "sections": [{
+      "title": "Colors",
+      "display_order":0,
+      "questions_and_groups": [
+        { "uuid": "*", "text": "What is your least favorite color?", "answers": [{"text": "least favorite color", "uuid": "*", "type": "string"}]}
+      ]
+    }]
+  }
+  """
+  When I visit "/surveys/simple.json"
+  Then the JSON should be:
+  """
+  {
+    "title": "NUBIC - Simple",
+    "uuid": "*",
+    "sections": [{
+      "title": "Colors",
+      "display_order":0,
+      "questions_and_groups": [
+        { "uuid": "*", "text": "What is your least favorite color?", "answers": [{"text": "least favorite color", "uuid": "*", "type": "string"}]}
+      ]
+    }]
+  }
+  """

data/features/internationalization.feature

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+Feature: Internationalization
+  As survey taker
+  I want to see surveys in my own language
+  So that I understand what they're asking
+
+  Scenario:
+  Given I parse
+    """
+    survey "One language is never enough" do
+      translations :es => "translations/languages.es.yml", :he => "translations/languages.he.yml", :ko => "translations/languages.ko.yml"
+      section_one "One" do
+        g_hello "Hello" do
+          q_name "What is your name?"
+          a_name :string, :help_text => "My name is..."
+        end
+      end
+    end
+    """
+  Then there should be 3 translations with
+    | locale |
+    | es     |
+    | he     |
+    | ko     |
+  When I start the survey
+  Then I should see "One language is never enough"
+    And I should see "One"
+    And I should see "Hello"
+    And I should see "What is your name?"
+    And I should see "My name is..."
+  When I start the survey in "es"
+  Then I should see "Un idioma nunca es suficiente"
+    And I should see "Uno"
+    And I should see "¡Hola!"
+    And I should see "¿Cómo se llama Usted?"
+    And I should see "Mi nombre es..."
+  When I start the survey in "he"
+  Then I should see "ידיעת שפה אחת אינה מספיקה"
+    And I should see "אחת"
+    And I should see "שלום"
+    And I should see "מה שמך?"
+    And I should see "שמי..."
+  When I start the survey in "ko"
+  Then I should see "한가지 언어로는 충분치 않습니다."
+    And I should see "하나"
+    And I should see "안녕하십니까"
+    And I should see "성함이 어떻게 되십니까?"
+    And I should see "제 이름은 ... 입니다"
+  When I start the survey
+  Then I should see "One language is never enough"
+    And I should see "One"
+    And I should see "Hello"
+    And I should see "What is your name?"
+    And I should see "My name is..."
+

data/features/step_definitions/parser_steps.rb

@@ -31,6 +31,13 @@ Then /^there should be (\d+) survey(?:s?) with:$/ do |x, table|
   end
 end
 
+Then /^there should be (\d+) translations with$/ do |x, table|
+  SurveyTranslation.count.should == x.to_i
+  table.hashes.each do |hash|
+    SurveyTranslation.find(:first, :conditions => hash).should_not be_nil
+  end
+end
+
 Then /^there should be (\d+) section(?:s?) with:$/ do |x, table|
   SurveySection.count.should == x.to_i
   table.hashes.each do |hash|

data/features/step_definitions/surveyor_steps.rb

@@ -11,12 +11,20 @@ end
 When /^I start the survey$/ do
   steps %Q{
     When I go to the surveys page
-     And I press "Take it"
+      And I press "Take it"
   }
   @survey_code       = current_path.split("/")[2] # /surveys/:survey_code/:response_set_code/take
   @response_set_code = current_path.split("/")[3] # /surveys/:survey_code/:response_set_code/take
 end
 
+When /^I start the survey in "(.*?)"$/ do |locale|
+    visit(available_surveys_path(:locale => locale))
+    steps %Q{
+      And I press "#{I18n.t 'surveyor.take_it'}"
+    }
+end
+
+
 # When I fill in the (nth) (string) for "(ref_id)" with "(value to fill)"
 When /^I fill in the (\d+[a-z]{0,2} )?(\w+) for "([^"]+)" with "([^"]+)"$/ do |index, type, answer_reference_id, value|
   answer = Answer.where(:reference_identifier => answer_reference_id).first
@@ -188,6 +196,23 @@ Then /^the JSON response at "(.*?)" should correspond to an answer with text "(.
   last_json.should be_json_eql(JsonSpec.remember("\"#{Answer.find_by_text(text).api_id}\"")).at_path(path)
 end
 
+Then /^the JSON representation for "(.*?)" should be:$/ do |title, string|
+  Survey.find_by_title(title).as_json.to_json.should be_json_eql(string)
+end
+
+Given /^I prefix the titles of exported surveys with "(.*?)"$/ do |prefix|
+  PREFIX = prefix
+  class Survey < ActiveRecord::Base
+    include Surveyor::Models::SurveyMethods
+    def filtered_for_json
+      dolly = self.clone
+      dolly.sections = self.sections
+      dolly.title = "#{PREFIX}#{dolly.title}"
+      dolly
+    end
+  end
+end
+
 ## Hidden and shown elements
 
 Then /the element "([^\"]*)" should be hidden$/ do |selector|
@@ -244,15 +269,22 @@ Given /^I replace question numbers with letters$/ do
   end
 end
 
-
 ## Various input elements
 
-Then /^I should see (\d+) textareas on the page$/ do |i|
-  page.has_css?('textarea', :count => i)
+Then /^I should see (\d+) textarea(?:s?) on the page$/ do |i|
+  page.has_css?('textarea', :count => i).should == true
+end
+
+Then /^I should see (\d+) text input(?:s?) on the page$/ do |i|
+  page.has_css?('input[type="text"]', :count => i).should == true
 end
 
-Then /^I should see (\d+) "(.*?)" input on the page$/ do |i, css_class|
-  page.has_css?("input.#{css_class}", :count => i)
+Then /^I should see no text input(?:s?) on the page$/ do
+  page.has_css?('input[type="text"]').should == false
+end
+
+Then /^I should see (\d+) "(.*?)" input(?:s?) on the page$/ do |i, css_class|
+  page.has_css?("input.#{css_class}", :count => i).should == true
 end
 
 Then /^I should see (\d+) select on the page$/ do |i|
@@ -284,3 +316,8 @@ end
 Then /^the question "(.*?)" should have correct answer "(.*?)"$/ do |q, a|
   Question.find_by_reference_identifier(q).correct_answer.reference_identifier.should == a
 end
+
+## for Rails 3.0
+Then /^I set the asset directory$/ do
+  ActionController::Base.helpers.config.assets_dir = "public" unless asset_pipeline_enabled?
+end

data/features/step_definitions/ui_steps.rb

@@ -1,3 +1,25 @@
 When /^I select "([^"]+)" as the datepicker's (\w+)$/ do |selection, type|
   page.find(".ui-datepicker-#{type}").select(selection)
 end
+
+When /^I click the first date field$/ do
+  first(:css, "input.date[type='text']").click
+end
+
+Then /^the first date field should contain "(.*?)"$/ do |value|
+  field_value = first(:css, "input.date[type='text']").value
+  if field_value.respond_to? :should
+    field_value.should =~ /#{value}/
+  else
+    assert_match(/#{value}/, field_value)
+  end
+end
+
+Then /^the first date field should not contain "(.*?)"$/ do |value|
+  field_value = first(:css, "input.date[type='text']").value
+  if field_value.respond_to? :should_not
+    field_value.should_not =~ /#{value}/
+  else
+    assert_no_match(/#{value}/, field_value)
+  end
+end

data/features/support/env.rb

@@ -6,6 +6,8 @@
 ENV["RAILS_ROOT"] ||= File.expand_path(File.dirname(__FILE__) + '/../../testbed')
 require 'cucumber/rails'
 
+# For Rails 3.0
+include Surveyor::Helpers::AssetPipeline
 
 # require File.expand_path(File.dirname(__FILE__) + '/../../testbed/config/environment.rb')
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In

data/features/support/hooks.rb

@@ -0,0 +1,4 @@
+AfterStep('@pause') do
+  print "Press Return to continue..."
+  STDIN.getc
+end

data/features/surveyor.feature

@@ -507,9 +507,10 @@ Feature: Survey creation
         end
       end
     """
+      And I set the asset directory
     When I start the "Images" survey
     Then I should see the image "/images/surveyor/next.gif"
-    And I should see the image "/images/surveyor/prev.gif"
+      And I should see the image "/images/surveyor/prev.gif"
 
   @javascript
   Scenario: Creating and unchecking checkboxes
@@ -777,3 +778,118 @@ Feature: Survey creation
       And I should see "the 2nd part of a round"
       And I should see "the 3rd part of a round"
       And I should see "the 4th part of a round"
+
+  Scenario: labels in groups
+    Given I parse
+    """
+      survey "Labels" do
+        section "One" do
+          group "Grouped" do
+            label "Grouped greetings"
+            a "Your response", :string
+          end
+          group "Inline group", :display_type => :inline do
+            label "Inline greetings"
+            a "Your response", :string
+          end
+          repeater "Repeater" do
+            label "Repeater greetings"
+            a "Your response", :string
+          end
+          grid "Grid" do
+            a "Grid response", :string
+            label "Grid greetings"
+          end
+        end
+      end
+    """
+    When I start the "Labels" survey
+    Then I should see "Grouped greetings"
+      And I should see "Inline greetings"
+      And I should see "Repeater greetings"
+      And I should see "Grid greetings"
+      And I should not see "Your response"
+      And I should see "Grid response"
+      And I should see no text inputs on the page
+
+  @javascript
+  Scenario: dates in pick one
+    Given I parse
+    """
+      survey "Dates" do
+        section "One" do
+          q_test_1 "When will you stop by?", :pick=>:one
+          a_date "On", :date, :custom_class => "date"
+          a_neg_1 "REFUSED"
+          a_neg_2 "DON'T KNOW"
+        end
+        section "Two" do
+          label "second section"
+        end
+      end
+    """
+    When I start the survey
+      And I click "On"
+      And I click the first date field
+      And I select "Mar" as the datepicker's month
+      And I select "2013" as the datepicker's year
+      And I follow "9"
+    Then there should be a date response with value "2013-03-09"
+    When I press "Two"
+      And I press "One"
+    Then the first date field should contain "2013-03-09"
+      And the first date field should not contain "2013-03-09 00:00:00.000000"
+
+  @javascript
+  Scenario: input mask and input mask placeholder
+    Given I parse
+    """
+      survey "Personal" do
+        section "One" do
+          q "What is your phone number?"
+          a "phone", :string, :input_mask => '(999)999-9999', :input_mask_placeholder => '#'
+        end
+      end
+    """
+    When  I start the "Personal" survey
+      And I fill in "phone" with "1234567890"
+      And I press "Click here to finish"
+    Then there should be 1 response set with 1 responses with:
+      | string_value  |
+      | (123)456-7890 |
+
+    @javascript
+    Scenario: numeric input mask with alphanumeric input
+    Given I parse
+    """
+      survey "Personal" do
+        section "One" do
+          q "What is your phone number?"
+          a 'phone', :string, :input_mask => '(999)999-9999'
+        end
+      end
+    """
+    When  I start the "Personal" survey
+      And I fill in "phone" with "1a2b3c4d5e6f7g8h9i0"
+      And I press "Click here to finish"
+    Then there should be 1 response set with 1 responses with:
+      | string_value  |
+      | (123)456-7890 |
+
+    @javascript
+    Scenario: alpha input mask with alphanumeric input
+    Given I parse
+    """
+      survey "Personal" do
+        section "One" do
+          q "What are your favorite letters?"
+          a 'letters', :string, :input_mask => 'aaaaaaaaa'
+        end
+      end
+    """
+    When  I start the "Personal" survey
+      And I fill in "letters" with "1a2b3c4d5e6f7g8h9i0"
+      And I press "Click here to finish"
+    Then there should be 1 response set with 1 responses with:
+      | string_value  |
+      | abcdefghi     |