active_record_survey 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316776fa0f2de65dad54cffc746342a4177bd0f8
-  data.tar.gz: da2a911ee4f3c17b012d6105b3d30514750934e2
+  metadata.gz: 36c2b2fd8de15c342720cd4da180be5ebf361d91
+  data.tar.gz: 476f142713f229b16cb5156ea7d8120f81c8eeec
 SHA512:
-  metadata.gz: 1ea0702079cf83209dd6178b146d451eac4de35fc20eb9cc65f57c3fdc6129457c410bbcfbd323bfc2f20b9a9e31a47c90990f372668d64fdbecacb82223c089
-  data.tar.gz: 65812f918dbc7061afff46083d6d419c18a0100ba7f98c1b58654bc8e11efe8b01a4d180860976f5f0beb1d365ee9060f8ede43bed37b71401817ebd11aa7919
+  metadata.gz: cae260e84326b7ecd9d20d36f548353fd57700f59426e731a53dff50b3a8987c2159147bee8100cc5817cc5757be03cdcd0a0f06e1aeb677789d3f92386bd343
+  data.tar.gz: d8b145292eee0814beef6723de523938fa2ece558fa8fda76803b1fdd700a699990f1bad25fb2c0ae13119b873bde5d86d48c662b103ae4b2964d8c9290be3e1

data/lib/active_record_survey/node/answer.rb

@@ -62,22 +62,33 @@ module ActiveRecordSurvey
 		def remove_link
 			@ancestor_marked_for_destruction ||= []
 
+			# Go through the answers node_maps
 			self.node_maps.each_with_index { |answer_node_map, answer_node_map_index|
-				answer_node_map.children.each_with_index { |child, child_index|
-					# child.node == question this answer is pointing to
-					child.node.node_maps.each_with_index { |i,ii|
+				# Go through all the node_maps this answers node map is linked to
+				# a.k.a all the questions node maps
+				answer_node_map.children = answer_node_map.children.select { |child|
+					node_map_removed = false
+					# TODO - clean up this logic to be easier to follow
+					# The question can be linked to from more than one answer!
+					# If this is the case, we *don'tz* want to leave one last node_map hanging out - we can destroy them all
+					linked_somewhere_else = !child.node.node_maps.select { |nm| nm.parent && nm.parent.node != self }.first.nil?
+
+					child.node.node_maps.select { |nm|
+						nm.parent && nm.parent.node == self
+					}.each_with_index { |nm,ii|
 						# Cleans up all the excess node_maps from the old linkage
-						if ii > 0
-							i.mark_for_destruction 
-							@ancestor_marked_for_destruction << i if ii > 0
+						if linked_somewhere_else || nm.parent && nm.parent.node == self && ii > 0
+							nm.mark_for_destruction 
+							@ancestor_marked_for_destruction << nm
+							node_map_removed = true
 						end
 					}
 
 					# Should not know about parent
-					child.parent = nil
+					child.parent = nil if node_map_removed
+
+					!node_map_removed
 				}
-				# Should not know about children
-				answer_node_map.children = []
 			}
 		end
 

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.19"
+	VERSION = "0.1.20"
 end

data/spec/active_record_survey/node/answer_spec.rb

@@ -2,11 +2,56 @@ require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 	describe 'a survey' do
-		before(:all) do
+		before(:each) do
 			@survey = FactoryGirl.build(:basic_survey)
 			@survey.save
 		end
 
+		describe '#remove_link', :focus => true do
+			it 'should only unlink the specified answer' do
+				
+				q4 = nil
+				q4_a1 = nil
+				q4_a2 = nil
+				q5 = nil
+				q5_a1 = nil
+				q5_a2 = nil
+				q6 = nil
+				@survey.questions.each { |i|
+					q4 = i if i.text == "Q4"
+					q5 = i if i.text == "Q5 Boolean"
+					q6 = i if i.text == "Q6"
+				}
+				
+				q4.answers.each { |i|
+					q4_a1 = i if i.text == "Q4 A1"
+					q4_a2 = i if i.text == "Q4 A2"
+				}
+				q5.answers.each { |i|
+					q5_a1 = i if i.text == "Q5 A1"
+					q5_a2 = i if i.text == "Q5 A2"
+				}
+
+				expect(q4_a1.next_question).to eq(q6)
+				expect(q5_a2.next_question).to eq(q6)
+
+				q5_a2.remove_link
+				q5_a2.save
+
+				# q5_a2 should now have no next question
+				expect(q5_a2.next_question).to eq(nil)
+
+				q5_a2.reload
+				expect(q5_a2.next_question).to eq(nil)
+
+				# q4_a1 should have been left alone
+				expect(q4_a1.next_question).to eq(q6)
+
+				q4_a1.reload
+				expect(q4_a1.next_question).to eq(q6)
+			end
+		end
+
 		describe '#next_question' do
 			it 'should get the next question' do
 				expected = [

data/spec/active_record_survey/node/question_spec.rb

@@ -57,7 +57,7 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 			end
 		end
 
-		describe '#build_answer', :focus => true do
+		describe '#build_answer' do
 			it 'should have the right number of node maps' 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.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord