surveyor 0.18.0 → 0.18.1

data/lib/surveyor/parser.rb

@@ -1,3 +1,4 @@
+%w(survey survey_section question_group question dependency dependency_condition answer validation validation_condition).each {|model| require model }
 module Surveyor
   class Parser
     # Attributes
@@ -66,7 +67,6 @@ end
 # Surveyor models with extra parsing methods
 class Survey < ActiveRecord::Base
   # block
-  include Surveyor::Models::SurveyMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
@@ -87,7 +87,6 @@ class Survey < ActiveRecord::Base
 end
 class SurveySection < ActiveRecord::Base
   # block
-  include Surveyor::Models::SurveySectionMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
@@ -103,7 +102,6 @@ class SurveySection < ActiveRecord::Base
 end
 class QuestionGroup < ActiveRecord::Base
   # block
-  include Surveyor::Models::QuestionGroupMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
@@ -120,7 +118,6 @@ class QuestionGroup < ActiveRecord::Base
 end
 class Question < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::QuestionMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
@@ -141,6 +138,7 @@ class Question < ActiveRecord::Base
     if context[:question_group] && context[:question_group].display_type == "grid"
       (context[:grid_answers] || []).each do |grid_answer|
         a = context[:question].answers.build(grid_answer.attributes)
+        context[:answer_references][reference_identifier] ||= {} unless reference_identifier.blank?
         context[:answer_references][reference_identifier][grid_answer.reference_identifier] = a unless reference_identifier.blank? or grid_answer.reference_identifier.blank?
       end
     end
@@ -148,19 +146,21 @@ class Question < ActiveRecord::Base
 end
 class Dependency < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::DependencyMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
     context.delete_if{|k,v| %w(dependency dependency_condition).map(&:to_sym).include? k}
     
     # build and set context
-    context[:dependency] = context[:question].build_dependency({ :question_group => context[:question_group]}.merge(args[0] || {}))
+    if context[:question]
+      context[:dependency] = context[:question].build_dependency({:question_group => context[:question_group]}.merge(args[0] || {}))
+    elsif context[:question_group]
+      context[:dependency] = context[:question_group].build_dependency(args[0] || {})
+    end
   end
 end
 class DependencyCondition < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::DependencyConditionMethods
   
   attr_accessor :question_reference, :answer_reference, :context_reference
   before_save :resolve_references
@@ -197,7 +197,6 @@ end
 
 class Answer < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::AnswerMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
@@ -249,7 +248,6 @@ class Answer < ActiveRecord::Base
 end
 class Validation < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::ValidationMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context
@@ -261,7 +259,6 @@ class Validation < ActiveRecord::Base
 end
 class ValidationCondition < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::ValidationConditionMethods
   
   def self.parse_and_build(context, args, original_method, reference_identifier)
     # clear context

data/lib/surveyor/redcap_parser.rb

@@ -1,3 +1,4 @@
+%w(survey survey_section question_group question dependency dependency_condition answer validation validation_condition).each {|model| require model }
 require 'fastercsv'
 require 'active_support' # for humanize
 module Surveyor
@@ -50,10 +51,8 @@ end
 
 # Surveyor models with extra parsing methods
 class Survey < ActiveRecord::Base
-  include Surveyor::Models::SurveyMethods
 end
 class SurveySection < ActiveRecord::Base
-  include Surveyor::Models::SurveySectionMethods
   def self.build_or_set(context, r)
     unless context[:survey_section] && context[:survey_section].reference_identifier == r[:form_name]
       if match = context[:survey].sections.detect{|ss| ss.reference_identifier == r[:form_name]}
@@ -66,10 +65,8 @@ class SurveySection < ActiveRecord::Base
   end
 end
 class QuestionGroup < ActiveRecord::Base
-  include Surveyor::Models::QuestionGroupMethods
 end
 class Question < ActiveRecord::Base
-  include Surveyor::Models::QuestionMethods
   def self.build_and_set(context, r)
     if !r[:section_header].blank?
       context[:survey_section].questions.build({:display_type => "label", :text => r[:section_header]})
@@ -93,7 +90,6 @@ class Question < ActiveRecord::Base
   end
 end
 class Dependency < ActiveRecord::Base
-  include Surveyor::Models::DependencyMethods
   def self.build_and_set(context, r)
     unless (bl = r[:branching_logic_show_field_only_if]).blank?
       # TODO: forgot to tie rule key to component, counting on the sequence of components
@@ -150,10 +146,10 @@ class Dependency < ActiveRecord::Base
   end
 end
 class DependencyCondition < ActiveRecord::Base
-  include Surveyor::Models::DependencyConditionMethods
   attr_accessor :question_reference, :answer_reference, :lookup_reference
   before_save :resolve_references
   def resolve_references
+    return unless lookup_reference
     print "resolve(#{question_reference},#{answer_reference})"
     if row = lookup_reference.find{|r| r[0] == question_reference and r[1] == answer_reference}
       print "...found "
@@ -165,7 +161,6 @@ class DependencyCondition < ActiveRecord::Base
   end
 end
 class Answer < ActiveRecord::Base
-  include Surveyor::Models::AnswerMethods
   def self.build_and_set(context, r)
     r[:choices_or_calculations].to_s.split("|").each do |pair|
       aref, atext = pair.strip.split(", ")
@@ -184,7 +179,6 @@ class Answer < ActiveRecord::Base
   end
 end
 class Validation < ActiveRecord::Base
-  include Surveyor::Models::ValidationMethods
   def self.build_and_set(context, r)
     # text_validation_type text_validation_min text_validation_max
     min = r[:text_validation_min].to_s.blank? ? nil : r[:text_validation_min].to_s
@@ -229,5 +223,4 @@ class Validation < ActiveRecord::Base
   
 end
 class ValidationCondition < ActiveRecord::Base
-  include Surveyor::Models::ValidationConditionMethods
 end

data/lib/surveyor/unparser.rb

@@ -1,3 +1,4 @@
+%w(survey survey_section question_group question dependency dependency_condition answer validation validation_condition).each {|model| require model }
 module Surveyor
   class Unparser
     # Class methods
@@ -11,7 +12,7 @@ end
 # Surveyor models with extra parsing methods
 class Survey < ActiveRecord::Base
   # block
-  include Surveyor::Models::SurveyMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff Survey.new(:title => title).attributes).delete_if{|k,v| %w(created_at updated_at inactive_at id title access_code).include? k}.symbolize_keys!
     dsl << "survey \"#{title}\""
@@ -22,7 +23,7 @@ class Survey < ActiveRecord::Base
 end
 class SurveySection < ActiveRecord::Base
   # block
-  include Surveyor::Models::SurveySectionMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff SurveySection.new(:title => title).attributes).delete_if{|k,v| %w(created_at updated_at id survey_id).include? k}.symbolize_keys!
     group_questions = []
@@ -45,7 +46,7 @@ class SurveySection < ActiveRecord::Base
 end
 class QuestionGroup < ActiveRecord::Base
   # block
-  include Surveyor::Models::QuestionGroupMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff QuestionGroup.new(:text => text).attributes).delete_if{|k,v| %w(created_at updated_at id).include?(k) or (k == "display_type" && %w(grid repeater default).include?(v))}.symbolize_keys!
     method = (%w(grid repeater).include?(display_type) ? display_type : "group")
@@ -59,7 +60,7 @@ class QuestionGroup < ActiveRecord::Base
 end
 class Question < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::QuestionMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff Question.new(:text => text).attributes).delete_if{|k,v| %w(created_at updated_at reference_identifier id survey_section_id question_group_id).include?(k) or (k == "display_type" && v == "label")}.symbolize_keys!
     dsl << (solo? ? "\n" : "  ")
@@ -79,7 +80,7 @@ class Question < ActiveRecord::Base
 end
 class Dependency < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::DependencyMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff Dependency.new.attributes).delete_if{|k,v| %w(created_at updated_at id question_id).include?(k) }.symbolize_keys!
     dsl << "  " if question.part_of_group?
@@ -90,7 +91,7 @@ class Dependency < ActiveRecord::Base
 end
 class DependencyCondition < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::DependencyConditionMethods  
+
   def unparse(dsl)
     attrs = (self.attributes.diff Dependency.new.attributes).delete_if{|k,v| %w(created_at updated_at question_id question_group_id rule_key rule operator id dependency_id answer_id).include? k}.symbolize_keys!
     dsl << "  " if dependency.question.part_of_group?
@@ -102,7 +103,7 @@ class DependencyCondition < ActiveRecord::Base
 end
 class Answer < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::AnswerMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff Answer.new(:text => text).attributes).delete_if{|k,v| %w(created_at updated_at reference_identifier response_class id question_id).include? k}.symbolize_keys!
     attrs.delete(:is_exclusive) if text == "Omit" && is_exclusive == true
@@ -123,7 +124,7 @@ class Answer < ActiveRecord::Base
 end
 class Validation < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::ValidationMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff Validation.new.attributes).delete_if{|k,v| %w(created_at updated_at id answer_id).include?(k) }.symbolize_keys!
     dsl << "  " if answer.question.part_of_group?
@@ -134,7 +135,7 @@ class Validation < ActiveRecord::Base
 end
 class ValidationCondition < ActiveRecord::Base
   # nonblock
-  include Surveyor::Models::ValidationConditionMethods
+
   def unparse(dsl)
     attrs = (self.attributes.diff ValidationCondition.new.attributes).delete_if{|k,v| %w(created_at updated_at operator rule_key id validation_id).include? k}.symbolize_keys!
     dsl << "  " if validation.answer.question.part_of_group?

data/rails/init.rb

@@ -1 +1,2 @@
+# For Rails 2.3 gem engine to work
 require 'surveyor'

data/spec/rcov.opts

@@ -1,2 +1,2 @@
---exclude "spec/*,gems/*" 
+--exclude "spec/*,gems/*"
 --rails

data/spec/spec_helper.rb

@@ -1,20 +1,55 @@
+# This file is copied to ~/spec when you run 'ruby script/generate rspec'
+# from the project root directory.
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','testbed','config','environment'))
+require 'spec/autorun'
+require 'spec/rails'
+require 'factories'
 
-require 'rubygems'
-require 'bundler'
-Bundler.setup
+# Uncomment the next line to use webrat's matchers
+#require 'webrat/integrations/rspec-rails'
 
-require "spec"
-
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-
-
-this_dir = File.dirname(__FILE__)
-raise "Alert! Run the rake task to install the test Rails app. It seems to be missing." unless File.directory?(File.join(this_dir,'test_app/spec'))
-require File.join(this_dir, 'test_app/spec/spec_helper')
-require File.join(this_dir, '/factories')
-
-require 'surveyor'
-require 'surveyor/parser'
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 Spec::Runner.configure do |config|
+  # If you're not using ActiveRecord you should remove these
+  # lines, delete config/database.yml and disable :active_record
+  # in your config/boot.rb
+  config.use_transactional_fixtures = true
+  config.use_instantiated_fixtures  = false
+  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+
+  # == Fixtures
+  #
+  # You can declare fixtures for each example_group like this:
+  #   describe "...." do
+  #     fixtures :table_a, :table_b
+  #
+  # Alternatively, if you prefer to declare them only once, you can
+  # do so right here. Just uncomment the next line and replace the fixture
+  # names with your fixtures.
+  #
+  # config.global_fixtures = :table_a, :table_b
+  #
+  # If you declare global fixtures, be aware that they will be declared
+  # for all of your examples, even those that don't use them.
+  #
+  # You can also declare which fixtures to use (for example fixtures for test/fixtures):
+  #
+  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+  #
+  # == Mock Framework
+  #
+  # RSpec uses its own mocking framework by default. If you prefer to
+  # use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  #
+  # == Notes
+  #
+  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
 end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.18.0"
+  s.version = "0.18.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2011-01-17}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
     ".gitignore",
      ".rvmrc",
      "CHANGELOG",
-     "Gemfile",
-     "Gemfile.lock",
      "MIT-LICENSE",
      "README.md",
      "Rakefile",
@@ -52,6 +50,7 @@ Gem::Specification.new do |s|
      "app/views/surveyor/edit.html.haml",
      "app/views/surveyor/new.html.haml",
      "app/views/surveyor/show.html.haml",
+     "ci-env.sh",
      "config/routes.rb",
      "features/redcap.feature",
      "features/step_definitions/surveyor_steps.rb",
@@ -140,8 +139,8 @@ Gem::Specification.new do |s|
      "generators/surveyor/templates/migrate/create_validations.rb",
      "generators/surveyor/templates/surveys/kitchen_sink_survey.rb",
      "generators/surveyor/templates/tasks/surveyor.rb",
-     "init.rb",
-     "install.rb",
+     "hudson.rakefile",
+     "init_testbed.rakefile",
      "lib/surveyor.rb",
      "lib/surveyor/acts_as_response.rb",
      "lib/surveyor/common.rb",
@@ -182,11 +181,9 @@ Gem::Specification.new do |s|
      "spec/rcov.opts",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/test_Gemfile",
-     "spec/test_boot.rb",
-     "spec/test_preinitializer.rb",
      "spec/views/surveyor/show.html.haml_spec.rb",
      "surveyor.gemspec",
+     "testbed/Gemfile",
      "uninstall.rb"
   ]
   s.homepage = %q{http://github.com/breakpointer/surveyor}
@@ -213,51 +210,6 @@ Gem::Specification.new do |s|
      "spec/models/validation_condition_spec.rb",
      "spec/models/validation_spec.rb",
      "spec/spec_helper.rb",
-     "spec/test_app/app/controllers/application_controller.rb",
-     "spec/test_app/app/helpers/application_helper.rb",
-     "spec/test_app/config/boot.rb",
-     "spec/test_app/config/environment.rb",
-     "spec/test_app/config/environments/cucumber.rb",
-     "spec/test_app/config/environments/development.rb",
-     "spec/test_app/config/environments/production.rb",
-     "spec/test_app/config/environments/test.rb",
-     "spec/test_app/config/initializers/backtrace_silencers.rb",
-     "spec/test_app/config/initializers/cookie_verification_secret.rb",
-     "spec/test_app/config/initializers/inflections.rb",
-     "spec/test_app/config/initializers/mime_types.rb",
-     "spec/test_app/config/initializers/new_rails_defaults.rb",
-     "spec/test_app/config/initializers/session_store.rb",
-     "spec/test_app/config/preinitializer.rb",
-     "spec/test_app/config/routes.rb",
-     "spec/test_app/db/migrate/20101119172426_create_surveys.rb",
-     "spec/test_app/db/migrate/20101119172427_create_survey_sections.rb",
-     "spec/test_app/db/migrate/20101119172428_create_questions.rb",
-     "spec/test_app/db/migrate/20101119172429_create_question_groups.rb",
-     "spec/test_app/db/migrate/20101119172430_create_answers.rb",
-     "spec/test_app/db/migrate/20101119172431_create_response_sets.rb",
-     "spec/test_app/db/migrate/20101119172432_create_responses.rb",
-     "spec/test_app/db/migrate/20101119172433_create_dependencies.rb",
-     "spec/test_app/db/migrate/20101119172434_create_dependency_conditions.rb",
-     "spec/test_app/db/migrate/20101119172435_create_validations.rb",
-     "spec/test_app/db/migrate/20101119172436_create_validation_conditions.rb",
-     "spec/test_app/db/migrate/20101119172437_add_display_order_to_surveys.rb",
-     "spec/test_app/db/migrate/20101119172438_add_correct_answer_id_to_questions.rb",
-     "spec/test_app/db/migrate/20101119172439_add_index_to_response_sets.rb",
-     "spec/test_app/db/migrate/20101119172440_add_index_to_surveys.rb",
-     "spec/test_app/db/migrate/20101119172441_add_unique_indicies.rb",
-     "spec/test_app/db/migrate/20101119172442_add_section_id_to_responses.rb",
-     "spec/test_app/db/schema.rb",
-     "spec/test_app/db/seeds.rb",
-     "spec/test_app/features/step_definitions/web_steps.rb",
-     "spec/test_app/features/support/env.rb",
-     "spec/test_app/features/support/paths.rb",
-     "spec/test_app/lib/tasks/surveyor.rb",
-     "spec/test_app/spec/spec_helper.rb",
-     "spec/test_app/surveys/kitchen_sink_survey.rb",
-     "spec/test_app/test/performance/browsing_test.rb",
-     "spec/test_app/test/test_helper.rb",
-     "spec/test_boot.rb",
-     "spec/test_preinitializer.rb",
      "spec/views/surveyor/show.html.haml_spec.rb"
   ]
 
@@ -268,13 +220,16 @@ 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_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 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<yard>, [">= 0"])
   end
 end
 

data/testbed/Gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'rails', '2.3.10'
+gem 'rspec', '~> 1.3'
+gem 'rspec-rails', '1.3.3'
+gem 'sqlite3-ruby', '1.2.5' # Using this version for ruby 1.8.7 compatibility reasons
+gem 'webrat'
+gem 'cucumber', '~> 0.8.0'
+gem 'cucumber-rails'
+gem 'database_cleaner'
+gem 'factory_girl'
+
+gem 'surveyor', :path => ".."