active_record_survey 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18f0a2bc583b09e654fbbb966f3e9899a8d67a4b
-  data.tar.gz: e41e6c23da5678240d833549fff30c60235bd90c
+  metadata.gz: 26eecc198f8c314ac2a23e3f746dcc823acb9720
+  data.tar.gz: 1e7076165aff517190a7e0f45b804d6b0fa0e93d
 SHA512:
-  metadata.gz: 47469259ac340357ac77f839042871b284e0c64b98d7036697edf5eec114dc802e179e038ce72dca1d7917ffaa5b495fc6aced94ca11a004066181898f0ca3f4
-  data.tar.gz: 2ebcef691288d4a91228da1bdcc31f41565fbdc24b103069532fae7a2cba7fb05c5edf9b956dc211703993ffbb9a003c983e3dd69f5fb7c51105f724a2e86656
+  metadata.gz: e4a76741e270ffcec64140526bf6467f40a82e55126c73796f357936a1e7a4a7085f07c662b71a24b4dc5dfcd340cdde9b61bff721aebe2b8a6f17496dcc4554
+  data.tar.gz: ae0b50818d46601fce209a7452b311bfcbd962e27c4ebbd4213254bb3b2b0a5b2504d9b54b80c0073a3db5116bf2be17686e6fe9c765083400637fed1cdbdce0

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.33**
+ - `ActiveRecordSurvey::Node::Answer#sibling_index` method for setting position as well
+
 **0.1.32**
  - `ActiveRecordSurvey::Node::Answer#sibling_index` for regular answers and chained answers
 

data/lib/active_record_survey/node/answer.rb

@@ -11,22 +11,6 @@ module ActiveRecordSurvey
 			}.include?(false)
 		end
 
-		# Gets index in sibling relationship
-		def sibling_index
-			if node_map = self.survey.node_maps.select { |i|
-				i.node == self
-			}.first
-
-				node_map.parent.children.each_with_index { |nm, i|
-					if nm == node_map
-						return i
-					end
-				}
-			end
-
-			return 0
-		end
-
 		# Returns the question that preceeds this answer
 		def question
 			self.survey.node_maps.select { |i|
@@ -151,9 +135,35 @@ module ActiveRecordSurvey
 			}
 		end
 
+		# Gets index in sibling relationship
+		def sibling_index
+			if node_map = self.survey.node_maps.select { |i|
+				i.node == self
+			}.first
+
+				node_map.parent.children.each_with_index { |nm, i|
+					if nm == node_map
+						return i
+					end
+				}
+			end
+
+			return 0
+		end
+
+		def sibling_index=index
+			current_index = self.sibling_index
+
+			offset = index - current_index
+
+			(1..offset.abs).each { |i|
+				self.send(((offset > 0)? "move_down" : "move_up"))
+			}
+		end
+
 		# Moves answer up relative to other answers
 		def move_up
-			!self.survey.node_maps.select { |i|
+			self.survey.node_maps.select { |i|
 				i.node == self
 			}.collect { |node_map|
 				begin
@@ -165,7 +175,7 @@ module ActiveRecordSurvey
 
 		# Moves answer down relative to other answers
 		def move_down
-			!self.survey.node_maps.select { |i|
+			self.survey.node_maps.select { |i|
 				i.node == self
 			}.collect { |node_map|
 				begin

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.32"
+	VERSION = "0.1.34"
 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 '#sibling_index', :focus => true do
+	describe '#sibling_index' do
 		before(:each) do
 			@survey = ActiveRecordSurvey::Survey.new()
 			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
@@ -34,6 +34,22 @@ describe ActiveRecordSurvey::Node::Answer::Boolean, :boolean_spec => true do
 			@survey.save
 		end
 
+		describe '#sibling_index' do
+			it 'should go higher if possible' do
+				@q1_a3.sibling_index = 0
+
+				@survey.reload
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[{"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer::Boolean", :children=>[]}]}]}]}])
+			end
+
+			it 'should go lower if possible' do
+				@q1_a1.sibling_index = 2
+
+				@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
+		end
+
 		describe '#move_up' do
 			it 'should go higher of possible' do
 				@q1_a2.move_up

data/spec/active_record_survey/node/answer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 
-	describe '#sibling_index', :focus => true do
+	describe '#sibling_index' do
 		before(:each) do
 			@survey = ActiveRecordSurvey::Survey.new()
 			@q1 = ActiveRecordSurvey::Node::Question.new(:text => "Question #1", :survey => @survey)
@@ -35,8 +35,41 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 			@survey.save
 		end
 
+		describe '#sibling_index' do
+			it 'should go higher if possible' do
+				@q1_a3.sibling_index = 0
+
+				@survey.reload
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+
+				@survey.save
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+
+				@survey.reload
+				expect(@survey.as_map(no_ids: true)).to eq([{"text"=>"Question #1", :type=>"ActiveRecordSurvey::Node::Question", :children=>[{"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #2", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			end
+
+			it 'should go lower by one' do
+				@q1_a1.sibling_index = 1
+				@survey.reload
+			end
+
+			it 'should go lower if possible' do
+				@q1_a1.sibling_index = 2
+
+				@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 #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :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", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :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", :children=>[]}, {"text"=>"Q1 Answer #3", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}, {"text"=>"Q1 Answer #1", :type=>"ActiveRecordSurvey::Node::Answer", :children=>[]}]}])
+			end
+		end
+
 		describe '#move_up' do
-			it 'should go higher of possible' do
+			it 'should go higher if possible' do
 				@q1_a2.move_up
 
 				@survey.reload
@@ -52,7 +85,7 @@ describe ActiveRecordSurvey::Node::Answer, :answer_spec => true do
 		end
 
 		describe '#move_down' do
-			it 'should go lower of possible' do
+			it 'should go lower if possible' do
 				@q1_a2.move_down
 
 				@survey.reload

metadata

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