surveyor 0.9.8 → 0.9.9

data/README.md

@@ -7,12 +7,12 @@ Surveyor is a rails (gem) plugin, that brings surveys to your rails app. Before
 As a plugin:
 
     sudo gem install haml
-    script/plugin install git://github.com/breakpointer/surveyor.git -r 'tag v0.9.0'
+    script/plugin install git://github.com/breakpointer/surveyor.git -r 'tag v0.9.8'
 
 Or as a gem plugin:
   
   # in environment.rb
-  config.gem "surveyor", :version => '>=0.9.0', :source => 'http://gemcutter.org'
+  config.gem "surveyor", :version => '>=0.9.8', :source => 'http://gemcutter.org'
   
     sudo gem install gemcutter
     gem tumble
@@ -109,6 +109,42 @@ Surveyor depends on Rails 2.3 and the SASS style sheet language, part of HAML (h
 
 # Changes
 
+0.9.8
+
+* @current\_user.id if @current\_user isn't nil. Closes #37
+
+0.9.7
+
+* fixing typos
+* remove surveyor controller from load\_once\_paths. fixes issue with dependencies and unloading in development. closes #36
+
+0.9.6
+
+* response set reports progress and mandatory questions completeness. closes #33
+* adding correctness to response sets
+* adding correctness to responses
+
+0.9.5
+
+* allow append for survey parser. closes #32
+
+0.9.4
+
+* making tinycode compatible with ruby 1.8.6
+
+0.9.3
+
+* fix for survey parser require
+
+0.9.2
+
+* fixing specs for namespacing and move of tinycode
+* namespacing SurveyParser models to avoid conflict with model extensions
+
+0.9.1
+
+* fix for tinycode, more descriptive missing method
+
 0.9.0
 
 * validations in dsl and surveyor models

data/VERSION

@@ -1 +1 @@
-0.9.8
+0.9.9

data/app/models/response_set.rb

@@ -112,7 +112,7 @@ class ResponseSet < ActiveRecord::Base
     }
   end
   def is_answered?(question)
-    !is_unanswered?(question)
+    %w(label image).include?(question.display_type) or !is_unanswered?(question)
   end
   def is_unanswered?(question)
     self.responses.detect{|r| r.question_id == question.id}.nil?

data/app/models/validation_condition.rb

@@ -27,12 +27,14 @@ class ValidationCondition < ActiveRecord::Base
   
   def is_valid?(response)
     klass = response.answer.response_class
+    compare_to = Response.find_by_question_id_and_answer_id(self.question_id, self.answer_id) || self
     case self.operator
     when "==", "<", ">", "<=", ">="
-      response.as(klass).send(self.operator, self.as(klass))
+      response.as(klass).send(self.operator, compare_to.as(klass))
     when "!="
-      !(response.as(klass) == self.as(klass))
+      !(response.as(klass) == compare_to.as(klass))
     when "=~"
+      return false if compare_to != self
       !(response.as(klass).to_s =~ Regexp.new(self.regexp || "")).nil?
     else
       false

data/spec/models/response_set_spec.rb

@@ -176,6 +176,13 @@ describe ResponseSet, "with mandatory questions" do
     @response_set.mandatory_questions_complete?.should be_false
     @response_set.progress_hash.should == {:questions => 3, :triggered => 3, :triggered_mandatory => 3, :triggered_mandatory_completed => 0}
   end
+  it "should ignore labels and images" do
+    generate_responses(3, "mandatory", "responded")
+    Factory(:question, :survey_section => @section, :display_type => "label", :is_mandatory => true)
+    Factory(:question, :survey_section => @section, :display_type => "image", :is_mandatory => true)
+    @response_set.mandatory_questions_complete?.should be_true
+    @response_set.progress_hash.should == {:questions => 5, :triggered => 5, :triggered_mandatory => 5, :triggered_mandatory_completed => 5}
+  end
 end
 describe ResponseSet, "with mandatory, dependent questions" do
   before(:each) do

data/spec/models/validation_condition_spec.rb

@@ -56,7 +56,7 @@ 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))
+    r = Factory(:response, {:answer => a, :question => a.question}.merge(rhash))
     return v.is_valid?(r)
   end
   
@@ -70,7 +70,7 @@ describe ValidationCondition, "validating responses" do
   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
+    test_var({:operator => "==", :string_value => "foo"}, {:response_class => "string"}, {:string_value => "foo"}).should be_true
   end
   it "should represent itself as a hash" do
     @v = Factory(:validation_condition, :rule_key => "A")
@@ -79,4 +79,27 @@ describe ValidationCondition, "validating responses" do
     @v.stub!(:is_valid?).and_return(false)
     @v.to_hash("foo").should == {:A => false}
   end
+end
+
+describe ValidationCondition, "validating responses by other responses" do
+  def test_var(v_hash, a_hash, r_hash, ca_hash, cr_hash)
+    ca = Factory(:answer, ca_hash)
+    cr = Factory(:response, cr_hash.merge(:answer => ca, :question => ca.question))
+    v = Factory(:validation_condition, v_hash.merge({:question_id => ca.question.id, :answer_id => ca.id}))
+    a = Factory(:answer, a_hash)
+    r = Factory(:response, r_hash.merge(:answer => a, :question => a.question))
+    return v.is_valid?(r)
+  end
+  it "should validate a response by integer comparison" do
+    test_var({:operator => ">"}, {:response_class => "integer"}, {:integer_value => 4}, {:response_class => "integer"}, {:integer_value => 3}).should be_true
+    test_var({:operator => "<="}, {:response_class => "integer"}, {:integer_value => 512}, {:response_class => "integer"}, {:integer_value => 4}).should be_false
+  end
+  it "should validate a response by (in)equality" do
+    test_var({:operator => "!="}, {:response_class => "date"}, {:datetime_value => Date.today}, {:response_class => "date"}, {:datetime_value => Date.today + 1}).should be_true
+    test_var({:operator => "=="}, {:response_class => "string"}, {:string_value => "donuts"}, {:response_class => "string"}, {:string_value => "donuts"}).should be_true
+  end
+  it "should not validate a response by regexp" do
+    test_var({:operator => "=~"}, {:response_class => "date"}, {:datetime_value => Date.today}, {:response_class => "date"}, {:datetime_value => Date.today + 1}).should be_false
+    test_var({:operator => "=~"}, {:response_class => "string"}, {:string_value => "donuts"}, {:response_class => "string"}, {:string_value => "donuts"}).should be_false
+  end
 end

data/surveyor.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   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-11-13}
+  s.date = %q{2009-11-16}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -209,3 +209,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<haml>, [">= 0"])
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -06:00
+date: 2009-11-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency