active_record_survey 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28cbe125545e5fec174484486e07e7ac56088438
-  data.tar.gz: 39c903c6db06d0f0c8b89a5aa18e766e776167eb
+  metadata.gz: d2afb9c3325db53de73001c5d6f59325c1358857
+  data.tar.gz: 79c0edcfa55069372786f9aec408e679f4216752
 SHA512:
-  metadata.gz: 863edda965f97873d7e7e3e4a0376b31b4df9f4e683f8fec0cc3fadc6a50e3571d421a2b2c5c82054d9bf27ad3545fec044057059244833f93deb93bd3038dd7
-  data.tar.gz: fdcbe0660f224af0d1b551724afe93e16f2876007f1aa23bb2c8f8295d79c44121127af31e27ee7d17c2de35828209b2d3d6e5e5302ff7ab1ba375a73ecad50b
+  metadata.gz: 1b82564a960e98748f511fe5aa26b8b76b1b1a71c6b993f18bdf979631cce2dcf714f008b5da9a1cd7176bb03088bca5ad6c17842df6f494ab225f5f4dea357a
+  data.tar.gz: 7ab230a31470113797bd349e784e24a500562ae4cd651e35b4e476f79c39712bcb30ab029cc8b66cfbade0320025593eb4436ef36516c64429ac2fe1180f77be

data/README.md

@@ -12,6 +12,10 @@ The goal is to give a simple interface for creating surveys and validating the a
 Release Notes
 ============
 
+**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
+
 **0.1.26**
  - Major refactor of answer#build_link and answer#remove_link
  - `ActiveRecordSurvey::Node` now has a direct reference to its survey.  Don't forget to run the install task Update_0_1_26_ActiveRecordSurvey

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

@@ -1,7 +1,8 @@
 module ActiveRecordSurvey
 	# Boolean answers can have values 0|1
 	class Node::Answer::Boolean < Node::Answer
-		include Answer::Chained
+		include Answer::Chained::InstanceMethods
+		extend Answer::Chained::ClassMethods
 
 		# Only boolean values
 		def validate_instance_node(instance_node)

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

@@ -1,28 +1,51 @@
 module ActiveRecordSurvey
 	class Answer
 		module Chained
-			# Chain nodes are different - they must find the final answer node added and add to it
-			def build_answer(question_node)
-				self.survey = question_node.survey
+			module ClassMethods
+				def self.extended(base)
+					base.before_destroy :before_destroy_rebuild_node_map, prepend: true # prepend is important! otherwise dependent: :destroy on node<->node_map relation is executed first and no records!
+				end
+			end
 
-				question_node_maps = self.survey.node_maps.select { |i| i.node == question_node && !i.marked_for_destruction? }
+			module InstanceMethods
+				# Chain nodes are different - they must find the final answer node added and add to it
+				def build_answer(question_node)
+					self.survey = question_node.survey
 
-				# No node_maps exist yet from this question
-				if question_node_maps.length === 0
-					# Build our first node-map
-					question_node_maps << self.survey.node_maps.build(:node => question_node, :survey => self.survey)
-				end
+					question_node_maps = self.survey.node_maps.select { |i| i.node == question_node && !i.marked_for_destruction? }
+
+					# No node_maps exist yet from this question
+					if question_node_maps.length === 0
+						# Build our first node-map
+						question_node_maps << self.survey.node_maps.build(:node => question_node, :survey => self.survey)
+					end
 
-				last_answer_in_chain = (question_node.answers.last || question_node)
+					last_answer_in_chain = (question_node.answers.last || question_node)
+
+					# Each instance of this question needs the answer hung from it
+					self.survey.node_maps.select { |i|
+						i.node == last_answer_in_chain
+					}.each { |node_map|
+						node_map.children << self.survey.node_maps.build(:node => self, :survey => self.survey)
+					}
+
+					true
+				end
 
-				# Each instance of this question needs the answer hung from it
-				self.survey.node_maps.select { |i|
-					i.node == last_answer_in_chain
-				}.each { |node_map|
-					node_map.children << self.survey.node_maps.build(:node => self, :survey => self.survey)
-				}
+				private
+					# Before a node is destroyed, will re-build the node_map links from parent to child if they exist
+					def before_destroy_rebuild_node_map
 
-				true
+						# All the node_maps from this node
+						self.survey.node_maps.select { |i|
+							i.node == self
+						}.each { |node_map|
+							# Remap all of this nodes children to the parent
+							node_map.children.each  { |child|
+								node_map.parent.children << child
+							}
+						}
+					end
 			end
 		end
 	end

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

@@ -1,7 +1,8 @@
 module ActiveRecordSurvey
 	# Rank in relation to parent/children of ActiveRecordSurvey::Node::Answer::Rank
 	class Node::Answer::Rank < Node::Answer
-		include Answer::Chained
+		include Answer::Chained::InstanceMethods
+		extend Answer::Chained::ClassMethods
 
 		# Accept integer or empty values
 		# Must be within range of the number of ranking nodes

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

@@ -1,7 +1,8 @@
 module ActiveRecordSurvey
 	# Can hold a value on a scale (e.g. from 0-10)
 	class Node::Answer::Scale < Node::Answer
-		include Answer::Chained
+		include Answer::Chained::InstanceMethods
+		extend Answer::Chained::ClassMethods
 
 		# Accept integer, float, or empty values
 		def validate_instance_node(instance_node)

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

@@ -1,7 +1,8 @@
 module ActiveRecordSurvey
 	# Text answers are... text answers
 	class Node::Answer::Text < Node::Answer
-		include Answer::Chained
+		include Answer::Chained::InstanceMethods
+		extend Answer::Chained::ClassMethods
 
 		# Text answers are considered answered if they have text entered
 		def is_answered_for_instance?(instance)

data/lib/active_record_survey/node.rb

@@ -2,8 +2,8 @@ module ActiveRecordSurvey
 	class Node < ::ActiveRecord::Base
 		self.table_name = "active_record_survey_nodes"
 		belongs_to :survey, :class_name => "ActiveRecordSurvey::Survey", :foreign_key => :active_record_survey_id
-		has_many :node_maps, :class_name => "ActiveRecordSurvey::NodeMap", :foreign_key => :active_record_survey_node_id, autosave: true
-		has_many :node_validations, :class_name => "ActiveRecordSurvey::NodeValidation", :foreign_key => :active_record_survey_node_id, autosave: true
+		has_many :node_maps, :class_name => "ActiveRecordSurvey::NodeMap", :foreign_key => :active_record_survey_node_id, autosave: true, dependent: :destroy
+		has_many :node_validations, :class_name => "ActiveRecordSurvey::NodeValidation", :foreign_key => :active_record_survey_node_id, autosave: true, dependent: :destroy
 		has_many :instance_nodes, :class_name => "ActiveRecordSurvey::InstanceNode", :foreign_key => :active_record_survey_node_id
 
 		# All the answer nodes that follow from this node

data/lib/active_record_survey/node_map.rb

@@ -25,9 +25,9 @@ module ActiveRecordSurvey
 			}
 
 			result = {}
-			result.merge!({ :id => self.id, :node_id => self.node.id }) if !options[:no_ids]
+			result.merge!({ :id => self.id, :node_id => ((self.node.respond_to?(:id))? self.node.id : "") }) if !options[:no_ids] && !self.node.nil?
 			result.merge!({
-				:type => self.node.class.to_s,
+				:type => ((!self.node.nil?)? self.node.class.to_s : ""),
 				:children => c.collect { |i|
 					i.as_map(options)
 				}

data/lib/active_record_survey/version.rb

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

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

@@ -1,6 +1,27 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
+	describe '#destroy', :focus => true do
+		it 'should re-link broken chains' do
+			survey = ActiveRecordSurvey::Survey.new()
+			q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => survey)
+			q1_a1 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #1")
+			q1_a2 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #2")
+			q1_a3 = ActiveRecordSurvey::Node::Answer::Boolean.new(:text => "Q1 Answer #3")
+			q1.build_answer(q1_a1)
+			q1.build_answer(q1_a2)
+			q1.build_answer(q1_a3)
+			survey.save
+
+			expect(survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+
+			q1_a2.destroy
+			survey.reload # reload seems to be necessary
+
+			expect(survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}])
+		end
+	end
+
 	describe 'a boolean survey is' do
 		before(:all) do
 			@survey = ActiveRecordSurvey::Survey.new()

data/spec/active_record_survey/node/answer_spec.rb

@@ -1,6 +1,30 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
+	# When answer nodes are deleted should:
+	#	- Clean upp node_maps
+	#	- If chained, build a chain from parent -> child after removing self
+	describe '#destroy' do
+		it 'should clean up node maps' do
+			survey = ActiveRecordSurvey::Survey.new()
+			q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => survey)
+			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)
+			q1.build_answer(q1_a2)
+			q1.build_answer(q1_a3)
+			survey.save
+
+			expect(survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+
+			q1_a2.destroy
+			survey.reload
+
+			expect(survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+		end
+	end
+
 	describe "#build_link" do
 		it 'should not have to be saved to produce a valid #as_map' do
 			survey = ActiveRecordSurvey::Survey.new()
@@ -83,7 +107,7 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 				expect{q3_a1.build_link(q1)}.to raise_error(RuntimeError) # This should throw exception
 			end
 
-			it 'should keep consistent number of nodes after calling #remove_link and #build_link', :focus => true do
+			it 'should keep consistent number of nodes after calling #remove_link and #build_link' do
 				survey = FactoryGirl.build(:simple_survey)
 				survey.save
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Surveys using activerecord