text_based_nested_set 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801c7e1b6c9348f8d13efbde0c51d6cf76b85287
-  data.tar.gz: 148ad9c927c282fcd9568b97db9bdc44a474f634
+  metadata.gz: c72f8e427941cd6feea390a265b733a43abb67d5
+  data.tar.gz: 9f53448a0eeac510ca11ec8bb7810113f11542bc
 SHA512:
-  metadata.gz: 4ec694a77e0dc41ff0af8c5fb97ce857bc3f61e313a5e4a8c8e8b0a31d564e5c09efbb125784d9deff3a7a93c7331059f46bdcde3d89771f03922e2ec3cb408b
-  data.tar.gz: 00a489336c447a164b5e3a20ba70477b917dad493fda790ed05cf005b9a9cd88380e9849aade04a31d9fef498782e99e09062c3c46f3e06fb040229ac7fa5e1c
+  metadata.gz: 3345259666272c83c3bcf68cf6c72a6c68200d5d08199acbbb786d601b7d9e312ea611b66a71edb60b67ba453cd39d8e8215295c8442d319f6840f5669be1448
+  data.tar.gz: b11900f37074b7415ef373bfd728e33bf443b9fb08a852e0f867522fbba1bbf5423ba42d78658b5f99e6a4c99a093fb101966afc727ae3548b7a6cafe12a6832

data/lib/text_based_nested_set/model.rb

@@ -151,7 +151,7 @@ module BeyondAlbert
 
         def descendants
           descendants_path = self.path + self.id.to_s + '/%'
-          current_class.where("path LIKE ?", descendants_path)
+          current_class.where("path LIKE ?", descendants_path).order("LENGTH(path) ASC, position ASC")
         end
 
         def right_sibling

data/lib/text_based_nested_set/version.rb

@@ -1,3 +1,3 @@
 module TextBasedNestedSet
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/text_based_nested_set_spec.rb

@@ -7,18 +7,18 @@ describe 'TextBasedNestedSet' do
     #  |__child_1(2)
     #  |     |__child_1_1(4)
     #  |     |     |__child_1_1_1(7)
-    #  |     |__child_1_2(5)
-    #  |     |     |__child_1_2_1(8)
-    #  |     |__child_1_3(6)
-    #  |__child_2(3) 
+    #  |     |__child_1_2(6)
+    #  |     |     |__child_1_2_1(3)
+    #  |     |__child_1_3(5)
+    #  |__child_2(8) 
     @root = create(:category, id: 1, parent_id: 0, path: "/0/", position: 0)
     @child_1 = create(:category, id: 2, name: "child_1", parent_id: 1, path: "/0/1/", position: 0)
-    @child_2 = create(:category, id: 3, name: "child_2", parent_id: 1, path: "/0/1/", position: 1)
-    @child_1_1 = create(:category, id: 4, name: "child_1_1", parent_id: 2, path: "/0/1/2/", position: 0)
-    @child_1_2 = create(:category, id: 5, name: "child_1_2", parent_id: 2, path: "/0/1/2/", position: 1)
-    @child_1_3 = create(:category, id: 6, name: "child_1_3", parent_id: 2, path: "/0/1/2/", position: 2)
+    @child_2 = create(:category, id: 8, name: "child_2", parent_id: 1, path: "/0/1/", position: 1)
+    @child_1_1 = create(:category, id: 4, name: "child_1_1", parent_id: 2, path: "/0/1/2/", position: 0)    
+    @child_1_2 = create(:category, id: 6, name: "child_1_2", parent_id: 2, path: "/0/1/2/", position: 1)
+    @child_1_3 = create(:category, id: 5, name: "child_1_3", parent_id: 2, path: "/0/1/2/", position: 2)
     @child_1_1_1 = create(:category, id: 7, name: "child_1_1_1", parent_id: 4, path: "/0/1/2/4/", position: 0)	
-    @child_1_2_1 = create(:category, id: 8, name: "child_1_2_1", parent_id: 5, path: "/0/1/2/5/", position: 0)
+    @child_1_2_1 = create(:category, id: 3, name: "child_1_2_1", parent_id: 6, path: "/0/1/2/6/", position: 0)
   end
 
   describe 'move_to_root' do
@@ -33,7 +33,7 @@ describe 'TextBasedNestedSet' do
       expect(@child_1_2.position).to eq(0)
       expect(@child_1_1.position).to eq(0)
       expect(@child_1_3.position).to eq(1)
-      expect(@child_1_2_1.path).to eq("/0/5/")
+      expect(@child_1_2_1.path).to eq("/0/6/")
       expect(@child_1.descendants).to eq([@child_1_1, @child_1_3, @child_1_1_1])
     end
   end
@@ -50,7 +50,7 @@ describe 'TextBasedNestedSet' do
       expect(@child_1_2.position).to eq(1)
       expect(@child_2.position).to eq(2)
       expect(@child_1_3.position).to eq(1)
-      expect(@child_1_2_1.path).to eq('/0/1/5/')
+      expect(@child_1_2_1.path).to eq('/0/1/6/')
     end
   end
 
@@ -80,7 +80,7 @@ describe 'TextBasedNestedSet' do
       expect(@child_1_2.path).to eq('/0/1/2/4/')
       expect(@child_1_2.position).to eq(1)
       expect(@child_1_3.position).to eq(1)
-      expect(@child_1_2_1.path).to eq('/0/1/2/4/5/')
+      expect(@child_1_2_1.path).to eq('/0/1/2/4/6/')
     end
   end
 
@@ -114,8 +114,8 @@ describe 'TextBasedNestedSet' do
 
   describe 'descendants' do
     it "should return current node's all descendants" do
-      expect(@child_1.descendants).to eq([@child_1_1, @child_1_2, @child_1_3, @child_1_1_1, @child_1_2_1])
-      expect(@root.descendants).to eq([@child_1, @child_2, @child_1_1, @child_1_2, @child_1_3, @child_1_1_1, @child_1_2_1])
+      expect(@child_1.descendants).to eq([@child_1_1, @child_1_2, @child_1_3, @child_1_2_1, @child_1_1_1])
+      expect(@root.descendants).to eq([@child_1, @child_2, @child_1_1, @child_1_2, @child_1_3, @child_1_2_1, @child_1_1_1])
     end
   end
 
@@ -194,7 +194,7 @@ describe 'TextBasedNestedSet' do
     it 'should destroy descendants when itself be destroyed' do
       @child_1.destroy
       expect(Category.find_by_id(4)).to eq(nil)
-      expect(Category.find_by_id(3).name).to eq('child_2')
+      expect(Category.find_by_id(8).name).to eq('child_2')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: text_based_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - beyondalbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler