active_record_survey 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2afb9c3325db53de73001c5d6f59325c1358857
-  data.tar.gz: 79c0edcfa55069372786f9aec408e679f4216752
+  metadata.gz: 600d9499d8cde5f959faf9af9775f35c84f965c2
+  data.tar.gz: 54c5136528e2ea561f2e0bb1fcfc875d21683a9d
 SHA512:
-  metadata.gz: 1b82564a960e98748f511fe5aa26b8b76b1b1a71c6b993f18bdf979631cce2dcf714f008b5da9a1cd7176bb03088bca5ad6c17842df6f494ab225f5f4dea357a
-  data.tar.gz: 7ab230a31470113797bd349e784e24a500562ae4cd651e35b4e476f79c39712bcb30ab029cc8b66cfbade0320025593eb4436ef36516c64429ac2fe1180f77be
+  metadata.gz: 830b35f1da8d9af17142c1a77061b62ec2dadcd104afbd4033f6ef277d58ee946acc91a704025b01bc0691f3c9988be9976bf1c81bcbbfed98c1633fdfe8b764
+  data.tar.gz: 82f5041bf2c60cc07c674e0f6217092465da5dfed2dfd3bcaa261d2106d21a52e00fae8a4fd4ab9b1a09ef00bc976560daa662d812e645c05fccdba3a43d6ff4

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.30**
+ - `ActiveRecordSurvey::Node::Question` now throws ArgumentError if answers of different types are added to it
+
 **0.1.29**
  - `ActiveRecordSurvey::Node::Answer` now cleans up associated node_maps on destruction
  - extending/including `ActiveRecordSurvey::Answer::Chained` now rebuilds broken links in the parent<->child node_maps if a middle node_map is destroyed

data/lib/active_record_survey/node/question.rb

@@ -11,11 +11,19 @@ module ActiveRecordSurvey
 		def build_answer(answer_node)
 			# A survey must either be passed or already present in self.node_maps
 			if self.survey.nil?
-				raise ArgumentError.new "A survey must be passed if Question is not yet added to a survey"
+				raise ArgumentError.new "A survey must be passed if ActiveRecordSurvey::Node::Question is not yet added to a survey"
+			end
+
+			# Cannot mix answer types
+			# Check if not match existing - throw error
+			if !self.answers.select { |answer|
+				answer.class != answer_node.class
+			}.empty?
+				raise ArgumentError.new "Cannot mix answer types on question"
 			end
 
 			# Answers actually define how they're built off the parent node
 			answer_node.send(:build_answer, self)
 		end
 	end
-end
+end

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.29"
+	VERSION = "0.1.30"
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
-	describe '#destroy', :focus => true do
+	describe '#destroy' do
 		it 'should re-link broken chains' do
 			survey = ActiveRecordSurvey::Survey.new()
 			q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => survey)

data/spec/active_record_survey/node/question_spec.rb

@@ -13,6 +13,13 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 			it 'should raise ArgumentError if survey not linked to question' do
 				expect{@q.build_answer(@a1)}.to raise_error(ArgumentError)
 			end
+			it 'should raise ArgumentError if answers of different types added' do
+				@q.survey = @survey
+				a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "A1")
+				a2 = ActiveRecordSurvey::Node::Answer::Text.new(:text => "A2")
+				@q.build_answer(a1)
+				expect{@q.build_answer(a2)}.to raise_error(ArgumentError)
+			end
 		end
 
 		describe 'when valid' do

metadata

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