surveyor 0.18.0 → 0.18.1

data/.gitignore

@@ -1,8 +1,25 @@
-*.sw?
+## MAC OS
 .DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
 coverage
 rdoc
 pkg
-spec/test_app/**
-.bundle
-surveys/fixtures/*.yml
+
+## PROJECT::SPECIFIC
+testbed/log/*.log
+testbed/db/*
+testbed/.bundle
+surveys/fixtures/*.yml

data/CHANGELOG

@@ -1,3 +1,22 @@
+0.18.1
+
+* group dependencies. closes #96
+* fixing grid answers error with parser. closes #95
+* prevent double inclusion of validations
+* cleaner setup for hudson
+* only resolve dependencies during redcap parsing
+* forgot to uncomment
+* fix hudson env setup
+* setup hudson env after rails
+* add hudson env to testbed init
+* ci setup
+* changing path for features files with new testbed
+* don't double include model methods in unparser
+* new testbed setup
+* don't double include model methods in unparser
+* don't double include model methods in redcap parser
+* don't double include model methods
+
 0.18.0
 
 * finalizing redcap feature. parse dependencies. closes #93

data/README.md

@@ -97,9 +97,8 @@ Surveyor depends on Ruby (1.8.7 - 1.9.1), Rails 2.3 and HAML/SASS http://haml.ha
 
 To work on the code fork this github project. Run:
 
-`bundler install`
-`rake testbed`
+`rake -f init_testbed.rakefile`
 
-and start writing tests!
+which will generate a test app in testbed. Run rake spec and rake cucumber there, and start writing tests!
 
 Copyright (c) 2008-2010 Brian Chamberlain and Mark Yoon, released under the MIT license

data/Rakefile

@@ -11,106 +11,19 @@ begin
     gem.authors = ["Brian Chamberlain", "Mark Yoon"]
     gem.add_dependency 'haml'
     gem.add_dependency 'fastercsv'
+    gem.add_development_dependency "yard", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
-
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
+  require 'yard'
+  YARD::Rake::YardocTask.new
 rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
-
-desc "Set up a rails app for testing in the spec dir"
-task :testbed => [:"testbed:build_app", :"testbed:copy_files", :"testbed:install_surveyor"]
-
-namespace "testbed" do
-  RAPPNAME = "test_app" #This is also hardcoded in the spec/spec_helper.rb and gitignore file. Change it there too...
-  
-  "Generate rails app in spec dir"
-  task :build_app do
-    directory "spec"
-    chdir("spec") do
-      sh "rails #{RAPPNAME}"
-      puts "Put a test_app in the spec folder"
-      chdir("#{RAPPNAME}") do
-        sh "ruby script/generate rspec"
-        puts "Ran installer for rspec in #{RAPPNAME}"
-        sh "ruby script/generate cucumber --webrat"
-        puts "Ran installer for cucumber in #{RAPPNAME}"
-      end
-    end
-  end
- 
-  desc "Copy in setup files to test app"
-  task :copy_files do
-    chdir("spec/#{RAPPNAME}") do
-      sh "cp ../test_Gemfile Gemfile"
-      sh "cp ../test_preinitializer.rb config/preinitializer.rb"
-      sh "cp ../test_boot.rb config/boot.rb"
-      puts "NOTE: These files were created/modified as described here: http://gembundler.com/rails23.html"
-    end
-  end
-
-  desc "Install surveyor in test app, run migrations, prep test db"
-  task :install_surveyor do
-    sh "gem install surveyor"
-    chdir("spec/#{RAPPNAME}") do
-      sh "bundle install"
-      sh "bundle exec script/generate surveyor"
-      sh "rake db:migrate"
-      sh "rake db:test:prepare"
-    end
-    # I don't think this is needed anymore
-    puts "NOTE: We installed the surveyor gem using 'gem install surveyor' to fix a problem where RVM (or bundler or both) don't let Rails see generators in a gem. ('script/generate surveyor' for example). To remove the gem run `gem uninstall surveyor` to remove the gem version of surveyor leaving the dev version" # Getting around a bug/problem in bundler. see: http://bit.ly/9NZOEz
-  end
-
-  desc "Remove rails test app from spec dir"
-  task :remove do
-    puts "Removing the test_app in the spec folder"
-    sh "rm -rf spec/#{RAPPNAME}"
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
-end # namespace
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList.new('spec/**/*_spec.rb') do |fl|
-    fl.exclude(/vendor\/plugins/) #excluding the stuff inthe embedded rails app
-    fl.exclude(/unparse/) #not sure why but this breaks a bunch of specs
-  end
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
-
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "surveyor #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-

data/VERSION

@@ -1 +1 @@
-0.18.0
+0.18.1

data/ci-env.sh

@@ -0,0 +1,29 @@
+######
+# This is not an executable script.  It selects and configures rvm for
+# bcsec's CI process based on the RVM_RUBY environment variable.
+#
+# Use it by sourcing it:
+#
+#  . ci-env.sh
+#
+# Assumes that the create-on-use settings are set in your ~/.rvmrc:
+#
+#  rvm_install_on_use_flag=1
+#  rvm_gemset_create_on_use_flag=1
+#
+# Hudson Build Execute Shell Commands:
+#
+# source ci-env.sh
+# rake -f hudson.rakefile --trace
+# cd testbed
+# export RAILS_ENV="hudson"
+# bundle exec rake spec cucumber
+
+export rvm_gemset_create_on_use_flag=1
+export rvm_project_rvmrc=0
+
+set +xe
+echo "Loading RVM ree@surveyor-dev"
+source ~/.rvm/scripts/rvm
+rvm use ree@surveyor-dev
+set -xe

data/features/step_definitions/surveyor_steps.rb

@@ -3,7 +3,7 @@ Given /^I parse$/ do |string|
 end
 
 Given /^I parse redcap file "([^"]*)"$/ do |name|
-  Surveyor::RedcapParser.parse File.read(File.join(RAILS_ROOT, '..', '..', 'features', 'support', name)), 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|
@@ -44,6 +44,16 @@ Then /^there should be (\d+) dependenc(?:y|ies) with:$/ do |x, table|
   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|

data/features/step_definitions/web_steps.rb

@@ -6,6 +6,7 @@
 
 
 require 'uri'
+require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
 # Commonly used webrat steps
@@ -19,23 +20,23 @@ When /^(?:|I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^(?:|I )press "([^\"]*)"$/ do |button|
+When /^(?:|I )press "([^"]*)"$/ do |button|
   click_button(button)
 end
 
-When /^(?:|I )follow "([^\"]*)"$/ do |link|
+When /^(?:|I )follow "([^"]*)"$/ do |link|
   click_link(link)
 end
 
-When /^(?:|I )follow "([^\"]*)" within "([^\"]*)"$/ do |link, parent|
+When /^(?:|I )follow "([^"]*)" within "([^"]*)"$/ do |link, parent|
   click_link_within(parent, link)
 end
 
-When /^(?:|I )fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
   fill_in(field, :with => value)
 end
 
-When /^(?:|I )fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
   fill_in(field, :with => value)
 end
 
@@ -56,13 +57,13 @@ When /^(?:|I )fill in the following:$/ do |fields|
   end
 end
 
-When /^(?:|I )select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
+When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
   select(value, :from => field)
 end
 
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time
-When /^(?:|I )select "([^\"]*)" as the date and time$/ do |time|
+When /^(?:|I )select "([^"]*)" as the date and time$/ do |time|
   select_datetime(time)
 end
 
@@ -75,7 +76,7 @@ end
 # The following steps would fill out the form:
 # When I select "November 23, 2004 11:20" as the "Preferred" date and time
 # And I select "November 25, 2004 10:30" as the "Alternative" date and time
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
+When /^(?:|I )select "([^"]*)" as the "([^"]*)" date and time$/ do |datetime, datetime_label|
   select_datetime(datetime, :from => datetime_label)
 end
 
@@ -83,46 +84,46 @@ end
 # When I select "2:20PM" as the time
 # Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
 # will convert the 2:20PM to 14:20 and then select it.
-When /^(?:|I )select "([^\"]*)" as the time$/ do |time|
+When /^(?:|I )select "([^"]*)" as the time$/ do |time|
   select_time(time)
 end
 
 # Use this step when using multiple time_select helpers on a page or you want to
 # specify the name of the time on the form.  For example:
 # When I select "7:30AM" as the "Gym" time
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
+When /^(?:|I )select "([^"]*)" as the "([^"]*)" time$/ do |time, time_label|
   select_time(time, :from => time_label)
 end
 
 # Use this step in conjunction with Rail's date_select helper.  For example:
 # When I select "February 20, 1981" as the date
-When /^(?:|I )select "([^\"]*)" as the date$/ do |date|
+When /^(?:|I )select "([^"]*)" as the date$/ do |date|
   select_date(date)
 end
 
 # Use this step when using multiple date_select helpers on one page or
 # you want to specify the name of the date on the form. For example:
 # When I select "April 26, 1982" as the "Date of Birth" date
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
+When /^(?:|I )select "([^"]*)" as the "([^"]*)" date$/ do |date, date_label|
   select_date(date, :from => date_label)
 end
 
-When /^(?:|I )check "([^\"]*)"$/ do |field|
+When /^(?:|I )check "([^"]*)"$/ do |field|
   check(field)
 end
 
-When /^(?:|I )uncheck "([^\"]*)"$/ do |field|
+When /^(?:|I )uncheck "([^"]*)"$/ do |field|
   uncheck(field)
 end
 
-When /^(?:|I )choose "([^\"]*)"$/ do |field|
+When /^(?:|I )choose "([^"]*)"$/ do |field|
   choose(field)
 end
 
 # Adds support for validates_attachment_content_type. Without the mime-type getting
 # passed to attach_file() you will get a "Photo file is not one of the allowed file types."
 # error message 
-When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"$/ do |path, field|
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
   type = path.split(".")[1]
 
   case type
@@ -139,17 +140,17 @@ When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"$/ do |path, field|
   attach_file(field, path, type)
 end
 
-Then /^(?:|I )should see "([^\"]*)"$/ do |text|
-  if defined?(Spec::Rails::Matchers)
+Then /^(?:|I )should see "([^"]*)"$/ do |text|
+  if response.respond_to? :should
     response.should contain(text)
   else
     assert_contain text
   end
 end
 
-Then /^(?:|I )should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
+Then /^(?:|I )should see "([^"]*)" within "([^"]*)"$/ do |text, selector|
   within(selector) do |content|
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should
       content.should contain(text)
     else
       hc = Webrat::Matchers::HasContent.new(text)
@@ -160,17 +161,17 @@ end
 
 Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  if defined?(Spec::Rails::Matchers)
+  if response.respond_to? :should
     response.should contain(regexp)
   else
     assert_match(regexp, response_body)
   end
 end
 
-Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
+Then /^(?:|I )should see \/([^\/]*)\/ within "([^"]*)"$/ do |regexp, selector|
   within(selector) do |content|
     regexp = Regexp.new(regexp)
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should
       content.should contain(regexp)
     else
       assert_match(regexp, content)
@@ -178,17 +179,17 @@ Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
   end
 end
 
-Then /^(?:|I )should not see "([^\"]*)"$/ do |text|
-  if defined?(Spec::Rails::Matchers)
+Then /^(?:|I )should not see "([^"]*)"$/ do |text|
+  if response.respond_to? :should_not
     response.should_not contain(text)
   else
     assert_not_contain(text)
   end
 end
 
-Then /^(?:|I )should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
+Then /^(?:|I )should not see "([^"]*)" within "([^"]*)"$/ do |text, selector|
   within(selector) do |content|
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should_not
       content.should_not contain(text)
     else
       hc = Webrat::Matchers::HasContent.new(text)
@@ -199,17 +200,17 @@ end
 
 Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  if defined?(Spec::Rails::Matchers)
+  if response.respond_to? :should_not
     response.should_not contain(regexp)
   else
     assert_not_contain(regexp)
   end
 end
 
-Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
+Then /^(?:|I )should not see \/([^\/]*)\/ within "([^"]*)"$/ do |regexp, selector|
   within(selector) do |content|
     regexp = Regexp.new(regexp)
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should_not
       content.should_not contain(regexp)
     else
       assert_no_match(regexp, content)
@@ -217,51 +218,58 @@ Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, select
   end
 end
 
-Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(field).value.should =~ /#{value}/
+Then /^the "([^"]*)" field should contain "([^"]*)"$/ do |field, value|
+  field_value = field_labeled(field).value
+  if field_value.respond_to? :should
+    field_value.should =~ /#{value}/
   else
-    assert_match(/#{value}/, field_labeled(field).value)
+    assert_match(/#{value}/, field_value)
   end
 end
 
-Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(field).value.should_not =~ /#{value}/
+Then /^the "([^"]*)" field should not contain "([^"]*)"$/ do |field, value|
+  field_value = field_labeled(field).value
+  if field_value.respond_to? :should_not
+    field_value.should_not =~ /#{value}/
   else
-    assert_no_match(/#{value}/, field_labeled(field).value)
+    assert_no_match(/#{value}/, field_value)
   end
 end
 
-Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(label).should be_checked
+Then /^the "([^"]*)" checkbox should be checked$/ do |label|
+  field = field_labeled(label)
+  if field.respond_to? :should
+    field.should be_checked
   else
-    assert field_labeled(label).checked?
+    assert field.checked?
   end
 end
 
-Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(label).should_not be_checked
+Then /^the "([^"]*)" checkbox should not be checked$/ do |label|
+  field = field_labeled(label)
+  if field.respond_to? :should_not
+    field.should_not be_checked
   else
-    assert !field_labeled(label).checked?
+    assert !field.checked?
   end
 end
 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
-  if defined?(Spec::Rails::Matchers)
-    URI.parse(current_url).path.should == path_to(page_name)
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
   else
-    assert_equal path_to(page_name), URI.parse(current_url).path
+    assert_equal path_to(page_name), current_path
   end
 end
 
 Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  actual_params   = CGI.parse(URI.parse(current_url).query)
-  expected_params = Hash[expected_pairs.rows_hash.map{|k,v| [k,[v]]}]
- 
-  if defined?(Spec::Rails::Matchers)
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+
+  if actual_params.respond_to? :should
     actual_params.should == expected_params
   else
     assert_equal expected_params, actual_params
@@ -270,4 +278,4 @@ end
 
 Then /^show me the page$/ do
   save_and_open_page
-end
+end