surveyor 0.16.1 → 0.17.0

data/.gitignore

@@ -3,4 +3,6 @@
 coverage
 rdoc
 pkg
-surveys/fixtures/*.yml
+spec/test_app/**
+.bundle
+surveys/fixtures/*.yml

data/.rvmrc

@@ -0,0 +1 @@
+rvm_gemset_create_on_use_flag=1; rvm gemset use surveyor-dev

data/Gemfile

@@ -0,0 +1,17 @@
+source :rubygems
+
+gem 'rails', '2.3.10'
+gem 'jeweler'
+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.8.0'
+gem 'cucumber-rails'
+gem 'database_cleaner'
+gem 'factory_girl'
+gem 'yard', '~> 0.6'
+
+plugin_root = File.dirname(__FILE__)
+gem 'surveyor', :path => plugin_root
+

data/Gemfile.lock

@@ -0,0 +1,86 @@
+PATH
+  remote: .
+  specs:
+    surveyor (0.16.1)
+      fastercsv
+      haml
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.10)
+      actionpack (= 2.3.10)
+    actionpack (2.3.10)
+      activesupport (= 2.3.10)
+      rack (~> 1.1.0)
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activeresource (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    builder (2.1.2)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    database_cleaner (0.6.0)
+    diff-lcs (1.1.2)
+    factory_girl (1.3.2)
+    fastercsv (1.5.3)
+    gemcutter (0.6.1)
+    gherkin (2.1.5)
+      trollop (~> 1.16.2)
+    git (1.2.5)
+    haml (3.0.23)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    nokogiri (1.4.3.1)
+    rack (1.1.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (2.3.10)
+      actionmailer (= 2.3.10)
+      actionpack (= 2.3.10)
+      activerecord (= 2.3.10)
+      activeresource (= 2.3.10)
+      activesupport (= 2.3.10)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    rspec (1.3.1)
+    rspec-rails (1.3.3)
+      rack (>= 1.0.0)
+      rspec (= 1.3.1)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sqlite3-ruby (1.2.5)
+    term-ansicolor (1.0.5)
+    trollop (1.16.2)
+    webrat (0.7.2)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    yard (0.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (~> 0.8.0)
+  cucumber-rails
+  database_cleaner
+  factory_girl
+  jeweler
+  rails (= 2.3.10)
+  rspec (~> 1.3)
+  rspec-rails (= 1.3.3)
+  sqlite3-ruby (= 1.2.5)
+  surveyor!
+  webrat
+  yard (~> 0.6)

data/README.md

@@ -55,13 +55,7 @@ The survey above shows a couple simple question types. The first one is a "pick
 
 # Installation
 
-As a plugin:
-
-    gem install haml
-    gem install fastercsv
-    script/plugin install git://github.com/breakpointer/surveyor.git
-
-Or as a gem:
+As a gem:
   
     # in environment.rb
     config.gem "surveyor", :source => 'http://gemcutter.org'
@@ -70,7 +64,7 @@ Or as a gem:
 
 Or as a gem (with bundler):
 
-    # in environment.rb
+    # in Gemfile
     gem "surveyor"
 
     bundle install
@@ -114,6 +108,25 @@ To work on the plugin code (for enhancements, and bug fixes, etc...) fork this g
 
 # Changes
 
+0.17.0
+
+* cucumber tests now work
+* correction to post install notes in rakefile
+* fix to rakefile instructions
+* un-dryed the gemfile to try to fix a gem location problem
+* added test boot file for test app usage, modified the rake task to copy in this file as well
+* removed unparser from specs, it was breakin a bunch of them. deferred investigation
+* got specs running and passing by adding internal rails app
+* added rvmrc to create default gemset and added bundler
+* Plugin installation is no longer supported
+* wrong information in readme
+* Merge branch 'master' into issue87
+* Add count operator example to kitchen sink survey
+* Generalize count operator to handle < <= >= !=
+* Parse/unparse surveys w/ count> DC operator
+* Add custom validation to handle count operator
+* Remove count> "operator."
+
 0.16.1
 
 * fixed surveyor.sections translation line

data/Rakefile

@@ -19,10 +19,80 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+
+  task :features => :check_dependencies
+rescue LoadError
+  task :features do
+    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  end
+end
+
+
+namespace "testbed" do
+
+  RAPPNAME = "test_app" #This is also hardcoded in the spec/spec_helper.rb and gitignore file. Change it there too...
+
+  desc "Install rails base app in spec dir"
+  task :build_app do
+    directory "spec"
+    chdir("spec") do
+      sh "rails #{RAPPNAME}"
+      puts "Put a test_app in the spec folder"
+      chdir("#{RAPPNAME}") do
+        sh "ruby script/generate rspec"
+        puts "Ran installer for rspec in #{RAPPNAME}"
+        sh "ruby script/generate cucumber --webrat"
+        puts "Ran installer for cucumber in #{RAPPNAME}"
+      end
+    end
+  end
+ 
+  desc "Copy in setup files to test app"
+  task :copy_files do
+    chdir("spec/#{RAPPNAME}") do
+      sh "cp ../test_Gemfile Gemfile"
+      sh "cp ../test_preinitializer.rb config/preinitializer.rb"
+      sh "cp ../test_boot.rb config/boot.rb"
+      puts "NOTE: These files were created/modified as described here: http://gembundler.com/rails23.html"
+    end
+  end
+
+  desc "Install surveyor in rails base app, runs migrations, preps for testing"
+  task :install_surveyor do
+    sh "gem install surveyor"
+    chdir("spec/#{RAPPNAME}") do
+      sh "bundle install"
+      sh "bundle exec script/generate surveyor"
+      sh "rake db:migrate"
+      sh "rake db:test:prepare"
+    end
+    # I don't think this is needed anymore
+    puts "NOTE: We installed the surveyor gem using 'gem install surveyor' to fix a problem where RVM (or bundler or both) don't let Rails see generators in a gem. ('script/generate surveyor' for example). To remove the gem run `gem uninstall surveyor` to remove the gem version of surveyor leaving the dev version" # Getting around a bug/problem in bundler. see: http://bit.ly/9NZOEz
+  end
+
+  desc "Remove rails base app in spec dir"
+  task :remove_app do
+    puts "Removing the test_app in the spec folder"
+    sh "rm -rf spec/#{RAPPNAME}"
+  end
+
+  desc "Setup for the test app (create)"
+  task :setup => [:build_app, :copy_files, :install_surveyor]
+  desc "Teardown for the test app (remove)"
+  task :teardown => [:remove_app]
+
+end # namespace
+
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_files = FileList.new('spec/**/*_spec.rb') do |fl|
+    fl.exclude(/vendor\/plugins/) #excluding the stuff inthe embedded rails app
+    fl.exclude(/unparse/) #not sure why but this breaks a bunch of specs
+  end
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.16.1
+0.17.0

data/features/step_definitions/surveyor_steps.rb

@@ -46,7 +46,7 @@ Then /^there should be (\d+) resolved dependency_condition(?:s?) with:$/ do |x,
     d = DependencyCondition.find(:first, :conditions => hash)
     d.should_not be_nil
     d.question.should_not be_nil
-    d.answer.should_not be_nil
+    d.answer.should_not be_nil unless d.operator.match(/^count[<>=!]{1,2}\d+/) 
   end
 end
 

data/features/support/env.rb

@@ -5,7 +5,7 @@
 # files.
 
 ENV["RAILS_ENV"] ||= "cucumber"
-require File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec/test_app/config/environment')
 
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'cucumber/rails/world'
@@ -15,43 +15,4 @@ require 'cucumber/web/tableish'
 require 'webrat'
 require 'webrat/core/matchers'
 
-Webrat.configure do |config|
-  config.mode = :rails
-  config.open_error_files = false # Set to true if you want error pages to pop up in the browser
-end
-
-
-# If you set this to false, any error raised from within your app will bubble 
-# up to your step definition and out to cucumber unless you catch it somewhere
-# on the way. You can make Rails rescue errors and render error pages on a
-# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
-#
-# If you set this to true, Rails will rescue all errors and render error
-# pages, more or less in the same way your application would behave in the
-# default production environment. It's not recommended to do this for all
-# of your scenarios, as this makes it hard to discover errors in your application.
-ActionController::Base.allow_rescue = false
-
-# If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging 
-# a feature or scenario with the @no-txn tag. If you are using Capybara,
-# tagging with @culerity or @javascript will also turn transactions off.
-#
-# If you set this to false, transactions will be off for all scenarios,
-# regardless of whether you use @no-txn or not.
-#
-# Beware that turning transactions off will leave data in your database 
-# after each scenario, which can lead to hard-to-debug failures in 
-# subsequent scenarios. If you do this, we recommend you create a Before
-# block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = true
-
-# How to clean your database when transactions are turned off. See
-# http://github.com/bmabey/database_cleaner for more info.
-if defined?(ActiveRecord::Base)
-  begin
-    require 'database_cleaner'
-    DatabaseCleaner.strategy = :truncation
-  rescue LoadError => ignore_if_database_cleaner_not_present
-  end
-end
+# Since we're using the test_app, and it has cucumber installed we don't need to do any configuration here.

data/features/surveyor.feature

@@ -119,22 +119,35 @@ Feature: Survey creation
           a :text, :custom_class => 'mapper'
           validation :rule => "AC"
           vcondition_AC "=~", :regexp => /[0-9a-zA-z\. #]/
+
+          q_2 "Which colors do you loathe?", :pick => :any
+          a_1 "red"
+          a_2 "blue"
+          a_3 "green"
+          a_4 "yellow"
+
+          q_2a "Please explain why you hate so many colors?"
+          a_1 "explanation", :text
+          dependency :rule => "Z"
+          condition_Z :q_2, "count>2"
         end
       end
     """
     Then there should be 1 survey with:
       | title                            |
       | Dependency and validation survey |
-    And there should be 4 questions with:
+    And there should be 6 questions with:
       | text                                                             | pick | display_type | custom_class |
       | What... is your name? (e.g. It is 'Arthur', King of the Britons) | none | default      | nil          |
       | What is your address?                                            | none | default      | address      |
-    And there should be 1 dependency with:
+    And there should be 2 dependency with:
       | rule |
       | A    |
-    And there should be 1 resolved dependency_condition with:
+      | Z    |
+    And there should be 2 resolved dependency_condition with:
       | rule_key |
       | A        |
+      | Z        |
     And there should be 2 validations with:
       | rule |
       | A    |

data/generators/surveyor/templates/assets/stylesheets/sass/surveyor.sass

@@ -64,7 +64,7 @@ body
     :padding 0.5em 1em 1em 0.3em
     :margin 0
     :font-size 2em
-    :font-weight bolid
+    :font-weight bold
   .previous_section
     :font-size 0.8em
     :margin -0.6em 0 0.5em -1em

data/generators/surveyor/templates/surveys/kitchen_sink_survey.rb

@@ -32,6 +32,15 @@ survey "“Kitchen Sink” survey" do
     condition_C :q_2, "==", :a_3
     condition_D :q_2, "==", :a_4
 
+    # A dependant question demonstrating the count operator. The 
+    # dependency condition checks the answer count for the referenced question.
+    # It understands conditions of the form count> count< count>= count<=
+    # count!=
+    q_2b "Please explain why you dislike so many colors?"
+    a_1 "explanation", :text
+    dependency :rule => "Z"
+    condition_Z :q_2, "count>2"
+
     # When :pick isn't specified, the default is :none (no checkbox or radio button)
     q_montypython3 "What... is your name? (e.g. It is 'Arthur', King of the Britons)"
     a_1 :string

data/lib/surveyor/common.rb

@@ -27,4 +27,4 @@ module Surveyor
       
     end
   end
-end
+end

data/lib/surveyor/models/dependency_condition_methods.rb

@@ -10,10 +10,10 @@ module Surveyor
 
         # Validations
         base.send :validates_presence_of, :operator, :rule_key
-        base.send :validates_inclusion_of, :operator, :in => Surveyor::Common::OPERATORS
+        base.send :validate, :validates_operator
         base.send :validates_uniqueness_of, :rule_key, :scope => :dependency_id
         # this causes issues with building and saving
-        # base.send :validates_numericality_of, :question_id, :answer_id, :dependency_id
+        # base.send :validates_numericality_of, :question_id, :dependency_id
         
         base.send :include, Surveyor::ActsAsResponse # includes "as" instance method
 
@@ -27,22 +27,44 @@ module Surveyor
 
       # Instance methods
       def to_hash(response_set)
-        response = response_set.responses.detect{|r| r.answer_id.to_i == self.answer_id.to_i} || false # eval("nil and false") => nil so return false if no response is found
-        {rule_key.to_sym => (response and self.is_met?(response))}
+        # all responses to associated question
+        responses = response_set.responses.select do |r| 
+          question && question.answers.include?(r.answer)
+        end
+        {rule_key.to_sym => (!responses.empty? and self.is_met?(responses))}
       end
 
-      # Checks to see if the response passed in meets the dependency condition
-      def is_met?(response)
+      # Checks to see if the responses passed in meet the dependency condition
+      def is_met?(responses)
+        # response to associated answer if available, or first response
+        response = if self.answer_id
+                     responses.detect do |r| 
+                       r.answer == self.answer
+                     end 
+                   end || responses.first
         klass = response.answer.response_class
         return case self.operator
         when "==", "<", ">", "<=", ">="
           response.as(klass).send(self.operator, self.as(klass))
         when "!="
           !(response.as(klass) == self.as(klass))
+        when /^count[<>=]{1,2}\d+$/
+          op, i = self.operator.scan(/^count([<>!=]{1,2})(\d+)$/).flatten
+          responses.count.send(op, i.to_i)
+        when /^count!=\d+$/
+          !(responses.count == self.operator.scan(/\d+/).first.to_i)
         else
           false
         end
       end
+
+    protected
+
+      def validates_operator
+        errors.add(:operator, "Invalid operator") unless
+          Surveyor::Common::OPERATORS.include?(self.operator) ||
+            self.operator && self.operator.match(/^count(<|>|==|>=|<=|!=)(\d+)/)
+      end
     end
   end
-end
+end

data/lib/surveyor/parser.rb

@@ -171,12 +171,20 @@ class DependencyCondition < ActiveRecord::Base
     
     # build and set context
     a0, a1, a2 = args
-    context[:dependency_condition] = context[:dependency].dependency_conditions.build({
-                                      :context_reference => context,
-                                      :operator => a1 || "==",
-                                      :question_reference => a0.to_s.gsub("q_", ""),
-                                      :rule_key => reference_identifier}.merge(a2.is_a?(Hash) ? a2 : {:answer_reference => a2.to_s.gsub("a_", "")}))
+    context[:dependency_condition] = context[:dependency].
+      dependency_conditions.build(
+        { 
+          :context_reference => context,
+          :operator => a1 || "==",
+          :question_reference => a0.to_s.gsub("q_", ""),
+          :rule_key => reference_identifier 
+        }.merge(
+            a2.is_a?(Hash) ? a2 : { :answer_reference => 
+                                      a2.to_s.gsub("a_", "") }
+          )
+      )
   end
+
   def resolve_references
     if context_reference
       # Looking up references to questions and answers for linking the dependency objects
@@ -185,8 +193,8 @@ class DependencyCondition < ActiveRecord::Base
       print (self.answer = context_reference[:answer_references][question_reference][answer_reference]) ? "found answer:#{answer_reference} " : "lost! answer:#{answer_reference} "
     end
   end
-  
 end
+
 class Answer < ActiveRecord::Base
   # nonblock
   include Surveyor::Models::AnswerMethods

data/lib/surveyor/unparser.rb

@@ -97,7 +97,7 @@ class DependencyCondition < ActiveRecord::Base
     dsl << "    condition"
     dsl << "_#{rule_key}" unless rule_key.blank?
     dsl << " :q_#{question.reference_identifier}, \"#{operator}\""
-    dsl << (attrs.blank? ? ", {:answer_reference=>\"#{answer.reference_identifier}\"}\n" : ", {#{attrs.inspect.gsub(/\{|\}/, "")}, :answer_reference=>\"#{answer.reference_identifier}\"}\n")
+    dsl << (attrs.blank? ? ", {:answer_reference=>\"#{answer && answer.reference_identifier}\"}\n" : ", {#{attrs.inspect.gsub(/\{|\}/, "")}, :answer_reference=>\"#{answer && answer.reference_identifier}\"}\n")
   end  
 end
 class Answer < ActiveRecord::Base

data/spec/models/dependency_condition_spec.rb

@@ -3,7 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DependencyCondition, "Class methods" do
   it "should have a list of operators" do
-    %w(== != < > <= >=).each{|operator| DependencyCondition.operators.include?(operator).should be_true }
+    %w(== != < > <= >=).each do |operator|
+      DependencyCondition.operators.include?(operator).should be_true
+    end
   end
 end
 
@@ -16,14 +18,12 @@ describe DependencyCondition, "instance" do
     @dependency_condition.should be_valid
   end
 
-  it "should be invalid without a parent dependency_id, question_id, answer_id" do
+  it "should be invalid without a parent dependency_id, question_id" do
     # this causes issues with building and saving
     # @dependency_condition.dependency_id = nil
     # @dependency_condition.should have(1).errors_on(:dependency_id)
     # @dependency_condition.question_id = nil
     # @dependency_condition.should have(1).errors_on(:question_id)
-    # @dependency_condition.answer_id = nil
-    # @dependency_condition.should have(1).errors_on(:answer_id)
   end
 
   it "should be invalid without an operator" do
@@ -59,15 +59,15 @@ describe DependencyCondition, "instance" do
   it "should evaluate within the context of a response set object" do
     @response = Response.new(:question_id => 45, :response_set_id => 40, :answer_id => 23)
     @response.answer = Answer.new(:question_id => 45, :response_class => "answer")
-    @dependency_condition.is_met?(@response).should be_true
+    @dependency_condition.is_met?([@response]).should be_true
     # inversion
     @alt_response = Response.new(:question_id => 45, :response_set_id => 40, :answer_id => 55)
     @alt_response.answer = Answer.new(:question_id => 45, :response_class => "answer")
 
-    @dependency_condition.is_met?(@alt_response).should be_false
+    @dependency_condition.is_met?([@alt_response]).should be_false
   end
   
-  it "converts to a hash for evaluation by the depedency object" do
+  it "converts to a hash for evaluation by the dependency object" do
     @response = Response.new(:question_id => 45, :response_set_id => 40, :answer_id => 23)
     @rs = mock(ResponseSet, :responses => [@response])
     @dependency_condition.stub!(:is_met?).and_return(true)
@@ -75,7 +75,7 @@ describe DependencyCondition, "instance" do
   end
 end
 
-describe DependencyCondition, "evaluting the resonse_set state" do
+describe DependencyCondition, "evaluating the response_set state" do
 
   describe "when if given a response object whether the dependency is satisfied using '=='" do
     before(:each) do
@@ -90,45 +90,45 @@ describe DependencyCondition, "evaluting the resonse_set state" do
     end
 
     it "knows checkbox/radio type response" do
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @dep_c.answer_id = 12
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
     it "knows string value response" do
       @select_answer.response_class = "string"
       @response.string_value = "hello123"
       @dep_c.string_value = "hello123"
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.string_value = "foo_abc"
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
     it "knows a text value response" do
       @select_answer.response_class = "text"
       @response.text_value = "hello this is some text for comparison"
       @dep_c.text_value = "hello this is some text for comparison"
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.text_value = "Not the same text"
-      @dep_c.is_met?(@response).should be_false 
+      @dep_c.is_met?([@response]).should be_false 
     end
 
     it "knows an integer value response" do
       @select_answer.response_class = "integer"
       @response.integer_value = 10045
       @dep_c.integer_value = 10045
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.integer_value = 421
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
     it "knows a float value response" do
       @select_answer.response_class = "float"
       @response.float_value = 121.1
       @dep_c.float_value = 121.1
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.float_value = 130.123
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
   end
@@ -146,45 +146,45 @@ describe DependencyCondition, "evaluting the resonse_set state" do
     end
 
     it "knows checkbox/radio type response" do
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @dep_c.answer_id = 12
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
     it "knows string value response" do
       @select_answer.response_class = "string"
       @response.string_value = "hello123"
       @dep_c.string_value = "hello123"
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.string_value = "foo_abc"
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
     it "knows a text value response" do
       @select_answer.response_class = "text"
       @response.text_value = "hello this is some text for comparison"
       @dep_c.text_value = "hello this is some text for comparison"
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.text_value = "Not the same text"
-      @dep_c.is_met?(@response).should be_true 
+      @dep_c.is_met?([@response]).should be_true 
     end
 
     it "knows an integer value response" do
       @select_answer.response_class = "integer"
       @response.integer_value = 10045
       @dep_c.integer_value = 10045
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.integer_value = 421
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
     it "knows a float value response" do
       @select_answer.response_class = "float"
       @response.float_value = 121.1
       @dep_c.float_value = 121.1
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.float_value = 130.123
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
   end
@@ -203,18 +203,18 @@ describe DependencyCondition, "evaluting the resonse_set state" do
       @select_answer.response_class = "integer"
       @response.integer_value = 50
       @dep_c.integer_value = 100
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.integer_value = 421
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
     it "knows operator on float value response" do
       @select_answer.response_class = "float"
       @response.float_value = 5.1
       @dep_c.float_value = 121.1
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.float_value = 130.123
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
   end
@@ -233,22 +233,22 @@ describe DependencyCondition, "evaluting the resonse_set state" do
       @select_answer.response_class = "integer"
       @response.integer_value = 50
       @dep_c.integer_value = 100
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.integer_value = 100
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.integer_value = 421
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
     it "knows operator on float value response" do
       @select_answer.response_class = "float"
       @response.float_value = 5.1
       @dep_c.float_value = 121.1
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.float_value = 121.1
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.float_value = 130.123
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
     end
 
   end
@@ -267,18 +267,18 @@ describe DependencyCondition, "evaluting the resonse_set state" do
       @select_answer.response_class = "integer"
       @response.integer_value = 50
       @dep_c.integer_value = 100
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.integer_value = 421
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
     it "knows operator on float value response" do
       @select_answer.response_class = "float"
       @response.float_value = 5.1
       @dep_c.float_value = 121.1
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.float_value = 130.123
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
   end
@@ -297,26 +297,82 @@ describe DependencyCondition, "evaluting the resonse_set state" do
       @select_answer.response_class = "integer"
       @response.integer_value = 50
       @dep_c.integer_value = 100
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.integer_value = 100
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.integer_value = 421
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
     end
 
     it "knows operator on float value response" do
       @select_answer.response_class = "float"
       @response.float_value = 5.1
       @dep_c.float_value = 121.1
-      @dep_c.is_met?(@response).should be_false
+      @dep_c.is_met?([@response]).should be_false
       @response.float_value = 121.1
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).should be_true
       @response.float_value = 130.123
-      @dep_c.is_met?(@response).should be_true
+      @dep_c.is_met?([@response]).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, 
+                                       :operator => "count>2")
+      @question = Question.new
+      @select_answers = []
+      3.times do 
+        @select_answers << Answer.new(:question => @question, 
+                                      :response_class => "answer")
+      end
+      @responses = []
+      @select_answers.slice(0,2).each do |a|
+        @responses << Response.new(:question => @question, :answer => a, 
+                                   :response_set_id => 159)
+      end
+     end
+
+    it "knows operator with >" do
+      @dep_c.is_met?(@responses).should be_false
+      @responses << Response.new(:question => @question, 
+                                 :answer => @select_answers.last, 
+                                 :response_set_id => 159)
+      @dep_c.is_met?(@responses).should be_true
+    end
 
-end
+    it "knows operator with <" do
+      @dep_c.operator = "count<2"
+      @dep_c.is_met?(@responses).should be_false
+      @dep_c.operator = "count<3"
+      @dep_c.is_met?(@responses).should be_true
+    end
 
+    it "knows operator with <=" do
+      @dep_c.operator = "count<=1"
+      @dep_c.is_met?(@responses).should be_false
+      @dep_c.operator = "count<=2"
+      @dep_c.is_met?(@responses).should be_true
+      @dep_c.operator = "count<=3"
+      @dep_c.is_met?(@responses).should be_true
+    end
+
+    it "knows operator with >=" do
+      @dep_c.operator = "count>=1"
+      @dep_c.is_met?(@responses).should be_true
+      @dep_c.operator = "count>=2"
+      @dep_c.is_met?(@responses).should be_true
+      @dep_c.operator = "count>=3"
+      @dep_c.is_met?(@responses).should be_false
+    end
+
+    it "knows operator with !=" do
+      @dep_c.operator = "count!=1"
+      @dep_c.is_met?(@responses).should be_true
+      @dep_c.operator = "count!=2"
+      @dep_c.is_met?(@responses).should be_false
+      @dep_c.operator = "count!=3"
+      @dep_c.is_met?(@responses).should be_true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,20 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
-require 'spec/autorun'
-require 'spec/rails'
 
-require File.dirname(__FILE__) + "/factories"
+require 'rubygems'
+require 'bundler'
+Bundler.setup
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require "spec"
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+
+this_dir = File.dirname(__FILE__)
+raise "Alert! Run the rake task to install the test Rails app. It seems to be missing." unless File.directory?(File.join(this_dir,'test_app/spec'))
+require File.join(this_dir, 'test_app/spec/spec_helper')
+require File.join(this_dir, '/factories')
+
+require 'surveyor'
+require 'surveyor/parser'
 
 Spec::Runner.configure do |config|
-end
+end

data/spec/test_Gemfile

@@ -0,0 +1,15 @@
+source :rubygems
+
+gem 'rails', '2.3.10'
+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.8.0'
+gem 'cucumber-rails'
+gem 'database_cleaner'
+gem 'factory_girl'
+
+plugin_root = File.expand_path("../../..", __FILE__)
+#self.instance_eval File.read("#{plugin_root}/Gemfile")
+gem 'surveyor', :path => plugin_root

data/spec/test_boot.rb

@@ -0,0 +1,128 @@
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      if load_error.message =~ /Could not find RubyGem rails/
+        STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+        exit 1
+      else
+        raise
+      end
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        min_version = '1.3.2'
+        require 'rubygems'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
+end
+class Rails::Boot
+  def run
+    load_initializer
+
+    Rails::Initializer.class_eval do
+      def load_gems
+        @bundler_loaded ||= Bundler.require :default, Rails.env
+      end
+    end
+
+    Rails::Initializer.run(:set_load_path)
+  end
+end
+
+
+# All that for this:
+Rails.boot!

data/spec/test_preinitializer.rb

@@ -0,0 +1,21 @@
+# To go in test_app/config
+
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old." +
+   "Run `gem install bundler` to upgrade."
+end
+
+begin
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end

data/surveyor.gemspec

@@ -5,17 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.16.1"
+  s.version = "0.17.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2010-11-30}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
     ".gitignore",
+     ".rvmrc",
+     "Gemfile",
+     "Gemfile.lock",
      "MIT-LICENSE",
      "README.md",
      "Rakefile",
@@ -177,6 +180,9 @@ Gem::Specification.new do |s|
      "spec/rcov.opts",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/test_Gemfile",
+     "spec/test_boot.rb",
+     "spec/test_preinitializer.rb",
      "spec/views/surveyor/show.html.haml_spec.rb",
      "surveyor.gemspec",
      "uninstall.rb"
@@ -204,6 +210,51 @@ Gem::Specification.new do |s|
      "spec/models/validation_condition_spec.rb",
      "spec/models/validation_spec.rb",
      "spec/spec_helper.rb",
+     "spec/test_app/app/controllers/application_controller.rb",
+     "spec/test_app/app/helpers/application_helper.rb",
+     "spec/test_app/config/boot.rb",
+     "spec/test_app/config/environment.rb",
+     "spec/test_app/config/environments/cucumber.rb",
+     "spec/test_app/config/environments/development.rb",
+     "spec/test_app/config/environments/production.rb",
+     "spec/test_app/config/environments/test.rb",
+     "spec/test_app/config/initializers/backtrace_silencers.rb",
+     "spec/test_app/config/initializers/cookie_verification_secret.rb",
+     "spec/test_app/config/initializers/inflections.rb",
+     "spec/test_app/config/initializers/mime_types.rb",
+     "spec/test_app/config/initializers/new_rails_defaults.rb",
+     "spec/test_app/config/initializers/session_store.rb",
+     "spec/test_app/config/preinitializer.rb",
+     "spec/test_app/config/routes.rb",
+     "spec/test_app/db/migrate/20101119172426_create_surveys.rb",
+     "spec/test_app/db/migrate/20101119172427_create_survey_sections.rb",
+     "spec/test_app/db/migrate/20101119172428_create_questions.rb",
+     "spec/test_app/db/migrate/20101119172429_create_question_groups.rb",
+     "spec/test_app/db/migrate/20101119172430_create_answers.rb",
+     "spec/test_app/db/migrate/20101119172431_create_response_sets.rb",
+     "spec/test_app/db/migrate/20101119172432_create_responses.rb",
+     "spec/test_app/db/migrate/20101119172433_create_dependencies.rb",
+     "spec/test_app/db/migrate/20101119172434_create_dependency_conditions.rb",
+     "spec/test_app/db/migrate/20101119172435_create_validations.rb",
+     "spec/test_app/db/migrate/20101119172436_create_validation_conditions.rb",
+     "spec/test_app/db/migrate/20101119172437_add_display_order_to_surveys.rb",
+     "spec/test_app/db/migrate/20101119172438_add_correct_answer_id_to_questions.rb",
+     "spec/test_app/db/migrate/20101119172439_add_index_to_response_sets.rb",
+     "spec/test_app/db/migrate/20101119172440_add_index_to_surveys.rb",
+     "spec/test_app/db/migrate/20101119172441_add_unique_indicies.rb",
+     "spec/test_app/db/migrate/20101119172442_add_section_id_to_responses.rb",
+     "spec/test_app/db/schema.rb",
+     "spec/test_app/db/seeds.rb",
+     "spec/test_app/features/step_definitions/web_steps.rb",
+     "spec/test_app/features/support/env.rb",
+     "spec/test_app/features/support/paths.rb",
+     "spec/test_app/lib/tasks/surveyor.rb",
+     "spec/test_app/spec/spec_helper.rb",
+     "spec/test_app/surveys/kitchen_sink_survey.rb",
+     "spec/test_app/test/performance/browsing_test.rb",
+     "spec/test_app/test/test_helper.rb",
+     "spec/test_boot.rb",
+     "spec/test_preinitializer.rb",
      "spec/views/surveyor/show.html.haml_spec.rb"
   ]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 91
   prerelease: false
   segments: 
   - 0
-  - 16
-  - 1
-  version: 0.16.1
+  - 17
+  - 0
+  version: 0.17.0
 platform: ruby
 authors: 
 - Brian Chamberlain
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -05:00
+date: 2010-11-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,9 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -218,9 +221,55 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/test_Gemfile
+- spec/test_boot.rb
+- spec/test_preinitializer.rb
 - spec/views/surveyor/show.html.haml_spec.rb
 - surveyor.gemspec
 - uninstall.rb
+- spec/test_app/app/controllers/application_controller.rb
+- spec/test_app/app/helpers/application_helper.rb
+- spec/test_app/config/boot.rb
+- spec/test_app/config/environment.rb
+- spec/test_app/config/environments/cucumber.rb
+- spec/test_app/config/environments/development.rb
+- spec/test_app/config/environments/production.rb
+- spec/test_app/config/environments/test.rb
+- spec/test_app/config/initializers/backtrace_silencers.rb
+- spec/test_app/config/initializers/cookie_verification_secret.rb
+- spec/test_app/config/initializers/inflections.rb
+- spec/test_app/config/initializers/mime_types.rb
+- spec/test_app/config/initializers/new_rails_defaults.rb
+- spec/test_app/config/initializers/session_store.rb
+- spec/test_app/config/preinitializer.rb
+- spec/test_app/config/routes.rb
+- spec/test_app/db/migrate/20101119172426_create_surveys.rb
+- spec/test_app/db/migrate/20101119172427_create_survey_sections.rb
+- spec/test_app/db/migrate/20101119172428_create_questions.rb
+- spec/test_app/db/migrate/20101119172429_create_question_groups.rb
+- spec/test_app/db/migrate/20101119172430_create_answers.rb
+- spec/test_app/db/migrate/20101119172431_create_response_sets.rb
+- spec/test_app/db/migrate/20101119172432_create_responses.rb
+- spec/test_app/db/migrate/20101119172433_create_dependencies.rb
+- spec/test_app/db/migrate/20101119172434_create_dependency_conditions.rb
+- spec/test_app/db/migrate/20101119172435_create_validations.rb
+- spec/test_app/db/migrate/20101119172436_create_validation_conditions.rb
+- spec/test_app/db/migrate/20101119172437_add_display_order_to_surveys.rb
+- spec/test_app/db/migrate/20101119172438_add_correct_answer_id_to_questions.rb
+- spec/test_app/db/migrate/20101119172439_add_index_to_response_sets.rb
+- spec/test_app/db/migrate/20101119172440_add_index_to_surveys.rb
+- spec/test_app/db/migrate/20101119172441_add_unique_indicies.rb
+- spec/test_app/db/migrate/20101119172442_add_section_id_to_responses.rb
+- spec/test_app/db/schema.rb
+- spec/test_app/db/seeds.rb
+- spec/test_app/features/step_definitions/web_steps.rb
+- spec/test_app/features/support/env.rb
+- spec/test_app/features/support/paths.rb
+- spec/test_app/lib/tasks/surveyor.rb
+- spec/test_app/spec/spec_helper.rb
+- spec/test_app/surveys/kitchen_sink_survey.rb
+- spec/test_app/test/performance/browsing_test.rb
+- spec/test_app/test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/breakpointer/surveyor
 licenses: []
@@ -273,4 +322,49 @@ test_files:
 - spec/models/validation_condition_spec.rb
 - spec/models/validation_spec.rb
 - spec/spec_helper.rb
+- spec/test_app/app/controllers/application_controller.rb
+- spec/test_app/app/helpers/application_helper.rb
+- spec/test_app/config/boot.rb
+- spec/test_app/config/environment.rb
+- spec/test_app/config/environments/cucumber.rb
+- spec/test_app/config/environments/development.rb
+- spec/test_app/config/environments/production.rb
+- spec/test_app/config/environments/test.rb
+- spec/test_app/config/initializers/backtrace_silencers.rb
+- spec/test_app/config/initializers/cookie_verification_secret.rb
+- spec/test_app/config/initializers/inflections.rb
+- spec/test_app/config/initializers/mime_types.rb
+- spec/test_app/config/initializers/new_rails_defaults.rb
+- spec/test_app/config/initializers/session_store.rb
+- spec/test_app/config/preinitializer.rb
+- spec/test_app/config/routes.rb
+- spec/test_app/db/migrate/20101119172426_create_surveys.rb
+- spec/test_app/db/migrate/20101119172427_create_survey_sections.rb
+- spec/test_app/db/migrate/20101119172428_create_questions.rb
+- spec/test_app/db/migrate/20101119172429_create_question_groups.rb
+- spec/test_app/db/migrate/20101119172430_create_answers.rb
+- spec/test_app/db/migrate/20101119172431_create_response_sets.rb
+- spec/test_app/db/migrate/20101119172432_create_responses.rb
+- spec/test_app/db/migrate/20101119172433_create_dependencies.rb
+- spec/test_app/db/migrate/20101119172434_create_dependency_conditions.rb
+- spec/test_app/db/migrate/20101119172435_create_validations.rb
+- spec/test_app/db/migrate/20101119172436_create_validation_conditions.rb
+- spec/test_app/db/migrate/20101119172437_add_display_order_to_surveys.rb
+- spec/test_app/db/migrate/20101119172438_add_correct_answer_id_to_questions.rb
+- spec/test_app/db/migrate/20101119172439_add_index_to_response_sets.rb
+- spec/test_app/db/migrate/20101119172440_add_index_to_surveys.rb
+- spec/test_app/db/migrate/20101119172441_add_unique_indicies.rb
+- spec/test_app/db/migrate/20101119172442_add_section_id_to_responses.rb
+- spec/test_app/db/schema.rb
+- spec/test_app/db/seeds.rb
+- spec/test_app/features/step_definitions/web_steps.rb
+- spec/test_app/features/support/env.rb
+- spec/test_app/features/support/paths.rb
+- spec/test_app/lib/tasks/surveyor.rb
+- spec/test_app/spec/spec_helper.rb
+- spec/test_app/surveys/kitchen_sink_survey.rb
+- spec/test_app/test/performance/browsing_test.rb
+- spec/test_app/test/test_helper.rb
+- spec/test_boot.rb
+- spec/test_preinitializer.rb
 - spec/views/surveyor/show.html.haml_spec.rb