surveyor 0.18.1 → 0.18.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.18.2
+
+* redcap text and string answers. closes #99
+* return survey objects from parsers. closes #98
+* delete survey components when deleting survey. closes #97
+
 0.18.1
 
 * group dependencies. closes #96

data/VERSION

@@ -1 +1 @@
-0.18.1
+0.18.2

data/features/redcap.feature

@@ -9,7 +9,7 @@ Feature: Survey creation
       ||
     And there should be 143 questions with:
       ||
-    And there should be 161 answers with:
+    And there should be 233 answers with:
       ||
     And there should be 3 resolved dependency_conditions with:
       ||

data/lib/surveyor/models/survey_methods.rb

@@ -3,7 +3,7 @@ module Surveyor
     module SurveyMethods
       def self.included(base)
         # Associations
-        base.send :has_many, :sections, :class_name => "SurveySection", :order => 'display_order'
+        base.send :has_many, :sections, :class_name => "SurveySection", :order => 'display_order', :dependent => :destroy
         base.send :has_many, :sections_with_questions, :include => :questions, :class_name => "SurveySection", :order => 'display_order'
         base.send :has_many, :response_sets
 

data/lib/surveyor/parser.rb

@@ -7,7 +7,7 @@ module Surveyor
     # Class methods
     def self.parse(str)
       puts
-      Surveyor::Parser.new.instance_eval(str)
+      Surveyor::Parser.new.parse(str)
       puts
     end
 
@@ -15,7 +15,10 @@ module Surveyor
     def initialize
       self.context = {}
     end
-    
+    def parse(str)
+      instance_eval(str)
+      return context[:survey]
+    end
     # This method_missing does all the heavy lifting for the DSL
     def method_missing(missing_method, *args, &block)
       method_name, reference_identifier = missing_method.to_s.split("_", 2)
@@ -37,7 +40,7 @@ module Surveyor
           puts
           print context[type.to_sym].save ? "saved. " : " not saved! #{context[type.to_sym].errors.each_full{|x| x }.join(", ")} "
         end
-        context[type.to_sym].clear(context)
+        context[type.to_sym].clear(context) unless type == 'survey'
       end
     end
     

data/lib/surveyor/redcap_parser.rb

@@ -39,6 +39,7 @@ module Surveyor
         puts = "Oops. Not a valid CSV file."
       # ensure
       end
+      return context[:survey]
     end
     def missing_columns(r)
       required_columns - r.headers.map(&:to_s)
@@ -162,6 +163,14 @@ class DependencyCondition < ActiveRecord::Base
 end
 class Answer < ActiveRecord::Base
   def self.build_and_set(context, r)
+    case r[:field_type]
+    when "text"
+      context[:answer] = context[:question].answers.build(:response_class => "string", :text => "Text")
+    when "notes"
+      context[:answer] = context[:question].answers.build(:response_class => "text", :text => "Notes")
+    when "file"
+      puts "\n!!! skipping answer: file"
+    end
     r[:choices_or_calculations].to_s.split("|").each do |pair|
       aref, atext = pair.strip.split(", ")
       if aref.blank? or atext.blank?
@@ -198,24 +207,24 @@ class Validation < ActiveRecord::Base
       when "email"
         context[:question].answers.each do |a|
           context[:validation] = a.validations.build(:rule => "A")
-          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp_value => "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$")
+          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp => "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$")
         end
       when "integer"
         context[:question].display_type = :integer if context[:question].display_type == :string
         context[:question].answers.each do |a|
           context[:validation] = a.validations.build(:rule => "A")
-          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp_value => "\d+")
+          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp => "\d+")
         end
       when "number"
         context[:question].display_type = :float if context[:question].display_type == :string
         context[:question].answers.each do |a|
           context[:validation] = a.validations.build(:rule => "A")
-          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp_value => "^\d*(,\d{3})*(\.\d*)?$")
+          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp => "^\d*(,\d{3})*(\.\d*)?$")
         end
       when "phone"
         context[:question].answers.each do |a|
           context[:validation] = a.validations.build(:rule => "A")
-          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp_value => "\d{3}.*\d{4}")
+          context[:validation].validation_conditions.build(:rule_key => "A", :operator => "=~", :regexp => "\d{3}.*\d{4}")
         end
       end
     end

data/spec/lib/parser_spec.rb

@@ -25,6 +25,8 @@ describe Surveyor::Parser do
   it "should identify models that take blocks" do
     @parser.send(:block_models).should == %w(survey survey_section question_group)
   end
-  
+  it "should return a survey object" do
+    Surveyor::Parser.new.parse("survey 'hi' do\n end").is_a?(Survey).should be_true
+  end
   
 end

data/spec/lib/redcap_parser_spec.rb

@@ -45,4 +45,9 @@ describe Surveyor::RedcapParser do
     Dependency.decompose_component('[initial_119(2)] = "1"').should == {:question_reference => 'initial_119', :operator => '==', :answer_reference => '2'}
     Dependency.decompose_component('[f1_q15] >= 21').should == {:question_reference => 'f1_q15', :operator => '>=', :integer_value => '21'}
   end
+  it "should return a survey object" do
+    x = %("Variable / Field Name","Form Name","Field Units","Section Header","Field Type","Field Label","Choices OR Calculations","Field Note","Text Validation Type","Text Validation Min","Text Validation Max",Identifier?,"Branching Logic (Show field only if...)","Required Field?"\nstudy_id,demographics,,,text,"Study ID",,,,,,,,)
+    Surveyor::RedcapParser.new.parse(x, "redcaptest").is_a?(Survey).should be_true
+  end
+  
 end

data/spec/models/answer_spec.rb

@@ -26,5 +26,10 @@ describe Answer, "when creating a new answer" do
     @answer.response_class = "B"
     @answer.renderer.should == :a_b
   end
-    
+  it "should delete validation when it is deleted" do
+    v_id = Factory(:validation, :answer => @answer).id
+    @answer.destroy
+    Validation.find_by_id(v_id).should be_nil
+  end
+  
 end

data/spec/models/dependency_spec.rb

@@ -77,5 +77,13 @@ describe Dependency, "when evaluating dependency conditions of a question in a r
     @dep3.conditions_hash(@response_set).should == {:A => true, :B => false}
     @dep4.conditions_hash(@response_set).should == {:A => true, :B => false, :C => true}
   end
-
 end
+describe Dependency, "with conditions" do
+  @dependency = Dependency.new(:rule => "A and B and C", :question_id => 1)
+  Factory(:dependency_condition, :dependency => @dependency, :rule_key => "A")
+  Factory(:dependency_condition, :dependency => @dependency, :rule_key => "B")
+  Factory(:dependency_condition, :dependency => @dependency, :rule_key => "C")
+  dc_ids = @dependency.dependency_conditions.map(&:id)
+  @dependency.destroy
+  dc_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
+end

data/spec/models/question_spec.rb

@@ -45,7 +45,11 @@ describe Question, "that has answers" do
   it "should retrieve those answers in display_order" do
     @question.answers.map(&:display_order).should == [1,2,3]
   end
-  
+  it "should delete answers when it is deleted" do
+    answer_ids = @question.answers.map(&:id)
+    @question.destroy
+    answer_ids.each{|id| Answer.find_by_id(id).should be_nil}
+  end
 end
 
 describe Question, "when interacting with an instance" do
@@ -81,5 +85,10 @@ describe Question, "with dependencies" do
     @question.stub!(:dependency).and_return(@dependency)
     @question.triggered?(@rs).should == true
   end
+  it "should delete dependency when it is deleted" do
+    dep_id = Factory(:dependency, :question => @question).id
+    @question.destroy
+    Dependency.find_by_id(dep_id).should be_nil
+  end
   
 end

data/spec/models/survey_section_spec.rb

@@ -30,4 +30,10 @@ describe SurveySection, "with questions" do
     @survey_section.questions.should have(3).questions
     @survey_section.questions.should == [@q2,@q3,@q1]
   end
+  it "should delete questions when it is deleted" do
+    question_ids = @survey_section.questions.map(&:id)
+    @survey_section.destroy
+    question_ids.each{|id| Question.find_by_id(id).should be_nil}
+  end
+  
 end

data/spec/models/survey_spec.rb

@@ -45,7 +45,11 @@ describe Survey, "that has sections" do
     @survey.sections_with_questions.map(&:questions).flatten.should have(4).questions
     @survey.sections_with_questions.map(&:questions).flatten.should == [@q4,@q1,@q3,@q2]
   end
-
+  it "should delete survey sections when it is deleted" do
+    section_ids = @survey.sections.map(&:id)
+    @survey.destroy
+    section_ids.each{|id| SurveySection.find_by_id(id).should be_nil}
+  end
 end
 
 # Methods

data/spec/models/validation_spec.rb

@@ -58,3 +58,12 @@ describe Validation, "reporting its status" do
     
   end
 end
+describe Validation, "with conditions" do
+  @validation = Factory(:validation)
+  Factory(:validation_condition, :validation => @validation, :rule_key => "A")
+  Factory(:validation_condition, :validation => @validation, :rule_key => "B")
+  Factory(:validation_condition, :validation => @validation, :rule_key => "C")
+  v_ids = @validation.validation_conditions.map(&:id)
+  @validation.destroy
+  v_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
+end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.18.1"
+  s.version = "0.18.2"
 
   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-17}
+  s.date = %q{2011-01-20}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 83
   prerelease: false
   segments: 
   - 0
   - 18
-  - 1
-  version: 0.18.1
+  - 2
+  version: 0.18.2
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -06:00
+date: 2011-01-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency