surveyor 0.18.2 → 0.19.0

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.18.2"
+  s.version = "0.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-01-31}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
      "app/controllers/results_controller.rb",
      "app/controllers/surveyor_controller.rb",
      "app/helpers/results_helper.rb",
-     "app/helpers/survey_form_builder.rb",
      "app/helpers/surveyor_helper.rb",
      "app/models/answer.rb",
      "app/models/dependency.rb",
@@ -42,9 +41,11 @@ Gem::Specification.new do |s|
      "app/views/layouts/results.html.erb",
      "app/views/layouts/surveyor_default.html.erb",
      "app/views/partials/_answer.html.haml",
+     "app/views/partials/_dependents.html.haml",
      "app/views/partials/_question.html.haml",
      "app/views/partials/_question_group.html.haml",
      "app/views/partials/_section.html.haml",
+     "app/views/partials/_section_menu.html.haml",
      "app/views/results/index.html.erb",
      "app/views/results/show.html.erb",
      "app/views/surveyor/edit.html.haml",
@@ -52,75 +53,34 @@ Gem::Specification.new do |s|
      "app/views/surveyor/show.html.haml",
      "ci-env.sh",
      "config/routes.rb",
-     "features/redcap.feature",
+     "features/redcap_parser.feature",
+     "features/step_definitions/parser_steps.rb",
      "features/step_definitions/surveyor_steps.rb",
      "features/step_definitions/web_steps.rb",
      "features/support/REDCapDemoDatabase_DataDictionary.csv",
      "features/support/env.rb",
      "features/support/paths.rb",
      "features/surveyor.feature",
+     "features/surveyor_parser.feature",
      "generators/extend_surveyor/extend_surveyor_generator.rb",
      "generators/extend_surveyor/templates/EXTENDING_SURVEYOR",
      "generators/extend_surveyor/templates/extensions/surveyor_controller.rb",
      "generators/extend_surveyor/templates/extensions/surveyor_custom.html.erb",
      "generators/surveyor/surveyor_generator.rb",
      "generators/surveyor/templates/README",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_leftright.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_updown.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_close.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_doc.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_folder_closed.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_folder_open.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_minus.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_plus.gif",
-     "generators/surveyor/templates/assets/images/222222_11x11_icon_resize_se.gif",
-     "generators/surveyor/templates/assets/images/222222_35x9_colorpicker_indicator.gif.gif",
-     "generators/surveyor/templates/assets/images/222222_7x7_arrow_down.gif",
-     "generators/surveyor/templates/assets/images/222222_7x7_arrow_left.gif",
-     "generators/surveyor/templates/assets/images/222222_7x7_arrow_right.gif",
-     "generators/surveyor/templates/assets/images/222222_7x7_arrow_up.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_arrows_leftright.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_arrows_updown.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_close.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_doc.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_folder_closed.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_folder_open.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_minus.gif",
-     "generators/surveyor/templates/assets/images/454545_11x11_icon_plus.gif",
-     "generators/surveyor/templates/assets/images/454545_7x7_arrow_down.gif",
-     "generators/surveyor/templates/assets/images/454545_7x7_arrow_left.gif",
-     "generators/surveyor/templates/assets/images/454545_7x7_arrow_right.gif",
-     "generators/surveyor/templates/assets/images/454545_7x7_arrow_up.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_arrows_leftright.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_arrows_updown.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_close.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_doc.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_folder_closed.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_folder_open.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_minus.gif",
-     "generators/surveyor/templates/assets/images/888888_11x11_icon_plus.gif",
-     "generators/surveyor/templates/assets/images/888888_7x7_arrow_down.gif",
-     "generators/surveyor/templates/assets/images/888888_7x7_arrow_left.gif",
-     "generators/surveyor/templates/assets/images/888888_7x7_arrow_right.gif",
-     "generators/surveyor/templates/assets/images/888888_7x7_arrow_up.gif",
-     "generators/surveyor/templates/assets/images/dadada_40x100_textures_02_glass_75.png",
-     "generators/surveyor/templates/assets/images/e6e6e6_40x100_textures_02_glass_75.png",
-     "generators/surveyor/templates/assets/images/ffffff_40x100_textures_01_flat_0.png",
-     "generators/surveyor/templates/assets/images/ffffff_40x100_textures_02_glass_65.png",
-     "generators/surveyor/templates/assets/javascripts/accessibleUISlider.jQuery.js",
-     "generators/surveyor/templates/assets/javascripts/jquery-1.2.6.js",
-     "generators/surveyor/templates/assets/javascripts/jquery-ui-personalized-1.5.3.js",
-     "generators/surveyor/templates/assets/javascripts/jquery.form.js",
-     "generators/surveyor/templates/assets/javascripts/surveyor.js",
-     "generators/surveyor/templates/assets/stylesheets/jquery-ui-slider-additions.css",
+     "generators/surveyor/templates/assets/images/next.gif",
+     "generators/surveyor/templates/assets/images/prev.gif",
+     "generators/surveyor/templates/assets/javascripts/jquery.surveyor.js",
+     "generators/surveyor/templates/assets/javascripts/jquery.tools.min.js",
+     "generators/surveyor/templates/assets/stylesheets/dateinput.css",
      "generators/surveyor/templates/assets/stylesheets/reset.css",
      "generators/surveyor/templates/assets/stylesheets/results.css",
      "generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass",
