surveyor 0.8.0 → 0.9.0

data/script/surveyor/validation.rb

@@ -0,0 +1,19 @@
+class Validation < SurveyParser::Base
+  
+  # Context, Conditional, Children
+  attr_accessor :id, :answer_id, :parser
+  attr_accessor :rule, :message
+  has_children :validation_conditions
+  
+  
+  def default_options
+    {:rule => "A"}
+  end
+  def parse_args(args)
+    args[0] || {}
+  end
+  def parse_opts(opts)
+    {} # toss the method name and reference identifier by default
+  end
+    
+end

data/script/surveyor/validation_condition.rb

@@ -0,0 +1,19 @@
+class ValidationCondition < SurveyParser::Base
+  # Context, Conditional, Value, Reference
+  attr_accessor :id, :validation_id, :rule_key, :parser
+  attr_accessor :operator
+  attr_accessor :question_id, :answer_id, :datetime_value, :integer_value, :float_value, :unit, :text_value, :string_value, :response_other, :regexp
+  attr_accessor :question_reference, :answer_reference
+  
+  def default_options
+    { :operator => "==" }
+  end
+  def parse_args(args)
+    a0, a1 = args
+    {:operator => a0}.merge(a1 || {})
+  end
+  def parse_opts(opts)
+    {:rule_key => opts[:reference_identifier]}
+  end
+    
+end

data/spec/lib/surveyor_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/surveyor')
+
+describe Surveyor do
+  it "should create a normalized code from the answer text" do
+    # The answer object should take the title of the text and convert it to a code that is more appropirate for a database entry
+    
+
+
+        
+    # Taking a few answers from the survey for testing
+    strings = [ "This? is a in - t3rrible-@nswer of! (question) on",
+                "Private insurance/ HMO/ PPO",
+                "<bold>VA</bold>",
+                "PMS (Premenstrual syndrome)/ PMDD (Premenstrual Dysphoric Disorder)",
+                "Have never been employed outside the home",
+                "Professional",
+                "Not working because of temporary disability, but expect to return to a job",
+                "How long has it been since you last visited a doctor for a routine checkup (routine being not for a particular reason)?",
+                "Do you take medications as directed?",
+                "Do you every leak urine (or) water when you didn't want to?", #checking for () and ' removal
+                "Do your biological family members (not adopted) have a \"history\" of any of the following?",
+                "Your health:",
+                "In general, you would say your health is:" ]
+    
+    # What the results should look like
+    codes = [ "this_t3rrible_nswer",
+              "private_insurance_hmo_ppo",
+              "va",
+              "pms_pmdd",
+              "never_been_employed_outside_home",
+              "professional",
+              "temporary_disability_expect_return_job",              
+              "visited_doctor_for_routine_checkup",
+              "you_take_medications_as_directed",
+              "urine_water_you_didnt_want",
+              "family_members_history_any_following",
+              "your_health",
+              "you_would_say_your_health" ]
+    
+    strings.each_with_index do |s, i|
+      Surveyor.to_normalized_string(s).should == codes[i]
+    end
+  end
+end

data/spec/models/dependency_spec.rb

@@ -65,24 +65,17 @@ describe Dependency, "when evaluating dependency conditions of a question in a r
   end
 
   it "knows if the dependencies are met" do
-    @dep.met?(@response_set).should be_true
-    @dep2.met?(@response_set).should be_false
-    @dep3.met?(@response_set).should be_true
-    @dep4.met?(@response_set).should be_true
+    @dep.is_met?(@response_set).should be_true
+    @dep2.is_met?(@response_set).should be_false
+    @dep3.is_met?(@response_set).should be_true
+    @dep4.is_met?(@response_set).should be_true
   end
 
   it "returns the proper keyed pairs from the dependency conditions" do
-    @dep.keyed_conditions(@response_set).should == {:A => true}
-    @dep2.keyed_conditions(@response_set).should == {:A => true, :B => false}
-    @dep3.keyed_conditions(@response_set).should == {:A => true, :B => false}
-    @dep4.keyed_conditions(@response_set).should == {:A => true, :B => false, :C => true}
+    @dep.conditions_hash(@response_set).should == {:A => true}
+    @dep2.conditions_hash(@response_set).should == {:A => true, :B => false}
+    @dep3.conditions_hash(@response_set).should == {:A => true, :B => false}
+    @dep4.conditions_hash(@response_set).should == {:A => true, :B => false, :C => true}
   end
