active_record_survey 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c9449620b59d5e5fead5ab4a0d168a20f09695
-  data.tar.gz: 477a7031adf2e0efe973606157f39bcec522b2bd
+  metadata.gz: 0ec49942bdb8de3f5ea1c79c524a7756c0c23ca5
+  data.tar.gz: 4a951bb87e0f5b9990eb1b6648fe41652a18426e
 SHA512:
-  metadata.gz: 36524e334c8ea4e54c402d2f1c2210a558b36dd6fbaf800ba509f9b7040ee3bf2a14620e20a7206c5fec546aa34c166de5b8e248fe971660c4900132acfda450
-  data.tar.gz: 625e0143247e13506f40b40f096ea0f5627f41671ad84793c736ed49bba4854c31b4d3fb5cba1ab13770a9dc26f5d0fe1baf39f7e0aa78a17535346acaf28137
+  metadata.gz: 4095f4b2118338abeed4e6a9c69f134479491ff45af9b997a8389b7f6562df34318c0b0ce842217599c1b43128e108c083ca57421de52723e5d4fe360554bba1
+  data.tar.gz: 57dcd1b8f5c50ccfcb43d551fb6d6ae0414f6f39cfd1527418dfe761ddc4ba50721c26e0ff257ff83bc1744c2d4e20ce8e881a9f0358ab95315a2579838c0edf

data/lib/active_record_survey/instance_node.rb

@@ -7,28 +7,33 @@ module ActiveRecordSurvey
 		validates_presence_of :instance
 
 		validate do |instance_node|
-			# This instance_node has no valid path to the root node
-			if !self.node.instance_node_path_to_root?(self)
-				instance_node.errors[:base] << "INVALID_PATH"
-			end
+			# No node to begin with!
+			if self.node.nil?
+				instance_node.errors[:base] << "INVALID_NODE"
+			else
+				# This instance_node has no valid path to the root node
+				if !self.node.instance_node_path_to_root?(self)
+					instance_node.errors[:base] << "INVALID_PATH"
+				end
 
-			parent_nodes = self.node.survey.node_maps.select { |i| i.node == self.node }.collect { |j| j.parent }
+				parent_nodes = self.node.survey.node_maps.select { |i| i.node == self.node }.collect { |j| j.parent }
 
-			# Two instance_nodes on the same node for this instance
-			if self.instance.instance_nodes.select { |i|
-					# We don't care about paths that are going to be deleted
-					!i.marked_for_destruction?
-				}.select { |i|
-					# And the two arrays
-					# Two votes share a parent (this means a question has two answers for this instance)
-					(i.node.survey.node_maps.select { |j| i.node == j.node }.collect { |j| j.parent } & parent_nodes).length > 0
-				}.length > 1
-				instance_node.errors[:base] << "DUPLICATE_PATH"
-			end
+				# Two instance_nodes on the same node for this instance
+				if self.instance.instance_nodes.select { |i|
+						# We don't care about paths that are going to be deleted
+						!i.marked_for_destruction?
+					}.select { |i|
+						# And the two arrays
+						# Two votes share a parent (this means a question has two answers for this instance)
+						(i.node.survey.node_maps.select { |j| i.node == j.node }.collect { |j| j.parent } & parent_nodes).length > 0
+					}.length > 1
+					instance_node.errors[:base] << "DUPLICATE_PATH"
+				end
 
-			# Validate against the associated node
-			if !self.node.validate_instance_node(self)
-				instance_node.errors[:base] << "INVALID"
+				# Validate against the associated node
+				if !self.node.validate_instance_node(self)
+					instance_node.errors[:base] << "INVALID"
+				end
 			end
 		end
 	end

data/lib/active_record_survey/node.rb

@@ -92,7 +92,7 @@ module ActiveRecordSurvey
 
 		# Whether there is a valid answer path from this node to the root node for the instance
 		def instance_node_path_to_root?(instance_node)
-			instance_nodes = instance_node.instance.instance_nodes.select { |i| i.node === self }
+			instance_nodes = instance_node.instance.instance_nodes.select { |i| i.node == self }
 
 			# if ::ActiveRecordSurvey::Node::Answer but no votes, not a valid path
 			if self.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer) &&
@@ -100,6 +100,13 @@ module ActiveRecordSurvey
 				return false
 			end
 
+			# if ::ActiveRecordSurvey::Node::Question but no answers, so needs at least one vote directly on itself
+			if self.class.ancestors.include?(::ActiveRecordSurvey::Node::Question) &&
+				(self.answers.length === 0) && 
+				(instance_nodes.length === 0)
+				return false
+			end
+
 			# Start at each node_map of this node
 			# Find the parent node ma
 			paths = self.survey.node_maps.select { |i| i.node == self }.collect { |node_map|

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.39"
+	VERSION = "0.1.40"
 end

data/spec/active_record_survey/instance_node_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ActiveRecordSurvey::InstanceNode, :instance_node_spec => true do
+	
+end

data/spec/active_record_survey/instance_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe ActiveRecordSurvey::Instance, :instance_spec => true do
+	before(:each) do
+		@survey = FactoryGirl.build(:boolean_survey)
+		@survey.save
+
+		@survey.questions.each { |q|
+			@q1 = q if q.text == "Q1"
+			@q2 = q if q.text == "Q2"
+			@q3 = q if q.text == "Q3"
+			@q4 = q if q.text == "Q4"
+			@q5 = q if q.text == "Q5"
+		}
+		
+		@q1.answers.each { |a|
+			@q1_a1 = a if a.text == "Q1 A1"
+			@q1_a2 = a if a.text == "Q1 A2"
+		}
+		@q2.answers.each { |a|
+			@q2_a1 = a if a.text == "Q2 A1"
+			@q2_a2 = a if a.text == "Q2 A2"
+		}
+		@q3.answers.each { |a|
+			@q3_a1 = a if a.text == "Q3 A1"
+			@q3_a2 = a if a.text == "Q3 A2"
+		}
+		@q4.answers.each { |a|
+			@q4_a1 = a if a.text == "Q4 A1"
+			@q4_a2 = a if a.text == "Q4 A2"
+		}
+		@instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+	end
+
+	describe "#invalid?" do
+		it 'should not allow not starting from the root' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q3_a1)
+
+			expect(@instance.invalid?).to eq(true)
+		end
+
+		it 'should not allow impossible answers' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q1_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q3_a1)
+
+			expect(@instance.invalid?).to eq(true)
+		end
+
+		it 'should fail when boolean answer is not passed an value of [0,1]' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q1_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a2)
+
+			expect(@instance.invalid?).to eq(true)
+		end
+
+		it 'should allow an incompleted survey, even if a missing part is a question node only' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q1_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a1, :value => 1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a2, :value => 0)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q3_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q5)
+
+			expect(@instance.invalid?).to eq(true)
+		end
+	end
+
+	describe "#valid?" do
+		it 'should allow a single answer' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q1_a1)
+
+			expect(@instance.valid?).to eq(true)
+		end
+
+		it 'should allow multiple answers' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q1_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a1, :value => 0)
+
+			expect(@instance.valid?).to eq(true)
+		end
+
+		it 'should allow a completed survey' do
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q1_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a1, :value => 1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q2_a2, :value => 0)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q3_a1)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q4)
+			@instance.instance_nodes << ActiveRecordSurvey::InstanceNode.new(:instance => @instance, :node => @q5)
+
+			expect(@instance.valid?).to eq(true)
+		end
+	end
+end

data/spec/active_record_survey/node/answer_spec.rb

@@ -345,6 +345,21 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 		end
 
 		describe '#next_question' do
+			it 'should not have a next question if not linked anywhere' do
+				survey = FactoryGirl.build(:survey1)
+				survey.save
+
+				q2 = survey.questions.select { |i|
+					i.text == "Question #2"
+				}.first
+
+				q2_a1 = q2.answers.select { |i|
+					i.text == "Q2 Answer #1"
+				}.first
+
+				expect(q2_a1.next_question).to be(nil)
+			end
+
 			it 'should get the next question' do
 				expected = {
 					"Q1" => {

data/spec/factories/active_record_survey/survey.rb

@@ -1,5 +1,72 @@
 module FactoryGirlSurveyHelpers
 	extend self
+	def build_survey1(survey)
+		q1 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #1", :survey => survey)
+		q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #1")
+		q1_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #2")
+		q1.build_answer(q1_a1)
+		q1.build_answer(q1_a2)
+
+		q2 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #2", :survey => survey)
+		q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 Answer #1")
+		q2_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 Answer #2")
+		q2.build_answer(q2_a1)
+		q2.build_answer(q2_a2)
+
+		q3 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #3", :survey => survey)
+		q3_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 Answer #1")
+		q3_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 Answer #2")
+		q3.build_answer(q3_a1)
+		q3.build_answer(q3_a2)
+
+		q4 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #4", :survey => survey)
+
+		q5 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #5", :survey => survey)
+
+		q1_a1.build_link(q2)
+		q1_a2.build_link(q3)
+		q2_a2.build_link(q3)
+
+		q3_a1.build_link(q4)
+		q3_a2.build_link(q4)
+
+		q4.build_link(q5)
+	end
+
+	def build_boolean_survey(survey)
+		q1 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q1", :survey => survey)
+		q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A1")
+		q1_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A2")
+		q1.build_answer(q1_a1)
+		q1.build_answer(q1_a2)
+
+		q2 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q2", :survey => survey)
+		q2_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 A1")
+		q2_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 A2")
+		q2.build_answer(q2_a1)
+		q2.build_answer(q2_a2)
+
+		q3 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q3", :survey => survey)
+		q3_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 A1")
+		q3_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 A2")
+		q3.build_answer(q3_a1)
+		q3.build_answer(q3_a2)
+
+		q4 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q4", :survey => survey)
+
+		q5 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Q5", :survey => survey)
+
+		q1_a1.build_link(q2)
+		q1_a2.build_link(q3)
+
+		q2_a2.build_link(q3)
+
+		q3_a1.build_link(q4)
+		q3_a2.build_link(q4)
+
+		q4.build_link(q5)
+	end
+
 	def build_simple_survey(survey)
 		q1 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :text => "Question #1", :survey => survey)
 		q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #1")
@@ -106,6 +173,10 @@ FactoryGirl.define do
 
 	end
 
+	factory :survey1, parent: :survey do |f|
+		after(:build) { |survey| FactoryGirlSurveyHelpers.build_survey1(survey) }
+	end
+
 	factory :simple_survey, parent: :survey do |f|
 		after(:build) { |survey| FactoryGirlSurveyHelpers.build_simple_survey(survey) }
 	end
@@ -113,4 +184,8 @@ FactoryGirl.define do
 	factory :basic_survey, parent: :survey do |f|
 		after(:build) { |survey| FactoryGirlSurveyHelpers.build_basic_survey(survey) }
 	end
+
+	factory :boolean_survey, parent: :survey do |f|
+		after(:build) { |survey| FactoryGirlSurveyHelpers.build_boolean_survey(survey) }
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -163,6 +163,8 @@ files:
 - lib/generators/active_record_survey/templates/migration_0.1.0.rb
 - lib/generators/active_record_survey/templates/migration_0.1.26.rb
 - rspec_rvm
+- spec/active_record_survey/instance_node_spec.rb
+- spec/active_record_survey/instance_spec.rb
 - spec/active_record_survey/node/answer/boolean_spec.rb
 - spec/active_record_survey/node/answer/rank_spec.rb
 - spec/active_record_survey/node/answer/scale_spec.rb
@@ -199,6 +201,8 @@ signing_key:
 specification_version: 4
 summary: Surveys using activerecord
 test_files:
+- spec/active_record_survey/instance_node_spec.rb
+- spec/active_record_survey/instance_spec.rb
 - spec/active_record_survey/node/answer/boolean_spec.rb
 - spec/active_record_survey/node/answer/rank_spec.rb
 - spec/active_record_survey/node/answer/scale_spec.rb