active_record_survey 0.1.44 → 0.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f946ba156789de15394c69e91b562a102b046b57
-  data.tar.gz: f10f2b482a0522dff5028172205e69c56762b072
+  metadata.gz: f15d8d045bf321f5d7268594b42c8cb2cceb9dcd
+  data.tar.gz: b32ee3894276b2c1005f6ba3ecbe8fb5cefaec50
 SHA512:
-  metadata.gz: 043b935b0cb4a714811685febc81d6d67c7bac689dca3916f11749e292da71c7fbe7c946a01710353cf7eeb9dc980d653ef7668755207a26329ec06e3e0528dc
-  data.tar.gz: 00d73a743e0874b61d6387f3f1590ba69788161d06068875923e8440bca76342e8e70039a0911f0bdd3801e5fd559768d7c5f021e4ccbe8f267474386fa67df4
+  metadata.gz: 04b156619131ab3532ee9aff962d01a4b424c8c362a4b41344652b4c384005ee4e63bcda9910a23d1a786716b5c3dac393b5e1b0ce6daefb60efbe1f9fa28b06
+  data.tar.gz: 9564a29336242f01d03fb9e9efce05a597f5ed32a0ade9915e05581f3a3dd38a71efe7f9c437004d765c4000e32b85478d40f57be2900f87b19846f40e5974ea

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

@@ -41,10 +41,12 @@ module ActiveRecordSurvey
 				def build_answer(question_node)
 					self.survey = question_node.survey
 
-					question_node_maps = self.survey.node_maps.select { |i| i.node == question_node && !i.marked_for_destruction? }
+					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?
+						i.node == self && i.parent.nil? && !i.marked_for_destruction?
 					}.collect { |i|
 						i.survey = self.survey
 
@@ -61,7 +63,7 @@ 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
+						i.node == last_answer_in_chain && !i.marked_for_destruction?
 					}.each_with_index { |node_map, index|
 						if answer_node_maps[index]
 							new_node_map = answer_node_maps[index]

data/lib/active_record_survey/node/question.rb

@@ -15,7 +15,7 @@ module ActiveRecordSurvey
 
 			nm = self.survey.node_maps
 
-			self.answers.collect { |answer|
+			answers = self.answers.collect { |answer|
 				nm.select { |i|
 					i.node == answer
 				}
@@ -30,9 +30,15 @@ module ActiveRecordSurvey
 				answer_node_map.node.survey = self.survey
 				answer_node_map.node.save
 
-				self.build_answer(answer_node_map.node)
+				answer_node_map.send((answer_node_map.new_record?)? :destroy : :mark_for_destruction)
 
-				answer_node_map
+				answer_node_map.node
+			}.uniq
+
+			answers.each { |answer|
+				answer.survey = self.survey
+
+				self.build_answer(answer)
 			}
 		end
 
@@ -76,11 +82,12 @@ module ActiveRecordSurvey
 
 				# If any questions existed directly following this question, insert after this answer
 				self.survey.node_maps.select { |i|
-					i.node == answer_node
+					i.node == answer_node && !i.marked_for_destruction?
 				}.each { |answer_node_map|
 					self.survey.node_maps.select { |j|
 						# Same parent
 						# Is a question
+						!j.marked_for_destruction? &&
 						j.parent == answer_node_map.parent && j.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
 					}.each { |j|
 						answer_node_map.survey = self.survey

data/lib/active_record_survey/version.rb

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

data/spec/active_record_survey/node/question_spec.rb

@@ -115,48 +115,69 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 	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)
+		describe "simple case" 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 "advanced case", :focus => true  do
+			before(:each) do
+				@survey = FactoryGirl.build(:basic_survey2)
+				@survey.save
+			end
 
-			@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)
+			it "should convert from ActiveRecordSurvey::Node::Answer to ActiveRecordSurvey::Node::Answer::Boolean and back again" do
+				q4 = nil
+				@survey.questions.each {|question|
+					q4 = question if question.text === "Question #4"
+				}
 
-			@survey.save
-		end
-		it 'should raise exception linked to another question' do
-			@q1_a1.build_link(@q2)
-			@survey.save
+				q4.update_question_type(ActiveRecordSurvey::Node::Answer::Boolean)
+				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=>[{"text"=>"Q2 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}, {"text"=>"Q2 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q3 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}, {"text"=>"Q3 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}]}]}]}]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q3 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}, {"text"=>"Q3 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}]}]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}]}])
 
-			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)
-			}
+				q4.update_question_type(ActiveRecordSurvey::Node::Answer)
+				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=>[{"text"=>"Q2 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}]}, {"text"=>"Q2 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q3 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}]}, {"text"=>"Q3 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}]}]}]}]}]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #3", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q3 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}]}, {"text"=>"Q3 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}]}]}]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[{"text"=>"Question #4", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q4 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q4 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}]}]}])
+			end
 		end
 	end
 

data/spec/factories/active_record_survey/survey.rb

@@ -166,6 +166,47 @@ module FactoryGirlSurveyHelpers
 		# Link up Q5
 		q5_a2.build_link(q6)
 	end
+	
+	def build_basic_survey2(survey)
+		q1 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :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.build_answer(q1_a1)
+		q1.build_answer(q1_a2)
+		q1.build_answer(q1_a3)
+
+		q2 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :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 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :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 = survey.questions.build(:type => "ActiveRecordSurvey::Node::Question", :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)
+
+		# 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)
+	end
 end
 
 FactoryGirl.define do	
@@ -185,6 +226,10 @@ FactoryGirl.define do
 		after(:build) { |survey| FactoryGirlSurveyHelpers.build_basic_survey(survey) }
 	end
 
+	factory :basic_survey2, parent: :survey do |f|
+		after(:build) { |survey| FactoryGirlSurveyHelpers.build_basic_survey2(survey) }
+	end
+
 	factory :boolean_survey, parent: :survey do |f|
 		after(:build) { |survey| FactoryGirlSurveyHelpers.build_boolean_survey(survey) }
 	end

metadata

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