surveyor 0.19.5 → 0.19.6

data/CHANGELOG

@@ -1,3 +1,14 @@
+0.19.6
+
+* fix parsing of group questions with dependencies. closes #160
+* update homepage
+* lock ci to ree-1.8.7-2010.02
+* Fixed safari issue with conditional questions not hiding/showing.
+* add checkbox + text renderer. closes #107
+* add sass, since Haml will no longer do so
+* adjusting testbed cucumber to avoid 'uninitialized constant Gherkin::Formatter::Model::PyString' error
+* Fixed error when user answers a checkbox question.
+
 0.19.5
 
 * Fixed dependent questions not appearing under certain conditions. Closes #143.

data/Rakefile

@@ -7,9 +7,10 @@ begin
     gem.name = "surveyor"
     gem.summary = %Q{A rails (gem) plugin to enable surveys in your application}
     gem.email = "yoon@northwestern.edu"
-    gem.homepage = "http://github.com/breakpointer/surveyor"
+    gem.homepage = "http://github.com/NUBIC/surveyor"
     gem.authors = ["Brian Chamberlain", "Mark Yoon"]
     gem.add_dependency 'haml'
+    gem.add_dependency 'sass'
     gem.add_dependency 'fastercsv'
     gem.add_dependency 'formtastic'
     gem.add_dependency 'uuid'

data/VERSION

@@ -1 +1 @@
-0.19.5
+0.19.6

data/ci-env.sh

@@ -25,5 +25,5 @@ export rvm_project_rvmrc=0
 set +xe
 echo "Loading RVM ree@surveyor-dev"
 source ~/.rvm/scripts/rvm
-rvm use ree@surveyor-dev
+rvm use ree-1.8.7-2010.02@surveyor-dev
 set -xe

data/features/step_definitions/parser_steps.rb

@@ -75,3 +75,14 @@ Then /^question "([^"]*)" should have correct answer "([^"]*)"$/ do |qr, ar|
   q.correct_answer.should == q.answers.find_by_reference_identifier(ar)
 end
 
+Then /^(\d+) dependencies should depend on questions$/ do |x|
+  arr = Dependency.find_all_by_question_group_id(nil)
+  arr.size.should == 2
+  arr.each{|d| d.question.should_not be_nil}
+end
+
+Then /^(\d+) dependencies should depend on question groups$/ do |x|
+  arr = Dependency.find_all_by_question_id(nil)
+  arr.size.should == 2
+  arr.each{|d| d.question_group.should_not be_nil}
+end

data/features/step_definitions/surveyor_steps.rb

@@ -50,3 +50,13 @@ Then /^a dropdown should exist with the options "([^"]*)"$/ do |options_text|
     end
   end
 end
+
+Then /^there should be (\d+) checkboxes$/ do |count|
+  response.should have_selector('input[type=checkbox]', :count => count.to_i)
+  
+end
+
+Then /^there should be (\d+) text areas$/ do |count|
+  response.should have_selector('textarea', :count => count.to_i)
+end
+

data/features/surveyor.feature

@@ -153,4 +153,19 @@ Feature: Survey creation
     And I press "Click here to finish"
     Then there should be 1 response set with 1 response with:
     | shrimp |
-    
+
+  Scenario: Checkboxes with text area
+    Given the survey
+    """
+      survey "Websites" do
+        section "Search engines" do
+          q "Have you ever used the following services?", :pick => :any
+          a "Yellowpages.com|Describe your experience", :text
+          a "Google.com|Describe your experience", :text
+          a "Bing.com|Describe your experience", :text
+        end
+      end
+    """
+    When I start the "Websites" survey
+    Then there should be 3 checkboxes
+    And there should be 3 text areas

data/features/surveyor_parser.feature

@@ -198,4 +198,44 @@ Feature: Survey creation
     """
     Then there should be 5 dependencies
     And question "copd_sh_1a" should have a dependency with rule "A"
-    And question "copd_sh_1ba" should have a dependency with rule "E"
+    And question "copd_sh_1ba" should have a dependency with rule "E"
+
+  Scenario: Dependencies on questions inside of a group
+    Given the survey
+    """
+      survey "Phone Screen Questions" do
+        section "Phone Screen" do
+          q_diabetes "Diabetes", :pick => :one
+          a_yes "Yes"
+          a_no "No"
+
+          q_high_blood_preassure "High blood pressure?", :pick => :one
+          a_yes "Yes"
+          a_no "No"
+
+          group do 
+            dependency :rule => "A"
+            condition_A :q_diabetes, "==", :a_yes
+            label "It looks like you are not eligible for this specific study at the time"
+          end
+
+          group "Eligible" do
+            dependency :rule => "A"
+            condition_A :q_diabetes, "==", :a_no
+
+            label "You're Eligible!"
+
+            label "You need medical clearance"
+            dependency :rule => "A"
+            condition_A :q_high_blood_preassure, "==", :a_yes
+
+            label "You don't need medical clearance"
+            dependency :rule => "A"
+            condition_A :q_high_blood_preassure, "==", :a_no
+          end
+        end
+      end
+    """
+    Then there should be 4 dependencies
+    And 2 dependencies should depend on questions
+    And 2 dependencies should depend on question groups

data/generators/surveyor/templates/assets/javascripts/jquery.surveyor.js

@@ -25,7 +25,7 @@ jQuery(document).ready(function(){
     // surveyor_controller returns a json object to show/hide elements and insert/remove ids e.g. {"ids": {"2" => 234}, "remove": {"4" => 21}, "hide":["question_12","question_13"],"show":["question_14"]}
     jQuery.each(responseText.show, function(){ jQuery('#' + this).show("fast"); });
     jQuery.each(responseText.hide, function(){ jQuery('#' + this).hide("fast"); });
-    jQuery.each(responseText.ids, function(k,v){ jQuery('#r_'+k+'_question_id').after('<input id="r_'+k+'_id" type="hidden" value="'+v+'" name="r['+k+'][id]"'); });
+    jQuery.each(responseText.ids, function(k,v){ jQuery('#r_'+k+'_question_id').after('<input id="r_'+k+'_id" type="hidden" value="'+v+'" name="r['+k+'][id]"/>'); });
     jQuery.each(responseText.remove, function(k,v){ jQuery('#r_'+k+'_id[value="'+v+'"]').remove(); });
     return false;
   }

data/lib/formtastic/surveyor_builder.rb

@@ -40,7 +40,8 @@ module Formtastic
         )
         li_content << basic_input_helper(:text_field, :string, :string_value, options) if options[:response_class] == "other_and_string"
         li_content << basic_input_helper(:text_field, :string, :string_value, options) if %w(string other_and_string).include?(options[:response_class])
-
+        li_content << basic_input_helper(:text_area, :text, :text_value, options) if options[:response_class] == "text"
+        
         # li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
         Formtastic::Util.html_safe(li_content)
       end

data/lib/surveyor/models/response_methods.rb

@@ -19,8 +19,9 @@ module Surveyor
         base.instance_eval do
           def applicable_attributes(attrs)
             result = HashWithIndifferentAccess.new(attrs)
-            if result[:string_value] && Answer.exists?(result[:answer_id])
-              answer = Answer.find(result[:answer_id])
+            answer_id = result[:answer_id].is_a?(Array) ? result[:answer_id].last : result[:answer_id] # checkboxes are arrays / radio buttons are not arrays
+            if result[:string_value] && Answer.exists?(answer_id)
+              answer = Answer.find(answer_id)
               result.delete(:string_value) unless answer.response_class && answer.response_class.to_sym == :string
             end
             result

data/lib/surveyor/parser.rb

@@ -169,7 +169,7 @@ class Dependency < ActiveRecord::Base
     
     # build and set context
     if context[:question]
-      context[:dependency] = context[:question].build_dependency({:question_group => context[:question_group]}.merge(args[0] || {}))
+      context[:dependency] = context[:question].build_dependency(args[0] || {})
     elsif context[:question_group]
       context[:dependency] = context[:question_group].build_dependency(args[0] || {})
     end

data/spec/models/response_set_spec.rb

@@ -82,7 +82,15 @@ describe ResponseSet do
       "20" => {"question_id" => "10", "answer_id" => "201", "string_value" => "hi"}, # new string, filled
       "21" => {"id" => "105", "question_id" => "11", "answer_id" => "211", "string_value" => ""}, # existing string, cleared
       "22" => {"id" => "106", "question_id" => "12", "answer_id" => "221", "string_value" => "ho"}, # existing string, changed
-      "23" => {"id" => "107", "question_id" => "13", "answer_id" => "231", "string_value" => "hi"} # existing string, unchanged
+      "23" => {"id" => "107", "question_id" => "13", "answer_id" => "231", "string_value" => "hi"}, # existing string, unchanged
+      "24" => {"question_id" => "14", "answer_id" => [""], "string_value" => "foo"}, # new checkbox with string value, blank
+      "25" => {"question_id" => "15", "answer_id" => ["", "241"], "string_value" => "bar"}, # new checkbox with string value, checked
+      "26" => {"id" => "108", "question_id" => "14", "answer_id" => [""], "string_value" => "moo"}, # existing checkbox with string value, unchecked
+      "27" => {"id" => "109", "question_id" => "15", "answer_id" => ["", "251"], "string_value" => "mar"}, # existing checkbox with string value, left alone
+      "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
     }
     ResponseSet.reject_or_destroy_blanks(hash_of_hashes).should == {
       # "11" => {"question_id" => "1", "answer_id" => [""]}, # new checkbox, blank
@@ -97,7 +105,15 @@ describe ResponseSet do
       "20" => {"question_id" => "10", "answer_id" => "201", "string_value" => "hi"}, # new string, filled
       "21" => {"id" => "105", "question_id" => "11", "answer_id" => "211", "string_value" => "", "_destroy" => "true"}, # existing string, cleared
       "22" => {"id" => "106", "question_id" => "12", "answer_id" => "221", "string_value" => "ho"}, # existing string, changed
-      "23" => {"id" => "107", "question_id" => "13", "answer_id" => "231", "string_value" => "hi"} # existing string, unchanged
+      "23" => {"id" => "107", "question_id" => "13", "answer_id" => "231", "string_value" => "hi"}, # existing string, unchanged
+      # "24" => {"question_id" => "14", "answer_id" => [""], "string_value" => "foo"}, # new checkbox with string value, blank
+      "25" => {"question_id" => "15", "answer_id" => ["", "241"], "string_value" => "bar"}, # new checkbox with string value, checked
+      "26" => {"id" => "108", "question_id" => "14", "answer_id" => [""], "string_value" => "moo", "_destroy" => "true"}, # existing checkbox with string value, unchecked
+      "27" => {"id" => "109", "question_id" => "15", "answer_id" => ["", "251"], "string_value" => "mar"}, # existing checkbox with string value, left alone
+      # "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
     }
   end
   it "should remove responses" do

data/spec/models/response_spec.rb

@@ -91,4 +91,20 @@ describe Response, "applicable_attributes" do
     bad = {"question_id"=>@who.id, "answer_id"=>@odoyle.id, "string_value"=>"Frank"}
     Response.applicable_attributes(bad).should == {"question_id" => @who.id, "answer_id"=> @odoyle.id}
   end
+  
+  it "should have string_value if response_type is string and answer_id is an array (in the case of checkboxes)" do
+    good = {"question_id"=>@who.id, "answer_id"=>["", @odoyle.id], "string_value"=>"Frank"}
+    Response.applicable_attributes(good).should == {"question_id" => @who.id, "answer_id"=> ["", @odoyle.id]}
+  end
+  
+  it "should have ignore attribute if missing answer_id" do
+    ignore = {"question_id"=>@who.id, "answer_id"=>"", "string_value"=>"Frank"}
+    Response.applicable_attributes(ignore).should == {"question_id"=>@who.id, "answer_id"=>"", "string_value"=>"Frank"}
+  end
+  
+  it "should have ignore attribute if missing answer_id is an array" do
+    ignore = {"question_id"=>@who.id, "answer_id"=>[""], "string_value"=>"Frank"}
+    Response.applicable_attributes(ignore).should == {"question_id"=>@who.id, "answer_id"=>[""], "string_value"=>"Frank"}
+  end
+  
 end

data/surveyor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.19.5"
+  s.version = "0.19.6"
 
   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-03}
+  s.date = %q{2011-06-08}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
@@ -148,7 +148,7 @@ Gem::Specification.new do |s|
     "surveyor.gemspec",
     "testbed/Gemfile"
   ]
-  s.homepage = %q{http://github.com/breakpointer/surveyor}
+  s.homepage = %q{http://github.com/NUBIC/surveyor}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{A rails (gem) plugin to enable surveys in your application}
@@ -158,12 +158,14 @@ 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<sass>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
       s.add_runtime_dependency(%q<formtastic>, [">= 0"])
       s.add_runtime_dependency(%q<uuid>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<sass>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
       s.add_dependency(%q<formtastic>, [">= 0"])
       s.add_dependency(%q<uuid>, [">= 0"])
@@ -171,6 +173,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<sass>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
     s.add_dependency(%q<formtastic>, [">= 0"])
     s.add_dependency(%q<uuid>, [">= 0"])

data/testbed/Gemfile

@@ -5,10 +5,9 @@ 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.10.3'
+gem 'cucumber', '~>0.9'
 gem 'cucumber-rails', '0.3.2'
 gem 'database_cleaner'
 gem 'factory_girl'
-gem 'uuid'
 
 gem 'surveyor', :path => ".."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 95
   prerelease: 
   segments: 
   - 0
   - 19
-  - 5
-  version: 0.19.5
+  - 6
+  version: 0.19.6
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -05:00
+date: 2011-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: sass
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  name: fastercsv
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,7 +62,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: uuid
+  name: formtastic
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,7 +76,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: uuid
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -87,8 +87,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: 
 email: yoon@northwestern.edu
 executables: []
@@ -231,7 +245,7 @@ files:
 - surveyor.gemspec
 - testbed/Gemfile
 has_rdoc: true
-homepage: http://github.com/breakpointer/surveyor
+homepage: http://github.com/NUBIC/surveyor
 licenses: []
 
 post_install_message: