active_record_survey 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c2b2fd8de15c342720cd4da180be5ebf361d91
-  data.tar.gz: 476f142713f229b16cb5156ea7d8120f81c8eeec
+  metadata.gz: 96acfdcb3022af01ad493de3970ded02d82e76ec
+  data.tar.gz: 77836f5cceb9598c7df0910446d72f022fac5b5d
 SHA512:
-  metadata.gz: cae260e84326b7ecd9d20d36f548353fd57700f59426e731a53dff50b3a8987c2159147bee8100cc5817cc5757be03cdcd0a0f06e1aeb677789d3f92386bd343
-  data.tar.gz: d8b145292eee0814beef6723de523938fa2ece558fa8fda76803b1fdd700a699990f1bad25fb2c0ae13119b873bde5d86d48c662b103ae4b2964d8c9290be3e1
+  metadata.gz: 61c26bc02c582db78f54379b961de73b3d91db7b8250c0e608c66734d00bdd32c7e3dd45a10b81dbd1eb47ed975472f38cad3e7321d7a76995c268f2d20bd4f4
+  data.tar.gz: f1a6e73f168e89abc61e0850a1f37f266a172907f1e044e0cc3adf642131b6137126f31194c5630e97bec448b56fee961dc0d8359b6c85b49521151edff512b9

data/README.md

@@ -12,6 +12,12 @@ The goal is to give a simple interface for creating surveys and validating the a
 Release Notes
 ============
 
+**0.1.20**
+ - answer#build_link now detects and throws an error when a infinite loop is added
+
+**0.1.20**
+ - answer#remove_link wasn't correct.  Fixed and added unit tests
+
 **0.1.15**
  - Don't consider instance_nodes marked for destruction when validating
 

data/lib/active_record_survey/node/answer.rb

@@ -138,7 +138,15 @@ module ActiveRecordSurvey
 					end
 				}
 
+				# TODO - check to make sure there is no path to itself
 			end
+
+			self.node_maps.each { |node_map|
+				# There is a path from Q -> A that is a loop
+				if node_map.has_infinite_loop?
+					raise RuntimeError.new "Infinite loop detected"
+				end
+			}
 		end
 
 		# By default - answers build off the original question node

data/lib/active_record_survey/node_map.rb

@@ -46,5 +46,16 @@ module ActiveRecordSurvey
 				i.children_until_node_not_ancestor_of(klass)
 			}
 		end
+
+		# Check to see whether there is an infinite loop from this node_map
+		def has_infinite_loop?(path = [])
+			self.children.each { |i|
+				# Detect infinite loop
+				if path.include?(self.node) || i.has_infinite_loop?(path.clone.push(self.node))
+					return true
+				end
+			}
+			false
+		end
 	end
 end

data/lib/active_record_survey/version.rb

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

data/spec/active_record_survey/node/answer_spec.rb

@@ -7,9 +7,33 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 			@survey.save
 		end
 
-		describe '#remove_link', :focus => true do
+		describe '#build_link', :focus => true do
+			it 'should throw error when build_link creates an infinite loop' do
+				survey = ActiveRecordSurvey::Survey.new()
+
+				q1 = ActiveRecordSurvey::Node::Question.new(:text => "Q1")
+				survey.build_question(q1)
+				q1_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 A1")
+				q1.build_answer(q1_a1)
+
+				q2 = ActiveRecordSurvey::Node::Question.new(:text => "Q2")
+				survey.build_question(q2)
+				q2_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q2 A1")
+				q2.build_answer(q2_a1)
+
+				q3 = ActiveRecordSurvey::Node::Question.new(:text => "Q3")
+				survey.build_question(q3)
+				q3_a1 = ActiveRecordSurvey::Node::Answer.new(:text => "Q3 A1")
+				q3.build_answer(q3_a1)
+
+				q1_a1.build_link(q2)
+				q2_a1.build_link(q3)
+				expect{q3_a1.build_link(q1)}.to raise_error(RuntimeError) # This should throw exception
+			end
+		end
+
+		describe '#remove_link' do
 			it 'should only unlink the specified answer' do
-				
 				q4 = nil
 				q4_a1 = nil
 				q4_a2 = nil
@@ -22,7 +46,7 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 					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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord