active_record_survey 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a522c8b6c32002e303859368fba6fca36f0952
-  data.tar.gz: 38d7e702b42eee467578db3ab511d529ceeb1c7d
+  metadata.gz: 5e14e2ac1a5afccd6174d0c4a6a6d63eaf299648
+  data.tar.gz: 851b819031bbf4121f31003892eed93168ba0bb6
 SHA512:
-  metadata.gz: 63be44b810cfbb1a11613eae3d4f5196bc77136876cfc9c059a34e1806dd7a4024b7dc3dba32f85ef189ca03096024fa50029d60847fe4d4acd537e21243c184
-  data.tar.gz: 9869e801ed85f59607a5971686b5344f5f0c9b4d7afeabf520807b17631cf46e3d13f808f1aaa9c8fcb508f44c0673df79b783d07837471824871cc838f8db69
+  metadata.gz: 96cd0a3783d52e6a472229deea9782fb11b46fa8e71a24739eefab6d2be7c6fc8080531fdc01c4532600094da451b05d9e57c5f6d00dee308dc3b2a554eb6140
+  data.tar.gz: 61fa51b61fe2e0de0e7b6fe9c0fa5f0de3fa9e1348f65d78a69e0458ee49f99c0a5f96f153bdc1916c32931826a4c35b8cc9bc9177ac8a5c3edd993a1b9e798d

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

@@ -1,12 +1,47 @@
 module ActiveRecordSurvey
-	# Rank in relation to parent/children
+	# Rank in relation to parent/children of ActiveRecordSurvey::Node::Answer::Rank
 	class Node::Answer::Rank < Node::Answer
 		# Accept integer or empty values
+		# Must be within range of the number of ranking nodes
 		def validate_instance_node(instance_node)
 			# super - all validations on this node pass
 			super &&
-			(instance_node.value.to_s.empty? ||
-			!instance_node.value.to_s.match(/^\d+$/).nil?)
+			(instance_node.value.to_s.empty? || !instance_node.value.to_s.match(/^\d+$/).nil?) &&
+			(instance_node.value.to_s.empty? || instance_node.value.to_i >= 1) &&
+			instance_node.value.to_i <= self.max_rank
+		end
+
+		protected
+
+		# Calculate the number of Rank nodes above this one
+		def num_above
+			count = 0
+			self.node_maps.each { |i|
+				# Parent is one of us as well - include it and check its parents
+				if i.parent.node.class.ancestors.include?(self.class)
+					count = count + 1 + i.parent.node.num_above
+				end
+			}
+			count
+		end
+
+		# Calculate the number of Rank nodes below this one
+		def num_below
+			count = 0
+			self.node_maps.each { |node_map|
+				node_map.children.each { |child|
+					# Child is one of us as well - include it and check its children
+					if child.node.class.ancestors.include?(self.class)
+						count = count + 1 + child.node.num_below
+					end
+				}
+			}
+			count
+		end
+
+		# Calculate the maximum rank value that is accepted
+		def max_rank
+			self.num_above + self.num_below + 1
 		end
 	end
 end

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.3"
+	VERSION = "0.1.4"
 end

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

@@ -0,0 +1,221 @@
+require 'spec_helper'
+
+describe ActiveRecordSurvey::Node::Answer::Rank, :focus => true do
+	describe 'survey is' do
+		before(:all) do
+			@survey = ActiveRecordSurvey::Survey.new
+
+			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Order by preference")
+			@q1_a1 = ActiveRecordSurvey::Node::Answer::Rank.new(:text => "Dogs")
+			@q1_a2 = ActiveRecordSurvey::Node::Answer::Rank.new(:text => "Cats")
+			@q1_a3 = ActiveRecordSurvey::Node::Answer::Rank.new(:text => "Mice")
+			@q1_a4 = ActiveRecordSurvey::Node::Answer::Rank.new(:text => "Ferrets")
+			@q1_a5 = ActiveRecordSurvey::Node::Answer::Rank.new(:text => "Rats")
+
+			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.save
+		end
+
+		describe 'valid when' do
+			it 'accepts an integer value' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 1
+				)
+				instance.save
+
+				expect(instance.valid?).to be(true)
+			end
+
+			it 'accepts an empty value (no rank given)' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+				)
+				instance.save
+
+				expect(instance.valid?).to be(true)
+			end
+
+			it 'ranked at than maximum number of answers' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 5
+				)
+				instance.save
+
+				expect(instance.valid?).to be(true)
+			end
+
+			it 'all answers are ranked in the correct order' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 1
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a2,
+					:value => 3
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a3,
+					:value => 2
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a4,
+					:value => 5
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a5,
+					:value => 4
+				)
+				instance.save
+
+				expect(instance.valid?).to be(true)
+			end
+
+			it 'one answer is not ranked' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 1
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a2,
+					:value => 3
+				)
+				# Refusal to rank a3
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a3
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a4,
+					:value => 2
+				)
+				# Refusal to rank a5
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a5
+				)
+				instance.save
+
+				expect(instance.valid?).to be(true)
+			end
+
+			# TODO - additional min and max answer required validation nodes... 
+		end
+
+		describe 'invalid when' do
+			it 'rejects a float value' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 1.5
+				)
+				instance.save
+
+				expect(instance.valid?).to be(false)
+			end
+
+			it 'rejects an alphabetical value' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => "1a2"
+				)
+				instance.save
+
+				expect(instance.valid?).to be(false)
+			end
+
+			it 'ranked 0' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 0
+				)
+				instance.save
+
+				expect(instance.valid?).to be(false)
+			end
+
+			it 'ranked higher than maximum number of answers' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 6
+				)
+				instance.save
+
+				expect(instance.valid?).to be(false)
+			end
+
+			it 'rejects when not answered in order' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a2,
+					:value => 1
+				)
+				instance.save
+
+				expect(instance.valid?).to be(false)
+			end
+
+			it 'all one answer is ranked in correctly' do
+				instance = ActiveRecordSurvey::Instance.new(:survey => @survey)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a1,
+					:value => 1
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a2,
+					:value => 3
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a3,
+					:value => 12
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a4,
+					:value => 5
+				)
+				instance.instance_nodes.build(
+					:instance => instance,
+					:node => @q1_a5,
+					:value => 4
+				)
+				instance.save
+
+				expect(instance.valid?).to be(false)
+			end
+		end
+	end
+end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveRecordSurvey::Node::Answer::Scale, :focus => true do
+describe ActiveRecordSurvey::Node::Answer::Scale do
 	describe 'survey is' do
 		before(:all) 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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Butch Marshall
@@ -144,6 +144,7 @@ files:
 - lib/generators/active_record_survey/templates/migration_0.1.0.rb
 - rspec_rvm
 - spec/active_record_survey/node/answer/boolean_spec.rb
+- spec/active_record_survey/node/answer/rank_spec.rb
 - spec/active_record_survey/node/answer/scale_spec.rb
 - spec/active_record_survey/survey_spec.rb
 - spec/active_record_survey_spec.rb
@@ -174,6 +175,7 @@ specification_version: 4
 summary: Surveys using activerecord
 test_files:
 - spec/active_record_survey/node/answer/boolean_spec.rb
+- spec/active_record_survey/node/answer/rank_spec.rb
 - spec/active_record_survey/node/answer/scale_spec.rb
 - spec/active_record_survey/survey_spec.rb
 - spec/active_record_survey_spec.rb