active_record_survey 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 097cc70133bbf8a7186e9c6873c5d7b74b772e2f
-  data.tar.gz: 20cb0b86665a6ec1858c782dde578b6a7005f9da
+  metadata.gz: db7d02e98f6dcacb15e74ed15c1694adb8d7b989
+  data.tar.gz: 21d3f34d72bd909c9cc7b0f55bb01bf426174668
 SHA512:
-  metadata.gz: da323dfe54ca2c301bc3cbc50fdb5edb280feb38346fffbff6e31032c9ec5996620cebd38f61fe6253a7e43777fb719ca00ea1baeee7ccdd19b3fb34100336e8
-  data.tar.gz: 7f8b23cfa0273126bffba10875947937ece3e742c356e0ebe26f4dbff20d2382bd9d2e498fadafd1675cce85f0a9e9d9f00ed5268b29734e6f21497af48896da
+  metadata.gz: d2f1460b9b14f498ea85882f229cc0f36d824f9e1bfbb41855fe908b59e91ac1b90ac76b69063b6ffcc47489eb0efe982e08d6f736a44813e344afdf399575c5
+  data.tar.gz: 3a14f13f378178a83eb06328d6de351851430c32605e74043445035b9fc08e7153cc327893737effc140a58a758059b9d74183186da7fd10dc16b3805fa7230c

data/lib/active_record_survey/node/answer.rb

@@ -91,18 +91,19 @@ module ActiveRecordSurvey
 
 		# Gets index in sibling relationship
 		def sibling_index
-			if node_map = self.survey.node_maps.select { |i|
-				i.node == self
-			}.first
+			node_maps = self.survey.node_maps.includes(:node, parent: [:node])
+
+			if node_map = node_maps.select { |i| i.node == self }.first
+				parent = node_map.parent
 
-				node_map.parent.children.each_with_index { |nm, i|
+				children = node_maps.select { |i| i.parent && i.parent.node === parent.node }
+
+				children.each_with_index { |nm, i|
 					if nm == node_map
 						return i
 					end
 				}
 			end
-
-			return 0
 		end
 
 		def sibling_index=index

data/lib/active_record_survey/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSurvey
-	VERSION = "0.1.46"
+	VERSION = "0.1.47"
 end

data/spec/active_record_survey/node/question_spec.rb

@@ -160,7 +160,7 @@ describe ActiveRecordSurvey::Node::Question, :question_spec => true do
 				}
 			end
 		end
-		describe "advanced case", :focus => true  do
+		describe "advanced case" do
 			before(:each) do
 				@survey = FactoryGirl.build(:basic_survey2)
 				@survey.save

metadata

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