active_record_survey 0.1.48 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80f1e61c2033324b9ff86b0baa996510fd715ca
-  data.tar.gz: c54065cd9fd75047dde99475e0c8ecfceaed3869
+  metadata.gz: f29de2a4c2c5e743506df020087a75c97525d67b
+  data.tar.gz: 523efb43fccaca4c0dc966affc470d5ee15f5fc6
 SHA512:
-  metadata.gz: 604a6b7d809abc8e93e999c3f406768d9e09826893a7a4b02d4f4ace3300d09124c31720e107b53d9553a9f2cab3ef1b70ddf811fb6123ece5370703d2b3b82e
-  data.tar.gz: a7cff9333be14be320b779101a68b0acdcf26c968740aa50719120702c9249cefbf1077f898d5df9a2949a3a5ce2cdc4e0d523d99d962b902fea5d4dd56cf197
+  metadata.gz: fb0fa79983055aaaa36330235135caab99885d56a47a15c01577044afb28b8b6c202b23c026248d9fbabe3398c5f3c6137f2bd82dd1fdc6e4c367138a42fed55
+  data.tar.gz: 6438c72f632a066fddc5c492c169659fe00b39d4f20fc41cb446a46db2591bb424a2720ffb5165031c330083cfb3fc05791dc272ec3a10b6b992870c75a2b02e

data/lib/active_record_survey/node.rb

@@ -2,7 +2,7 @@ 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, dependent: :destroy
+		has_many :node_maps, -> { includes(:node, parent: [:node]) }, :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
 
@@ -10,9 +10,10 @@ module ActiveRecordSurvey
 
 		# All the answer nodes that follow from this node
 		def answers
-#=begin
-			next_answer_nodes = lambda { |node, survey, list|
-				survey.node_maps.select { |node_map|
+			nm = self.survey.node_maps
+
+			next_answer_nodes = lambda { |node, list|
+				nm.select { |node_map|
 					!node_map.parent.nil? && node_map.parent.node == node && node_map.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer) && !node_map.marked_for_destruction?
 				}.select { |i|
 					!list.include?(i.node)
@@ -22,30 +23,12 @@ module ActiveRecordSurvey
 
 					list << i.node
 
-					next_answer_nodes.call(i.node, survey, list)
+					next_answer_nodes.call(i.node, list)
 				}.flatten.uniq
 
 				list
 			}
-			next_answer_nodes.call(self, self.survey, []).flatten.uniq
-#=end
-=begin
-			self.survey.node_maps.select { |i|
-				i.node == self
-			}.collect { |i|
-				# Get all the children from this node
-				i.children
-			}.flatten.collect { |i|
-				# Get the nodes
-				i.node
-			}.select { |i|
-				# Only the nodes that are answers
-				i.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer)
-			}.uniq.collect { |i|
-				i.survey = self.survey # ensure that the survey being referenced by the answers is the original survey - needed for keeping consistent node_maps between build_link and remove_link
-				[i] + i.answers
-			}.flatten.uniq
-=end
+			next_answer_nodes.call(self, []).flatten.uniq
 		end
 
 		# The instance_node recorded for the passed instance for this node

data/lib/active_record_survey/node/answer.rb

@@ -91,7 +91,7 @@ module ActiveRecordSurvey
 
 		# Gets index in sibling relationship
 		def sibling_index
-			node_maps = self.survey.node_maps.includes(:node, parent: [:node])
+			node_maps = self.survey.node_maps
 
 			if node_map = node_maps.select { |i| i.node == self }.first
 				parent = node_map.parent

data/lib/active_record_survey/node/question.rb

@@ -20,19 +20,15 @@ module ActiveRecordSurvey
 					i.node == answer
 				}
 			}.flatten.uniq.collect { |answer_node_map|
-				answer_node_map.move_to_root
-				answer_node_map.survey = self.survey
-
-				answer_node_map
-			}.collect { |answer_node_map|
-				answer_node_map.node.type = klass.to_s
-				answer_node_map.node = answer_node_map.node.becomes(klass)
-				answer_node_map.node.survey = self.survey
-				answer_node_map.node.save
-
+				node = answer_node_map.node
 				answer_node_map.send((answer_node_map.new_record?)? :destroy : :mark_for_destruction)
+				node
+			}.collect { |answer|
+				answer.type = klass.to_s
+				answer = answer.becomes(klass)
+				answer.save if !answer.new_record?
 
-				answer_node_map.node
+				answer
 			}.uniq
 
 			answers.each { |answer|

data/lib/active_record_survey/survey.rb

@@ -1,12 +1,10 @@
 module ActiveRecordSurvey
 	class Survey < ::ActiveRecord::Base
 		self.table_name = "active_record_surveys"
-		has_many :node_maps, :class_name => "ActiveRecordSurvey::NodeMap", :foreign_key => :active_record_survey_id, autosave: true
+		has_many :node_maps, -> { includes(:node, parent: [:node]) }, :class_name => "ActiveRecordSurvey::NodeMap", :foreign_key => :active_record_survey_id, autosave: true
 		has_many :nodes, :class_name => "ActiveRecordSurvey::Node", :foreign_key => :active_record_survey_id
 		has_many :questions, :class_name => "ActiveRecordSurvey::Node::Question", :foreign_key => :active_record_survey_id
 
-		default_scope { includes(node_maps:[:node,parent:[:node]]) }
-
 		def root_node
 			self.node_maps.includes(:node).select { |i| i.depth === 0 }.first
 		end
@@ -28,8 +26,7 @@ module ActiveRecordSurvey
 
 		# All the connective edges
 		def edges
-			self.node_maps.includes(:node, parent:[ :node ])
-			.select { |i| !i.marked_for_destruction? }.select { |i|
+			self.node_maps.select { |i| !i.marked_for_destruction? }.select { |i|
 				i.node && i.parent
 			}.collect { |i|
 				{

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.48"
+	VERSION = "0.1.49"
 end

data/spec/active_record_survey/node/answer_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+#ActiveRecord::Base.logger = Logger.new(STDOUT) if defined?(ActiveRecord::Base)
+
 describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 
 	describe '#sibling_index' do

data/spec/active_record_survey/node/question_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+#ActiveRecord::Base.logger = Logger.new(STDOUT) if defined?(ActiveRecord::Base)
+
 describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 	describe "#before_destroy_rebuild_node_map" do
 		it 'should not relink any following questions' do

metadata

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