active_record_survey 0.1.34 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26eecc198f8c314ac2a23e3f746dcc823acb9720
-  data.tar.gz: 1e7076165aff517190a7e0f45b804d6b0fa0e93d
+  metadata.gz: e024c72de4b41b4e3937d465726d0110cadbcf83
+  data.tar.gz: 41352a433cb8b8a6b8f0d8779c7ce8ced446cc4a
 SHA512:
-  metadata.gz: e4a76741e270ffcec64140526bf6467f40a82e55126c73796f357936a1e7a4a7085f07c662b71a24b4dc5dfcd340cdde9b61bff721aebe2b8a6f17496dcc4554
-  data.tar.gz: ae0b50818d46601fce209a7452b311bfcbd962e27c4ebbd4213254bb3b2b0a5b2504d9b54b80c0073a3db5116bf2be17686e6fe9c765083400637fed1cdbdce0
+  metadata.gz: 6f70aea6ac4dd79b3ff9e6b6b97096ca52ea839d6241b39aaef8740ad5ec91d1f9ce18fa7acd5fe5ce7ff5db1657b10586b2effa4fa1a1c7a0f8fca3d89b65a5
+  data.tar.gz: 77f86f2a2b516981e85cff63cd97bd2fb570cf7014c241894774c6c5a7ff0330fcbcbf226d93b1b02215e40b4b54ffc1c9f26450134c55b46843b93addcfb789

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

@@ -20,6 +20,7 @@ module ActiveRecordSurvey
 				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)
 					self.survey = question_node.survey
 
@@ -37,7 +38,17 @@ module ActiveRecordSurvey
 					self.survey.node_maps.select { |i|
 						i.node == last_answer_in_chain
 					}.each { |node_map|
-						node_map.children << self.survey.node_maps.build(:node => self, :survey => self.survey)
+						curr_children = self.survey.node_maps.select { |j|
+							node_map.children.include?(j)
+						}
+
+						new_node_map = self.survey.node_maps.build(:node => self, :survey => self.survey)
+
+						node_map.children << new_node_map
+
+						curr_children.each { |c|
+							new_node_map.children << c
+						}
 					}
 
 					true

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.34"
+	VERSION = "0.1.35"
 end

data/spec/active_record_survey/node/answer/boolean_spec.rb

@@ -1,6 +1,40 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
+	describe '#build_answer' do
+		before(:each) do
+			@survey = ActiveRecordSurvey::Survey.new()
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
+			@q1_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #1")
+			@q1_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #2")
+			@q1_a3 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #3")
+			@q1.build_answer(@q1_a1)
+			@q1.build_answer(@q1_a2)
+			@q1.build_answer(@q1_a3)
+
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2", :survey => @survey)
+			@q2_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 Answer #1")
+			@q2_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 Answer #2")
+			@q2_a3 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 Answer #3")
+			@q2.build_answer(@q2_a1)
+			@q2.build_answer(@q2_a2)
+			@q2.build_answer(@q2_a3)
+
+			@q1_a3.build_link(@q2)
+
+			@survey.save
+		end
+
+		it 'should append to last answer and fix chain to next question' do
+			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"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q2 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q2 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q2 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}]}]}]}]}])
+
+			@q1_a4 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q2 Answer #4")
+			@q1.build_answer(@q1_a4)
+
+			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"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q2 Answer #4", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Question #2", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q2 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q2 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q2 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}]}]}]}]}]}])
+		end
+	end
+
 	describe '#sibling_index' do
 		before(:each) do
 			@survey = ActiveRecordSurvey::Survey.new()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.34
+  version: 0.1.35
 platform: ruby
 authors:
 - Butch Marshall