active_record_survey 0.1.43 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dc949333e22faad454c71dbdc2cd63088cd71cf
-  data.tar.gz: d341536053150cdfcca45862094780537de92539
+  metadata.gz: f946ba156789de15394c69e91b562a102b046b57
+  data.tar.gz: f10f2b482a0522dff5028172205e69c56762b072
 SHA512:
-  metadata.gz: 6ebc9abf180663238c747ba7173754435148a1b9bf99c996825dd864bed8f25f0cbc96b14ad987ecc65ecf4d382cab28c60a7071056472c13240e8ced7709581
-  data.tar.gz: 0b85ef3c7fef633bcfc843a3782114fd5dac5884b48993c0a936d35737f4c873e0e989bdd696532653533127574846e49b647ff542d3e73b4ec6bdefe734acb3
+  metadata.gz: 043b935b0cb4a714811685febc81d6d67c7bac689dca3916f11749e292da71c7fbe7c946a01710353cf7eeb9dc980d653ef7668755207a26329ec06e3e0528dc
+  data.tar.gz: 00d73a743e0874b61d6387f3f1590ba69788161d06068875923e8440bca76342e8e70039a0911f0bdd3801e5fd559768d7c5f021e4ccbe8f267474386fa67df4

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

@@ -7,6 +7,7 @@ module ActiveRecordSurvey
 			end
 
 			module InstanceMethods
+
 				# Gets index relative to other chained answers
 				def sibling_index
 					if node_map = self.survey.node_maps.select { |i|
@@ -18,6 +19,23 @@ module ActiveRecordSurvey
 					return 0
 				end
 
+				# Chain nodes are different
+				# They must also see if this answer linked to subsequent answers, and re-build the link
+				def remove_answer(question_node)
+					self.survey = question_node.survey
+
+					# The node from answer from the parent question
+					self.survey.node_maps.reverse.select { |i|
+						i.node == self && !i.marked_for_destruction?
+					}.each { |answer_node_map|
+						answer_node_map.children.each { |child|
+							answer_node_map.parent.children << child
+						}
+
+						answer_node_map.send((answer_node_map.new_record?)? :destroy : :mark_for_destruction )
+					}
+				end
+
 				# Chain nodes are different - they must find the final answer node added and add to it
 				# They must also see if the final answer node then points somewhere else - and fix the links on that
 				def build_answer(question_node)
@@ -25,6 +43,14 @@ module ActiveRecordSurvey
 
 					question_node_maps = self.survey.node_maps.select { |i| i.node == question_node && !i.marked_for_destruction? }
 
+					answer_node_maps = self.survey.node_maps.select { |i|
+						i.node == self && i.parent.nil?
+					}.collect { |i|
+						i.survey = self.survey
+
+						i
+					}
+
 					# No node_maps exist yet from this question
 					if question_node_maps.length === 0
 						# Build our first node-map
@@ -36,18 +62,23 @@ module ActiveRecordSurvey
 					# Each instance of this question needs the answer hung from it
 					self.survey.node_maps.select { |i|
 						i.node == last_answer_in_chain
-					}.each { |node_map|
-						curr_children = self.survey.node_maps.select { |j|
-							node_map.children.include?(j)
-						}
+					}.each_with_index { |node_map, index|
+						if answer_node_maps[index]
+							new_node_map = answer_node_maps[index]
+						else
+							new_node_map = self.survey.node_maps.build(:node => self, :survey => self.survey)
+						end
 
-						new_node_map = self.survey.node_maps.build(:node => self, :survey => self.survey)
+						# Hack - should fix this - why does self.survey.node_maps still think... yea somethigns not referenced right
+						#curr_children = self.survey.node_maps.select { |j|
+						#	node_map.children.include?(j) && j != new_node_map
+						#}
 
 						node_map.children << new_node_map
 
-						curr_children.each { |c|
-							new_node_map.children << c
-						}
+						#curr_children.each { |c|
+						#	new_node_map.children << c
+						#}
 					}
 
 					true

data/lib/active_record_survey/node/answer.rb

@@ -140,12 +140,35 @@ module ActiveRecordSurvey
 		end
 
 		private
+			# By default - answers build off the original question node
+			#
+			# This allows us to easily override the answer removal behaviour for different answer types
+			def remove_answer(question_node)
+				#self.survey = question_node.survey
+
+				# The node from answer from the parent question
+				self.survey.node_maps.select { |i|
+					!i.marked_for_destruction? &&
+					i.node == self && i.parent && i.parent.node === question_node
+				}.each { |answer_node_map|
+					answer_node_map.send((answer_node_map.new_record?)? :destroy : :mark_for_destruction )
+				}
+			end
+
 			# By default - answers build off the original question node
 			#
 			# This allows us to easily override the answer building behaviour for different answer types
 			def build_answer(question_node)
 				self.survey = question_node.survey
 
+				answer_node_maps = self.survey.node_maps.select { |i|
+					i.node == self && i.parent.nil?
+				}.collect { |i|
+					i.survey = self.survey
+
+					i
+				}
+
 				question_node_maps = self.survey.node_maps.select { |i| i.node == question_node && !i.marked_for_destruction? }
 
 				# No node_maps exist yet from this question
@@ -155,8 +178,14 @@ module ActiveRecordSurvey
 				end
 
 				# Each instance of this question needs the answer hung from it
-				question_node_maps.each { |question_node_map|
-					question_node_map.children << self.survey.node_maps.build(:node => self, :survey => self.survey)
+				question_node_maps.each_with_index { |question_node_map, index|
+					if answer_node_maps[index]
+						new_node_map = answer_node_maps[index]
+					else
+						new_node_map = self.survey.node_maps.build(:node => self, :survey => self.survey)
+					end
+
+					question_node_map.children << new_node_map
 				}
 
 				true

data/lib/active_record_survey/node/question.rb

@@ -7,6 +7,55 @@ module ActiveRecordSurvey
 			}.include?(false)
 		end
 
+		# Updates the answers of this question to a different type
+		def update_question_type(klass)
+			if self.next_questions.length > 0
+				raise RuntimeError.new "No questions can follow when changing the question type" 
+			end
+
+			nm = self.survey.node_maps
+
+			self.answers.collect { |answer|
+				nm.select { |i|
+					i.node == answer
+				}
+			}.flatten.uniq.collect { |answer_node_map|
+				answer_node_map.move_to_root
+				answer_node_map.survey = self.survey
+
+				answer_node_map
+			}.collect { |answer_node_map|
+				answer_node_map.node.type = klass.to_s
+				answer_node_map.node = answer_node_map.node.becomes(klass)
+				answer_node_map.node.survey = self.survey
+				answer_node_map.node.save
+
+				self.build_answer(answer_node_map.node)
+
+				answer_node_map
+			}
+		end
+
+		# Removes an answer
+		def remove_answer(answer_node)
+			# A survey must either be passed or already present in self.node_maps
+			if self.survey.nil?
+				raise ArgumentError.new "A survey must be passed if ActiveRecordSurvey::Node::Question is not yet added to a survey"
+			end
+
+			if !answer_node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer)
+				raise ArgumentError.new "::ActiveRecordSurvey::Node::Answer not passed"
+			end
+
+			# Cannot mix answer types
+			# Check if not match existing - throw error
+			if !self.answers.include?(answer_node)
+				raise ArgumentError.new "Answer not linked to question"
+			end
+
+			answer_node.send(:remove_answer, self)
+		end
+
 		# Build an answer off this node
 		def build_answer(answer_node)
 			# A survey must either be passed or already present in self.node_maps
@@ -34,6 +83,9 @@ module ActiveRecordSurvey
 						# Is a question
 						j.parent == answer_node_map.parent && j.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
 					}.each { |j|
+						answer_node_map.survey = self.survey
+						j.survey = self.survey
+
 						answer_node_map.children << j
 					}
 				}

data/lib/active_record_survey/node.rb

@@ -10,6 +10,26 @@ module ActiveRecordSurvey
 
 		# All the answer nodes that follow from this node
 		def answers
+#=begin
+			next_answer_nodes = lambda { |node, survey, list|
+				survey.node_maps.select { |node_map|
+					!node_map.parent.nil? && node_map.parent.node == node && node_map.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer) && !node_map.marked_for_destruction?
+				}.select { |i|
+					!list.include?(i.node)
+				}.collect { |i|
+					i.survey = self.survey
+					i.node.survey = self.survey
+
+					list << i.node
+
+					next_answer_nodes.call(i.node, survey, list)
+				}.flatten.uniq
+
+				list
+			}
+			next_answer_nodes.call(self, self.survey, []).flatten.uniq
+#=end
+=begin
 			self.survey.node_maps.select { |i|
 				i.node == self
 			}.collect { |i|
@@ -25,6 +45,7 @@ module ActiveRecordSurvey
 				i.survey = self.survey # ensure that the survey being referenced by the answers is the original survey - needed for keeping consistent node_maps between build_link and remove_link
 				[i] + i.answers
 			}.flatten.uniq
+=end
 		end
 
 		# The instance_node recorded for the passed instance for this node

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.43"
+	VERSION = "0.1.44"
 end

data/spec/active_record_survey/node/question_spec.rb

@@ -51,6 +51,115 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 		end
 	end
 
+	describe "#remove_answer" do
+		before(:each) do
+			@survey = ActiveRecordSurvey::Survey.new()
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(: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 = ActiveRecordSurvey::Node::Question.new(:text => "Q2", :survey => @survey)
+			@q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 A1")
+			@q2_a2 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 A2")
+			@q2.build_answer(@q2_a1)
+			@q2.build_answer(@q2_a2)
+
+			@q3 = ActiveRecordSurvey::Node::Question.new(:text => "Q3", :survey => @survey)
+			@q3_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q3 A1")
+			@q3_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q3 A1")
+			@q3.build_answer(@q3_a1)
+			@q3.build_answer(@q3_a2)
+
+			@survey.save
+		end
+
+		it 'should remove the answer for regular answers' do
+			expect(@q1.answers.length).to eq(2)
+
+			@q1.remove_answer(@q1_a1)
+
+			expect(@q1.answers.length).to eq(1)
+		end
+
+		it 'should remove the answer for boolean answers' do
+			expect(@q3.answers.length).to eq(2)
+
+			@q3.remove_answer(@q3_a1)
+
+			@survey.save
+			@survey.reload
+
+			expect(@q3.answers.length).to eq(1)
+		end
+
+		it 'should remove the answer for boolean answers, and keep full question links' do
+			@q3_a2.build_link(@q2)
+
+			@survey.save
+			@survey.reload
+
+			expect(@q3.answers.length).to eq(2)
+			expect(@q3.next_questions.length).to eq(1)
+
+			@q3.remove_answer(@q3_a1)
+
+			@survey.save
+			@survey.reload
+
+			expect(@q3.answers.length).to eq(1)
+			expect(@q3.next_questions.length).to eq(1)
+		end
+	end
+
+	describe "#update_question_type" do
+		before(:each) do
+			@survey = ActiveRecordSurvey::Survey.new()
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(: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 = ActiveRecordSurvey::Node::Question.new(:text => "Q2", :survey => @survey)
+			@q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 A1")
+			@q2.build_answer(@q2_a1)
+
+			@q3 = ActiveRecordSurvey::Node::Question.new(:text => "Q3", :survey => @survey)
+			@q3_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q3 A1")
+			@q3_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q3 A2")
+			@q3.build_answer(@q3_a1)
+			@q3.build_answer(@q3_a2)
+
+			@survey.save
+		end
+		it 'should raise exception linked to another question' do
+			@q1_a1.build_link(@q2)
+			@survey.save
+
+			expect{@q1.update_question_type(ActiveRecordSurvey::Node::Answer::Boolean)}.to raise_error(RuntimeError)
+		end
+		it 'should change ActiveRecordSurvey::Node::Answer to ActiveRecordSurvey::Node::Answer::Boolean' do
+			@q1.update_question_type(ActiveRecordSurvey::Node::Answer::Boolean)
+			expect(@survey.as_map(:no_ids => true)).to eq([{"text"=>"Q1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 A2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}, {"text"=>"Q2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q2 A1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}, {"text"=>"Q3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q3 A1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q3 A2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}])
+			expect(@q1.answers.length).to eq(2)
+			@q1.answers.each { |answer|
+				expect(answer.class).to eq(ActiveRecordSurvey::Node::Answer::Boolean)
+			}
+		end
+		it  'should change ActiveRecordSurvey::Node::Answer::Boolean to ActiveRecordSurvey::Node::Answer' do
+			@q3.update_question_type(ActiveRecordSurvey::Node::Answer)
+			expect(@survey.as_map(:no_ids => true)).to eq([{"text"=>"Q1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 A1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 A2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}, {"text"=>"Q2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q2 A1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}, {"text"=>"Q3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q3 A1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q3 A2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			expect(@q3.answers.length).to eq(2)
+			@q3.answers.each { |answer|
+				expect(answer.class).to eq(ActiveRecordSurvey::Node::Answer)
+			}
+		end
+	end
+
 	describe "#remove_link" do
 		it 'should remove the link between the question and child questions or answers child questions' do
 			@survey = ActiveRecordSurvey::Survey.new()

data/spec/active_record_survey/survey_spec.rb

@@ -53,7 +53,7 @@ describe ActiveRecordSurvey::Survey, :survey_spec => true do
 			end
 		end
 
-		describe '#nodes', :focus => true do
+		describe '#nodes' do
 			it 'should return an array of all the nodes' do
 				expect(@survey.nodes.length).to eq(13)
 			end

metadata

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