surveyor 0.18.0 → 0.18.1

data/features/support/env.rb

@@ -5,7 +5,7 @@
 # files.
 
 ENV["RAILS_ENV"] ||= "cucumber"
-require File.expand_path(File.dirname(__FILE__) + '/../../spec/test_app/config/environment')
+require File.expand_path(File.dirname(__FILE__) + '/../../testbed/config/environment')
 
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'cucumber/rails/world'
@@ -15,4 +15,42 @@ require 'cucumber/web/tableish'
 require 'webrat'
 require 'webrat/core/matchers'
 
-# Since we're using the test_app, and it has cucumber installed we don't need to do any configuration here.
+Webrat.configure do |config|
+  config.mode = :rails
+  config.open_error_files = false # Set to true if you want error pages to pop up in the browser
+end
+
+
+# If you set this to false, any error raised from within your app will bubble 
+# up to your step definition and out to cucumber unless you catch it somewhere
+# on the way. You can make Rails rescue errors and render error pages on a
+# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+#
+# If you set this to true, Rails will rescue all errors and render error
+# pages, more or less in the same way your application would behave in the
+# default production environment. It's not recommended to do this for all
+# of your scenarios, as this makes it hard to discover errors in your application.
+ActionController::Base.allow_rescue = false
+
+# If you set this to true, each scenario will run in a database transaction.
+# You can still turn off transactions on a per-scenario basis, simply tagging 
+# a feature or scenario with the @no-txn tag. If you are using Capybara,
+# tagging with @culerity or @javascript will also turn transactions off.
+#
+# If you set this to false, transactions will be off for all scenarios,
+# regardless of whether you use @no-txn or not.
+#
+# Beware that turning transactions off will leave data in your database 
+# after each scenario, which can lead to hard-to-debug failures in 
+# subsequent scenarios. If you do this, we recommend you create a Before
+# block that will explicitly put your database in a known state.
+Cucumber::Rails::World.use_transactional_fixtures = true
+# How to clean your database when transactions are turned off. See
+# http://github.com/bmabey/database_cleaner for more info.
+if defined?(ActiveRecord::Base)
+  begin
+    require 'database_cleaner'
+    DatabaseCleaner.strategy = :truncation
+  rescue LoadError => ignore_if_database_cleaner_not_present
+  end
+end

data/features/support/paths.rb

@@ -7,7 +7,7 @@ module NavigationHelpers
   #
   def path_to(page_name)
     case page_name
-    
+
     when /the home\s?page/
       '/'
     
@@ -18,8 +18,16 @@ module NavigationHelpers
     #     user_profile_path(User.find_by_login($1))
 
     else
-      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-        "Now, go and add a mapping in #{__FILE__}"
+      begin
+        page_name =~ /the (.*) page/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue Object => e
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
     end
   end
-end
+end
+
+World(NavigationHelpers)

data/features/surveyor.feature

@@ -155,3 +155,37 @@ Feature: Survey creation
     And there should be 2 validation_conditions with:
       | rule_key | integer_value |
       | A        | 0             |
+  Scenario: Group dependencies
+    Given I parse
+    """
+      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
+        end
+      end
+    """
+    And there should be 1 group dependency with:
+      | rule |
+      | A    |
+      
+    

data/generators/surveyor/surveyor_generator.rb

@@ -5,7 +5,7 @@ class SurveyorGenerator < Rails::Generator::Base
       m.directory "surveys"
       
       # Copy README to your app
-      m.file "../../../README.md", "surveys/README.md"
+      # m.file "../../../README.md", "surveys/README.md"
           
       # Gem plugin rake tasks
       m.file "tasks/surveyor.rb", "lib/tasks/surveyor.rb"

data/hudson.rakefile

@@ -0,0 +1,33 @@
+BUNDLER_VERSION="1.0.7"
+import 'init_testbed.rakefile'
+
+namespace :bundle do
+  task :ensure_bundler_available do
+    `gem list -i bundler -v '=#{BUNDLER_VERSION}'`
+    unless $? == 0
+      puts bordered_message("Installing bundler #{BUNDLER_VERSION}")
+      system("gem install bundler -v '=#{BUNDLER_VERSION}' --no-ri --no-rdoc")
+      unless $? == 0
+        fail bordered_message("Install failed.\nPlease fix the problem and try again or manually install bundler #{BUNDLER_VERSION}.")
+      end
+    end
+  end
+
+  def bordered_message(msg)
+    len = msg.split("\n").collect { |l| l.size }.max
+    ['=' * len, msg, '=' * len].join("\n")
+  end
+end
+namespace :ci do
+  task :generate_testbed_for_hudson => [:'testbed:remove', :'testbed:generate'] do
+    # Hudson
+    chdir("testbed") do
+      database_yml = File.read('config/database.yml') + "\n\nhudson:\n  <<: *test\n"
+      File.open('config/database.yml', 'w'){|f| f.write database_yml}
+      sh "cp config/environments/cucumber.rb config/environments/hudson.rb"
+    end
+  end
+  task :setup_testbed_for_hudson => [:'testbed:setup', :'testbed:migrate']
+end
+
+task :default => [:'bundle:ensure_bundler_available', :'ci:generate_testbed_for_hudson', :'ci:setup_testbed_for_hudson']

data/init_testbed.rakefile

@@ -0,0 +1,55 @@
+desc "Set up a rails app for testing in the spec dir"
+task :default => [:"testbed:generate", :"testbed:setup", :"testbed:migrate"]
+
+namespace "testbed" do
+  # "testbed" is also hardcoded in the spec/spec_helper.rb features/support/env.rb and gitignore file. Change it there too...
+  
+  "Generate rails, rspec, cucumber"
+  task :generate do
+    chdir("testbed") do
+      sh "bundle install"
+      sh "bundle exec rails ."
+      sh "bundle exec script/generate rspec"
+      sh "bundle exec script/generate cucumber --webrat"
+      sh "rm -rf spec features"
+    end
+  end
+ 
+  desc "Setup bundler, rspec, cucumber"
+  task :setup do
+    chdir("testbed") do
+      # Bundler
+      preinitializer_rb = "begin\n  require \"rubygems\"\n  require \"bundler\"\nrescue LoadError\n  raise \"Could not load the bundler gem. Install it with `gem install bundler`.\"\nend\n\nif Gem::Version.new(Bundler::VERSION) <= Gem::Version.new(\"0.9.24\")\n  raise RuntimeError, \"Your bundler version is too old for Rails 2.3.\" +\n   \"Run `gem install bundler` to upgrade.\"\nend\n\nbegin\n  # Set up load paths for all bundled gems\n  ENV[\"BUNDLE_GEMFILE\"] = File.expand_path(\"../../Gemfile\", __FILE__)\n  Bundler.setup\nrescue Bundler::GemNotFound\n  raise RuntimeError, \"Bundler couldn't find some gems.\" +\n    \"Did you run `bundle install`?\"\nend\n"
+      File.open('config/preinitializer.rb', 'w'){|f| f.write preinitializer_rb}
+      
+      boot_rb = File.read('config/boot.rb').sub("# All that for this:", "class Rails::Boot\n  def run\n    load_initializer\n\n    Rails::Initializer.class_eval do\n      def load_gems\n        @bundler_loaded ||= Bundler.require :default, Rails.env\n      end\n    end\n\n    Rails::Initializer.run(:set_load_path)\n  end\nend\n\n# All that for this:")
+      File.open('config/boot.rb', 'w'){|f| f.write boot_rb}
+      puts "NOTE: These files were created/modified as described here: http://gembundler.com/rails23.html"
+      
+      # Rspec
+      rspec_rake = File.read('lib/tasks/rspec.rake').gsub('#{RAILS_ROOT}/spec/', '#{RAILS_ROOT}/../spec/').gsub("FileList['spec/", "FileList['../spec/").gsub("File.exist?('spec/","File.exist?('../spec/")
+      File.open('lib/tasks/rspec.rake', 'w'){|f| f.write rspec_rake}
+
+      # Cucumber
+      cucumber_rake = File.read('lib/tasks/cucumber.rake').sub("begin", "ENV['FEATURE'] ||= '../features'\n\nbegin")
+      File.open('lib/tasks/cucumber.rake', 'w'){|f| f.write cucumber_rake}
+    end
+  end
+
+  desc "Generate, migrate testbed"
+  task :migrate do
+    sh "cp -R generators testbed/lib"
+    chdir("testbed") do
+      sh "bundle exec script/generate surveyor"
+      sh "bundle exec rake db:migrate db:test:prepare"
+    end
+  end
+
+  desc "Remove testbed app"
+  task :remove do
+    puts "Removing the test_app in the spec folder"
+    chdir("testbed") do
+      sh 'rm -rf Gemfile.lock README Rakefile app config db doc features lib log public script spec surveys test tmp vendor'
+    end
+  end
+end

data/lib/surveyor/models/answer_methods.rb

@@ -9,11 +9,15 @@ module Surveyor
         
         # Scopes
         base.send :default_scope, :order => "display_order ASC"
-
-        # Validations
-        base.send :validates_presence_of, :text
-        # this causes issues with building and saving
-        # base.send :validates_numericality_of, :question_id, :allow_nil => false, :only_integer => true
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :text
+          # this causes issues with building and saving
+          # base.send :validates_numericality_of, :question_id, :allow_nil => false, :only_integer => true
+          @@validations_already_included = true
+        end
       end
 
       # Instance Methods

data/lib/surveyor/models/dependency_condition_methods.rb

@@ -7,14 +7,19 @@ module Surveyor
         base.send :belongs_to, :dependency
         base.send :belongs_to, :dependent_question, :foreign_key => :question_id, :class_name => :question
         base.send :belongs_to, :question
-
-        # Validations
-        base.send :validates_presence_of, :operator, :rule_key
-        base.send :validate, :validates_operator
-        base.send :validates_uniqueness_of, :rule_key, :scope => :dependency_id
-        # this causes issues with building and saving
-        # base.send :validates_numericality_of, :question_id, :dependency_id
         
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :operator, :rule_key
+          base.send :validate, :validates_operator
+          base.send :validates_uniqueness_of, :rule_key, :scope => :dependency_id
+          # this causes issues with building and saving
+          # base.send :validates_numericality_of, :question_id, :dependency_id
+          
+          @@validations_already_included = true
+        end
+                
         base.send :include, Surveyor::ActsAsResponse # includes "as" instance method
 
         # Class methods

data/lib/surveyor/models/dependency_methods.rb

@@ -6,13 +6,18 @@ module Surveyor
         base.send :belongs_to, :question
         base.send :belongs_to, :question_group
         base.send :has_many, :dependency_conditions, :dependent => :destroy
-
-        # Validations
-        base.send :validates_presence_of, :rule
-        base.send :validates_format_of, :rule, :with => /^(?:and|or|\)|\(|[A-Z]|\s)+$/ #TODO properly formed parenthesis etc.
-        base.send :validates_numericality_of, :question_id, :if => Proc.new { |d| d.question_group_id.nil? }
-        base.send :validates_numericality_of, :question_group_id, :if => Proc.new { |d| d.question_id.nil? }
-
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :rule
+          base.send :validates_format_of, :rule, :with => /^(?:and|or|\)|\(|[A-Z]|\s)+$/ #TODO properly formed parenthesis etc.
+          base.send :validates_numericality_of, :question_id, :if => Proc.new { |d| d.question_group_id.nil? }
+          base.send :validates_numericality_of, :question_group_id, :if => Proc.new { |d| d.question_id.nil? }
+          
+          @@validations_already_included = true
+        end
+        
         # Attribute aliases
         base.send :alias_attribute, :dependent_question_id, :question_id
       end

data/lib/surveyor/models/question_methods.rb

@@ -10,12 +10,17 @@ module Surveyor
 
         # Scopes
         base.send :default_scope, :order => "display_order ASC"
-
-        # Validations
-        base.send :validates_presence_of, :text, :display_order
-        # this causes issues with building and saving
-        #, :survey_section_id
-        base.send :validates_inclusion_of, :is_mandatory, :in => [true, false]
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :text, :display_order
+          # this causes issues with building and saving
+          #, :survey_section_id
+          base.send :validates_inclusion_of, :is_mandatory, :in => [true, false]
+          
+          @@validations_already_included = true
+        end
       end
 
       # Instance Methods

data/lib/surveyor/models/response_methods.rb

@@ -6,10 +6,15 @@ module Surveyor
         base.send :belongs_to, :response_set
         base.send :belongs_to, :question
         base.send :belongs_to, :answer
-
-        # Validations
-        base.send :validates_presence_of, :response_set_id, :question_id, :answer_id
-
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :response_set_id, :question_id, :answer_id
+          
+          @@validations_already_included = true
+        end
+        
         base.send :include, Surveyor::ActsAsResponse # includes "as" instance method
 
       end

data/lib/surveyor/models/response_set_methods.rb

@@ -6,12 +6,17 @@ module Surveyor
         base.send :belongs_to, :survey
         base.send :belongs_to, :user
         base.send :has_many, :responses, :dependent => :destroy
-
-        # Validations
-        base.send :validates_presence_of, :survey_id
-        base.send :validates_associated, :responses
-        base.send :validates_uniqueness_of, :access_code
-
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :survey_id
+          base.send :validates_associated, :responses
+          base.send :validates_uniqueness_of, :access_code
+          
+          @@validations_already_included = true
+        end
+        
         # Attributes
         base.send :attr_protected, :completed_at
         base.send :attr_accessor, :current_section_id

data/lib/surveyor/models/survey_methods.rb

@@ -9,10 +9,15 @@ module Surveyor
 
         # Scopes
         base.send :named_scope, :with_sections, {:include => :sections}
-
-        # Validations
-        base.send :validates_presence_of, :title
-        base.send :validates_uniqueness_of, :access_code
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :title
+          base.send :validates_uniqueness_of, :access_code
+          
+          @@validations_already_included = true
+        end        
 
         # Class methods
         base.instance_eval do

data/lib/surveyor/models/survey_section_methods.rb

@@ -9,11 +9,16 @@ module Surveyor
         # Scopes
         base.send :default_scope, :order => "display_order ASC"
         base.send :named_scope, :with_includes, { :include => {:questions => [:answers, :question_group, {:dependency => :dependency_conditions}]}}
-
-        # Validations
-        base.send :validates_presence_of, :title, :display_order
-        # this causes issues with building and saving
-        #, :survey
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :title, :display_order
+          # this causes issues with building and saving
+          #, :survey
+          
+          @@validations_already_included = true
+        end
       end
 
       # Instance Methods

data/lib/surveyor/models/validation_condition_methods.rb

@@ -6,14 +6,19 @@ module Surveyor
         base.send :belongs_to, :validation
 
         # Scopes
-
-        # Validations
-        base.send :validates_presence_of, :operator, :rule_key
-        base.send :validates_inclusion_of, :operator, :in => Surveyor::Common::OPERATORS
-        base.send :validates_uniqueness_of, :rule_key, :scope => :validation_id
-        # this causes issues with building and saving
-        # base.send :validates_numericality_of, :validation_id #, :question_id, :answer_id
-
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :operator, :rule_key
+          base.send :validates_inclusion_of, :operator, :in => Surveyor::Common::OPERATORS
+          base.send :validates_uniqueness_of, :rule_key, :scope => :validation_id
+          # this causes issues with building and saving
+          # base.send :validates_numericality_of, :validation_id #, :question_id, :answer_id
+          
+          @@validations_already_included = true
+        end
+        
         base.send :include, Surveyor::ActsAsResponse # includes "as" instance method
 
         # Class methods

data/lib/surveyor/models/validation_methods.rb

@@ -7,12 +7,17 @@ module Surveyor
         base.send :has_many, :validation_conditions, :dependent => :destroy
 
         # Scopes
-
-        # Validations
-        base.send :validates_presence_of, :rule
-        base.send :validates_format_of, :rule, :with => /^(?:and|or|\)|\(|[A-Z]|\s)+$/
-        # this causes issues with building and saving
-        # base.send :validates_numericality_of, :answer_id
+        
+        @@validations_already_included ||= nil
+        unless @@validations_already_included
+          # Validations
+          base.send :validates_presence_of, :rule
+          base.send :validates_format_of, :rule, :with => /^(?:and|or|\)|\(|[A-Z]|\s)+$/
+          # this causes issues with building and saving
+          # base.send :validates_numericality_of, :answer_id
+          
+          @@validations_already_included = true
+        end
       end
 
       # Instance Methods