active_record_survey 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea8378c022e6489a03056cfd20fcb7dac00863c5
-  data.tar.gz: d779425ffc38a345a61c391ef713c3b006f0d20b
+  metadata.gz: 83a2266578ea626f30af00337a09c9e3e5d72479
+  data.tar.gz: 41c7b8258b00f3d622543603758eda0c720f372e
 SHA512:
-  metadata.gz: 5f55ed3b2a5035039c103d6ce3fe3be7681bc9e4e8d555ecaa753712e5efb6f442a01c9a5b4a1447032568af99dde0da14e6bd6daf4304a7c2eb67a5620aab45
-  data.tar.gz: 00b171258168e584b04d828f20c68610a5a57af3abb4d7f8ff60b0a355432bc047a1de3905d3ff5d39df90c8197de5819811e624ae82919217807b020cab2cb7
+  metadata.gz: 9b01dbf73ba271e7cc2d7c0b7e980b8d26282917f9e505c7261915158cc8ed38cfb5076f1f00bee24485789782830393695b84f37f243893a97728f5e54b0563
+  data.tar.gz: 93aaf4fa9c8b98b94b57f1bd73d3f9fa96b8d4ff08db6604ea838fa32ce5fec99c61bed561a51e65371e2918074ef595d3568894dd426c4ec880d843a2a4b6bc

data/README.md

@@ -9,6 +9,12 @@ This gem tries to be as unopinionated as possible on the peripheral details on h
 
 The goal is to give a simple interface for creating surveys and validating the answers given to them.
 
+Release Notes
+============
+
+**0.1.13**
+ - Added Question#build_answer and Answer#build_link to make survey creation possible without dealing with internal nodes
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -38,6 +44,49 @@ See the spec file for more detailed usage.
 **Build a basic survey**
 ```ruby
 
+# New method for building surveys
+
+@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)
+
+# Depricated method for building surveys
+
 q1 = ActiveRecordSurvey::Node::Question.new() # Q1
 q1_a1 = ActiveRecordSurvey::Node::Answer.new() # Q1 A1
 q1_a2 = ActiveRecordSurvey::Node::Answer.new() # Q1 A2

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

@@ -15,5 +15,24 @@ module ActiveRecordSurvey
 				(instance_node.value.to_i === 1)
 			end
 		end
+
+		# Boolean nodes are different - they must find the final boolean 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

@@ -8,5 +8,70 @@ module ActiveRecordSurvey
 				node_map.parent.node.validate_node(instance)
 			}.include?(false)
 		end
+
+		# Removes the link
+		# TODO - does this work when saved??
+		def remove_link
+			self.node_maps.each { |answer_node_map|
+				answer_node_map.children.each { |child|
+					# Should not know about parent
+					child.parent = nil
+				}
+				# Should not know about children
+				answer_node_map.children = []
+			}
+		end
+
+		# 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)
+			# Answer has already got a question - throw error
+			if self.node_maps.select { |i|
+				i.children.length === 0
+			}.length === 0
+				raise RuntimeError.new "This answer has already been linked to a question"
+			end
+
+			# Attempt to find an unused to_node node_map
+			if !(to_without_parent = to_node.node_maps.select { |i| i.parent.nil? }.first)
+				# no unused path exists
+				# we need to recursively clone the existing path
+
+				to_node_map = to_node.node_maps.first || to_node.node_maps.build(:node => to_node, :survey => self.node_maps.first.survey)
+
+				# Add it to all the from_node_maps
+				self.node_maps.each { |from_node_map|
+					from_node_map.children << to_node_map.recursive_clone
+				}
+			else
+				# Find the node map from this node that has no children
+				from_with_no_children = self.node_maps.select { |i|
+					i.children.length == 0
+				}.first
+
+				# Set the child node of this node to a node
+				from_with_no_children.children << to_without_parent
+			end
+		end
+
+		# By default - answers build off the original question node
+		#
+		# This allows us to easily override the answer building behaviour for different answer types
+		#
+		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
+
+			# Each instance of this question needs the answer hung from it
+			question_node.node_maps.each { |question_node_map|
+				answer_node_map = self.node_maps.build(:node => self, :survey => survey)
+				question_node_map.children << answer_node_map
+			}
+
+			true
+		end
 	end
 end

data/lib/active_record_survey/node/question.rb

@@ -6,5 +6,11 @@ module ActiveRecordSurvey
 				node_validation.validate_instance_node(instance_node, self)
 			}.include?(false)
 		end
+
+		# Build an answer off this node
+		def build_answer(answer_node, survey)
+			# Answers actually define how they're built off the parent node... yep
+			answer_node.build_answer(self, survey)
+		end
 	end
 end

data/lib/active_record_survey/node.rb

@@ -5,6 +5,22 @@ module ActiveRecordSurvey
 		has_many :node_validations, :class_name => "ActiveRecordSurvey::NodeValidation", :foreign_key => :active_record_survey_node_id, autosave: true
 		has_many :instance_nodes, :class_name => "ActiveRecordSurvey::InstanceNode", :foreign_key => :active_record_survey_node_id
 
+		# All the answer nodes that follow from this node
+		def answers
+			self.node_maps.collect { |i|
+				# Get all the children from this node
+				i.children
+			}.flatten.collect { |i|
+				# Get the nodes
+				i.node
+			}.select { |i|
+				# Only the nodes that are answers
+				i.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer)
+			}.uniq.collect { |i|
+				[i] + i.answers
+			}.flatten.uniq
+		end
+
 		# The instance_node recorded for the passed instance for this node
 		def instance_node_for_instance(instance)
 			instance.instance_nodes.select { |instance_node|

data/lib/active_record_survey/node_map.rb

@@ -4,9 +4,21 @@ module ActiveRecordSurvey
 		belongs_to :node, :foreign_key => :active_record_survey_node_id
 		belongs_to :survey, :class_name => "ActiveRecordSurvey::Survey", :foreign_key => :active_record_survey_id
 		acts_as_nested_set :scope => [:active_record_survey_id]
-		
+
+		validates_presence_of :survey
+
 		after_initialize do |i|
-			i.survey.node_maps << self if i.new_record?
+			# Required for all functions to work without creating
+			i.survey.node_maps << self if i.new_record? && i.survey
+		end
+
+		# Recursively creates a copy of this entire node_map
+		def recursive_clone
+			node_map = self.node.node_maps.build(:survey => self.survey, :node => self.node)
+			self.children.each { |child_node|
+				node_map.children << child_node.recursive_clone
+			}
+			node_map
 		end
 
 		def as_map(node_maps = nil)
@@ -15,8 +27,9 @@ module ActiveRecordSurvey
 			}
 
 			{
+				:id => self.id,
+				:node_id => self.node.id,
 				:type => self.node.class.to_s,
-				:text => "#{self.node.text}",
 				:children => children.collect { |i|
 					i.as_map(node_maps)
 				}

data/lib/active_record_survey/survey.rb

@@ -2,14 +2,26 @@ module ActiveRecordSurvey
 	class Survey < ::ActiveRecord::Base
 		self.table_name = "active_record_surveys"
 		has_many :node_maps, :class_name => "ActiveRecordSurvey::NodeMap", :foreign_key => :active_record_survey_id
-		has_many :nodes, :through => :node_maps
+		has_many :nodes, -> { distinct }, :through => :node_maps
+
+		def questions
+			self.node_maps.includes(:node).select { |i|
+				i.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
+			}.collect { |i|
+				i.node
+			}.uniq
+		end
 
 		def root_node
 			self.node_maps.includes(:node).select { |i| i.depth === 0 }.first
 		end
 
 		def as_map
-			self.root_node.as_map(self.node_maps.includes(:node))
+			list = self.node_maps
+
+			list.select { |i| !i.parent }.collect { |i|
+				i.as_map(list)
+			}
 		end
 
 		# Build a question with answers for this survey

data/lib/active_record_survey/version.rb

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

data/spec/active_record_survey/node/question_spec.rb

@@ -0,0 +1,159 @@
+require 'spec_helper'
+
+describe ActiveRecordSurvey::Node::Question, :question_spec => true do
+	describe 'a survey' 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])
+
+			@survey.save
+		end
+
+		describe '#answers' do
+			it 'should return all the answers' do
+				answers = @survey.questions.collect { |question|
+					question.answers
+				}.flatten
+
+				expect(answers.length).to eq(14)
+			end
+		end
+
+		describe 'build_answer', :focus => true do
+			it 'should have the right number of node maps' do
+				@survey = ActiveRecordSurvey::Survey.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(: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)
+
+				expect(@survey.node_maps.length).to eq(13)
+
+				# Link up Q1
+				@q1_a1.build_link(@q2)
+				@q1_a2.build_link(@q3)
+				@q1_a3.build_link(@q4)
+
+				expect(@survey.node_maps.length).to eq(13)
+
+				# Link up Q2
+				@q2_a1.build_link(@q4)
+				@q2_a2.build_link(@q3)
+
+				expect(@survey.node_maps.length).to eq(19)
+
+				# Link up Q3
+				@q3_a1.build_link(@q4)
+				@q3_a2.build_link(@q4)
+
+				expect(@survey.node_maps.length).to eq(31)
+
+				@q5 = ActiveRecordSurvey::Node::Question.new(:text => "Question #5")
+				@q5_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 Answer #1")
+				@q5_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 Answer #2")
+				@q5_a3 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 Answer #3")
+				@q5_a4 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 Answer #4")
+				@q5_a5 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q5 Answer #5")
+				# Boolean builds the links differently! - it chains them so there is no branching choice
+				@q5.build_answer(@q5_a1, @survey)
+				@q5.build_answer(@q5_a2, @survey)
+				@q5.build_answer(@q5_a3, @survey)
+				@q5.build_answer(@q5_a4, @survey)
+				@q5.build_answer(@q5_a5, @survey)
+
+				@q4_a1.build_link(@q5)
+
+				expect(@survey.node_maps.length).to eq(37)
+
+				# Now - add an extra answer to Q1
+				@q1_a4 = ActiveRecordSurvey::Node::Answer.new(:text => "Q1 Answer #4")
+				@q1.build_answer(@q1_a4, @survey)
+
+				expect(@survey.node_maps.length).to eq(38)
+
+				@q1_a4.build_link(@q5)
+
+				expect(@survey.node_maps.length).to eq(44)
+
+				expect(@survey.as_map.as_json).to eq([{"text"=>"Question #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q1 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q2 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q2 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q3 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q3 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}]}]}]}]}, {"text"=>"Q1 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q3 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q3 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}]}]}, {"text"=>"Q1 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q5 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[]}]}]}]}]}]}]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q1 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q5 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[]}]}]}]}]}]}]}]}])
+
+				# Cannot build a link when a link already exists
+				expect { @q1_a2.build_link(@q2) }.to raise_error RuntimeError
+
+				# Remove the link
+				@q1_a2.remove_link
+
+				expect(@survey.as_map.as_json).to eq([{"text"=>"Question #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q1 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q2 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q2 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q3 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q3 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}]}]}]}]}, {"text"=>"Q1 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q1 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q5 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[]}]}]}]}]}]}]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q1 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q5 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[]}]}]}]}]}]}]}]}, {"text"=>"Question #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q3 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q3 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}]}])
+
+				@q1_a2.build_link(@q3)
+
+				expect(@survey.as_map.as_json).to eq([{"text"=>"Question #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q1 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q2 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q2 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q3 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q3 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}]}]}]}]}, {"text"=>"Q1 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q3 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q3 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}]}]}, {"text"=>"Q1 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q4 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q5 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[]}]}]}]}]}]}]}, {"text"=>"Q4 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[]}]}]}, {"text"=>"Q1 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer", "children"=>[{"text"=>"Question #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Question", "children"=>[{"text"=>"Q5 Answer #1", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #2", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #3", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #4", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[{"text"=>"Q5 Answer #5", "id"=>nil, "node_id"=>nil, "type"=>"ActiveRecordSurvey::Node::Answer::Boolean", "children"=>[]}]}]}]}]}]}]}]}])
+			end
+		end
+	end
+end

data/spec/active_record_survey/survey_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveRecordSurvey::Survey do
+describe ActiveRecordSurvey::Survey, :survey_spec => true do
 	describe 'a survey' do
 		before(:all) do
 			@survey = ActiveRecordSurvey::Survey.new
@@ -39,6 +39,12 @@ describe ActiveRecordSurvey::Survey do
 			@survey.save
 		end
 
+		describe '#questions' do
+			it 'should return all the questions' do
+				expect(@survey.questions.length).to be (4)
+			end
+		end
+
 		describe ActiveRecordSurvey::Instance do
 			it 'should allow valid instance_nodes to save' do
 				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)

data/spec/spec_helper.rb

@@ -29,7 +29,31 @@ require "generators/active_record_survey/templates/migration_0.1.0"
 
 ActiveRecord::Schema.define do
 	AddActiveRecordSurvey.up
+
+	# Make it easier when you can put text on things
+	add_column :active_record_survey_nodes, :text, :string
+end
+
+module ActiveRecordSurveyNodeMap
+	def self.extended(base)
+		base.instance_eval do
+			include InstanceMethods
+			alias_method_chain :as_map, :text
+		end
+	end
+
+	module InstanceMethods
+		def as_map_with_text(node_maps = nil)
+			result = {
+				"text" => self.node.text
+ 			}
+			result = result.merge(as_map_without_text(node_maps))
+
+			result
+		end
+	end
 end
+ActiveRecordSurvey::NodeMap.send(:extend, ActiveRecordSurveyNodeMap)
 
 RSpec.configure do |config|
 	config.include FactoryGirl::Syntax::Methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -155,6 +155,7 @@ files:
 - spec/active_record_survey/node/answer/rank_spec.rb
 - spec/active_record_survey/node/answer/scale_spec.rb
 - spec/active_record_survey/node/answer/text_spec.rb
+- spec/active_record_survey/node/question_spec.rb
 - spec/active_record_survey/survey_spec.rb
 - spec/active_record_survey_spec.rb
 - spec/spec_helper.rb
@@ -187,6 +188,7 @@ test_files:
 - spec/active_record_survey/node/answer/rank_spec.rb
 - spec/active_record_survey/node/answer/scale_spec.rb
 - spec/active_record_survey/node/answer/text_spec.rb
+- spec/active_record_survey/node/question_spec.rb
 - spec/active_record_survey/survey_spec.rb
 - spec/active_record_survey_spec.rb
 - spec/spec_helper.rb