active_record_survey 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f6faab384d06f3ef40dd8786143e54b36bc195
-  data.tar.gz: 47f1f3bc3f2a8319d3978cc94388ebbfdde81f82
+  metadata.gz: d54c3e737a268c6e9aa3f60f02a62433131007f3
+  data.tar.gz: 56c1e7fa286ef30e2735fc1f6f118cae6facc6f3
 SHA512:
-  metadata.gz: 502f9da2618cd7e84441668135c5d1678f49fc382e729e04e8fd1eeba374a8049049b6ec2a012205d69cff2352865d217e890a3da85fcb26f8bb82c74c4e4ac7
-  data.tar.gz: 552fc36dfacb68835174cc6e8f53151b2def44c6f0a789befee1aa49225f5bb3409084e8f88363632620a4849cee5a81c08b25428ec57df85f956f85ca658914
+  metadata.gz: 4618ddd55a8dda8bc1b6589ba8241cb9afc73bfdf502439990fb449441c4334d1a3b3d1306843e8b00f9c040b331787d265dc594c616dc32e953847e0745b05d
+  data.tar.gz: 1ce77748739de54e4189e94a40951bf22e877d69bd636401ca9097fee94d6211e56c7bf7b8627b7740a356244441acdd80545031984d14446f7efb746a9c915c

data/lib/active_record_survey/instance_node.rb

@@ -9,7 +9,7 @@ module ActiveRecordSurvey
 		validate do |instance_node|
 			# This instance_node has no valid path to the root node
 			if !self.node.instance_node_path_to_root?(self)
-				instance_node.errors[:base] << "NO_PATH"
+				instance_node.errors[:base] << "INVALID_PATH"
 			end
 
 			parent_nodes = self.node.node_maps.collect { |j| j.parent }

data/lib/active_record_survey/node.rb

@@ -30,22 +30,42 @@ module ActiveRecordSurvey
 			self.has_instance_node_for_instance?(instance)
 		end
 
+		# Default behaviour is to recurse up the chain (goal is to hit a question node)
+		def validate_parent_instance_node(instance_node, child_node)
+			!self.node_maps.collect { |node_map|
+				if node_map.parent
+					node_map.parent.node.validate_parent_instance_node(instance_node, self)
+				# Hit top node
+				else
+					true
+				end
+			}.include?(false)
+		end
+
 		# Run all validations applied to this node
 		def validate_instance_node(instance_node)
 			# Basically this cache is messed up? Why? TODO.
 			# Reloading in the spec seems to fix this... but... this could be a booby trap for others
 			#self.node_validations(true)
 
-			!self.node_validations.collect { |node_validation|
+			# Check the validations on this node against the instance_node
+			validations_passed = !self.node_validations.collect { |node_validation|
 				node_validation.validate_instance_node(instance_node, self)
-			}.include?(false) &&  !self.node_maps.collect { |node_map|
+			}.include?(false)
+
+			# More complex....
+			# Recureses to the parent node to check
+			# This is to validate Node::Question since they don't have instance_nodes directly to validate them
+			parent_validations_passed = !self.node_maps.collect { |node_map|
 				if node_map.parent
-					node_map.parent.node.validate_instance_node(instance_node)
+					node_map.parent.node.validate_parent_instance_node(instance_node, self)
 				# Hit top node
 				else
 					true
 				end
 			}.include?(false)
+
+			validations_passed && parent_validations_passed
 		end
 
 		# Whether there is a valid answer path from this node to the root node for the instance

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

@@ -6,6 +6,8 @@ module ActiveRecordSurvey
 			if instance_node = self.instance_node_for_instance(instance)
 				# Answered if has text
 				instance_node.value.to_s.strip.length > 0
+			else
+				false
 			end
 		end
 	end

data/lib/active_record_survey/node/question.rb

@@ -1,4 +1,10 @@
 module ActiveRecordSurvey
 	class Node::Question < Node
+		# Stop validating at the Question node
+		def validate_parent_instance_node(instance_node, child_node)
+			!self.node_validations.collect { |node_validation|
+				node_validation.validate_instance_node(instance_node, self)
+			}.include?(false)
+		end
 	end
 end

data/lib/active_record_survey/node_validation/maximum_answer.rb

@@ -5,7 +5,7 @@ module ActiveRecordSurvey
 		def validate_instance_node(instance_node, question_node = nil)
 			# Only makes sense for questions to have maximum answers
 			if !question_node.class.ancestors.include?(::ActiveRecordSurvey::Node::Question)
-				return false 
+				return false
 			end
 
 			instance = instance_node.instance
@@ -20,7 +20,11 @@ module ActiveRecordSurvey
 				}
 			}.flatten.select { |i| i }.count
 
-			total_answered <= self.value.to_i
+			is_valid = (total_answered <= self.value.to_i)
+
+			instance_node.errors[:base] << { :nodes => { question_node.id => ["MAXIMUM_ANSWER"] } } if !is_valid
+
+			is_valid
 		end
 	end
 end

data/lib/active_record_survey/node_validation/maximum_length.rb

@@ -2,8 +2,12 @@ module ActiveRecordSurvey
 	# Ensure the instance_node has a length less than the maximum
 	class NodeValidation::MaximumLength < NodeValidation
 		# Validate the instance_node value
-		def validate_instance_node(instance_node, node = nil)
-			(self.value.to_i >= instance_node.value.to_s.length.to_i)
+		def validate_instance_node(instance_node, answer_node = nil)
+			is_valid = (self.value.to_i >= instance_node.value.to_s.length.to_i)
+
+			instance_node.errors[:base] << { :nodes => { answer_node.id => ["MAXIMUM_LENGTH"] } } if !is_valid
+
+			is_valid
 		end
 	end
 end

data/lib/active_record_survey/node_validation/maximum_value.rb

@@ -2,9 +2,12 @@ module ActiveRecordSurvey
 	# Ensure the instance_node has a value less than the maximum
 	class NodeValidation::MaximumValue < NodeValidation
 		# Validate the instance_node value is less than the maximum
-		def validate_instance_node(instance_node, node = nil)
-			!instance_node.value.to_s.empty? &&
-			instance_node.value.to_f <= self.value.to_f
+		def validate_instance_node(instance_node, answer_node = nil)
+			is_valid = (!instance_node.value.to_s.empty? && instance_node.value.to_f <= self.value.to_f)
+
+			instance_node.errors[:base] << { :nodes => { answer_node.id => ["MAXIMUM_VALUE"] } } if !is_valid
+
+			is_valid
 		end
 	end
 end

data/lib/active_record_survey/node_validation/minimum_answer.rb

@@ -20,7 +20,11 @@ module ActiveRecordSurvey
 				}
 			}.flatten.select { |i| i }.count
 
-			total_answered >= self.value.to_i
+			is_valid = (total_answered >= self.value.to_i)
+
+			instance_node.errors[:base] << { :nodes => { question_node.id => ["MINIMUM_ANSWER"] } } if !is_valid
+
+			is_valid
 		end
 	end
 end

data/lib/active_record_survey/node_validation/minimum_length.rb

@@ -2,8 +2,12 @@ module ActiveRecordSurvey
 	# Ensure the instance_node has a value greater than the minimum
 	class NodeValidation::MinimumLength < NodeValidation
 		# Validate the instance_node value is greater than the minimum
-		def validate_instance_node(instance_node, node = nil)
-			instance_node.value.to_s.length >= self.value.to_i
+		def validate_instance_node(instance_node, answer_node = nil)
+			is_valid = (instance_node.value.to_s.length >= self.value.to_i)
+
+			instance_node.errors[:base] << { :nodes => { answer_node.id => ["MINIMUM_LENGTH"] } } if !is_valid
+
+			is_valid
 		end
 	end
 end

data/lib/active_record_survey/node_validation/minimum_value.rb

@@ -2,9 +2,12 @@ module ActiveRecordSurvey
 	# Ensure the instance_node has a value greater than the minimum
 	class NodeValidation::MinimumValue < NodeValidation
 		# Validate the instance_node value is greater than the minimum
-		def validate_instance_node(instance_node, node = nil)
-			!instance_node.value.to_s.empty? &&
-			instance_node.value.to_f >= self.value.to_f
+		def validate_instance_node(instance_node, answer_node = nil)
+			is_valid = (!instance_node.value.to_s.empty? && instance_node.value.to_f >= self.value.to_f)
+
+			instance_node.errors[:base] << { :nodes => { answer_node.id => ["MINIMUM_VALUE"] } } if !is_valid
+
+			is_valid
 		end
 	end
 end

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.7"
+	VERSION = "0.1.8"
 end

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

@@ -87,7 +87,7 @@ describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
 				expect(instance.valid?).to be(false)
 			end
 
-			it 'not answered in order' do
+			it 'when not answered in order' do
 				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
 				instance.instance_nodes.build(
 					:instance => instance,

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

@@ -1,14 +1,16 @@
 require 'spec_helper'
 
-describe ActiveRecordSurvey::Node::Answer::Text do
+describe ActiveRecordSurvey::Node::Answer::Text, :text_spec => true do
 	describe 'a text survey is' do
 		before(:all) do
 			@survey = ActiveRecordSurvey::Survey.new
 
 			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "What... what do you think?")
-			@q1_a1 = ActiveRecordSurvey::Node::Answer::Text.new()
+			@q1_a1 = ActiveRecordSurvey::Node::Answer::Text.new(:text => "Text #1")
+			@q1_a2 = ActiveRecordSurvey::Node::Answer::Text.new(:text => "Text #2")
 
-			@survey.build_question(@q1, [@q1_a1])
+			nodes = @survey.build_question(@q1, [@q1_a1])
+			nodes = @survey.build_question(@q1_a2, [], nodes[1])
 
 			@survey.save
 		end
@@ -50,78 +52,180 @@ describe ActiveRecordSurvey::Node::Answer::Text do
 			end
 		end
 
-		describe ActiveRecordSurvey::NodeValidation::MinimumLength do
-			describe 'valid when' do
-				it 'has a value greater than the minimum' do
-					@q1_a1.node_validations << ActiveRecordSurvey::NodeValidation::MinimumLength.new(
-						:node => @q1_a1,
-						:value => 3
-					)
-					instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
-					instance.instance_nodes.build(
-						:instance => instance,
+		describe ActiveRecordSurvey::NodeValidation do
+			describe ActiveRecordSurvey::NodeValidation::MaximumLength do
+				before(:all) do
+					@q1_a1.node_validations << ActiveRecordSurvey::NodeValidation::MaximumLength.new(
 						:node => @q1_a1,
-						:value => "this is greater than minimum length",
+						:value => 15
 					)
-					instance.save
-	
-					expect(instance.valid?).to be(true)
+
+					# Weird caching is happening
+					@q1_a1.reload
+				end
+
+				describe 'invalid when' do
+					it 'has a value greater than the maximum' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "123456789111213141516",
+						)
+						instance.save
+
+						expect(instance.valid?).to be(false)
+					end
+				end
+
+				describe 'valid when' do
+					it 'has a value less than the maximum' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "test",
+						)
+						instance.save
+
+						expect(instance.valid?).to be(true)
+					end
 				end
 			end
 
-			describe 'invalid when' do
-				it 'has a value less than the minimum' do
+			describe ActiveRecordSurvey::NodeValidation::MinimumLength do
+				before(:all) do
 					@q1_a1.node_validations << ActiveRecordSurvey::NodeValidation::MinimumLength.new(
 						:node => @q1_a1,
-						:value => 3
-					)
-					instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
-					instance.instance_nodes.build(
-						:instance => instance,
-						:node => @q1_a1,
-						:value => "12",
+						:value => 5
 					)
-					instance.save
 
-					expect(instance.valid?).to be(false)
+					# Weird caching is happening
+					@q1_a1.reload
+				end
+
+				describe 'invalid when' do
+					it 'has a value less than the minimum' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "1234",
+						)
+						instance.save
+
+						expect(instance.valid?).to be(false)
+					end
+				end
+
+				describe 'valid when' do
+					it 'has a value greater than the minimum' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "12345",
+						)
+						instance.save
+
+						expect(instance.valid?).to be(true)
+					end
 				end
 			end
-		end
 
-		describe ActiveRecordSurvey::NodeValidation::MaximumLength do
-			describe 'invalid when' do
-				it 'has a value greater than the maximum' do
-					@q1_a1.node_validations << ActiveRecordSurvey::NodeValidation::MaximumLength.new(
-						:node => @q1_a1,
-						:value => 15
+			describe ActiveRecordSurvey::NodeValidation::MaximumAnswer do
+				before(:all) do
+					@q1.node_validations << ActiveRecordSurvey::NodeValidation::MaximumAnswer.new(
+						:node => @q1,
+						:value => 1
 					)
-					instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
-					instance.instance_nodes.build(
-						:instance => instance,
-						:node => @q1_a1,
-						:value => "123456789111213141516",
-					)
-					instance.save
 
-					expect(instance.valid?).to be(false)
+					# Weird caching is happening
+					@q1_a1.reload
+				end
+
+				describe 'invalid when' do
+					it 'has more answers than the maximum' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "123456",
+						)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "abcdefg",
+						)
+						instance.save
+
+						expect(instance.valid?).to be(false)
+					end
+				end
+
+				describe 'valid when' do
+					it 'has less answers than the maximum' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "123456",
+						)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a2,
+						)
+						instance.save
+puts instance.errors.inspect
+						expect(instance.valid?).to be(true)
+					end
 				end
 			end
 
-			describe 'valid when' do
-				it 'has a value less than the maximum' do
-					@q1_a1.node_validations << ActiveRecordSurvey::NodeValidation::MaximumLength.new(
-						:node => @q1_a1,
-						:value => 15
-					)
-					instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
-					instance.instance_nodes.build(
-						:instance => instance,
-						:node => @q1_a1,
-						:value => "test",
+			describe ActiveRecordSurvey::NodeValidation::MinimumAnswer do
+				before(:all) do
+					@q1.node_validations << ActiveRecordSurvey::NodeValidation::MinimumAnswer.new(
+						:node => @q1,
+						:value => 1
 					)
-					instance.save
 
-					expect(instance.valid?).to be(true)
+					# Weird caching is happening
+					@q1_a1.reload
+				end
+
+				describe 'invalid when' do
+					it 'has less than the minimum number of answers' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+						)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a2,
+						)
+						instance.save
+
+						expect(instance.valid?).to be(false)
+					end
+				end
+
+				describe 'valid when' do
+					it 'has greater than the minimum number of answers' do
+						instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a1,
+							:value => "12345",
+						)
+						instance.instance_nodes.build(
+							:instance => instance,
+							:node => @q1_a2,
+						)
+						instance.save
+puts instance.errors.inspect
+						expect(instance.valid?).to be(true)
+					end
 				end
 			end
 		end

metadata

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