-     "generators/surveyor/templates/assets/stylesheets/ui.theme.css",
      "generators/surveyor/templates/locales/surveyor_en.yml",
      "generators/surveyor/templates/locales/surveyor_es.yml",
      "generators/surveyor/templates/locales/surveyor_he.yml",
      "generators/surveyor/templates/migrate/add_correct_answer_id_to_questions.rb",
+     "generators/surveyor/templates/migrate/add_default_value_to_answers.rb",
      "generators/surveyor/templates/migrate/add_display_order_to_surveys.rb",
      "generators/surveyor/templates/migrate/add_index_to_response_sets.rb",
      "generators/surveyor/templates/migrate/add_index_to_surveys.rb",
@@ -141,6 +101,7 @@ Gem::Specification.new do |s|
      "generators/surveyor/templates/tasks/surveyor.rb",
      "hudson.rakefile",
      "init_testbed.rakefile",
+     "lib/formtastic/surveyor_builder.rb",
      "lib/surveyor.rb",
      "lib/surveyor/acts_as_response.rb",
      "lib/surveyor/common.rb",
@@ -163,6 +124,7 @@ Gem::Specification.new do |s|
      "rails/init.rb",
      "spec/controllers/surveyor_controller_spec.rb",
      "spec/factories.rb",
+     "spec/helpers/surveyor_helper_spec.rb",
      "spec/lib/common_spec.rb",
      "spec/lib/parser_spec.rb",
      "spec/lib/redcap_parser_spec.rb",
@@ -181,10 +143,8 @@ Gem::Specification.new do |s|
      "spec/rcov.opts",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/views/surveyor/show.html.haml_spec.rb",
      "surveyor.gemspec",
-     "testbed/Gemfile",
-     "uninstall.rb"
+     "testbed/Gemfile"
   ]
   s.homepage = %q{http://github.com/breakpointer/surveyor}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -194,6 +154,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/controllers/surveyor_controller_spec.rb",
      "spec/factories.rb",
+     "spec/helpers/surveyor_helper_spec.rb",
      "spec/lib/common_spec.rb",
      "spec/lib/parser_spec.rb",
      "spec/lib/redcap_parser_spec.rb",
@@ -209,8 +170,7 @@ Gem::Specification.new do |s|
      "spec/models/survey_spec.rb",
      "spec/models/validation_condition_spec.rb",
      "spec/models/validation_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/views/surveyor/show.html.haml_spec.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -220,15 +180,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
+      s.add_runtime_dependency(%q<formtastic>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
+      s.add_dependency(%q<formtastic>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
+    s.add_dependency(%q<formtastic>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

data/testbed/Gemfile

@@ -9,5 +9,6 @@ gem 'cucumber', '~> 0.8.0'
 gem 'cucumber-rails'
 gem 'database_cleaner'
 gem 'factory_girl'
+gem 'formtastic'
 
 gem 'surveyor', :path => ".."

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 18
-  - 2
-  version: 0.18.2
+  - 19
+  - 0
+  version: 0.19.0
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -06:00
+date: 2011-01-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: formtastic
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,8 +59,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: yoon@northwestern.edu
 executables: []
@@ -80,7 +94,6 @@ files:
 - app/controllers/results_controller.rb
 - app/controllers/surveyor_controller.rb
 - app/helpers/results_helper.rb
-- app/helpers/survey_form_builder.rb
 - app/helpers/surveyor_helper.rb
 - app/models/answer.rb
 - app/models/dependency.rb
@@ -97,9 +110,11 @@ files:
 - app/views/layouts/results.html.erb
 - app/views/layouts/surveyor_default.html.erb
 - app/views/partials/_answer.html.haml
+- app/views/partials/_dependents.html.haml
 - app/views/partials/_question.html.haml
 - app/views/partials/_question_group.html.haml
 - app/views/partials/_section.html.haml
+- app/views/partials/_section_menu.html.haml
 - app/views/results/index.html.erb
 - app/views/results/show.html.erb
 - app/views/surveyor/edit.html.haml
@@ -107,75 +122,34 @@ files:
 - app/views/surveyor/show.html.haml
 - ci-env.sh
 - config/routes.rb
-- features/redcap.feature
+- features/redcap_parser.feature
+- features/step_definitions/parser_steps.rb
 - features/step_definitions/surveyor_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/REDCapDemoDatabase_DataDictionary.csv
 - features/support/env.rb
 - features/support/paths.rb
 - features/surveyor.feature
+- features/surveyor_parser.feature
 - generators/extend_surveyor/extend_surveyor_generator.rb
 - generators/extend_surveyor/templates/EXTENDING_SURVEYOR
 - generators/extend_surveyor/templates/extensions/surveyor_controller.rb
 - generators/extend_surveyor/templates/extensions/surveyor_custom.html.erb
 - generators/surveyor/surveyor_generator.rb
 - generators/surveyor/templates/README
-- generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_leftright.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_arrows_updown.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_close.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_doc.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_folder_closed.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_folder_open.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_minus.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_plus.gif
-- generators/surveyor/templates/assets/images/222222_11x11_icon_resize_se.gif
-- generators/surveyor/templates/assets/images/222222_35x9_colorpicker_indicator.gif.gif
-- generators/surveyor/templates/assets/images/222222_7x7_arrow_down.gif
-- generators/surveyor/templates/assets/images/222222_7x7_arrow_left.gif
-- generators/surveyor/templates/assets/images/222222_7x7_arrow_right.gif
-- generators/surveyor/templates/assets/images/222222_7x7_arrow_up.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_arrows_leftright.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_arrows_updown.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_close.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_doc.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_folder_closed.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_folder_open.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_minus.gif
-- generators/surveyor/templates/assets/images/454545_11x11_icon_plus.gif
-- generators/surveyor/templates/assets/images/454545_7x7_arrow_down.gif
-- generators/surveyor/templates/assets/images/454545_7x7_arrow_left.gif
-- generators/surveyor/templates/assets/images/454545_7x7_arrow_right.gif
-- generators/surveyor/templates/assets/images/454545_7x7_arrow_up.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_arrows_leftright.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_arrows_updown.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_close.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_doc.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_folder_closed.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_folder_open.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_minus.gif
-- generators/surveyor/templates/assets/images/888888_11x11_icon_plus.gif
-- generators/surveyor/templates/assets/images/888888_7x7_arrow_down.gif
-- generators/surveyor/templates/assets/images/888888_7x7_arrow_left.gif
-- generators/surveyor/templates/assets/images/888888_7x7_arrow_right.gif
-- generators/surveyor/templates/assets/images/888888_7x7_arrow_up.gif
-- generators/surveyor/templates/assets/images/dadada_40x100_textures_02_glass_75.png
-- generators/surveyor/templates/assets/images/e6e6e6_40x100_textures_02_glass_75.png
-- generators/surveyor/templates/assets/images/ffffff_40x100_textures_01_flat_0.png
-- generators/surveyor/templates/assets/images/ffffff_40x100_textures_02_glass_65.png
-- generators/surveyor/templates/assets/javascripts/accessibleUISlider.jQuery.js
-- generators/surveyor/templates/assets/javascripts/jquery-1.2.6.js
-- generators/surveyor/templates/assets/javascripts/jquery-ui-personalized-1.5.3.js
-- generators/surveyor/templates/assets/javascripts/jquery.form.js
-- generators/surveyor/templates/assets/javascripts/surveyor.js
-- generators/surveyor/templates/assets/stylesheets/jquery-ui-slider-additions.css
+- generators/surveyor/templates/assets/images/next.gif
+- generators/surveyor/templates/assets/images/prev.gif
+- generators/surveyor/templates/assets/javascripts/jquery.surveyor.js
+- generators/surveyor/templates/assets/javascripts/jquery.tools.min.js
+- generators/surveyor/templates/assets/stylesheets/dateinput.css
 - generators/surveyor/templates/assets/stylesheets/reset.css
 - generators/surveyor/templates/assets/stylesheets/results.css
 - generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass
-- generators/surveyor/templates/assets/stylesheets/ui.theme.css
 - generators/surveyor/templates/locales/surveyor_en.yml
 - generators/surveyor/templates/locales/surveyor_es.yml
 - generators/surveyor/templates/locales/surveyor_he.yml
 - generators/surveyor/templates/migrate/add_correct_answer_id_to_questions.rb
+- generators/surveyor/templates/migrate/add_default_value_to_answers.rb
 - generators/surveyor/templates/migrate/add_display_order_to_surveys.rb
 - generators/surveyor/templates/migrate/add_index_to_response_sets.rb
 - generators/surveyor/templates/migrate/add_index_to_surveys.rb
@@ -196,6 +170,7 @@ files:
 - generators/surveyor/templates/tasks/surveyor.rb
 - hudson.rakefile
 - init_testbed.rakefile
+- lib/formtastic/surveyor_builder.rb
 - lib/surveyor.rb
 - lib/surveyor/acts_as_response.rb
 - lib/surveyor/common.rb
@@ -218,6 +193,7 @@ files:
 - rails/init.rb
 - spec/controllers/surveyor_controller_spec.rb
 - spec/factories.rb
+- spec/helpers/surveyor_helper_spec.rb
 - spec/lib/common_spec.rb
 - spec/lib/parser_spec.rb
 - spec/lib/redcap_parser_spec.rb
@@ -236,10 +212,8 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/views/surveyor/show.html.haml_spec.rb
 - surveyor.gemspec
 - testbed/Gemfile
-- uninstall.rb
 has_rdoc: true
 homepage: http://github.com/breakpointer/surveyor
 licenses: []
@@ -277,6 +251,7 @@ summary: A rails (gem) plugin to enable surveys in your application
 test_files: 
 - spec/controllers/surveyor_controller_spec.rb
 - spec/factories.rb
+- spec/helpers/surveyor_helper_spec.rb
 - spec/lib/common_spec.rb
 - spec/lib/parser_spec.rb
 - spec/lib/redcap_parser_spec.rb
@@ -293,4 +268,3 @@ test_files:
 - spec/models/validation_condition_spec.rb
 - spec/models/validation_spec.rb
 - spec/spec_helper.rb
-- spec/views/surveyor/show.html.haml_spec.rb

data/app/helpers/survey_form_builder.rb

@@ -1,37 +0,0 @@
-class SurveyFormBuilder < ActionView::Helpers::FormBuilder 
-  def survey_check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
-    fields = @template.survey_check_box(@object_name, method, options.merge(:object => @object), checked_value, unchecked_value)
-    fields[1]
-  end
-end
-
-module ActionView
-  module Helpers
-    module FormHelper
-      def survey_check_box(object_name, method, options = {}, checked_value = "1", unchecked_value = "0")
-        if (Rails::VERSION::STRING.to_f > 2.1)
-          InstanceTag.new(object_name, method, self, options.delete(:object)).to_survey_check_box_tag(options, checked_value, unchecked_value)
-        else
-          InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_survey_check_box_tag(options, checked_value, unchecked_value)
-        end
-      end
-    end
-
-    class InstanceTag
-      def to_survey_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
-        options = options.stringify_keys
-        options["type"]     = "checkbox"
-        options["value"]    = checked_value
-        if options.has_key?("checked")
-          cv = options.delete "checked"
-          checked = cv == true || cv == "checked"
-        else
-          checked = self.class.check_box_checked?(value(object), checked_value)
-        end
-        options["checked"] = "checked" if checked
-        add_default_name_and_id(options)
-        [tag("input", "name" => options["name"], "type" => "hidden", "value" => unchecked_value), tag("input", options)]
-      end
-    end
-  end
-end