surveyor 0.9.6 → 0.9.7

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/app/models/response_set.rb

@@ -93,7 +93,7 @@ class ResponseSet < ActiveRecord::Base
     responses.all?(&:correct?)
   end
   def correctness_hash
-    { :questions => @survey.sections_with_questions.map(&:questions).flatten.compact.size,
+    { :questions => survey.sections_with_questions.map(&:questions).flatten.compact.size,
       :responses => responses.compact.size,
       :correct => responses.find_all(&:correct?).compact.size
     }
@@ -102,7 +102,7 @@ class ResponseSet < ActiveRecord::Base
     progress_hash[:triggered_mandatory] == progress_hash[:triggered_mandatory_completed]
   end
   def progress_hash
-    qs = @survey.sections_with_questions.map(&:questions).flatten
+    qs = survey.sections_with_questions.map(&:questions).flatten
     ds = dependencies(qs.map(&:id))
     triggered = qs - ds.select{|d| !d.is_met?(self)}.map(&:question)
     { :questions => qs.compact.size,

data/lib/surveyor.rb

@@ -1,9 +1,4 @@
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
-
-require 'surveyor/config'
-require 'surveyor/acts_as_response'
-
+require File.dirname(__FILE__) + '/surveyor/acts_as_response'
 module Surveyor
   RAND_CHARS = [('a'..'z'), ('A'..'Z'), (0..9)].map{|r| r.to_a}.flatten.to_s
 
@@ -25,4 +20,18 @@ module Surveyor
     cols = (col_text.split(' ') - words_to_omit)
     (cols.size > 5 ? cols[-5..-1] : cols).join("_")
   end
-end
+end
+
+# From http://guides.rubyonrails.org/plugins.html#controllers
+# Fix for:
+# ArgumentError in SurveyorController#edit 
+# A copy of ApplicationController has been removed from the module tree but is still active!
+# Equivalent of using "unloadable" in SurveyorController (unloadable has been deprecated)
+
+%w{models controllers}.each do |dir|
+  path = File.expand_path(File.join(File.dirname(__FILE__), '../app', dir))
+  # $LOAD_PATH << path # already here
+  # ActiveSupport::Dependencies.load_paths << path # already here too
+  ActiveSupport::Dependencies.load_once_paths.delete(path)
+  # [$LOAD_PATH, ActiveSupport::Dependencies.load_paths, ActiveSupport::Dependencies.load_once_paths].each{|x| Rails.logger.info x}
+end

data/spec/models/response_set_spec.rb

@@ -190,7 +190,7 @@ describe ResponseSet, "with mandatory, dependent questions" do
     count.times do |i|
       q = Factory(:question, :survey_section => @section, :is_mandatory => (mandatory == "mandatory"))
       a = Factory(:answer, :question => q, :response_class => "answer")
-      if dependent = "dependent"
+      if dependent == "dependent"
         d = Factory(:dependency, :question => q)
         dc = Factory(:dependency_condition, :dependency => d, :question_id => dq.id, :answer_id => da.id)
       end

data/surveyor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surveyor}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Chamberlain", "Mark Yoon"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: surveyor
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Brian Chamberlain