active_record_survey 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e48bc1f74ce11bb6285537bb34e00fb614b1e33
-  data.tar.gz: 1528b2c91f64d66e4cf543b37f2b933e356efa5d
+  metadata.gz: 241fd16207e3dbcd096b90623040aa4142152663
+  data.tar.gz: 6ccfd912a9438462a86152a38e4b783c3088d85d
 SHA512:
-  metadata.gz: d5ed3484bfcac51667d8243b31e187b9b1a372faab368e85d23477ec675b1cfa68ec75e147d3fde56acb57e6a04ca03ce5a740ecf843bde15034ec30959d16bf
-  data.tar.gz: 5ff5d9269c791274f92c6538d0f5559080367b1866ef4929b2363d29dbe244fd877fea29283747624ec480a6df0de940b3e848a882f54d20657da9a6a8c25339
+  metadata.gz: e30a4dda78ec1c903d70100db1a83dc6fdbbf0a93d213b329a389a02f5beadad0cefdcff43e02d1b790ce053e924345beabd502da3c89bd54369a36a7a6efb1c
+  data.tar.gz: a80ed53f9f0261fe74ef34537b28451d3291fd9d72ff5cf04a26b72a26cd2a3ee9bdccb3c399970e21f5570bb95f67acd00937c3661fcd42a2bed2ef642ccf76

data/lib/active_record_survey/node/question.rb

@@ -86,5 +86,24 @@ module ActiveRecordSurvey
 
 			list.compact.uniq
 		end
+
+		private
+			# Before a node is destroyed, will re-build the node_map links from parent to child if they exist
+			# If a question is being destroyed and it has answers - don't link its answers - only parent questions that follow it
+			def before_destroy_rebuild_node_map
+
+				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|
+						if !child.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer)
+							node_map.parent.children << child
+						end
+					}
+				}
+
+				true
+			end
 	end
 end

data/lib/active_record_survey/version.rb

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

data/spec/active_record_survey/node/question_spec.rb

@@ -1,8 +1,58 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Question, :question_spec => true do
+	describe "#before_destroy_rebuild_node_map" do
+		it 'should not relink any following questions' do
+			@survey = ActiveRecordSurvey::Survey.new()
+			@survey.save
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
+			@q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Answer #1a")
+			@q1.build_answer(@q1_a1)
+
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2", :survey => @survey)
+			@q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Answer #1b")
+			@q2.build_answer(@q2_a1)
+
+			@q3 = ActiveRecordSurvey::Node::Question.new(:text => "Question #3", :survey => @survey)
+			@q3_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Answer #1c")
+			@q3.build_answer(@q3_a1)
+
+			@q1_a1.build_link(@q2)
+			@q2_a1.build_link(@q3)
+
+			@survey.save
+
+			@q2.destroy
+			@survey.reload
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Answer #1a", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+		end
+
+		it 'should relink any following questions' do
+			@survey = ActiveRecordSurvey::Survey.new()
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2", :survey => @survey)
+			@q3 = ActiveRecordSurvey::Node::Question.new(:text => "Question #3", :survey => @survey)
+
+			@survey.build_first_question(@q1)
+			@q1.build_link(@q2)
+			@q2.build_link(@q3)
+
+			@survey.save
+
+			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=>[{"text"=>"Question #3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}]}])
+
+			@q2.destroy
+			@survey.reload
+
+			expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Question #3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[]}]}])
+		end
+	end
+
 	describe "#remove_link" do
-		it 'should remove the link between the question and child questions or answers child questions', :focus => true do
+		it 'should remove the link between the question and child questions or answers child questions' do
 			@survey = ActiveRecordSurvey::Survey.new()
 			@survey.save
 

metadata

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