active_record_survey 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600d9499d8cde5f959faf9af9775f35c84f965c2
-  data.tar.gz: 54c5136528e2ea561f2e0bb1fcfc875d21683a9d
+  metadata.gz: 082ebe76b425818c9a032b73ed6c0c5385744225
+  data.tar.gz: c0c5f13b437c964afa64e515c91e45a180525942
 SHA512:
-  metadata.gz: 830b35f1da8d9af17142c1a77061b62ec2dadcd104afbd4033f6ef277d58ee946acc91a704025b01bc0691f3c9988be9976bf1c81bcbbfed98c1633fdfe8b764
-  data.tar.gz: 82f5041bf2c60cc07c674e0f6217092465da5dfed2dfd3bcaa261d2106d21a52e00fae8a4fd4ab9b1a09ef00bc976560daa662d812e645c05fccdba3a43d6ff4
+  metadata.gz: 5b0880add7fe547eaecc719abd0467f1b4c1e3c652831c4d9c9d347840146c9159c71e24cff4a11141c004311bc1ed9907424d2b31512c507dd4a7de322c053e
+  data.tar.gz: c3fd2f597ba728044f8556b1a81d57dbd43c0d471baadc3db73086a6ed166f340864a406c08df1020f5aa6f4fbc0af6bc977e7ceabc87bc32f70a2f606fb098d

data/README.md

@@ -11,6 +11,9 @@ The goal is to give a simple interface for creating surveys and validating the a
 
 Release Notes
 ============
+**0.1.31**
+ - `ActiveRecordSurvey::Node::Answer#move_up` and `ActiveRecordSurvey::Node::Answer#move_down` implemented so you can change the position of answers relative to one another i both branching and chained types.
+	I am not happy yet with this.  [AwesomeNestedSet](https://github.com/collectiveidea/awesome_nested_set) seems to require nodes exist before moving them which is a limitation I'd like to not have.
 
 **0.1.30**
  - `ActiveRecordSurvey::Node::Question` now throws ArgumentError if answers of different types are added to it

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

@@ -32,6 +32,76 @@ module ActiveRecordSurvey
 					true
 				end
 
+				# Moves answer down relative to other answers by swapping parent and children
+				def move_up
+					# Ensure each parent node to this node (the goal here is to hit a question node) is valid
+					!self.survey.node_maps.select { |i|
+						i.node == self
+					}.collect { |node_map|
+						# Parent must be an answer - cannot move into the position of a Question!
+						if !node_map.parent.nil? && node_map.parent.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer)
+							# I know this looks overly complicated, but we need to always work with the survey.node_maps - never children/parent of the relation
+							parent_node = self.survey.node_maps.select { |j|
+								node_map.parent == j
+							}.first
+
+							parent_parent = self.survey.node_maps.select { |j|
+								node_map.parent.parent == j
+							}.first
+
+							node_map.parent = parent_parent
+							parent_parent.children << node_map
+
+							self.survey.node_maps.select { |j|
+								node_map.children.include?(j)
+							}.each { |c|
+								c.parent = parent_node
+								parent_node.children << c
+							}
+
+							parent_node.parent = node_map
+							node_map.children << parent_node
+						end
+					}
+				end
+
+				# Moves answer down relative to other answers by swapping parent and children
+				def move_down
+					# Ensure each parent node to this node (the goal here is to hit a question node) is valid
+					!self.survey.node_maps.select { |i|
+						i.node == self
+					}.collect { |node_map|
+						# Must have children to move lower!
+						# And the children are also answers!
+						if node_map.children.length > 0 && !node_map.children.select { |j| j.node.class.ancestors.include?(::ActiveRecordSurvey::Node::Answer) }.empty?
+							# I know this looks overly complicated, but we need to always work with the survey.node_maps - never children/parent of the relation
+							parent_node = self.survey.node_maps.select { |j|
+								node_map.parent == j
+							}.first
+
+							children = self.survey.node_maps.select { |j|
+								node_map.children.include?(j)
+							}
+
+							children_children = self.survey.node_maps.select { |j|
+								children.collect { |k| k.children }.flatten.include?(j)
+							}
+
+							children.each { |c|
+								parent_node.children << c
+							}
+
+							children.each { |c|
+								c.children << node_map
+							}
+
+							children_children.each { |i|
+								node_map.children << i
+							}
+						end
+					}
+				end
+
 				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

data/lib/active_record_survey/node/answer.rb

@@ -135,6 +135,30 @@ module ActiveRecordSurvey
 			}
 		end
 
+		# Moves answer up relative to other answers
+		def move_up
+			!self.survey.node_maps.select { |i|
+				i.node == self
+			}.collect { |node_map|
+				begin
+					node_map.move_left
+				rescue
+				end
+			}
+		end
+
+		# Moves answer down relative to other answers
+		def move_down
+			!self.survey.node_maps.select { |i|
+				i.node == self
+			}.collect { |node_map|
+				begin
+					node_map.move_right
+				rescue
+				end
+			}
+		end
+
 		private
 			# By default - answers build off the original question node
 			#

data/lib/active_record_survey/node_map.rb

@@ -22,7 +22,7 @@ module ActiveRecordSurvey
 
 			c = (node_maps.nil?)? self.children : node_maps.select { |i|
 				i.parent == self && !i.marked_for_destruction?
-			}
+			}.sort { |a,b| a.left<=>b.left }
 
 			result = {}
 			result.merge!({ :id => self.id, :node_id => ((self.node.respond_to?(:id))? self.node.id : "") }) if !options[:no_ids] && !self.node.nil?

data/lib/active_record_survey/version.rb

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

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

@@ -1,6 +1,66 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
+	describe 'move operations' do
+		before(:each) 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
+		end
+
+		describe '#move_up' do
+			it 'should go higher of possible' do
+				@q1_a2.move_up
+
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+
+				@q1_a3.move_up
+
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+
+				@survey.save
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+
+				@survey.reload
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+			end
+
+			it 'should not change the position of the first question' do
+				@q1_a1.move_up
+
+				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=>[]}]}]}]}])
+
+				# Save should not affect it
+				@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=>[]}]}]}]}])
+
+				# Reload should not affect it
+				@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::Boolean", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+			end
+		end
+
+		describe '#move_down' do
+			it 'should go lower of possible' do
+				@q1_a2.move_down
+
+				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=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+			end
+
+			it 'should not change the position of the last question' do
+				@q1_a3.move_down
+
+				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=>[]}]}]}]}])
+			end
+		end
+	end
+
 	describe '#destroy' do
 		it 'should re-link broken chains' do
 			survey = ActiveRecordSurvey::Survey.new()

data/spec/active_record_survey/node/answer_spec.rb

@@ -1,6 +1,52 @@
 require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
+	describe 'move operations' do
+		before(:each) 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
+		end
+
+		describe '#move_up' do
+			it 'should go higher of possible' do
+				@q1_a2.move_up
+
+				@survey.reload
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			end
+
+			it 'should not change the position of the first question' do
+				@q1_a1.move_up
+
+				@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 #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			end
+		end
+
+		describe '#move_down' do
+			it 'should go lower of possible' do
+				@q1_a2.move_down
+
+				@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=>[]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			end
+
+			it 'should not change the position of the last question' do
+				@q1_a3.move_down
+
+				@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 #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			end
+		end
+	end
+
 	# When answer nodes are deleted should:
 	#	- Clean upp node_maps
 	#	- If chained, build a chain from parent -> child after removing self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_survey
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord