surveyor 0.21.0 → 0.22.0

data/spec/lib/common_spec.rb

@@ -18,5 +18,56 @@ describe Surveyor::Common, "" do
       "In general, you would say your health is:" => "you_would_say_your_health"
     }.each{|k, v| Surveyor::Common.to_normalized_string(k).should == v}
   end
-  
+  it "should deep compare json objects" do
+    a = {"a" => "b"}.to_json
+    b = '{"a": "b"}'
+    Surveyor::Common.equal_json_excluding_wildcards(a,b).should be_true
+    
+    a = {"y" => "x"}.to_json
+    b = {:y => "x"}
+    Surveyor::Common.equal_json_excluding_wildcards(a,b).should be_true
+
+    a = [{"y" => "x"}, {"j" => "b"}].to_json
+    b = '[{"y": "x"}]'
+    Surveyor::Common.equal_json_excluding_wildcards(a,b).should be_false
+    
+    a = [{"y" => "x"}, {"uuid" => "*"}].to_json
+    b = '[{"y": "x"}, {"uuid": "12312312312123"}]'
+    Surveyor::Common.equal_json_excluding_wildcards(a,b).should be_true
+
+    a = %({"survey": {
+      "title":"Simple survey",
+      "uuid":"72888670-9151-012e-9ec1-00254bc472f4",
+      "sections":[{
+        "title":"Basic questions"
+        }]
+      }
+    })
+    b = %({"survey": {"title": "Simple survey","uuid": "*","sections": [{"title": "Basic questions"}]}})
+    Surveyor::Common.equal_json_excluding_wildcards(a,b).should be_true
+    
+    a = %({"survey": {
+      "title":"Simple survey",
+      "uuid":"72888670-9151-012e-9ec1-00254bc472f4",
+      "sections":[{
+        "title":"Different"
+        }]
+      }
+    })
+    b = %({"survey": {"title": "Simple survey","uuid": "*","sections": [{"title": "Basic questions"}]}})
+    Surveyor::Common.equal_json_excluding_wildcards(a,b).should be_false
+  end
+  describe '#generate_api_id' do
+    def generate
+      Surveyor::Common.generate_api_id
+    end
+
+    it 'generates a String' do
+      generate.should be_a String
+    end
+
+    it 'generates a new value every time' do
+      (1..100).collect { generate }.uniq.size.should == 100
+    end
+  end
 end

data/spec/lib/rake_kitchen_sink.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rake'
+
+describe Surveyor::Parser do
+  before do
+    @rake = Rake::Application.new
+    Rake.application = @rake
+    Rake.application.rake_require "lib/tasks/surveyor_tasks"
+    Rake::Task.define_task(:environment)
+  end
+  it "should return properly parse the kitchen sink survey" do
+    ENV["FILE"]="surveys/kitchen_sink_survey.rb"
+    @rake["surveyor"].invoke
+    
+    Survey.count.should == 1
+    SurveySection.count.should == 2 
+    Question.count.should == 44 
+    Answer.count.should == 241 
+    Dependency.count.should == 6 
+    DependencyCondition.count.should == 9 
+    QuestionGroup.count.should == 6
+
+    Survey.all.map(&:destroy)
+  end
+  it "should return properly parse a UTF8 survey" do
+    ENV["FILE"]="../spec/lib/chinese_survey.rb"
+    @rake["surveyor"].invoke
+    
+    Survey.count.should == 1
+    SurveySection.count.should == 1
+    Question.count.should == 3
+    Answer.count.should == 15
+    Dependency.count.should == 0
+    DependencyCondition.count.should == 0
+    QuestionGroup.count.should == 1
+
+    Survey.all.map(&:destroy)
+  end
+
+end

data/spec/models/answer_spec.rb

@@ -41,4 +41,15 @@ describe Answer, "when creating a new answer" do
   it "should have an api_id" do
     @answer.api_id.length.should == 36
   end
+  
+  require 'mustache'
+  class FakeMustacheContext < ::Mustache
+    def site
+      "Northwestern"
+    end
+  end
+  it "should substitute 'Northwestern' in place {{site}}" do
+      @answer.text = "You are in {{site}}"
+      @answer.split_or_hidden_text(nil, FakeMustacheContext).should == "You are in Northwestern"
+  end
 end

data/spec/models/question_spec.rb

@@ -85,6 +85,21 @@ describe Question, "when interacting with an instance" do
     @question.solo?.should be_true
     @question.part_of_group?.should be_false
   end
+  
+  require 'mustache'
+  class FakeMustacheContext < ::Mustache
+    def site
+      "Northwestern"
+    end
+    def somethingElse
+      "something new"
+    end
+  end
+  it "should substitute 'Northwestern' in place {{site}}" do
+      @question.text = "You are in {{site}}"
+      @question.render_question_text(FakeMustacheContext).should == "You are in Northwestern"
+  end
+        
 end
 
 describe Question, "with dependencies" do

data/spec/models/response_set_spec.rb

@@ -13,6 +13,36 @@ describe ResponseSet do
     @response_set.access_code.length.should == 10
   end
 
+  describe '#access_code' do
+    let!(:rs1) { Factory(:response_set).tap { |rs| rs.update_attribute(:access_code, 'one') } }
+    let!(:rs2) { Factory(:response_set).tap { |rs| rs.update_attribute(:access_code, 'two') } }
+
+    # Regression test for #263
+    it 'accepts an access code in the constructor' do
+      ResponseSet.new(:access_code => 'eleven').access_code.should == 'eleven'
+    end
+
+    # Regression test for #263
+    it 'setter accepts a conflicting access code' do
+      rs2.access_code = 'one'
+      rs2.access_code.should == 'one'
+    end
+
+    it 'is invalid when conflicting' do
+      rs2.access_code = 'one'
+      rs2.should_not be_valid
+      rs2.should have(1).errors_on(:access_code)
+    end
+
+    it 'defaults to a random, non-conflicting value on init' do
+      Surveyor::Common.should_receive(:make_tiny_code).and_return('one')
+      Surveyor::Common.should_receive(:make_tiny_code).and_return('two')
+      Surveyor::Common.should_receive(:make_tiny_code).and_return('three')
+
+      ResponseSet.new.access_code.should == 'three'
+    end
+  end
+
   it "is completable" do
     @response_set.completed_at.should be_nil
     @response_set.complete!
@@ -23,7 +53,13 @@ describe ResponseSet do
 
   it "does not allow completion through mass assignment" do
     @response_set.completed_at.should be_nil
-    @response_set.update_attributes(:completed_at => Time.now)
+    # Rails 3.2 throws an ActiveModel::MassAssignmentSecurity::Error error on response_set.update_attribues
+    # Using begin..rescue..end for Rails 3.1 and 3.0 backwards compatibility
+    # lambda { @response_set.update_attributes(:completed_at => Time.now) }.should raise_error(ActiveModel::MassAssignmentSecurity::Error)
+    begin
+      @response_set.update_attributes(:completed_at => Time.now)
+    rescue
+    end
     @response_set.completed_at.should be_nil
   end
 
@@ -39,6 +75,14 @@ describe ResponseSet do
     @response_set.responses.detect{|r| r.question_id == 7}.text_value.should == "Brian is tired"
   end
 
+  it 'saves its responses' do
+    new_set = ResponseSet.new(:survey => Factory(:survey))
+    new_set.responses.build(:question_id => 1, :answer_id => 1, :string_value => 'XXL')
+    new_set.save!
+
+    ResponseSet.find(new_set.id).responses.should have(1).items
+  end
+
   it "should ignore data if corresponding radio button is not selected" do
     @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

data/spec/models/response_spec.rb

@@ -10,10 +10,7 @@ describe Response, "when saving a response" do
     @response.should be_valid
   end
 
-  it "should be invalid without a parent response set and question" do
-    @response.response_set_id = nil
-    @response.should have(1).error_on(:response_set_id)
-
+  it "should be invalid without a question" do
     @response.question_id = nil
     @response.should have(1).error_on(:question_id)
   end
@@ -36,6 +33,12 @@ describe Response, "when saving a response" do
     @response.answer = Factory(:answer, :response_class => "answer").tap { |a| a.id = 143 }
     @response.correct?.should be_false
   end
+  
+  it "should be in order by created_at" do
+    @response.response_set.should_not be_nil
+    response2 = Factory(:response, :question => Factory(:question), :answer => Factory(:answer), :response_set => @response.response_set, :created_at => (@response.created_at + 1))
+    Response.all.should == [@response, response2]
+  end
 
   describe "returns the response as the type requested" do
     it "returns 'string'" do

data/surveyor.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
   s.add_dependency('sass')
   s.add_dependency('fastercsv', '~> 1.5.4')
   s.add_dependency('formtastic', '~> 1.2.4')
-  s.add_dependency('uuid')
+  s.add_dependency('uuidtools', '~> 2.1')
+  s.add_dependency('mustache', '0.99.4')
+  s.add_dependency('rabl', '~>0.6.6')
 
   s.add_development_dependency('yard')
   s.add_development_dependency('rake', '0.8.7')
@@ -34,6 +36,6 @@ Gem::Specification.new do |s|
   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')
+  s.add_development_dependency('ci_reporter', '1.6.6')
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 71
   prerelease: 
   segments: 
   - 0
-  - 21
+  - 22
   - 0
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -96,23 +96,56 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: uuid
+  name: uuidtools
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: mustache
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 411
+        segments: 
+        - 0
+        - 99
+        - 4
+        version: 0.99.4
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rabl
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 6
+        - 6
+        version: 0.6.6
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,11 +155,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -138,11 +171,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,11 +187,11 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -177,11 +210,11 @@ dependencies:
         - 21
         version: 1.0.21
   type: :development
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -193,11 +226,11 @@ dependencies:
         - 2
         version: 2.1.2
   type: :development
-  version_requirements: *id011
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -207,11 +240,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -223,11 +256,11 @@ dependencies:
         - 1
         version: 1.1.1
   type: :development
-  version_requirements: *id013
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: database_cleaner
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -239,11 +272,11 @@ dependencies:
         - 7
         version: 0.6.7
   type: :development
-  version_requirements: *id014
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -255,11 +288,11 @@ dependencies:
         - 5
         version: 2.0.5
   type: :development
-  version_requirements: *id015
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -271,22 +304,23 @@ dependencies:
         - 1
         version: 1.1.1
   type: :development
-  version_requirements: *id016
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 1
         - 6
-        version: "1.6"
+        - 6
+        version: 1.6.6
   type: :development
-  version_requirements: *id017
+  version_requirements: *id019
 description: 
 email: yoon@northwestern.edu
 executables: []
@@ -302,7 +336,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/controllers/results_controller.rb
 - app/controllers/surveyor_controller.rb
 - app/helpers/results_helper.rb
 - app/helpers/survey_form_builder.rb
@@ -327,19 +360,21 @@ files:
 - 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/export.json.rabl
 - app/views/surveyor/new.html.haml
 - app/views/surveyor/show.html.haml
+- app/views/surveyor/show.json.rabl
 - ci-exec.sh
 - config/routes.rb
 - cucumber.yml
 - doc/question types.png
+- doc/surveyor reject or delete decision matrix.png
 - doc/surveyor_models.png
 - doc/surveyor_models2.png
-- features/redcap_parser.feature
-- features/step_definitions/common_setps.rb
+- features/export_to_json.feature
+- features/show_survey.feature
+- features/step_definitions/common_steps.rb
 - features/step_definitions/parser_steps.rb
 - features/step_definitions/surveyor_steps.rb
 - features/step_definitions/web_steps.rb
@@ -353,6 +388,7 @@ files:
 - features/surveyor.feature
 - features/surveyor_dependencies.feature
 - features/surveyor_parser.feature
+- features/z_redcap_parser.feature
 - lib/formtastic/surveyor_builder.rb
 - lib/generators/surveyor/custom_generator.rb
 - lib/generators/surveyor/install_generator.rb
@@ -361,7 +397,9 @@ files:
 - lib/generators/surveyor/templates/config/locales/surveyor_en.yml
 - lib/generators/surveyor/templates/config/locales/surveyor_es.yml
 - lib/generators/surveyor/templates/config/locales/surveyor_he.yml
+- lib/generators/surveyor/templates/db/migrate/add_api_id_to_question_groups.rb
 - lib/generators/surveyor/templates/db/migrate/add_api_ids.rb
+- lib/generators/surveyor/templates/db/migrate/add_api_ids_to_response_sets_and_responses.rb
 - lib/generators/surveyor/templates/db/migrate/add_correct_answer_id_to_questions.rb
 - lib/generators/surveyor/templates/db/migrate/add_default_value_to_answers.rb
 - lib/generators/surveyor/templates/db/migrate/add_display_order_to_surveys.rb
@@ -383,21 +421,35 @@ files:
 - lib/generators/surveyor/templates/db/migrate/create_validations.rb
 - lib/generators/surveyor/templates/public/images/surveyor/next.gif
 - lib/generators/surveyor/templates/public/images/surveyor/prev.gif
+- lib/generators/surveyor/templates/public/javascripts/surveyor/jquery-ui-timepicker-addon.js
+- lib/generators/surveyor/templates/public/javascripts/surveyor/jquery-ui.js
 - lib/generators/surveyor/templates/public/javascripts/surveyor/jquery.blockUI.js
 - lib/generators/surveyor/templates/public/javascripts/surveyor/jquery.surveyor.js
 - lib/generators/surveyor/templates/public/javascripts/surveyor/jquery.tools.min.js
 - lib/generators/surveyor/templates/public/stylesheets/sass/custom.sass
 - lib/generators/surveyor/templates/public/stylesheets/sass/surveyor.sass
 - lib/generators/surveyor/templates/public/stylesheets/surveyor/dateinput.css
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/jquery-ui-timepicker-addon.css
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/jquery-ui.custom.css
 - lib/generators/surveyor/templates/public/stylesheets/surveyor/reset.css
 - lib/generators/surveyor/templates/public/stylesheets/surveyor/results.css
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-bg_glass_100_f6f6f6_1x400.png
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-bg_glass_100_fdf5ce_1x400.png
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-bg_glass_65_ffffff_1x400.png
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-bg_gloss-wave_35_f6a828_500x100.png
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-bg_highlight-soft_75_ffe45c_1x100.png
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-icons_ef8c08_256x240.png
+- lib/generators/surveyor/templates/public/stylesheets/surveyor/ui-icons_ffffff_256x240.png
 - lib/generators/surveyor/templates/surveys/EXTENDING_SURVEYOR.md
+- lib/generators/surveyor/templates/surveys/MODIFYING_SURVEYOR.md
+- lib/generators/surveyor/templates/surveys/date_survey.rb
 - lib/generators/surveyor/templates/surveys/kitchen_sink_survey.rb
 - lib/generators/surveyor/templates/surveys/quiz.rb
 - lib/surveyor.rb
 - lib/surveyor/acts_as_response.rb
 - lib/surveyor/common.rb
 - lib/surveyor/engine.rb
+- lib/surveyor/helpers/surveyor_helper_methods.rb
 - lib/surveyor/models/answer_methods.rb
 - lib/surveyor/models/dependency_condition_methods.rb
 - lib/surveyor/models/dependency_methods.rb
@@ -411,6 +463,7 @@ files:
 - lib/surveyor/models/validation_methods.rb
 - lib/surveyor/parser.rb
 - lib/surveyor/redcap_parser.rb
+- lib/surveyor/render_text.rb
 - lib/surveyor/surveyor_controller_methods.rb
 - lib/surveyor/unparser.rb
 - lib/surveyor/version.rb
@@ -420,8 +473,10 @@ files:
 - spec/factories.rb
 - spec/helpers/surveyor_helper_spec.rb
 - spec/lib/benchmark_spec.rb
+- spec/lib/chinese_survey.rb
 - spec/lib/common_spec.rb
 - spec/lib/parser_spec.rb
+- spec/lib/rake_kitchen_sink.rb
 - spec/lib/redcap_parser_spec.rb
 - spec/lib/unparser_spec.rb
 - spec/models/answer_spec.rb
@@ -473,8 +528,9 @@ signing_key:
 specification_version: 3
 summary: A rails (gem) plugin to enable surveys in your application
 test_files: 
-- features/redcap_parser.feature
-- features/step_definitions/common_setps.rb
+- features/export_to_json.feature
+- features/show_survey.feature
+- features/step_definitions/common_steps.rb
 - features/step_definitions/parser_steps.rb
 - features/step_definitions/surveyor_steps.rb
 - features/step_definitions/web_steps.rb
@@ -488,12 +544,15 @@ test_files:
 - features/surveyor.feature
 - features/surveyor_dependencies.feature
 - features/surveyor_parser.feature
+- features/z_redcap_parser.feature
 - spec/controllers/surveyor_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/surveyor_helper_spec.rb
 - spec/lib/benchmark_spec.rb
+- spec/lib/chinese_survey.rb
 - spec/lib/common_spec.rb
 - spec/lib/parser_spec.rb
+- spec/lib/rake_kitchen_sink.rb
 - spec/lib/redcap_parser_spec.rb
 - spec/lib/unparser_spec.rb
 - spec/models/answer_spec.rb