active_record_survey 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a2266578ea626f30af00337a09c9e3e5d72479
-  data.tar.gz: 41c7b8258b00f3d622543603758eda0c720f372e
+  metadata.gz: c61a24fbd16d0add2429b4bbe70a02c19aec13f2
+  data.tar.gz: ba2f206b945844811bb7393dfe573ee5bb023a55
 SHA512:
-  metadata.gz: 9b01dbf73ba271e7cc2d7c0b7e980b8d26282917f9e505c7261915158cc8ed38cfb5076f1f00bee24485789782830393695b84f37f243893a97728f5e54b0563
-  data.tar.gz: 93aaf4fa9c8b98b94b57f1bd73d3f9fa96b8d4ff08db6604ea838fa32ce5fec99c61bed561a51e65371e2918074ef595d3568894dd426c4ec880d843a2a4b6bc
+  metadata.gz: b7b6d0b8319ddbb329358af965a05ba740af3d19ab5ec18af17743537c114243b82a1e957588b55851978b6c334bba0d33613e0b10e4ed538799ee5d9ecff150
+  data.tar.gz: 40c2e2f618498d56dbb81fd019154d8949f1e416cbc872ffc0117831bbf18bea35787266efc05a28e7db0b81e9d63fdab3814d70e1c358c1bd24c709b97f8d63

data/README.md

@@ -12,6 +12,9 @@ The goal is to give a simple interface for creating surveys and validating the a
 Release Notes
 ============
 
+**0.1.14**
+ - build_question now only accepts a question
+ - Exceptions added
 **0.1.13**
  - Added Question#build_answer and Answer#build_link to make survey creation possible without dealing with internal nodes
 

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

@@ -19,6 +19,25 @@ module ActiveRecordSurvey
 			end
 		end
 
+		# Rank nodes are different - they must find the final rank node added and add to it
+		def build_answer(question_node, survey)
+			# No node_maps exist yet from this question
+			if question_node.node_maps.length === 0
+				# Build our first node-map
+				question_node.node_maps.build(:node => question_node, :survey => survey)
+			end
+
+			last_in_chain = question_node.answers.last || question_node
+
+			# Each instance of this question needs the answer hung from it
+			last_in_chain.node_maps.each { |node_map|
+				answer_node_map = self.node_maps.build(:node => self, :survey => survey)
+				node_map.children << answer_node_map
+			}
+
+			true
+		end
+
 		protected
 
 		# Calculate the number of Rank nodes above this one

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

@@ -17,5 +17,24 @@ module ActiveRecordSurvey
 				false
 			end
 		end
+
+		# Scale nodes are different - they must find the final scale node added and add to it
+		def build_answer(question_node, survey)
+			# No node_maps exist yet from this question
+			if question_node.node_maps.length === 0
+				# Build our first node-map
+				question_node.node_maps.build(:node => question_node, :survey => survey)
+			end
+
+			last_in_chain = question_node.answers.last || question_node
+
+			# Each instance of this question needs the answer hung from it
+			last_in_chain.node_maps.each { |node_map|
+				answer_node_map = self.node_maps.build(:node => self, :survey => survey)
+				node_map.children << answer_node_map
+			}
+
+			true
+		end
 	end
 end

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

@@ -10,5 +10,24 @@ module ActiveRecordSurvey
 				false
 			end
 		end
+
+		# Text nodes are different - they must find the final text node added and add to it
+		def build_answer(question_node, survey)
+			# No node_maps exist yet from this question
+			if question_node.node_maps.length === 0
+				# Build our first node-map
+				question_node.node_maps.build(:node => question_node, :survey => survey)
+			end
+
+			last_in_chain = question_node.answers.last || question_node
+
+			# Each instance of this question needs the answer hung from it
+			last_in_chain.node_maps.each { |node_map|
+				answer_node_map = self.node_maps.build(:node => self, :survey => survey)
+				node_map.children << answer_node_map
+			}
+
+			true
+		end
 	end
 end

data/lib/active_record_survey/node/answer.rb

@@ -25,6 +25,11 @@ module ActiveRecordSurvey
 		# Build a link from this node to another node
 		# Building a link actually needs to throw off a whole new clone of all children nodes
 		def build_link(to_node)
+			# build_link only accepts a to_node that inherits from Question
+			if !to_node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+				raise ArgumentError.new "to_node must inherit from ::ActiveRecordSurvey::Node::Question"
+			end
+
 			# Answer has already got a question - throw error
 			if self.node_maps.select { |i|
 				i.children.length === 0

data/lib/active_record_survey/node/question.rb

@@ -8,7 +8,18 @@ module ActiveRecordSurvey
 		end
 
 		# Build an answer off this node
-		def build_answer(answer_node, survey)
+		def build_answer(answer_node, survey = nil)
+			survey = survey || self.node_maps.select { |i|
+				!i.survey.nil?
+			}.collect { |i|
+				i.survey
+			}.first
+
+			# A survey must either be passed or already present in node_maps
+			if survey.nil?
+				raise ArgumentError.new "A survey must be passed if Question is not yet added to a survey"
+			end
+
 			# Answers actually define how they're built off the parent node... yep
 			answer_node.build_answer(self, survey)
 		end

data/lib/active_record_survey/survey.rb

@@ -24,22 +24,21 @@ module ActiveRecordSurvey
 			}
 		end
 
-		# Build a question with answers for this survey
-		def build_question(question, answers = [], parent = nil)
-			node_maps = []
-			n_question = question.node_maps.build(:node => question, :survey => self)
-			node_maps << n_question
-
-			answers.each { |answer|
-				n_answer = answer.node_maps.build(:node => answer, :survey => self)
-				n_question.children << n_answer
-				node_maps << n_answer
-			}
-
-			# If a parent node is passed, add it
-			parent.children << n_question if !parent.nil?
-
-			node_maps
+		# Build a question for this survey
+		def build_question(question)
+			# build_question only accepts a node that inherits from Question
+			if !question.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+				raise ArgumentError.new "Question must inherit from ::ActiveRecordSurvey::Node::Question"
+			end
+
+			# Already added - shouldn't add twice
+			if question.node_maps.select { |node_map|
+				node_map.survey === self
+			}.length > 0
+				raise RuntimeError.new "This question has already been added to the survey"
+			end
+
+			question.node_maps.build(:node => question, :survey => self)
 		end
 	end
 end

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.13"
+	VERSION = "0.1.14"
 end

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

@@ -12,11 +12,12 @@ describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
 			@q1_a4 = ActiveRecordSurvey::Node::Answer::Boolean.new()
 			@q1_a5 = ActiveRecordSurvey::Node::Answer::Boolean.new()
 
-			nodes = @survey.build_question(@q1, [@q1_a1])
-			nodes = @survey.build_question(@q1_a2, [], nodes[1])
-			nodes = @survey.build_question(@q1_a3, [], nodes[0])
-			nodes = @survey.build_question(@q1_a4, [], nodes[0])
-			nodes = @survey.build_question(@q1_a5, [], nodes[0])
+			@survey.build_question(@q1)
+			@q1.build_answer(@q1_a1, @survey)
+			@q1.build_answer(@q1_a2, @survey)
+			@q1.build_answer(@q1_a3, @survey)
+			@q1.build_answer(@q1_a4, @survey)
+			@q1.build_answer(@q1_a5, @survey)
 
 			@survey.save
 		end

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

@@ -12,11 +12,12 @@ describe ActiveRecordSurvey::Node::Answer::Rank, :rank_spec => true do
 			@q1_a4 = ActiveRecordSurvey::Node::Answer::Rank.new()
 			@q1_a5 = ActiveRecordSurvey::Node::Answer::Rank.new()
 
-			nodes = @survey.build_question(@q1, [@q1_a1])
-			nodes = @survey.build_question(@q1_a2, [], nodes[1])
-			nodes = @survey.build_question(@q1_a3, [], nodes[0])
-			nodes = @survey.build_question(@q1_a4, [], nodes[0])
-			nodes = @survey.build_question(@q1_a5, [], nodes[0])
+			@survey.build_question(@q1)
+			@q1.build_answer(@q1_a1, @survey)
+			@q1.build_answer(@q1_a2, @survey)
+			@q1.build_answer(@q1_a3, @survey)
+			@q1.build_answer(@q1_a4, @survey)
+			@q1.build_answer(@q1_a5, @survey)
 
 			@survey.save
 		end

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

@@ -10,9 +10,10 @@ describe ActiveRecordSurvey::Node::Answer::Scale, :scale_spec => true do
 			@q1_a2 = ActiveRecordSurvey::Node::Answer::Scale.new()
 			@q1_a3 = ActiveRecordSurvey::Node::Answer::Scale.new()
 
-			nodes = @survey.build_question(@q1, [@q1_a1])
-			nodes = @survey.build_question(@q1_a2, [], nodes[1])
-			nodes = @survey.build_question(@q1_a3, [], nodes[0])
+			@survey.build_question(@q1)
+			@q1.build_answer(@q1_a1, @survey)
+			@q1.build_answer(@q1_a2, @survey)
+			@q1.build_answer(@q1_a3, @survey)
 
 			@survey.save
 		end

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

@@ -9,8 +9,9 @@ describe ActiveRecordSurvey::Node::Answer::Text, :text_spec => true do
 			@q1_a1 = ActiveRecordSurvey::Node::Answer::Text.new()
 			@q1_a2 = ActiveRecordSurvey::Node::Answer::Text.new()
 
-			nodes = @survey.build_question(@q1, [@q1_a1])
-			nodes = @survey.build_question(@q1_a2, [], nodes[1])
+			@survey.build_question(@q1)
+			@q1.build_answer(@q1_a1)
+			@q1.build_answer(@q1_a2)
 
 			@survey.save
 		end

data/spec/active_record_survey/node/question_spec.rb

@@ -5,49 +5,44 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 		before(:all) do
 			@survey = ActiveRecordSurvey::Survey.new()
 
-			@q1 = ActiveRecordSurvey::Node::Question.new()
-			@q1_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q1_a2 = ActiveRecordSurvey::Node::Answer.new()
-			@q1_a3 = ActiveRecordSurvey::Node::Answer.new()
-
-			@q2 = ActiveRecordSurvey::Node::Question.new()
-			@q2_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q2_a2 = ActiveRecordSurvey::Node::Answer.new()
-
-			@q3 = ActiveRecordSurvey::Node::Question.new()
-			@q3_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q3_a2 = ActiveRecordSurvey::Node::Answer.new()
-
-			@q4 = ActiveRecordSurvey::Node::Question.new()
-			@q4_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q4_a2 = ActiveRecordSurvey::Node::Answer.new()
-
-			@q5 = ActiveRecordSurvey::Node::Question.new()
-			@q5_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new()
-			@q5_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new()
-			@q5_a3 = ActiveRecordSurvey::Node::Answer::Boolean.new()
-			@q5_a4 = ActiveRecordSurvey::Node::Answer::Boolean.new()
-			@q5_a5 = ActiveRecordSurvey::Node::Answer::Boolean.new()
-
-			q1_nodes = @survey.build_question(@q1, [@q1_a1, @q1_a2, @q1_a3])
-			q2_nodes = @survey.build_question(@q2, [@q2_a1, @q2_a2], q1_nodes[1])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q2_nodes[1])
-
-			q3_nodes = @survey.build_question(@q3, [@q3_a1, @q3_a2], q2_nodes[2])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[1])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[2])
-
-			q3_nodes = @survey.build_question(@q3, [@q3_a1, @q3_a2], q1_nodes[2])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[1])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[2])
-
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q1_nodes[3])
-
-			q5_nodes = @survey.build_question(@q5, [@q5_a1], q4_nodes[1])
-			nodes = @survey.build_question(@q5_a2, [], q5_nodes[1])
-			nodes = @survey.build_question(@q5_a3, [], nodes[0])
-			nodes = @survey.build_question(@q5_a4, [], nodes[0])
-			nodes = @survey.build_question(@q5_a5, [], nodes[0])
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1")
+			@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, @survey)
+			@q1.build_answer(@q1_a2, @survey)
+			@q1.build_answer(@q1_a3, @survey)
+
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2")
+			@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, @survey)
+			@q2.build_answer(@q2_a2, @survey)
+
+			@q3 = ActiveRecordSurvey::Node::Question.new(:text => "Question #3")
+			@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, @survey)
+			@q3.build_answer(@q3_a2, @survey)
+
+			@q4 = ActiveRecordSurvey::Node::Question.new(:text => "Question #4")
+			@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, @survey)
+			@q4.build_answer(@q4_a2, @survey)
+
+			# 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)
 
 			@survey.save
 		end
@@ -58,11 +53,11 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 					question.answers
 				}.flatten
 
-				expect(answers.length).to eq(14)
+				expect(answers.length).to eq(9)
 			end
 		end
 
-		describe 'build_answer', :focus => true do
+		describe '#build_answer', :focus => true do
 			it 'should have the right number of node maps' do
 				@survey = ActiveRecordSurvey::Survey.new()
 

data/spec/active_record_survey/survey_spec.rb

@@ -3,38 +3,46 @@ require 'spec_helper'
 describe ActiveRecordSurvey::Survey, :survey_spec => true do
 	describe 'a survey' do
 		before(:all) do
-			@survey = ActiveRecordSurvey::Survey.new
+			@survey = ActiveRecordSurvey::Survey.new()
 
-			@q1 = ActiveRecordSurvey::Node::Question.new()
-			@q1_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q1_a2 = ActiveRecordSurvey::Node::Answer.new()
-			@q1_a3 = ActiveRecordSurvey::Node::Answer.new()
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1")
+			@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, @survey)
+			@q1.build_answer(@q1_a2, @survey)
+			@q1.build_answer(@q1_a3, @survey)
 
-			@q2 = ActiveRecordSurvey::Node::Question.new()
-			@q2_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q2_a2 = ActiveRecordSurvey::Node::Answer.new()
+			@q2 = ActiveRecordSurvey::Node::Question.new(:text => "Question #2")
+			@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, @survey)
+			@q2.build_answer(@q2_a2, @survey)
 
-			@q3 = ActiveRecordSurvey::Node::Question.new()
-			@q3_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q3_a2 = ActiveRecordSurvey::Node::Answer.new()
+			@q3 = ActiveRecordSurvey::Node::Question.new(:text => "Question #3")
+			@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, @survey)
+			@q3.build_answer(@q3_a2, @survey)
 
-			@q4 = ActiveRecordSurvey::Node::Question.new()
-			@q4_a1 = ActiveRecordSurvey::Node::Answer.new()
-			@q4_a2 = ActiveRecordSurvey::Node::Answer.new()
+			@q4 = ActiveRecordSurvey::Node::Question.new(:text => "Question #4")
+			@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, @survey)
+			@q4.build_answer(@q4_a2, @survey)
 
-			q1_nodes = @survey.build_question(@q1, [@q1_a1, @q1_a2, @q1_a3])
-			q2_nodes = @survey.build_question(@q2, [@q2_a1, @q2_a2], q1_nodes[1])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q2_nodes[1])
+			# Link up Q1
+			@q1_a1.build_link(@q2)
+			@q1_a2.build_link(@q3)
+			@q1_a3.build_link(@q4)
 
-			q3_nodes = @survey.build_question(@q3, [@q3_a1, @q3_a2], q2_nodes[2])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[1])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[2])
+			# Link up Q2
+			@q2_a1.build_link(@q4)
+			@q2_a2.build_link(@q3)
 
-			q3_nodes = @survey.build_question(@q3, [@q3_a1, @q3_a2], q1_nodes[2])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[1])
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q3_nodes[2])
-
-			q4_nodes = @survey.build_question(@q4, [@q4_a1, @q4_a2], q1_nodes[3])
+			# Link up Q3
+			@q3_a1.build_link(@q4)
+			@q3_a2.build_link(@q4)
 
 			@survey.save
 		end

metadata

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