surveyor 0.22.0 → 1.0.0

data/.gitignore

@@ -19,6 +19,7 @@ rdoc
 pkg
 Gemfile.lock
 reports
+chromedriver.log
 
 ## PROJECT::SPECIFIC
 testbed

data/.rspec

@@ -0,0 +1 @@
+--color -fn

data/CHANGELOG.md

@@ -0,0 +1,83 @@
+History for Surveyor
+====================
+
+1.0.0
+------
+
+### Features
+
+- Official support for Rails 3.2, including declaring of all mass-assignable
+  attributes with `attr_accessible`.
+
+- Breaking change: Surveys are now explicitly versioned. If you loaded a survey
+  when another survey with the same title/access code had already been loaded,
+  Surveyor would previously have appended a serial number to the title. As of
+  this version, Surveyor keeps the serial number in a separate `survey_version`
+  field. (#262)
+
+- Add encoding comments for generated files. (#329)
+
+- Asset pipeline support for Rails 3.1+. Rails 3.0 is still supported.
+  (#307, #314, #315)
+
+- Upgrade to Formtastic 2.1. (#227)
+
+- `:pick => :one` and `:pick => :any` questions may now have date, time,
+  datetime, integer, or float values, in addition to the already-supported
+  string values. (#207)
+
+- Added Survey#as_json, ResponseSet#as_json. (#291)
+
+- Changed defaults for and interpretation of for Survey#active_at and
+  Survey#inactive_at. (#258)
+
+- JSON export representation of DateTimes is 2010-04-08T10:30+00:00 and Dates is
+  2010-04-08 and Times is 10:30. (#355)
+
+- JSON representation of Response includes response_group. (#349)
+
+- Use Object#extend to inject SuryeyorParser and SurveyorRedcapParser methods into
+  instances of models instead of reopening classes. Move responsibility for keeping
+  track of and reporting duplicate and bad references from the models to the parsers.
+  Upgrade SurveyorRedcapParser to trace only when rake --trace is specified. (#341)
+
+- export Question#data_export_identifier, Answer#data_export_identifier,
+  Answer#reference_identifier in survey JSON export. (#368)
+
+### Fixes
+
+- Ensure response set is available to `render_context` (#320)
+
+- Hide dependent rows of grids. (#343)
+
+- Dependency condition with '!=' now returns true if there is no response. (#337)
+
+- Properly handle multiple "exclusive" checkboxes in a single question. (#336)
+
+- Correct storing of "correct" answers when parsing a survey. (#326)
+
+- Restore "slider" renderer. (#230)
+
+- Ensure that duplicate responses cannot be created by parallel AJAX requests.
+  (#328)
+
+- Create default identifiers in before_create, not in the initializer. (#369)
+
+- Eliminate unnecessary (and incorrect) access code uniqueness checks.
+  Use SecureRandom for generating access codes. (#370)
+
+- Use json_spec for testing JSON responses, instead of
+  Surveyor::Common#deep_compare_excluding_wildcards. (#350)
+
+- Parser now sets Question#correct_answer_id correctly. The association is changed from
+  Question :has_one correct_answer => Question :belongs_to correct_answer. (#365)
+
+### Infrastructure
+
+- Enabled Selenium-backed cucumber features in CI. (#333)
+
+- Added `testbed:surveys` task to load all sample surveys in the testbed.
+
+- Begin formal changelog.
+
+- Change test infra so that tx behavior can be tested. (#360)

data/Gemfile.rails_version

@@ -4,9 +4,15 @@
 if ENV['RAILS_VERSION']
   case ENV['RAILS_VERSION']
   when /3.0$/
-    gem 'rails', '~> 3.0.10'
+    gem 'rails', '~> 3.0.15'
   when /3.1$/
     gem 'rails', '~> 3.1.0'
+    # A JS runtime is required for Rails 3.1+
+    gem 'therubyracer'
+  when /3.2$/
+    gem 'rails', '~> 3.2.0'
+    # A JS runtime is required for Rails 3.1+
+    gem 'therubyracer'
   else
     fail "Unknown Rails version #{ENV['RAILS_VERSION']}"
   end

data/README.md

@@ -1,6 +1,10 @@
 # Surveys On Rails
 
-Surveyor is a ruby gem and developer tool that brings surveys into Rails applications. Surveys are written in the Surveyor DSL (Domain Specific Language). Before Rails 2.3, it was implemented as a Rails Engine. It also existed previously as a plugin. Today it is a gem only.
+Surveyor is a developer tool that brings surveys into Rails
+applications. Surveys are written in the Surveyor DSL (Domain Specific
+Language). Internally, Surveyor is a Rails engine distributed as a
+ruby gem, meaning it is straightforward to override or extend its
+behaviors in your Rails app without maintaining a fork.
 
 ## Why you might want to use Surveyor
 
@@ -55,7 +59,7 @@ The first question is "pick one" (radio buttons) with "other". The second questi
 
 # Installation
 
-1. Add surveyor to your Gemfile:
+Add surveyor to your Gemfile:
 
     gem "surveyor"
 
@@ -63,16 +67,16 @@ Then run:
 
     bundle install
 
-2. Generate assets, run migrations:
+Generate assets, run migrations:
 
     script/rails generate surveyor:install
-    rake db:migrate
+    bundle exec rake db:migrate
 
-3. Try out the "kitchen sink" survey. The rake task above generates surveys from our custom survey DSL (a good format for end users and stakeholders).
+Try out the "kitchen sink" survey. The rake task above generates surveys from our custom survey DSL (a good format for end users and stakeholders).
 
-    rake surveyor FILE=surveys/kitchen_sink_survey.rb
+    bundle exec rake surveyor FILE=surveys/kitchen_sink_survey.rb
 
-4. Start up your app and visit http://localhost:3000/surveys
+Start up your app and visit http://localhost:3000/surveys
 
 Try taking the survey and compare it to the contents of the DSL file kitchen\_sink\_survey.rb. See how the DSL maps to what you see.
 
@@ -82,14 +86,71 @@ There are two other useful rake tasks:
 * `rake surveyor:unparse` exports a survey from the application into a
   file in the surveyor DSL.
 
+# Upgrading
+
+When you are ready to update to the latest version of Surveyor, just do
+
+    bundle update surveyor
+
+and you'll get the latest version that bundler thinks you can use based on the
+constraints in your Gemfile.
+
+After you've installed a new version, you should always re-run the surveyor
+generator:
+
+    script/rails generate surveyor:install
+
+This will copy over any new or updated assets and new migrations. Use your VCS'
+utilities to review what's changed, then commit the new versions.
+
+    git status
+    git diff
+    [...]
+    git add -A
+    git commit
+
+If there were new migrations, you'll want to be sure to run them before the next
+time you start your app:
+
+    bundle exec rake db:migrate
+
+Finally, review the [changelog][] entries corresponding to the versions between
+your original version and the version you've updated to. There may be changes
+which will affect your customizations. There should be hints in the changelog
+or the referenced issues for what to update when necessary.
+
+[changelog]: https://github.com/NUBIC/surveyor/blob/master/CHANGELOG.md
+
+## Following master
+
+If you are following along with pre-release versions of Surveyor using a `:git`
+source in your Gemfile, be particularly careful about reviewing migrations after
+updating Surveyor and re-running the generator. We will never change a migration
+between two released versions of Surveyor. However, we may on rare occasions
+change a migration which has been merged into master. When this happens, you'll
+need to assess the differences and decide on an appropriate course of action for
+your app.
+
+If you aren't sure what this means, we do not recommend that you deploy an app
+that's locked to surveyor master into production.
+
 # Customizing surveyor
 
 Surveyor's controller, models, and views may be customized via classes in your app/models, app/helpers and app/controllers directories. To generate a sample custom controller and layout, run:
 
-`script/rails generate surveyor:custom`
+    script/rails generate surveyor:custom
 
 and read surveys/EXTENDING\_SURVEYOR
 
+# The asset pipeline
+
+Surveyor is now aware of the Rails asset pipeline (http://guides.rubyonrails.org/asset_pipeline.html). With the asset pipeline enabled `Rails.application.config.assets.enabled == true`, then the `surveyor:install` generator will generate `app/assets/stylesheets/surveyor_all.css` and `app/assets/javascripts/surveyor_all.js` manifest files and link them from the surveyor\_default layout.  Assets remain in the gem and are picked up for inclusion and pre-compilation from there if `config/environments/production.rb` is set to include surveyor assets.
+
+    # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+    config.assets.precompile += %w( surveyor_all.js surveyor_all.css )
+
+The previous copy-to-application behavior still exists in the case where the asset pipeline is missing or disabled.
+
 # PDF support
 
 * Add the following lines to your Gemfile:
@@ -120,17 +181,33 @@ or on OSX:
 
 # Requirements
 
-Surveyor depends on:
+Surveyor works with:
+
+* Ruby 1.8.7, 1.9.2, and 1.9.3
+* Rails 3.0-3.2
+
+Some key library dependencies are:
 
-* Ruby (1.8.7 - 1.9.2)
-* Rails 3.0-3.1
 * HAML
-* SASS
-* fastercsv (or CSV for ruby 1.9) for csv exports
-* formtastic
-* UUID
+* Sass
+* Formtastic
+
+A more exhaustive list can be found in the gemspec.
+
+# Support
+
+For general discussion (e.g., "how do I do this?"), please send a message to the
+[surveyor-dev][] group. This group is moderated to keep out spam; don't be
+surprised if your message isn't posted immediately.
 
-Specific versions of the gem dependencies are listed in the gemspec.
+For reproducible bugs, please file an issue on the [GitHub issue
+tracker][issues]. Please include a minimal test case (a detailed description of
+how to trigger the bug in a clean rails application). If you aren't sure how to
+isolate the bug, send a message to [surveyor-dev][] with what you know and we'll
+try to help.
+
+[surveyor-dev]: https://groups.google.com/group/surveyor-dev
+[issues]: https://github.com/NUBIC/surveyor/issues
 
 # Contributing, testing
 
@@ -155,4 +232,25 @@ to run the features and start writing tests!
 
 [bundler]: http://gembundler.com/
 
+## Selenium
+
+Some of Surveyor's integration tests use Selenium WebDriver and Capybara. The
+WebDriver-based tests default to running in Chrome due to an unfortunate
+[Firefox bug][FF566671]. For them to run, you'll either need:
+
+* Chrome and [chromedriver][] installed, or
+* to switch to use Firefox instead
+
+To use Firefox instead of Chrome, invoke one or more features with
+`SELENIUM_BROWSER` set in the environment:
+
+    $ SELENIUM_BROWSER=firefox bundle exec rake cucumber
+    $ SELENIUM_BROWSER=firefox bundle exec cucumber features/ajax_submissions.feature
+
+Note that when running features in Firefox, you must allow the WebDriver-driven
+Firefox to retain focus, otherwise some tests will fail.
+
+[FF566671]: https://bugzilla.mozilla.org/show_bug.cgi?id=566671
+[chromedriver]: http://code.google.com/p/selenium/wiki/ChromeDriver
+
 Copyright (c) 2008-2011 Brian Chamberlain and Mark Yoon, released under the MIT license

data/Rakefile

@@ -40,18 +40,14 @@ task :testbed => 'testbed:rebuild'
 namespace :testbed do
   desc 'Generate a minimal surveyor-using rails app'
   task :generate do
-    sh 'bundle exec rails new testbed'
+    sh 'bundle exec rails new testbed --skip-bundle' # don't run bundle install until the Gemfile modifications
     chdir('testbed') do
-      File.open('Gemfile', 'w') do |f|
-        f.puts %q{source :rubygems}
-        f.puts %q{plugin_root = File.expand_path('../..', __FILE__)}
-        f.puts %q{eval(File.read File.join(plugin_root, 'Gemfile.rails_version'))}
-        f.puts %q{gem 'sqlite3'}
-        f.puts %q{gem 'surveyor', :path => plugin_root}
-      end
+      gem_file_contents = File.read('Gemfile')
+      gem_file_contents.sub!(/^(gem 'rails'.*)$/, %Q{# \\1\nplugin_root = File.expand_path('../..', __FILE__)\neval(File.read File.join(plugin_root, 'Gemfile.rails_version'))\ngem 'surveyor', :path => plugin_root})
+      File.open('Gemfile', 'w'){|f| f.write(gem_file_contents) }
 
       Bundler.with_clean_env do
-        sh 'bundle update'
+        sh 'bundle install' # run bundle install after Gemfile modifications
       end
     end
   end
@@ -72,6 +68,16 @@ namespace :testbed do
   end
 
   task :rebuild => [:remove, :generate, :migrate]
+
+  desc 'Load all the sample surveys into the testbed instance'
+  task :surveys do
+    cd('testbed') do
+      Dir[File.join('surveys', '*.rb')].each do |fn|
+        puts "Installing #{fn} into the testbed"
+        system("rake surveyor FILE='#{fn}'")
+      end
+    end
+  end
 end
 
 ###### CI

data/app/inputs/quiet_input.rb

@@ -0,0 +1,5 @@
+class QuietInput < Formtastic::Inputs::HiddenInput
+  def to_html
+    super
+  end
+end

data/app/inputs/surveyor_check_boxes_input.rb

@@ -0,0 +1,35 @@
+class SurveyorCheckBoxesInput < Formtastic::Inputs::CheckBoxesInput
+  include Surveyor::Helpers::FormtasticCustomInput
+  def to_html
+    super
+  end
+  def choice_html(choice)
+    output = "" 
+    output << template.content_tag(:label,
+      hidden_fields? ?
+        check_box_with_hidden_input(choice) :
+        check_box_without_hidden_input(choice) <<
+      choice_label(choice),
+      label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
+    )
+    output << builder.text_field(:response_other, input_html_options_with(choice, :response_other)) if options[:response_class] == "other_and_string"
+    output << builder.text_field(response_class_to_method(options[:response_class]), input_html_options_with(choice, options[:response_class])) if %w(date datetime time float integer string other_and_string).include? options[:response_class]
+    output << builder.text_area(:text_value, input_html_options_with(choice, :text_value)) if options[:response_class] == "text"
+    output.html_safe
+  end
+  def checked?(value)
+    selected_values.include?(value.to_s)
+  end
+  def disabled?(value)
+    disabled_values.include?(value) || input_html_options[:disabled] == true
+  end
+  def make_selected_values
+    if object.respond_to?(method)
+      selected_items = [object.send(method)].compact.flatten.map(&:to_s)
+      
+      [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
+    else
+      []
+    end
+  end
+end

data/app/inputs/surveyor_radio_input.rb

@@ -0,0 +1,18 @@
+class SurveyorRadioInput < Formtastic::Inputs::RadioInput
+  include Surveyor::Helpers::FormtasticCustomInput
+  def to_html
+    super
+  end
+  def choice_html(choice)
+    output = "" 
+    output << template.content_tag(:label,
+      builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
+      choice_label(choice),
+      label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
+    )
+    output << builder.text_field(:response_other, input_html_options_with(choice, :response_other)) if options[:response_class] == "other_and_string"
+    output << builder.text_field(response_class_to_method(options[:response_class]), input_html_options_with(choice, options[:response_class])) if %w(date datetime time float integer string other_and_string).include? options[:response_class]
+    output << builder.text_area(:text_value, input_html_options_with(choice, :text_value)) if options[:response_class] == "text"
+    output.html_safe
+  end
+end

data/app/views/partials/_answer.html.haml

@@ -4,9 +4,9 @@
 - i = response_idx(q.pick != "one") # argument will be false (don't increment i) if we're on radio buttons
 - disabled = defined?(disableFlag) ? disableFlag : false
 = f.semantic_fields_for i, r do |ff|
-  = ff.quiet_input :question_id unless q.pick == "one" # don't repeat question_id if we're on radio buttons
-  = ff.quiet_input :id unless q.pick == "one" or r.new_record?
-  = ff.quiet_input :response_group, :value => rg if q.pick != "one" && g && g.display_type == "repeater"
+  = ff.input :question_id, :as => :quiet unless q.pick == "one" # don't repeat question_id if we're on radio buttons
+  = ff.input :api_id, :as => :quiet unless q.pick == "one"
+  = ff.input :response_group, :value => rg, :as => :quiet if q.pick != "one" && g && g.display_type == "repeater"
   - case q.pick
   - when "one"
     = ff.input :answer_id, :as => :surveyor_radio, :collection => [[a_text(a, nil, @render_context), a.id]], :label => false, :input_html => {:class => a.css_class, :disabled => disabled}, :response_class => a.response_class
@@ -14,7 +14,7 @@
     = ff.input :answer_id, :as => :surveyor_check_boxes, :collection => [[a_text(a, nil, @render_context), a.id]], :label => false, :input_html => {:class => a.css_class, :disabled => disabled}, :response_class => a.response_class
   - when "none"
     - if %w(date datetime time float integer string text).include? a.response_class
-      = ff.quiet_input :answer_id, :input_html => {:class => a.css_class, :value => a.id}
+      = ff.input :answer_id, :as => :quiet, :input_html => {:class => a.css_class, :value => a.id}
       = ff.input rc_to_attr(a.response_class), :as => rc_to_as(a.response_class), :label => a_text(a, :pre, @render_context).blank? ? false : a_text(a, :pre, @render_context), :hint => a_text(a, :post, @render_context), :input_html => generate_pick_none_input_html(r.as(a.response_class), a.default_value, a.css_class, a.response_class, disabled)
     - else
       = a_text(a, nil, @render_context)

data/app/views/partials/_question.html.haml

@@ -10,18 +10,18 @@
     - r = response_for(@response_set, q, nil, rg)
     - i = response_idx
     = f.semantic_fields_for i, r do |ff|
-      = ff.quiet_input :question_id
-      = ff.quiet_input :response_group, :value => rg if g && g.display_type == "repeater"
-      = ff.quiet_input :id unless r.new_record?
-      = ff.input :answer_id, :as => :select, :collection => q.answers.map{|a| [a.text, a.id]}, :label => q.text, :input_html => { :disabled => disabled }
+      = ff.input :question_id, :as => :quiet
+      = ff.input :response_group, :as => :quiet, :value => rg if g && g.display_type == "repeater"
+      = ff.input :api_id, :as => :quiet
+      = ff.input :answer_id, :as => :select, :collection => q.answers.map{|a| [a.text, a.id]}, :include_blank => (renderer != :slider), :label => q.text, :input_html => { :disabled => disabled }
   - else # :default, :inline, :inline_default
     - if q.pick == "one"
       - r = response_for(@response_set, q, nil, rg)
       - i = response_idx  # increment the response index since the answer partial skips for q.pick == one
       = f.semantic_fields_for i, r do |ff|
-        = ff.quiet_input :question_id
-        = ff.quiet_input :response_group, :value => rg if g && g.display_type == "repeater"
-        = ff.quiet_input :id unless r.new_record?
+        = ff.input :question_id, :as => :quiet
+        = ff.input :response_group, :as => :quiet, :value => rg if g && g.display_type == "repeater"
+        = ff.input :api_id, :as => :quiet
     - q.answers.each do |a|
       - next if (q.pick == "one" or q.pick == "any") and disabled and @response_set.responses.where( :question_id => q.id, :answer_id => a.id).empty? 
       = render a.custom_renderer || '/partials/answer', :q => q, :a => a, :f => f, :rg => rg, :g => g, :disableFlag => disabled

data/app/views/partials/_question_group.html.haml

@@ -6,7 +6,7 @@
       %li
         %table
           %col.pre
-          - qs.first.answers.each do |a| 
+          - qs.first.answers.each do |a|
             %col{:class => cycle("odd", "even")}
           %col.post
           %tbody
@@ -18,13 +18,14 @@
                 %th  
               - ten_questions.each_with_index do |q, i|
                 %tr{:id => "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}"}
-                  - if q.pick == "one"
-                    - r = response_for(@response_set, q, nil, g)
-                    - i = response_idx  # increment the response index since the answer partial skips for q.pick == one
-                    = f.semantic_fields_for i, r do |ff|
-                      = ff.quiet_input :question_id
-                      = ff.quiet_input :id unless r.new_record?
-                  %th= q.split_text(:pre)
+                  %th
+                    = q.split_text(:pre)
+                    - if q.pick == "one"
+                      - r = response_for(@response_set, q, nil, g)
+                      - i = response_idx  # increment the response index since the answer partial skips for q.pick == one
+                      = f.semantic_fields_for i, r do |ff|
+                        = ff.input :question_id, :as => :quiet
+                        = ff.input :api_id, :as => :quiet
                   - q.answers.each do |a|
                     %td= render a.custom_renderer || '/partials/answer', :g => g, :q => q, :a => a, :f => f
                   %th= q.split_text(:post)

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

@@ -1,36 +1,39 @@
 object @survey
 attribute :title
-attribute :api_id => :uuid
-node(:description,            :if => lambda {|s| !s.description.blank? }){|s| s.description }
-node(:reference_identifier,   :if => lambda {|s| !s.reference_identifier.blank? }){|s| s.reference_identifier }
+attribute :api_id                       => :uuid
+node(:description,                  :if => lambda {|s| !s.description.blank? }){|s| s.description }
+node(:reference_identifier,         :if => lambda {|s| !s.reference_identifier.blank? }){|s| s.reference_identifier }
 
 child :sections => :sections do
   attributes :title, :display_order
-  node(:description,            :if => lambda {|s| !s.description.blank? }){|s| s.description }
-  node(:reference_identifier,   :if => lambda {|s| !s.reference_identifier.blank? }){|s| s.reference_identifier }
-  
+  node(:description,                :if => lambda {|s| !s.description.blank? }){|s| s.description }
+  node(:reference_identifier,       :if => lambda {|s| !s.reference_identifier.blank? }){|s| s.reference_identifier }
+
   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?(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 }
-    node(:type,                 :if => lambda { |q| q.display_type != "default" }){ |q| q.display_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?(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 }
+    node(:data_export_identifier,   :if => lambda { |q| !q.data_export_identifier.blank? }){ |q| q.data_export_identifier }
+    node(:type,                     :if => lambda { |q| q.display_type != "default" }){ |q| q.display_type }
+
     # 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(: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) }
+
     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 }
+      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(:type, :if => lambda { |a| a.response_class != "answer" }){ |a| a.response_class }
+      node(:post_text,              :if => lambda { |a| !a.split_or_hidden_text(:post).blank? }){ |a| a.split_or_hidden_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 }
     end
-    
+
     # both questions and question_groups have dependencies
     child :dependency, :if => lambda { |q| q.dependency } do
       attributes :rule
@@ -41,7 +44,7 @@ child :sections => :sections do
         node(:value, :if => lambda { |d| d.answer && d.answer.response_class != "answer" && d.as(d.answer.response_class) }){ |d| d.as(d.answer.response_class)}
       end
     end
-    
+
     child(:questions, :if => lambda{|x| x.is_a?(QuestionGroup)}) do
       attributes :api_id => :uuid
       node(:text){ |q| q.split_text(:pre) }
@@ -50,7 +53,7 @@ child :sections => :sections do
       node(:reference_identifier, :if => lambda { |q| !q.reference_identifier.blank? }){ |q| q.reference_identifier }
       node(:type, :if => lambda { |q| q.display_type != "default" }){ |q| q.display_type }
       node(:pick, :if => lambda { |q| q.pick != "none" }){ |q| q.pick }
-  
+
       child :answers, :if => lambda { |q| !q.answers.blank? } do
         attributes :api_id => :uuid
         node(:help_text, :if => lambda { |a| !a.help_text.blank? }){ |a| a.help_text }
@@ -59,7 +62,7 @@ child :sections => :sections do
         node(:post_text, :if => lambda { |a| !a.split_or_hidden_text(:post).blank? }){ |a| a.split_or_hidden_text(:post) }
         node(:type, :if => lambda { |a| a.response_class != "answer" }){ |a| a.response_class }
       end
-  
+
       child :dependency, :if => lambda { |q| q.dependency } do
         attributes :rule
         child :dependency_conditions => :conditions do

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

@@ -7,13 +7,16 @@
   %br
   #survey_list
     %ul
-      - unless @surveys.empty?
-        - @surveys.each do |survey|
+      - unless @codes.empty?
+        - @codes.each do |access_code, values|
           %li
-            = form_tag(take_survey_path(:survey_code => survey.access_code)) do 
+            = form_tag take_survey_path(:survey_code => access_code) do 
               = hidden_field_tag :surveyor_javascript_enabled, false              
-
-              = survey.title
+        
+              = 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

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

@@ -4,11 +4,12 @@ attribute :created_at
 attribute :completed_at
 node(:survey_id){|rs| rs.survey.api_id }
 
-child :responses do
+child (@response_set.responses || []) => :responses do
   attribute :api_id => :uuid
   attribute :created_at
   attribute :updated_at => :modified_at
+  attribute :response_group
   node(:answer_id){|r| r.answer.api_id }
   node(:question_id){|r| r.question.api_id }
-  node(:value, :if => lambda{|r| r.answer.response_class != "answer"}){|r| r.as(r.answer.response_class) }
+  node(:value, :if => lambda{|r| r.answer.response_class != "answer"}){|r| r.json_value }
 end

data/ci-exec.sh

@@ -1,19 +1,25 @@
 #!/bin/bash -xe
 
-BUNDLER_VERSION=1.1.rc
+BUNDLER_VERSION=1.1.5
 GEMSET=surveyor
 
-export TMPDIR="`pwd`/tmp"
-mkdir -p tmp
+if [ -z $CI_RUBY ]; then
+    echo "CI_RUBY must be set"
+    exit 1
+fi
+
+# TMPDIR under the workspace causes gconfd-2 to stop responding and eat all
+# memory when Firefox is running for the Selenium tests. TMPDIR in user home
+# seems to work fine.
+export TMPDIR="${HOME}/tmp/surveyor-ci-${CI_RUBY}"
 
 if [ -n "${RAILS_VERSION}" ]; then
     GEMSET="${GEMSET}-${RAILS_VERSION}"
+    TMPDIR="${TMPDIR}-${RAILS_VERSION}"
 fi
 
-if [ -z $CI_RUBY ]; then
-    echo "CI_RUBY must be set"
-    exit 1
-fi
+rm -rf "${TMPDIR}"
+mkdir -p "${TMPDIR}"
 
 set +xe
 echo "Initializing RVM"

data/cucumber.yml

@@ -4,7 +4,7 @@ rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'pr
 std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
 %>
 default: <%= std_opts %> features
-wip: --tags @wip:3 --wip features
+wip: --tags @wip --wip features
 rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
-ci: --tags ~@wip --tags ~@javascript --format html --out reports/cucumber.html --format junit --out reports/cucumber-xml --format pretty --strict features
-ci_wip: --wip --tags @wip --tags ~@javascript --format html --out reports/cucumber_wip.html --format pretty features
+ci: --tags ~@wip --format html --out reports/cucumber.html --format junit --out reports/cucumber-xml --format pretty --strict features
+ci_wip: --wip --tags @wip --format html --out reports/cucumber_wip.html --format pretty features