active_record_survey 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc22ee8242273415952e25ab1c2dd47f8c92275e
-  data.tar.gz: c0896bfda37bc9df6705a27237ad2696d0bf087e
+  metadata.gz: 316776fa0f2de65dad54cffc746342a4177bd0f8
+  data.tar.gz: da2a911ee4f3c17b012d6105b3d30514750934e2
 SHA512:
-  metadata.gz: 222b0693802954fa9367b349b4da5f087b46b42509cdbbc01ad978346b5d07c6468f3ac9b7b2ef31b3d5aa508a2f1f04e1530b944e6fe84d20ea691f9ccc6a91
-  data.tar.gz: fe9ac6b5e0793761e0fa13f0c6b925d48f768374409ab18455058d42830f537ec6e8279f43d26357ba3dabab93c6424ab184ea7c070ade78e4d92242061aaf71
+  metadata.gz: 1ea0702079cf83209dd6178b146d451eac4de35fc20eb9cc65f57c3fdc6129457c410bbcfbd323bfc2f20b9a9e31a47c90990f372668d64fdbecacb82223c089
+  data.tar.gz: 65812f918dbc7061afff46083d6d419c18a0100ba7f98c1b58654bc8e11efe8b01a4d180860976f5f0beb1d365ee9060f8ede43bed37b71401817ebd11aa7919

data/lib/active_record_survey/node/answer.rb

@@ -1,5 +1,18 @@
 module ActiveRecordSurvey
 	class Node::Answer < Node
+		attr_accessor :ancestor_marked_for_destruction
+		protected :ancestor_marked_for_destruction
+
+		before_save do |node|
+			# ------------------------ WARNING ------------------------
+			# This code is to support #remove_link which uses mark_for_destruction
+			# This code is necessary to clean everything up.
+			# Calling save on this answer won't automatically go to its next_question -> node_maps and clean everything up
+			(@ancestor_marked_for_destruction || []).each { |i|
+				i.destroy
+			}
+		end
+
 		# Answer nodes are valid if their questions are valid!
 		# Validate this node against an instance
 		def validate_node(instance)
@@ -47,8 +60,19 @@ module ActiveRecordSurvey
 		# 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|
+			@ancestor_marked_for_destruction ||= []
+
+			self.node_maps.each_with_index { |answer_node_map, answer_node_map_index|
+				answer_node_map.children.each_with_index { |child, child_index|
+					# child.node == question this answer is pointing to
+					child.node.node_maps.each_with_index { |i,ii|
+						# Cleans up all the excess node_maps from the old linkage
+						if ii > 0
+							i.mark_for_destruction 
+							@ancestor_marked_for_destruction << i if ii > 0
+						end
+					}
+
 					# Should not know about parent
 					child.parent = nil
 				}

data/lib/active_record_survey/node.rb

@@ -1,7 +1,7 @@
 module ActiveRecordSurvey
 	class Node < ::ActiveRecord::Base
 		self.table_name = "active_record_survey_nodes"
-		has_many :node_maps, :class_name => "ActiveRecordSurvey::NodeMap", :foreign_key => :active_record_survey_node_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 :instance_nodes, :class_name => "ActiveRecordSurvey::InstanceNode", :foreign_key => :active_record_survey_node_id
 

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.18"
+	VERSION = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord