surveyor 0.20.0 → 0.21.0

data/spec/models/response_set_spec.rb

@@ -28,46 +28,47 @@ describe ResponseSet do
   end
 
   it "should save new responses from radio buttons, ignoring blanks" do
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks(@radio_response_attributes))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable(@radio_response_attributes))
     @response_set.responses.should have(2).items
     @response_set.responses.detect{|r| r.question_id == 2}.answer_id.should == 6
   end
 
   it "should save new responses from other types, ignoring blanks" do
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks(@other_response_attributes))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable(@other_response_attributes))
     @response_set.responses.should have(1).items
     @response_set.responses.detect{|r| r.question_id == 7}.text_value.should == "Brian is tired"
   end
 
   it "should ignore data if corresponding radio button is not selected" do
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks(@radio_response_attributes))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable(@radio_response_attributes))
     @response_set.responses.select{|r| r.question_id == 2}.should have(1).item
     @response_set.responses.detect{|r| r.question_id == 2}.string_value.should == nil
   end
 
   it "should preserve response ids in checkboxes when adding another checkbox" do
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks(@checkbox_response_attributes))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable(@checkbox_response_attributes))
     @response_set.responses.should have(2).items
     initial_response_ids = @response_set.responses.map(&:id)
     # adding a checkbox
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks({"1"=>{"question_id"=>"9", "answer_id"=>"13"}}))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable({"1"=>{"question_id"=>"9", "answer_id"=>"13"}}))
     @response_set.responses.should have(3).items
     (@response_set.responses.map(&:id) - initial_response_ids).size.should == 1
   end
-  
+
   it "should preserve response ids in checkboxes when removing another checkbox" do
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks(@checkbox_response_attributes))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable(@checkbox_response_attributes))
     @response_set.responses.should have(2).items
     initial_response_ids = @response_set.responses.map(&:id)
     # removing a checkbox, reload the response set
-    @response_set.update_attributes(:responses_attributes => ResponseSet.reject_or_destroy_blanks({"1"=>{"question_id"=>"9", "answer_id"=>"", "id" => initial_response_ids.first}}))
+    @response_set.update_attributes(:responses_attributes => ResponseSet.to_savable({"1"=>{"question_id"=>"9", "answer_id"=>"", "id" => initial_response_ids.first}}))
     @response_set.reload.responses.should have(1).items
     (initial_response_ids - @response_set.responses.map(&:id)).size.should == 1
   end
   it "should clean up a blank or empty hash" do
-    ResponseSet.reject_or_destroy_blanks(nil).should == {}
-    ResponseSet.reject_or_destroy_blanks({}).should == {}
+    ResponseSet.to_savable(nil).should == []
+    ResponseSet.to_savable({}).should == []
   end
+
   it "should clean up responses_attributes before passing to nested_attributes" do
     hash_of_hashes = {
       "11" => {"question_id" => "1", "answer_id" => [""]}, # new checkbox, blank
@@ -92,39 +93,42 @@ describe ResponseSet do
       "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 == {
+
+    Set.new(ResponseSet.to_savable(hash_of_hashes)).should == Set.new([
       # "11" => {"question_id" => "1", "answer_id" => [""]}, # new checkbox, blank
-      "12" => {"question_id" => "2", "answer_id" => ["", "124"]}, # new checkbox, checked
-      "13" => {"id" => "101", "question_id" => "3", "answer_id" => [""], "_destroy" => "true"}, # existing checkbox, unchecked
-      "14" => {"id" => "102", "question_id" => "4", "answer_id" => ["", "147"]}, # existing checkbox, left alone
+      {"question_id"=>"2", "answer_id"=>["", "124"]}, # new checkbox, checked
+      {"question_id"=>"3", "id"=>"101", "_destroy"=>"1"}, # existing checkbox, unchecked
+      {"question_id"=>"4", "id"=>"102", "answer_id"=>["", "147"]}, # existing checkbox, left alone
       # "15" => {"question_id" => "5", "answer_id" => ""}, # new radio, blank
-      "16" => {"question_id" => "6", "answer_id" => "161"}, # new radio, selected
-      "17" => {"id" => "103", "question_id" => "7", "answer_id" => "171"}, # existing radio, changed
-      "18" => {"id" => "104", "question_id" => "8", "answer_id" => "181"}, # existing radio, unchanged
+      {"question_id"=>"6", "answer_id"=>"161"}, # new radio, selected
+      {"question_id"=>"7", "id"=>"103", "answer_id"=>"171"}, # existing radio, changed
+      {"question_id"=>"8", "id"=>"104", "answer_id"=>"181"}, # existing radio, unchanged
       # "19" => {"question_id" => "9", "answer_id" => "191", "string_value" => ""}, # new string, blank
-      "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
+      {"question_id"=>"10", "string_value"=>"hi", "answer_id"=>"201"}, # new string, filled
+      {"question_id"=>"11", "string_value"=>"", "id"=>"105", "_destroy"=>"1"}, # existing string, cleared
+      {"question_id"=>"12", "id"=>"106", "string_value"=>"ho", "answer_id"=>"221"}, # existing string, changed
+      {"question_id"=>"13", "id"=>"107", "string_value"=>"hi", "answer_id"=>"231"}, # 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
+      {"question_id"=>"15", "string_value"=>"bar", "answer_id"=>["", "241"]}, # new checkbox with string value, checked
+      {"question_id"=>"14", "string_value"=>"moo", "id"=>"108", "_destroy"=>"1"}, # existing checkbox with string value, unchecked
+      {"question_id"=>"15", "id"=>"109", "string_value"=>"mar", "answer_id"=>["", "251"]},# 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
-    }
+      {"question_id"=>"17", "string_value"=>"bar", "answer_id"=>"261"}, # new radio with string value, selected
+      {"question_id"=>"18", "id"=>"110", "string_value"=>"moo", "answer_id"=>"271"}, # existing radio with string value, changed
+      {"question_id"=>"19", "id"=>"111", "string_value"=>"mar", "answer_id"=>"281"} # 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
     }
+    ResponseSet.to_savable(hash_of_hashes).should == [
+      {"question_id" => @qone.id, "answer_id" => "291", "string_value" => ""} # new radio with blank string value, selected
+    ]
   end
+
   it "should clean up responses for lookups to get ids after saving via ajax" do
     hash_of_hashes = {"1"=>{"question_id"=>"2", "answer_id"=>"1"},
       "2"=>{"question_id"=>"3", "answer_id"=>["", "6"]},
@@ -134,7 +138,7 @@ describe ResponseSet do
       "19"=>{"question_id"=>"15", "datetime_value"=>"", "answer_id"=>"23", "id" => "1"},
       "47"=>{"question_id"=>"38", "answer_id"=>"220", "integer_value"=>"2", "id" => "2"},
       "61"=>{"question_id"=>"44", "response_group"=>"0", "answer_id"=>"241", "integer_value"=>"12"}}
-    ResponseSet.trim_for_lookups(hash_of_hashes).should == 
+    ResponseSet.trim_for_lookups(hash_of_hashes).should ==
     { "1"=>{"question_id"=>"2", "answer_id"=>"1"},
       "2"=>{"question_id"=>"3", "answer_id"=>["", "6"]},
       "9"=>{"question_id"=>"6", "answer_id"=>"13"},
@@ -145,12 +149,13 @@ describe ResponseSet do
       "61"=>{"question_id"=>"44", "response_group"=>"0", "answer_id"=>"241"}
     }
   end
+
   it "should remove responses" do
     r = @response_set.responses.create(:question_id => 1, :answer_id => 2)
     r.id.should_not be nil
     @response_set.should have(1).responses
-    ResponseSet.reject_or_destroy_blanks({"2"=>{"question_id"=>"1", "id"=> r.id, "answer_id"=>[""]}}).should == {"2"=>{"question_id"=>"1", "id"=> r.id, "_destroy"=> "true", "answer_id"=>[""]}}
-    @response_set.update_attributes(:responses_attributes => {"2"=>{"question_id"=>"1", "id"=> r.id, "_destroy"=> "true", "answer_id"=>[""]}}).should be_true
+    ResponseSet.to_savable({"2"=>{"question_id"=>"1", "id"=> r.id, "answer_id"=>[""]}}).should == [{"question_id"=>"1", "id"=> r.id, "_destroy"=> "1" }]
+    @response_set.update_attributes(:responses_attributes => [{"question_id"=>"1", "id"=> r.id, "_destroy"=> "1"}]).should be_true
     @response_set.reload.should have(0).responses
   end
 end
@@ -177,7 +182,7 @@ describe ResponseSet, "with dependencies" do
     @response_set.responses << Factory(:response, :question_id => @do_you_like_pie.id, :answer_id => @do_you_like_pie.answers.first.id, :response_set_id => @response_set.id)
     @response_set.responses << Factory(:response, :string_value => "pecan pie", :question_id => @what_flavor.id, :answer_id => @what_flavor.answers.first.id, :response_set_id => @response_set.id)
   end
-  
+
   it "should list unanswered dependencies to show at the top of the next page (javascript turned off)" do
     @response_set.unanswered_dependencies.should == [@what_bakery]
   end
@@ -187,18 +192,18 @@ describe ResponseSet, "with dependencies" do
   it "should list group as dependency" do
     # Question Group
     crust_group = Factory(:question_group, :text => "Favorite Crusts")
-    
+
     # Question
     what_crust = Factory(:question, :text => "What is your favorite curst type?", :survey_section => @section)
     crust_group.questions << what_crust
 
     # Answers
     what_crust.answers << Factory(:answer, :response_class => :string, :question_id => what_crust.id)
-    
+
     # Dependency
     crust_group_dep = Factory(:dependency, :rule => "C", :question_group_id => crust_group.id, :question => nil)
     Factory(:dependency_condition, :rule_key => "C", :question_id => @do_you_like_pie.id, :operator => "==", :answer_id => @do_you_like_pie.answers.first.id, :dependency_id => crust_group_dep.id)
-    
+
     @response_set.unanswered_dependencies.should == [@what_bakery, crust_group]
   end
 end
@@ -208,7 +213,7 @@ describe ResponseSet, "dependency_conditions" do
     # Questions
     @like_pie = Factory(:question, :text => "Do you like pie?", :survey_section => @section)
     @like_jam = Factory(:question, :text => "Do you like jam?", :survey_section => @section)
-    @what_is_wrong_with_you = Factory(:question, :text => "What's wrong with you?", :survey_section => @section)    
+    @what_is_wrong_with_you = Factory(:question, :text => "What's wrong with you?", :survey_section => @section)
     # Answers
     @like_pie.answers << Factory(:answer, :text => "yes", :question_id => @like_pie.id)
     @like_pie.answers << Factory(:answer, :text => "no", :question_id => @like_pie.id)
@@ -227,7 +232,7 @@ describe ResponseSet, "dependency_conditions" do
     dependency_conditions.size.should == 2
     dependency_conditions.should include(@dep_a)
     dependency_conditions.should include(@dep_b)
-    
+
   end
   it "should list all dependencies for passed question_id" do
     # Questions
@@ -239,9 +244,9 @@ describe ResponseSet, "dependency_conditions" do
     what_flavor.answers << Factory(:answer, :response_class => :string, :question_id => what_flavor.id)
     # Dependency
     flavor_dependency = Factory(:dependency, :rule => "C", :question_id => what_flavor.id)
-    flavor_dependency_condition = Factory(:dependency_condition, :rule_key => "A", :question_id => like_ice_cream.id, :operator => "==", 
+    flavor_dependency_condition = Factory(:dependency_condition, :rule_key => "A", :question_id => like_ice_cream.id, :operator => "==",
                                           :answer_id => like_ice_cream.answers.first.id, :dependency_id => flavor_dependency.id)
-    # Responses    
+    # Responses
     dependency_conditions = @response_set.send(:dependencies, like_ice_cream.id).should == [flavor_dependency]
   end
 end
@@ -257,11 +262,11 @@ describe ResponseSet, "as a quiz" do
       q = Factory(:question, :survey_section => @section)
       a = Factory(:answer, :question => q, :response_class => "answer")
       x = Factory(:answer, :question => q, :response_class => "answer")
-      q.correct_answer_id = (quiz == "quiz" ? a.id : nil)
+      q.correct_answer = (quiz == "quiz" ? a : nil)
       @response_set.responses << Factory(:response, :question => q, :answer => (correct == "correct" ? a : x))
     end
   end
-  
+
   it "should report correctness if it is a quiz" do
     generate_responses(3, "quiz", "correct")
     @response_set.correct?.should be_true
@@ -333,8 +338,8 @@ describe ResponseSet, "with mandatory, dependent questions" do
         d = Factory(:dependency, :question => q)
         dc = Factory(:dependency_condition, :dependency => d, :question_id => dq.id, :answer_id => da.id)
       end
-      @response_set.responses << Factory(:response, :question => dq, :answer => (triggered == "triggered" ? da : dx))
-      @response_set.responses << Factory(:response, :question => q, :answer => a)
+      @response_set.responses << Factory(:response, :response_set => @response_set, :question => dq, :answer => (triggered == "triggered" ? da : dx))
+      @response_set.responses << Factory(:response, :response_set => @response_set, :question => q, :answer => a)
     end
   end
   it "should report progress without mandatory questions" do
@@ -371,6 +376,6 @@ describe ResponseSet, "exporting csv" do
     csv.is_a?(String).should be_true
     csv.should match "question.short_text"
     csv.should match "What flavor?"
-    csv.should match /pecan pie/    
+    csv.should match /pecan pie/
   end
 end

data/spec/models/response_spec.rb

@@ -22,20 +22,22 @@ describe Response, "when saving a response" do
     @response.question.correct_answer_id.should be_nil
     @response.correct?.should be_true
   end
+
   it "should be correct if the answer's response class != answer" do
     @response.answer.response_class.should_not == "answer"
     @response.correct?.should be_true
-  end  
+  end
+
   it "should be (in)correct if answer_id is (not) equal to question's correct_answer_id" do
     @answer = Factory(:answer, :response_class => "answer")
-    @question = Factory(:question, :correct_answer_id => @answer.id)
+    @question = Factory(:question, :correct_answer => @answer)
     @response = Factory(:response, :question => @question, :answer => @answer)
     @response.correct?.should be_true
-    @response.answer_id = 143
+    @response.answer = Factory(:answer, :response_class => "answer").tap { |a| a.id = 143 }
     @response.correct?.should be_false
   end
-  describe "returns the response as the type requested" do
 
+  describe "returns the response as the type requested" do
     it "returns 'string'" do
       @response.string_value = "blah"
       @response.as("string").should == "blah"
@@ -70,9 +72,7 @@ describe Response, "when saving a response" do
       resp.as(:answer).should == nil
       resp.as(:stuff).should == nil
     end
-
   end
-
 end
 
 describe Response, "applicable_attributes" do
@@ -81,30 +81,33 @@ describe Response, "applicable_attributes" do
     @odoyle = Factory(:answer, :text => "Odoyle", :response_class => "answer")
     @other = Factory(:answer, :text => "Other", :response_class => "string")
   end
-  
+
   it "should have string_value if response_type is string" do
     good = {"question_id" => @who.id, "answer_id" => @other.id, "string_value" => "Frank"}
     Response.applicable_attributes(good).should == good
   end
-  
+
   it "should not have string_value if response_type is answer" 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}
+    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]}
+    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"}
+    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"}
+    Response.applicable_attributes(ignore).
+      should == {"question_id"=>@who.id, "answer_id"=>[""], "string_value"=>"Frank"}
   end
-  
 end

data/spec/spec_helper.rb

@@ -1,55 +1,32 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
+# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path(File.join(File.dirname(__FILE__),'..','testbed','config','environment'))
-require 'spec/autorun'
-require 'spec/rails'
+begin
+  require File.expand_path("../../testbed/config/environment", __FILE__)
+rescue LoadError => e
+  fail "Could not load the testbed app. Have you generated it?\n#{e.class}: #{e}"
+end
+require 'rspec/rails'
 require 'factories'
 
-# Uncomment the next line to use webrat's matchers
-#require 'webrat/integrations/rspec-rails'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
-
-Spec::Runner.configure do |config|
-  # If you're not using ActiveRecord you should remove these
-  # lines, delete config/database.yml and disable :active_record
-  # in your config/boot.rb
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-  # == Fixtures
-  #
-  # You can declare fixtures for each example_group like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so right here. Just uncomment the next line and replace the fixture
-  # names with your fixtures.
-  #
-  # config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
-  #
-  # You can also declare which fixtures to use (for example fixtures for test/fixtures):
-  #
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-  #
+RSpec.configure do |config|
   # == Mock Framework
   #
-  # RSpec uses its own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
   #
   # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
-  #
-  # == Notes
-  #
-  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
 end

data/surveyor.gemspec

@@ -1,190 +1,39 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "surveyor/version"
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.20.0"
+  s.version = Surveyor::VERSION
 
-  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-07-11}
   s.email = %q{yoon@northwestern.edu}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "CHANGELOG",
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/controllers/results_controller.rb",
-    "app/controllers/surveyor_controller.rb",
-    "app/helpers/results_helper.rb",
-    "app/helpers/surveyor_helper.rb",
-    "app/models/answer.rb",
-    "app/models/dependency.rb",
-    "app/models/dependency_condition.rb",
-    "app/models/question.rb",
-    "app/models/question_group.rb",
-    "app/models/response.rb",
-    "app/models/response_set.rb",
-    "app/models/survey.rb",
-    "app/models/survey_section.rb",
-    "app/models/survey_section_sweeper.rb",
-    "app/models/validation.rb",
-    "app/models/validation_condition.rb",
-    "app/views/layouts/results.html.erb",
-    "app/views/layouts/surveyor_default.html.erb",
-    "app/views/partials/_answer.html.haml",
-    "app/views/partials/_dependents.html.haml",
-    "app/views/partials/_question.html.haml",
-    "app/views/partials/_question_group.html.haml",
-    "app/views/partials/_section.html.haml",
-    "app/views/partials/_section_menu.html.haml",
-    "app/views/results/index.html.erb",
-    "app/views/results/show.html.erb",
-    "app/views/surveyor/edit.html.haml",
-    "app/views/surveyor/new.html.haml",
-    "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",
-    "features/step_definitions/web_steps.rb",
-    "features/support/REDCapDemoDatabase_DataDictionary.csv",
-    "features/support/env.rb",
-    "features/support/paths.rb",
-    "features/support/redcap_new_headers.csv",
-    "features/support/redcap_siblings.csv",
-    "features/support/redcap_whitespace.csv",
-    "features/surveyor.feature",
-    "features/surveyor_parser.feature",
-    "generators/extend_surveyor/extend_surveyor_generator.rb",
-    "generators/extend_surveyor/templates/EXTENDING_SURVEYOR",
-    "generators/extend_surveyor/templates/extensions/surveyor_controller.rb",
-    "generators/extend_surveyor/templates/extensions/surveyor_custom.html.erb",
-    "generators/surveyor/surveyor_generator.rb",
-    "generators/surveyor/templates/README",
-    "generators/surveyor/templates/assets/images/next.gif",
-    "generators/surveyor/templates/assets/images/prev.gif",
-    "generators/surveyor/templates/assets/javascripts/jquery.surveyor.js",
-    "generators/surveyor/templates/assets/javascripts/jquery.tools.min.js",
-    "generators/surveyor/templates/assets/stylesheets/dateinput.css",
-    "generators/surveyor/templates/assets/stylesheets/reset.css",
-    "generators/surveyor/templates/assets/stylesheets/results.css",
-    "generators/surveyor/templates/assets/stylesheets/sass/custom.sass",
-    "generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass",
-    "generators/surveyor/templates/locales/surveyor_en.yml",
-    "generators/surveyor/templates/locales/surveyor_es.yml",
-    "generators/surveyor/templates/locales/surveyor_he.yml",
-    "generators/surveyor/templates/migrate/add_api_ids.rb",
-    "generators/surveyor/templates/migrate/add_correct_answer_id_to_questions.rb",
-    "generators/surveyor/templates/migrate/add_default_value_to_answers.rb",
-    "generators/surveyor/templates/migrate/add_display_order_to_surveys.rb",
-    "generators/surveyor/templates/migrate/add_display_type_to_answers.rb",
-    "generators/surveyor/templates/migrate/add_index_to_response_sets.rb",
-    "generators/surveyor/templates/migrate/add_index_to_surveys.rb",
-    "generators/surveyor/templates/migrate/add_section_id_to_responses.rb",
-    "generators/surveyor/templates/migrate/add_unique_indicies.rb",
-    "generators/surveyor/templates/migrate/create_answers.rb",
-    "generators/surveyor/templates/migrate/create_dependencies.rb",
-    "generators/surveyor/templates/migrate/create_dependency_conditions.rb",
-    "generators/surveyor/templates/migrate/create_question_groups.rb",
-    "generators/surveyor/templates/migrate/create_questions.rb",
-    "generators/surveyor/templates/migrate/create_response_sets.rb",
-    "generators/surveyor/templates/migrate/create_responses.rb",
-    "generators/surveyor/templates/migrate/create_survey_sections.rb",
-    "generators/surveyor/templates/migrate/create_surveys.rb",
-    "generators/surveyor/templates/migrate/create_validation_conditions.rb",
-    "generators/surveyor/templates/migrate/create_validations.rb",
-    "generators/surveyor/templates/surveys/kitchen_sink_survey.rb",
-    "generators/surveyor/templates/surveys/quiz.rb",
-    "generators/surveyor/templates/tasks/surveyor.rb",
-    "hudson.rakefile",
-    "init_testbed.rakefile",
-    "lib/formtastic/surveyor_builder.rb",
-    "lib/surveyor.rb",
-    "lib/surveyor/acts_as_response.rb",
-    "lib/surveyor/common.rb",
-    "lib/surveyor/models/answer_methods.rb",
-    "lib/surveyor/models/dependency_condition_methods.rb",
-    "lib/surveyor/models/dependency_methods.rb",
-    "lib/surveyor/models/question_group_methods.rb",
-    "lib/surveyor/models/question_methods.rb",
-    "lib/surveyor/models/response_methods.rb",
-    "lib/surveyor/models/response_set_methods.rb",
-    "lib/surveyor/models/survey_methods.rb",
-    "lib/surveyor/models/survey_section_methods.rb",
-    "lib/surveyor/models/validation_condition_methods.rb",
-    "lib/surveyor/models/validation_methods.rb",
-    "lib/surveyor/parser.rb",
-    "lib/surveyor/redcap_parser.rb",
-    "lib/surveyor/surveyor_controller_methods.rb",
-    "lib/surveyor/unparser.rb",
-    "lib/tasks/surveyor_tasks.rake",
-    "rails/init.rb",
-    "spec/controllers/surveyor_controller_spec.rb",
-    "spec/factories.rb",
-    "spec/helpers/surveyor_helper_spec.rb",
-    "spec/lib/benchmark_spec.rb",
-    "spec/lib/common_spec.rb",
-    "spec/lib/parser_spec.rb",
-    "spec/lib/redcap_parser_spec.rb",
-    "spec/lib/unparser_spec.rb",
-    "spec/models/answer_spec.rb",
-    "spec/models/dependency_condition_spec.rb",
-    "spec/models/dependency_spec.rb",
-    "spec/models/question_group_spec.rb",
-    "spec/models/question_spec.rb",
-    "spec/models/response_set_spec.rb",
-    "spec/models/response_spec.rb",
-    "spec/models/survey_section_spec.rb",
-    "spec/models/survey_spec.rb",
-    "spec/models/validation_condition_spec.rb",
-    "spec/models/validation_spec.rb",
-    "spec/rcov.opts",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "surveyor.gemspec",
-    "testbed/Gemfile"
-  ]
   s.homepage = %q{http://github.com/NUBIC/surveyor}
   s.post_install_message = %q{Thanks for installing surveyor! The time has come to run the surveyor generator and migrate your database, even if you are upgrading.}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A rails (gem) plugin to enable surveys in your application}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n") - ['irb']
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency('rails', '~> 3.0')
+  s.add_dependency('haml', '~> 3.1.3')
+  s.add_dependency('sass')
+  s.add_dependency('fastercsv', '~> 1.5.4')
+  s.add_dependency('formtastic', '~> 1.2.4')
+  s.add_dependency('uuid')
 
-    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"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    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"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
+  s.add_development_dependency('yard')
+  s.add_development_dependency('rake', '0.8.7')
+  s.add_development_dependency('rspec-rails', '~> 2.6.0')
+  s.add_development_dependency('bundler', '~> 1.0', '>= 1.0.21')
+  s.add_development_dependency('factory_girl', '~> 2.1.2')
+  s.add_development_dependency('sqlite3')
+  s.add_development_dependency('cucumber-rails', '~> 1.1.1')
+  s.add_development_dependency('database_cleaner', '~> 0.6.7')
+  s.add_development_dependency('launchy', '~> 2.0.5')
+  s.add_development_dependency('capybara', '~> 1.1.1')
+  s.add_development_dependency('ci_reporter', '~> 1.6')
 end