active_record_survey 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be07fe6de1d3387ccd71f4c56ea9e33535baf95d
-  data.tar.gz: 8a24d9f1c4459a1f2131b28782dbc035ccbace2a
+  metadata.gz: 1e48bc1f74ce11bb6285537bb34e00fb614b1e33
+  data.tar.gz: 1528b2c91f64d66e4cf543b37f2b933e356efa5d
 SHA512:
-  metadata.gz: 7a533e0173ba238d96430fe78348414cb76249abfd568cc4c6f920d745d920ddc3ea3b12462bb2d4577def1b4d8efefed0ccd2b702c49f9e4c3a822a8f4fa779
-  data.tar.gz: 13cd48140d0a0050e487e5a615afa3040b19763268a926db3d93e7758c726f261866f14aa21b3970893508aefadb429e9c47460476c5400fa6c6107ea54aa56d
+  metadata.gz: d5ed3484bfcac51667d8243b31e187b9b1a372faab368e85d23477ec675b1cfa68ec75e147d3fde56acb57e6a04ca03ce5a740ecf843bde15034ec30959d16bf
+  data.tar.gz: 5ff5d9269c791274f92c6538d0f5559080367b1866ef4929b2363d29dbe244fd877fea29283747624ec480a6df0de940b3e848a882f54d20657da9a6a8c25339

data/lib/active_record_survey/node/answer.rb

@@ -50,6 +50,35 @@ module ActiveRecordSurvey
 			return nil
 		end
 
+		# Removes the node_map from this answer to its next question
+		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
+
 		def build_link(to_node)
 			if self.question.nil?
 				raise ArgumentError.new "A question is required before calling #build_link"

data/lib/active_record_survey/node/question.rb

@@ -23,7 +23,47 @@ module ActiveRecordSurvey
 			end
 
 			# Answers actually define how they're built off the parent node
-			answer_node.send(:build_answer, self)
+			if answer_node.send(:build_answer, self)
+
+				# If any questions existed directly following this question, insert after this answer
+				self.survey.node_maps.select { |i|
+					i.node == answer_node
+				}.each { |answer_node_map|
+					self.survey.node_maps.select { |j|
+						# Same parent
+						# Is a question
+						j.parent == answer_node_map.parent && j.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+					}.each { |j|
+						answer_node_map.children << j
+					}
+				}
+
+				true
+			end
+		end
+
+		# Removes the node_map link from this question all of its next questions
+		def remove_link
+			return true if (questions = self.next_questions).length === 0
+
+			# Remove the link to any direct questions
+			self.survey.node_maps.select { |i|
+				i.node == self
+			}.each { |node_map|
+				self.survey.node_maps.select { |j|
+					node_map.children.include?(j) 
+				}.each { |child|
+					if child.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+						child.parent = nil
+						child.send((child.new_record?)? :destroy : :mark_for_destruction )
+					end
+				}
+			}
+
+			# remove link any answeres that have questions
+			self.answers.collect { |i|
+				i.remove_link
+			}
 		end
 
 		# Returns the questions that follows this question (either directly or via its answers)

data/lib/active_record_survey/node.rb

@@ -116,35 +116,6 @@ module ActiveRecordSurvey
 			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)
@@ -161,8 +132,8 @@ module ActiveRecordSurvey
 
 			# Answer has already got a question - throw error
 			if from_node_maps.select { |i|
-				i.children.length === 0
-			}.length === 0
+				i.children.length > 0
+			}.length > 0
 				raise RuntimeError.new "This node has already been linked" 
 			end
 

data/lib/active_record_survey/survey.rb

@@ -9,6 +9,21 @@ module ActiveRecordSurvey
 			self.node_maps.includes(:node).select { |i| i.depth === 0 }.first
 		end
 
+		# Builds first question
+		def build_first_question(question_node)
+			if !question_node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+				raise ArgumentError.new "must inherit from ::ActiveRecordSurvey::Node::Question"
+			end
+
+			question_node_maps = self.node_maps.select { |i| i.node == question_node && !i.marked_for_destruction? }
+
+			# No node_maps exist yet from this question
+			if question_node_maps.length === 0
+				# Build our first node-map
+				question_node_maps << self.node_maps.build(:node => question_node, :survey => self)
+			end
+		end
+
 		def as_map(*args)
 			options = args.extract_options!
 			options[:node_maps] ||= self.node_maps

data/lib/active_record_survey/version.rb

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

data/spec/active_record_survey/node/question_spec.rb

@@ -1,6 +1,84 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Question, :question_spec => true do
+	describe "#remove_link" do
+		it 'should remove the link between the question and child questions or answers child questions', :focus => true do
+			@survey = ActiveRecordSurvey::Survey.new()
+			@survey.save
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
+			@survey.build_first_question(@q1)
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2", :survey => @survey)
+			@q1.build_link(@q2)
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}])
+
+			@q1.remove_link
+
+			@survey.save
+			@survey.reload
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}])
+
+			@q1.build_link(@q2)
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}])
+
+			@q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #1")
+			@q1.build_answer(@q1_a1)
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}])
+
+			@q1.remove_link
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+
+			@survey.save
+			@survey.reload
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+		end
+	end
+
+	describe "#build_link" do
+		it 'should build a link between two questions' do
+			@survey = ActiveRecordSurvey::Survey.new()
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
+			@survey.build_first_question(@q1)
+
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2", :survey => @survey)
+
+			@q1.build_link(@q2)
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}])
+		end
+
+		it 'should still allow answers to be inserted' do
+			@survey = ActiveRecordSurvey::Survey.new()
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
+			@survey.build_first_question(@q1)
+
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2", :survey => @survey)
+
+			@q1.build_link(@q2)
+
+			@q1_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #1")
+			@q1.build_answer(@q1_a1)
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}])
+
+			@q1_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #2")
+			@q1.build_answer(@q1_a2)
+
+			@survey.save
+			@survey.reload
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}]}])
+		end
+	end
+
 	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()

metadata

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