surveyor 0.19.6 → 0.19.7

data/CHANGELOG

@@ -1,3 +1,14 @@
+0.19.7
+
+* fix accidentally allowing through blank pick => any answers
+* rewrote a test to reflect re-saving a survey via an admin controller
+* stop survey titles from appending '1' to itself when calling update attributes
+* fix response saving and dependencies on pick one/many with string. closes #158
+* changed fastercsv to csv for ruby 1.9. closes #111
+* changed .to_s to .join for ruby 1.9
+* Merge pull request #137 from keviniano/master
+* surveyor models
+
 0.19.6
 
 * fix parsing of group questions with dependencies. closes #160

data/README.md

@@ -97,11 +97,12 @@ and read surveys/EXTENDING\_SURVEYOR
 
 Surveyor depends on:
 
-* Ruby (1.8.7 - 1.9.1)
+* Ruby (1.8.7 - 1.9.2)
 * Rails 2.3
-* HAML/SASS
+* HAML
+* SASS
+* fastercsv (or CSV for ruby 1.9) for csv exports
 * formtastic
-* fastercsv for csv exports
 * UUID
 
 To work on the code fork this github project. Run:

data/VERSION

@@ -1 +1 @@
-0.19.6
+0.19.7

data/app/views/partials/_question.html.haml

@@ -1,7 +1,7 @@
 -# TODO: js for slider
 - rg ||= nil
 - renderer = q.renderer(g ||= nil)
-- f.inputs q_text(q), :id => rg ? "q_#{q.id}_#{rg.id}" : "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}" do
+- f.inputs q_text(q), :id => rg ? "q_#{q.id}_#{rg}" : "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}" do
   %span.help= q.help_text
   - case renderer
   - when :image, :label

data/lib/surveyor/common.rb

@@ -1,14 +1,14 @@
 module Surveyor
   class Common
-    RAND_CHARS = [('a'..'z'), ('A'..'Z'), (0..9)].map{|r| r.to_a}.flatten.to_s
+    RAND_CHARS = [('a'..'z'), ('A'..'Z'), (0..9)].map{|r| r.to_a}.flatten.join
     OPERATORS = %w(== != < > <= >= =~)
     
     class << self
       def make_tiny_code(len = 10)
         if RUBY_VERSION < "1.8.7"
-          (1..len).to_a.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.to_s
+          (1..len).to_a.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.join
         else
-          len.times.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.to_s
+          len.times.map{|i| RAND_CHARS[rand(RAND_CHARS.size), 1] }.join
         end
       end
 

data/lib/surveyor/models/dependency_condition_methods.rb

@@ -48,6 +48,7 @@ module Surveyor
                      end 
                    end || responses.first
         klass = response.answer.response_class
+        klass = "answer" if self.as(klass).nil?
         return case self.operator
         when "==", "<", ">", "<=", ">="
           response.as(klass).send(self.operator, self.as(klass))

data/lib/surveyor/models/response_set_methods.rb

@@ -1,3 +1,5 @@
+require 'fastercsv'
+require 'csv'
 module Surveyor
   module Models
     module ResponseSetMethods
@@ -36,7 +38,9 @@ module Surveyor
             result
           end
           def has_blank_value?(hash)
-            hash["answer_id"].blank? or hash.any?{|k,v| v.is_a?(Array) ? v.all?{|x| x.to_s.blank?} : v.to_s.blank?}
+            return true if hash["answer_id"].blank?
+            return false if (q = Question.find_by_id(hash["question_id"])) and q.pick == "one"
+            hash.any?{|k,v| v.is_a?(Array) ? v.all?{|x| x.to_s.blank?} : v.to_s.blank?}
           end
         end
       end
@@ -63,8 +67,8 @@ module Surveyor
         qcols = Question.content_columns.map(&:name) - %w(created_at updated_at)
         acols = Answer.content_columns.map(&:name) - %w(created_at updated_at)
         rcols = Response.content_columns.map(&:name)
-        require 'fastercsv'
-        FCSV(result = "") do |csv|
+        csvlib = CSV.const_defined?(:Reader) ? FasterCSV : CSV
+        result = csvlib.generate do |csv|
           csv << (access_code ? ["response set access code"] : []) + qcols.map{|qcol| "question.#{qcol}"} + acols.map{|acol| "answer.#{acol}"} + rcols.map{|rcol| "response.#{rcol}"} if print_header
           responses.each do |response|
             csv << (access_code ? [self.access_code] : []) + qcols.map{|qcol| response.question.send(qcol)} + acols.map{|acol| response.answer.send(acol)} + rcols.map{|rcol| response.send(rcol)}

data/lib/surveyor/models/survey_methods.rb

@@ -42,6 +42,7 @@ module Surveyor
       end
 
       def title=(value)
+        return if value == self.title
         adjusted_value = value
         while Survey.find_by_access_code(Survey.to_normalized_string(adjusted_value))
           i ||= 0
@@ -49,7 +50,7 @@ module Surveyor
           adjusted_value = "#{value} #{i.to_s}"
         end
         self.access_code = Survey.to_normalized_string(adjusted_value)
-        super(adjusted_value)        
+        super(adjusted_value)
         # self.access_code = Survey.to_normalized_string(value)
         # super
       end
@@ -76,4 +77,4 @@ module Surveyor
       end
     end
   end
-end
+end

data/lib/surveyor/redcap_parser.rb

@@ -1,6 +1,7 @@
 %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
+require 'fastercsv'
+require 'csv'
 module Surveyor
   class RedcapParser
     # Attributes
@@ -19,8 +20,9 @@ module Surveyor
       self.context = {}
     end
     def parse(str, filename)
+      csvlib = CSV.const_defined?(:Reader) ? FasterCSV : CSV
       begin
-        FasterCSV.parse(str, :headers => :first_row, :return_headers => true, :header_converters => :symbol) do |r|
+        csvlib.parse(str, :headers => :first_row, :return_headers => true, :header_converters => :symbol) do |r|
           if r.header_row? # header row
             return puts "Missing headers: #{missing_columns(r).inspect}\n\n" unless missing_columns(r).blank?
             context[:survey] = Survey.new(:title => filename)
@@ -35,7 +37,7 @@ module Surveyor
         end
         print context[:survey].save ? "saved. " : " not saved! #{context[:survey].errors.each_full{|x| x }.join(", ")} "
         # print context[:survey].sections.map(&:questions).flatten.map(&:answers).flatten.map{|x| x.errors.each_full{|y| y}.join}.join
-      rescue FasterCSV::MalformedCSVError
+      rescue csvlib::MalformedCSVError
         puts = "Oops. Not a valid CSV file."
       # ensure
       end

data/spec/models/dependency_condition_spec.rb

@@ -339,7 +339,28 @@ describe DependencyCondition do
       @dep_c.is_met?([@response]).should be_true
     end
   end
-  
+
+  describe "when evaluating a pick one/many with response_class e.g. string" do
+    it "should compare answer ids when the string_value is nil" do
+      a = Factory(:answer, :response_class => "string")
+      dc = Factory(:dependency_condition, :question_id => a.question.id, :answer_id => a.id, :operator => "==")
+      r = Factory(:response, :question_id => a.question.id, :answer_id => a.id, :string_value => "")
+      r.should_receive(:as).with("answer").and_return(a.id)
+      dc.is_met?([r]).should be_true
+    end
+    it "should compare strings when the string_value is not nil, even if it is blank" do
+      a = Factory(:answer, :response_class => "string")
+      dc = Factory(:dependency_condition, :question_id => a.question.id, :answer_id => a.id, :operator => "==", :string_value => "foo")
+      r = Factory(:response, :question_id => a.question.id, :answer_id => a.id, :string_value => "foo")
+      r.should_receive(:as).with("string").and_return("foo")
+      dc.is_met?([r]).should be_true      
+
+      dc2 = Factory(:dependency_condition, :question_id => a.question.id, :answer_id => a.id, :operator => "==", :string_value => "")
+      r2 = Factory(:response, :question_id => a.question.id, :answer_id => a.id, :string_value => "")
+      r2.should_receive(:as).with("string").and_return("")
+      dc2.is_met?([r2]).should be_true      
+    end
+  end
   describe "when given responses whether the dependency is satisfied using 'count'" do
     before(:each) do
       @dep_c = DependencyCondition.new(:answer_id => nil, 

data/spec/models/response_set_spec.rb

@@ -90,7 +90,7 @@ describe ResponseSet do
       "28" => {"question_id" => "16", "answer_id" => "", "string_value" => "foo"}, # new radio with string value, blank
       "29" => {"question_id" => "17", "answer_id" => "261", "string_value" => "bar"}, # new radio with string value, selected
       "30" => {"id" => "110", "question_id" => "18", "answer_id" => "271", "string_value" => "moo"}, # existing radio with string value, changed
-      "31" => {"id" => "111", "question_id" => "19", "answer_id" => "281", "string_value" => "mar"}, # existing radio with string value, unchanged
+      "31" => {"id" => "111", "question_id" => "19", "answer_id" => "281", "string_value" => "mar"} # existing radio with string value, unchanged
     }
     ResponseSet.reject_or_destroy_blanks(hash_of_hashes).should == {
       # "11" => {"question_id" => "1", "answer_id" => [""]}, # new checkbox, blank
@@ -113,7 +113,16 @@ describe ResponseSet do
       # "28" => {"question_id" => "16", "answer_id" => "", "string_value" => "foo"}, # new radio with string value, blank
       "29" => {"question_id" => "17", "answer_id" => "261", "string_value" => "bar"}, # new radio with string value, selected
       "30" => {"id" => "110", "question_id" => "18", "answer_id" => "271", "string_value" => "moo"}, # existing radio with string value, changed
-      "31" => {"id" => "111", "question_id" => "19", "answer_id" => "281", "string_value" => "mar"}, # existing radio with string value, unchanged
+      "31" => {"id" => "111", "question_id" => "19", "answer_id" => "281", "string_value" => "mar"} # existing radio with string value, unchanged
+    }
+  end
+  it "should clean up radio and string responses_attributes before passing to nested_attributes" do
+    @qone = Factory(:question, :pick => "one")
+    hash_of_hashes = {
+      "32" => {"question_id" => @qone.id, "answer_id" => "291", "string_value" => ""} # new radio with blank string value, selected      
+    }
+    ResponseSet.reject_or_destroy_blanks(hash_of_hashes).should == {
+      "32" => {"question_id" => @qone.id, "answer_id" => "291", "string_value" => ""} # new radio with blank string value, selected
     }
   end
   it "should remove responses" do

data/spec/models/survey_spec.rb

@@ -5,12 +5,12 @@ describe Survey, "when saving a new one" do
   before(:each) do
     @survey = Factory(:survey, :title => "Foo")
   end
-  
+
   it "should be invalid without a title" do
     @survey.title = nil
     @survey.should have(1).error_on(:title)
   end
-  
+
   it "should adjust the title to save unique titles" do
     original = Survey.new(:title => "Foo")
     original.save.should be_true
@@ -21,7 +21,14 @@ describe Survey, "when saving a new one" do
     bandwagoneer.save.should be_true
     bandwagoneer.title.should == "Foo 2"
   end
-  
+
+  it "should not adjust the title when updating itself" do
+    original = Factory(:survey, :title => "Foo")
+    original.save.should be_true
+    original.update_attributes(:title => "Foo")
+    original.title.should == "Foo"
+  end
+
   it "should have an api_id" do
     @survey.api_id.length.should == 36
   end
@@ -44,7 +51,7 @@ describe Survey, "that has sections" do
     @survey.sections.should have(3).sections
     @survey.sections.should == [@s3, @s1, @s2]
   end
-  
+
   it "should return survey_sections_with_questions in display order" do
     @survey.sections_with_questions.map(&:questions).flatten.should have(4).questions
     @survey.sections_with_questions.map(&:questions).flatten.should == [@q4,@q1,@q3,@q2]
@@ -72,19 +79,19 @@ describe Survey do
     @survey.active?.should be_true
     @survey.inactive_at.should be_nil
   end
-  
+
   it "should be able to deactivate as of a certain date/time" do
     @survey.active_at = 2.days.ago
     @survey.inactive_at = 3.days.ago
     @survey.active?.should be_false
     @survey.active_at.should be_nil
   end
-  
+
   it "should activate and deactivate" do
     @survey.activate!
     @survey.active?.should be_true
     @survey.deactivate!
     @survey.active?.should be_false
   end
-  
-end
+
+end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.19.6"
+  s.version = "0.19.7"
 
   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-06-08}
+  s.date = %q{2011-06-23}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -52,6 +52,8 @@ Gem::Specification.new do |s|
     "app/views/surveyor/show.html.haml",
     "ci-env.sh",
     "config/routes.rb",
+    "doc/surveyor_models.png",
+    "doc/surveyor_models2.png",
     "features/redcap_parser.feature",
     "features/step_definitions/parser_steps.rb",
     "features/step_definitions/surveyor_steps.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 19
-  - 6
-  version: 0.19.6
+  - 7
+  version: 0.19.7
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -05:00
+date: 2011-06-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,6 +149,8 @@ files:
 - app/views/surveyor/show.html.haml
 - ci-env.sh
 - config/routes.rb
+- doc/surveyor_models.png
+- doc/surveyor_models2.png
 - features/redcap_parser.feature
 - features/step_definitions/parser_steps.rb
 - features/step_definitions/surveyor_steps.rb