-  
-  it "evaluates the rule from the keyed pairs and return a boolean value" do
-    @dep.rule_evaluation(@dep.keyed_conditions(@response_set)).should be_true
-    @dep2.rule_evaluation(@dep2.keyed_conditions(@response_set)).should be_false
-    @dep3.rule_evaluation(@dep3.keyed_conditions(@response_set)).should be_true
-    @dep4.rule_evaluation(@dep4.keyed_conditions(@response_set)).should be_true
-  end
-  
+
 end

data/spec/models/question_group_spec.rb

@@ -22,14 +22,14 @@ describe QuestionGroup do
   it "should return its dependency class" do
     @dependency = Factory(:dependency)
     @question_group.dependency = @dependency
-    @dependency.should_receive(:met?).and_return(true)
+    @dependency.should_receive(:is_met?).and_return(true)
     @question_group.css_class(Factory(:response_set)).should == "dependent"
 
-    @dependency.should_receive(:met?).and_return(false)
+    @dependency.should_receive(:is_met?).and_return(false)
     @question_group.css_class(Factory(:response_set)).should == "dependent hidden"
 
     @question_group.custom_class = "foo bar"
-    @dependency.should_receive(:met?).and_return(false)
+    @dependency.should_receive(:is_met?).and_return(false)
     @question_group.css_class(Factory(:response_set)).should == "dependent hidden foo bar"
   end
 end

data/spec/models/question_spec.rb

@@ -67,7 +67,7 @@ describe Question, "with dependencies" do
 
   it "should check its dependency" do
     @dependency = mock_model(Dependency)
-    @dependency.stub!(:met?).with(@rs).and_return(true)
+    @dependency.stub!(:is_met?).with(@rs).and_return(true)
     @question.stub!(:dependency).and_return(@dependency)
     @question.triggered?(@rs).should == true
   end

data/spec/models/validation_condition_spec.rb

@@ -51,3 +51,32 @@ describe ValidationCondition do
   end
   
 end
+
+describe ValidationCondition, "validating responses" do
+  def test_var(vhash, ahash, rhash)
+    v = Factory(:validation_condition, vhash)
+    a = Factory(:answer, ahash)
+    r = Factory(:response, rhash.merge(:answer => a, :question => a.question))
+    return v.is_valid?(r)
+  end
+  
+  it "should validate a response by regexp" do
+    test_var({:operator => "=~", :regexp => /^[a-z]{1,6}$/}, {:response_class => "string"}, {:string_value => "clear"}).should be_true
+    test_var({:operator => "=~", :regexp => /^[a-z]{1,6}$/}, {:response_class => "string"}, {:string_value => "foobarbaz"}).should be_false
+  end
+  it "should validate a response by integer comparison" do
+    test_var({:operator => ">", :integer_value => 3}, {:response_class => "integer"}, {:integer_value => 4}).should be_true
+    test_var({:operator => "<=", :integer_value => 256}, {:response_class => "integer"}, {:integer_value => 512}).should be_false
+  end
+  it "should validate a response by (in)equality" do
+    test_var({:operator => "!=", :datetime_value => Date.today + 1}, {:response_class => "date"}, {:datetime_value => Date.today}).should be_true
+    test_var({:operator => "==", :answer_id => 2}, {:response_class => "answer"}, {:answer_id => 2}).should be_false
+  end
+  it "should represent itself as a hash" do
+    @v = Factory(:validation_condition, :rule_key => "A")
+    @v.stub!(:is_valid?).and_return(true)
+    @v.to_hash("foo").should == {:A => true}
+    @v.stub!(:is_valid?).and_return(false)
+    @v.to_hash("foo").should == {:A => false}
+  end
+end

data/spec/models/validation_spec.rb

@@ -30,3 +30,30 @@ describe Validation do
     @validation.should have(1).error_on(:rule)
   end
 end
+describe Validation, "reporting its status" do
+  def test_var(vhash, vchashes, ahash, rhash)
+    a = Factory(:answer, ahash)
+    v = Factory(:validation, {:answer => a, :rule => "A"}.merge(vhash))
+    vchashes.each do |vchash|
+      Factory(:validation_condition, {:validation => v, :rule_key => "A"}.merge(vchash))
+    end
+    rs = Factory(:response_set)
+    r = Factory(:response, {:answer => a, :question => a.question}.merge(rhash))
+    rs.responses << r
+    return v.is_valid?(rs)
+  end
+
+  it "should validate a response by integer comparison" do
+    test_var({:rule => "A and B"}, [{:operator => ">=", :integer_value => 0}, {:rule_key => "B", :operator => "<=", :integer_value => 120}], {:response_class => "integer"}, {:integer_value => 48}).should be_true
+  end
+  it "should validate a response by regexp" do
+    test_var({}, [{:operator => "=~", :regexp => /^[a-z]{1,6}$/}], {:response_class => "string"}, {:string_value => ""}).should be_false
+  end
+  it "should validate a response by (in)equality" do
+    # test_var({:operator => "!=", :datetime_value => Date.today + 1}, {:response_class => "date"}, {:datetime_value => Date.today}).should be_true
+    # test_var({:operator => "==", :answer_id => 2}, {:response_class => "answer"}, {:answer_id => 2}).should be_false
+  end
+  it "should validate a response by lookup" do
+    
+  end
+end

data/spec/spec_helper.rb

@@ -7,8 +7,6 @@ require File.dirname(__FILE__) + "/factories"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-# require 'surveyor'
 
 Spec::Runner.configure do |config|
-  
 end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.8.0"
+  s.version = "0.9.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{2009-10-23}
+  s.date = %q{2009-11-09}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -109,6 +109,7 @@ Gem::Specification.new do |s|
      "generators/surveyor/templates/assets/stylesheets/ui.theme.css",
      "generators/surveyor/templates/initializers/haml.rb",
      "generators/surveyor/templates/initializers/surveyor.rb",
+     "generators/surveyor/templates/migrate/add_display_order_to_surveys.rb",
      "generators/surveyor/templates/migrate/create_answers.rb",
      "generators/surveyor/templates/migrate/create_dependencies.rb",
      "generators/surveyor/templates/migrate/create_dependency_conditions.rb",
@@ -131,25 +132,28 @@ Gem::Specification.new do |s|
      "lib/surveyor/acts_as_response.rb",
      "lib/surveyor/config.rb",
      "lib/tasks/surveyor_tasks.rake",
-     "lib/tiny_code.rb",
      "lib/xml_formatter.rb",
      "script/surveyor/answer.rb",
-     "script/surveyor/columnizer.rb",
+     "script/surveyor/base.rb",
      "script/surveyor/dependency.rb",
      "script/surveyor/dependency_condition.rb",
      "script/surveyor/question.rb",
      "script/surveyor/question_group.rb",
      "script/surveyor/specs/answer_spec.rb",
-     "script/surveyor/specs/question_dependency_spec.rb",
-     "script/surveyor/specs/question_group_spec.rb",
      "script/surveyor/specs/question_spec.rb",
-     "script/surveyor/specs/section_spec.rb",
+     "script/surveyor/specs/spec_helper.rb",
+     "script/surveyor/specs/survey_section_spec.rb",
+     "script/surveyor/specs/validation_condition_spec.rb",
+     "script/surveyor/specs/validation_spec.rb",
      "script/surveyor/survey.rb",
      "script/surveyor/survey_parser.rb",
      "script/surveyor/survey_section.rb",
+     "script/surveyor/validation.rb",
+     "script/surveyor/validation_condition.rb",
      "script/surveyor/whr_dsl.tmproj",
      "spec/controllers/surveyor_controller_spec.rb",
      "spec/factories.rb",
+     "spec/lib/surveyor_spec.rb",
      "spec/models/answer_spec.rb",
      "spec/models/dependency_condition_spec.rb",
      "spec/models/dependency_spec.rb",
@@ -175,6 +179,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/controllers/surveyor_controller_spec.rb",
      "spec/factories.rb",
+     "spec/lib/surveyor_spec.rb",
      "spec/models/answer_spec.rb",
      "spec/models/dependency_condition_spec.rb",
      "spec/models/dependency_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -05:00
+date: 2009-11-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,6 +126,7 @@ files:
 - generators/surveyor/templates/assets/stylesheets/ui.theme.css
 - generators/surveyor/templates/initializers/haml.rb
 - generators/surveyor/templates/initializers/surveyor.rb
+- generators/surveyor/templates/migrate/add_display_order_to_surveys.rb
 - generators/surveyor/templates/migrate/create_answers.rb
 - generators/surveyor/templates/migrate/create_dependencies.rb
 - generators/surveyor/templates/migrate/create_dependency_conditions.rb
@@ -148,25 +149,28 @@ files:
 - lib/surveyor/acts_as_response.rb
 - lib/surveyor/config.rb
 - lib/tasks/surveyor_tasks.rake
-- lib/tiny_code.rb
 - lib/xml_formatter.rb
 - script/surveyor/answer.rb
-- script/surveyor/columnizer.rb
+- script/surveyor/base.rb
 - script/surveyor/dependency.rb
 - script/surveyor/dependency_condition.rb
 - script/surveyor/question.rb
 - script/surveyor/question_group.rb
 - script/surveyor/specs/answer_spec.rb
-- script/surveyor/specs/question_dependency_spec.rb
-- script/surveyor/specs/question_group_spec.rb
 - script/surveyor/specs/question_spec.rb
-- script/surveyor/specs/section_spec.rb
+- script/surveyor/specs/spec_helper.rb
+- script/surveyor/specs/survey_section_spec.rb
+- script/surveyor/specs/validation_condition_spec.rb
+- script/surveyor/specs/validation_spec.rb
 - script/surveyor/survey.rb
 - script/surveyor/survey_parser.rb
 - script/surveyor/survey_section.rb
+- script/surveyor/validation.rb
+- script/surveyor/validation_condition.rb
 - script/surveyor/whr_dsl.tmproj
 - spec/controllers/surveyor_controller_spec.rb
 - spec/factories.rb
+- spec/lib/surveyor_spec.rb
 - spec/models/answer_spec.rb
 - spec/models/dependency_condition_spec.rb
 - spec/models/dependency_spec.rb
@@ -214,6 +218,7 @@ summary: A rails (gem) plugin to enable surveys in your application
 test_files: 
 - spec/controllers/surveyor_controller_spec.rb
 - spec/factories.rb
+- spec/lib/surveyor_spec.rb
 - spec/models/answer_spec.rb
 - spec/models/dependency_condition_spec.rb
 - spec/models/dependency_spec.rb

data/lib/tiny_code.rb

@@ -1,58 +0,0 @@
-module TinyCode
-
-  module ClassMethods
-
-    RAND_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789" + "abcdefghijklmnopqrstuvwxyz"
-
-    def make_tiny_code
-      random_string(10)
-    end
-
-    def random_string(len)
-      rand_max = RAND_CHARS.size
-      ret = "" 
-      len.times{ ret << RAND_CHARS[rand(rand_max)] }
-      ret 
-    end
-
-
-    def self.to_normalized_string(text)
-      words_to_omit = ["a", "to", "the", "of", "has", "have", "it", "is", "in", "on", "or", "but", "when", "be"]
-
-      # strip all the html tags from the text data
-      col_text = text.gsub(/(<[^>]*>)|\n|\t/s, ' ')
-
-      # Removing capitalization
-      col_text.downcase!
-      # Removing potential problem characters
-      col_text.gsub!(/\"|\'/, '')
-      # Removing text inside parens
-      col_text.gsub!(/\(.*?\)/,'')
-
-      # Removing all other non-word characters
-      col_text.gsub!(/\W/, ' ')
-
-      column_words = []
-      words = col_text.split(' ')
-      words.each do |word|
-        if !words_to_omit.include?(word)
-          column_words << word
-        end
-      end
-
-      #reducing the word list to limit column length
-      if column_words.length > 5
-        column_words.slice!(0, column_words.length - 5)
-      end
-
-      #re-assemble the string
-      column_words.join("_")
-    end 
-
-  end
-
-  def self.included(klass)
-    klass.extend(ClassMethods)
-  end
-
-end

data/script/surveyor/columnizer.rb

@@ -1,36 +0,0 @@
-module Columnizer
-   
-   def self.to_normalized_column(text)
-      words_to_omit = ["a", "to", "the", "of", "has", "have", "it", "is", "in", "on", "or", "but", "when", "be"]
-      
-      # strip all the html tags from the text data
-      col_text = text.gsub(/(<[^>]*>)|\n|\t/s, ' ')
-      
-      # Removing capitalization
-      col_text.downcase!
-      # Removing potential problem characters
-      col_text.gsub!(/\"|\'/, '')
-      # Removing text inside parens
-      col_text.gsub!(/\(.*?\)/,'')
-      
-      # Removing all other non-word characters
-      col_text.gsub!(/\W/, ' ')
-      
-      column_words = []
-      words = col_text.split(' ')
-      words.each do |word|
-         if !words_to_omit.include?(word)
-             column_words << word
-         end
-      end
-      
-      #reducing the word list to limit column length
-      if column_words.length > 5
-          column_words.slice!(0, column_words.length - 5)
-      end
-      
-      #re-assemble the string
-      column_words.join("_")
-   end 
-    
-end