active_record_survey 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e024c72de4b41b4e3937d465726d0110cadbcf83
-  data.tar.gz: 41352a433cb8b8a6b8f0d8779c7ce8ced446cc4a
+  metadata.gz: be07fe6de1d3387ccd71f4c56ea9e33535baf95d
+  data.tar.gz: 8a24d9f1c4459a1f2131b28782dbc035ccbace2a
 SHA512:
-  metadata.gz: 6f70aea6ac4dd79b3ff9e6b6b97096ca52ea839d6241b39aaef8740ad5ec91d1f9ce18fa7acd5fe5ce7ff5db1657b10586b2effa4fa1a1c7a0f8fca3d89b65a5
-  data.tar.gz: 77f86f2a2b516981e85cff63cd97bd2fb570cf7014c241894774c6c5a7ff0330fcbcbf226d93b1b02215e40b4b54ffc1c9f26450134c55b46843b93addcfb789
+  metadata.gz: 7a533e0173ba238d96430fe78348414cb76249abfd568cc4c6f920d745d920ddc3ea3b12462bb2d4577def1b4d8efefed0ccd2b702c49f9e4c3a822a8f4fa779
+  data.tar.gz: 13cd48140d0a0050e487e5a615afa3040b19763268a926db3d93e7758c726f261866f14aa21b3970893508aefadb429e9c47460476c5400fa6c6107ea54aa56d

data/README.md

@@ -12,6 +12,10 @@ The goal is to give a simple interface for creating surveys and validating the a
 Release Notes
 ============
 
+**0.1.36**
+ - `ActiveRecordSurvey::Node::Answer#build_link` and `ActiveRecordSurvey::Node::Answer#remove_link` moved to `ActiveRecordSurvey::Node` so that questions can directly follow one another without answers
+ - Implemented `ActiveRecordSurvey::Node::Question#next_questions` to return all questions that follow either directly or through answers
+
 **0.1.33**
  - `ActiveRecordSurvey::Node::Answer#sibling_index` method for setting position as well
 

data/lib/active_record_survey/node/answer/chained.rb

@@ -3,7 +3,6 @@ module ActiveRecordSurvey
 		module Chained
 			module ClassMethods
 				def self.extended(base)
-					base.before_destroy :before_destroy_rebuild_node_map, prepend: true # prepend is important! otherwise dependent: :destroy on node<->node_map relation is executed first and no records!
 				end
 			end
 
@@ -123,21 +122,6 @@ module ActiveRecordSurvey
 						end
 					}
 				end
-
-				private
-					# Before a node is destroyed, will re-build the node_map links from parent to child if they exist
-					def before_destroy_rebuild_node_map
-
-						# All the node_maps from this node
-						self.survey.node_maps.select { |i|
-							i.node == self
-						}.each { |node_map|
-							# Remap all of this nodes children to the parent
-							node_map.children.each  { |child|
-								node_map.parent.children << child
-							}
-						}
-					end
 			end
 		end
 	end

data/lib/active_record_survey/node/answer.rb

@@ -50,89 +50,12 @@ module ActiveRecordSurvey
 			return nil
 		end
 
-		# Removes the link
-		def remove_link
-			# not linked to a question - nothing to remove!
-			return true if (question = self.next_question).nil?
-
-			count = 0
-			to_remove = []
-			self.survey.node_maps.each { |node_map|
-				if node_map.node == question
-					if count > 0
-						to_remove.concat(node_map.self_and_descendants)
-					else
-						node_map.parent = nil
-					end
-					count = count + 1
-				end
-
-				if node_map.node == self
-					node_map.children = []
-				end
-			}
-			self.survey.node_maps.each { |node_map|
-				if to_remove.include?(node_map)
-					node_map.parent = nil
-					node_map.mark_for_destruction
-				end
-			}
-		end
-
-		# Build a link from this node to another node
-		# Building a link actually needs to throw off a whole new clone of all children nodes
 		def build_link(to_node)
-			# build_link only accepts a to_node that inherits from Question
-			if !to_node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
-				raise ArgumentError.new "to_node must inherit from ::ActiveRecordSurvey::Node::Question"
-			end
-
 			if self.question.nil?
 				raise ArgumentError.new "A question is required before calling #build_link"
 			end
 
-			if self.survey.nil?
-				raise ArgumentError.new "A survey is required before calling #build_link"
-			end
-
-			from_node_maps = self.survey.node_maps.select { |i| i.node == self && !i.marked_for_destruction? }
-
-			# Answer has already got a question - throw error
-			if from_node_maps.select { |i|
-				i.children.length === 0
-			}.length === 0
-				raise RuntimeError.new "This answer has already been linked" 
-			end
-
-			# Because we need something to clone - filter this further below
-			to_node_maps = self.survey.node_maps.select { |i| i.node == to_node && !i.marked_for_destruction? }
-
-			if to_node_maps.first.nil?
-				to_node_maps << self.survey.node_maps.build(:survey => self.survey, :node => to_node)
-			end
-
-			# Ensure we can through each possible path of getting to this answer
-			to_node_map = to_node_maps.first
-			to_node_map.survey = self.survey # required due to voodoo - we want to use the same survey with the same object_id
-
-			# We only want node maps that aren't linked somewhere
-			to_node_maps = to_node_maps.select { |i| i.parent.nil? }
-			while to_node_maps.length < from_node_maps.length do
-				to_node_maps.push(to_node_map.recursive_clone)
-			end
-
-			# Link unused node_maps to the new parents
-			from_node_maps.each_with_index { |from_node_map, index|
-				from_node_map.children << to_node_maps[index]
-			}
-
-			# Ensure no infinite loops were created
-			from_node_maps.each { |node_map|
-				# There is a path from Q -> A that is a loop
-				if node_map.has_infinite_loop?
-					raise RuntimeError.new "Infinite loop detected"
-				end
-			}
+			super(to_node)
 		end
 
 		# Gets index in sibling relationship

data/lib/active_record_survey/node/question.rb

@@ -25,5 +25,26 @@ module ActiveRecordSurvey
 			# Answers actually define how they're built off the parent node
 			answer_node.send(:build_answer, self)
 		end
+
+		# Returns the questions that follows this question (either directly or via its answers)
+		def next_questions
+			list = []
+
+			if question_node_map = self.survey.node_maps.select { |i|
+				i.node == self && !i.marked_for_destruction?
+			}.first
+				question_node_map.children.each { |child|
+					if !child.node.nil? && !child.marked_for_destruction?
+						if child.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+							list << child.node
+						elsif child.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer)
+							list << child.node.next_question 
+						end
+					end
+				}
+			end
+
+			list.compact.uniq
+		end
 	end
 end

data/lib/active_record_survey/node.rb

@@ -6,6 +6,8 @@ module ActiveRecordSurvey
 		has_many :node_validations, :class_name => "ActiveRecordSurvey::NodeValidation", :foreign_key => :active_record_survey_node_id, autosave: true, dependent: :destroy
 		has_many :instance_nodes, :class_name => "ActiveRecordSurvey::InstanceNode", :foreign_key => :active_record_survey_node_id
 
+		before_destroy :before_destroy_rebuild_node_map, prepend: true # prepend is important! otherwise dependent: :destroy on node<->node_map relation is executed first and no records!
+
 		# All the answer nodes that follow from this node
 		def answers
 			self.survey.node_maps.select { |i|
@@ -113,5 +115,102 @@ module ActiveRecordSurvey
 			# If recursion reports back to have at least one valid path to root
 			paths.include?(true)
 		end
+
+		# Removes the node_map link
+		def remove_link
+			# not linked to a question - nothing to remove!
+			return true if (question = self.next_question).nil?
+
+			count = 0
+			to_remove = []
+			self.survey.node_maps.each { |node_map|
+				if node_map.node == question
+					if count > 0
+						to_remove.concat(node_map.self_and_descendants)
+					else
+						node_map.parent = nil
+					end
+					count = count + 1
+				end
+
+				if node_map.node == self
+					node_map.children = []
+				end
+			}
+			self.survey.node_maps.each { |node_map|
+				if to_remove.include?(node_map)
+					node_map.parent = nil
+					node_map.mark_for_destruction
+				end
+			}
+		end
+
+		# Build a link from this node to another node
+		# Building a link actually needs to throw off a whole new clone of all children nodes
+		def build_link(to_node)
+			# build_link only accepts a to_node that inherits from Question
+			if !to_node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+				raise ArgumentError.new "to_node must inherit from ::ActiveRecordSurvey::Node::Question"
+			end
+
+			if self.survey.nil?
+				raise ArgumentError.new "A survey is required before calling #build_link"
+			end
+
+			from_node_maps = self.survey.node_maps.select { |i| i.node == self && !i.marked_for_destruction? }
+
+			# Answer has already got a question - throw error
+			if from_node_maps.select { |i|
+				i.children.length === 0
+			}.length === 0
+				raise RuntimeError.new "This node has already been linked" 
+			end
+
+			# Because we need something to clone - filter this further below
+			to_node_maps = self.survey.node_maps.select { |i| i.node == to_node && !i.marked_for_destruction? }
+
+			if to_node_maps.first.nil?
+				to_node_maps << self.survey.node_maps.build(:survey => self.survey, :node => to_node)
+			end
+
+			# Ensure we can through each possible path of getting to this answer
+			to_node_map = to_node_maps.first
+			to_node_map.survey = self.survey # required due to voodoo - we want to use the same survey with the same object_id
+
+			# We only want node maps that aren't linked somewhere
+			to_node_maps = to_node_maps.select { |i| i.parent.nil? }
+			while to_node_maps.length < from_node_maps.length do
+				to_node_maps.push(to_node_map.recursive_clone)
+			end
+
+			# Link unused node_maps to the new parents
+			from_node_maps.each_with_index { |from_node_map, index|
+				from_node_map.children << to_node_maps[index]
+			}
+
+			# Ensure no infinite loops were created
+			from_node_maps.each { |node_map|
+				# There is a path from Q -> A that is a loop
+				if node_map.has_infinite_loop?
+					raise RuntimeError.new "Infinite loop detected"
+				end
+			}
+		end
+
+		private
+			# Before a node is destroyed, will re-build the node_map links from parent to child if they exist
+			def before_destroy_rebuild_node_map
+				# All the node_maps from this node
+				self.survey.node_maps.select { |i|
+					i.node == self
+				}.each { |node_map|
+					# Remap all of this nodes children to the parent
+					node_map.children.each  { |child|
+						node_map.parent.children << child
+					}
+				}
+
+				true
+			end
 	end
 end

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.35"
+	VERSION = "0.1.36"
 end

data/spec/active_record_survey/node/question_spec.rb

@@ -1,6 +1,88 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Question, :question_spec => true do
+	describe "#next_questions" do
+		it "should return an array of all questions following a question, whether they have answers or not" do
+			@survey = ActiveRecordSurvey::Survey.new()
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(: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_a3 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #3")
+			@q1_a4 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #4")
+			@q1.build_answer(@q1_a1)
+			@q1.build_answer(@q1_a2)
+			@q1.build_answer(@q1_a3)
+			@q1.build_answer(@q1_a4)
+
+			@q2 = ActiveRecordSurvey::Node::Question.new(: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 = ActiveRecordSurvey::Node::Question.new(: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 = ActiveRecordSurvey::Node::Question.new(:text => "Question #4", :survey => @survey)
+			@q4_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q4 Answer #1")
+			@q4_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q4 Answer #2")
+			@q4.build_answer(@q4_a1)
+			@q4.build_answer(@q4_a2)
+
+			@q5 = ActiveRecordSurvey::Node::Question.new(:text => "Question #5", :survey => @survey)
+
+			@q6 = ActiveRecordSurvey::Node::Question.new(:text => "Question #6", :survey => @survey)
+			@q6_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q6 Answer #1")
+			@q6_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q6 Answer #2")
+			@q6.build_answer(@q6_a1)
+			@q6.build_answer(@q6_a2)
+
+			@q7 = ActiveRecordSurvey::Node::Question.new(:text => "Question #7", :survey => @survey)
+
+			# Link up Q1
+			@q1_a1.build_link(@q2)
+			@q1_a2.build_link(@q3)
+			@q1_a3.build_link(@q4)
+
+			# Link up Q2
+			@q2_a1.build_link(@q4)
+			@q2_a2.build_link(@q3)
+
+			# Link up Q3
+			@q3_a1.build_link(@q4)
+			@q3_a2.build_link(@q4)
+
+			# Link up Q1A4 -> Q5
+			@q1_a4.build_link(@q5)
+
+			# Link up Q5 -> Q6
+			@q5.build_link(@q6)
+
+			# Link up Q6 -> Q7
+			@q6_a2.build_link(@q7)
+
+			@survey.save
+
+			q1_next_questions = @q1.next_questions
+			q2_next_questions = @q2.next_questions
+			q3_next_questions = @q3.next_questions
+			q4_next_questions = @q4.next_questions
+			q5_next_questions = @q5.next_questions
+			q6_next_questions = @q6.next_questions
+
+			expect(q1_next_questions.length).to eq(4)
+			expect(q2_next_questions.length).to eq(2)
+			expect(q3_next_questions.length).to eq(1)
+			expect(q4_next_questions.length).to eq(0)
+			expect(q5_next_questions.length).to eq(1)
+			expect(q6_next_questions.length).to eq(1)
+		end
+	end
+
 	describe "#build_answer" do
 		before(:each) do
 			@survey = ActiveRecordSurvey::Survey.new()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord