ancestry 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c70fafe20e537ed6cb98a60e671dc01fd540ac
-  data.tar.gz: 583d3382374a761c553d99329f71be36ac423222
+  metadata.gz: a5bb7b7759117d88e5bec4658c6c4d691549f606
+  data.tar.gz: 0314da6d13466c30a6d21252083f37bbf5304bc5
 SHA512:
-  metadata.gz: 55df9269223d805cd09f8fb87b5e0a25cad36aaad892e3527217cd086e15c6105e5552c0d7cd108645fe9a947712986a0885252f4b71a861eec1525be374f0b7
-  data.tar.gz: 3f8ea178c2f3cc918ddd1fb79f8af4e3b8ed63704cd764bed42d8fb79da3b5316ab7160871eade25f8af9aac3bb004a298abc59f17e5b9759085c1ef8eb3c41d
+  metadata.gz: 2bcd4bc5dcf11e3aab9242990a98aefb18bdbb6c7de506d501689de9514ed664467d008037f5699dde52ebe4c5e27e655682d243c6b6fbd394e48eb40766906f
+  data.tar.gz: 7eddc0d2e5e9a46e7e8404b7447681f0205c7fa7db4075a410c73301cd31ce99988e0087b217a3cd0d7491411c4457e83628d41baf39489038af5ae87a00ec54

data/lib/ancestry/class_methods.rb

@@ -27,32 +27,27 @@ module Ancestry
       end
     end
 
-    # Arrangement
+    # Get all nodes and sorting them into an empty hash
     def arrange options = {}
-      # Get all nodes ordered by ancestry and start sorting them into an empty hash
-      arrange_nodes self.ancestry_base_class.reorder(options.delete(:order)).where(options)
+      if (order = options.delete(:order))
+        arrange_nodes self.ancestry_base_class.order(order).where(options)
+      else
+        arrange_nodes self.ancestry_base_class.where(options)
+      end
     end
 
     # Arrange array of nodes into a nested hash of the form
     # {node => children}, where children = {} if the node has no children
+    # If a node's parent is not included, the node will be included as if it is a top level node
     def arrange_nodes(nodes)
-      arranged = ActiveSupport::OrderedHash.new
-      min_depth = Float::INFINITY
-      index = Hash.new { |h, k| h[k] = ActiveSupport::OrderedHash.new }
+      node_ids = Set.new(nodes.map(&:id))
+      index = Hash.new { |h, k| h[k] = {} }
 
-      nodes.each do |node|
+      nodes.each_with_object({}) do |node, arranged|
         children = index[node.id]
         index[node.parent_id][node] = children
-
-        depth = node.depth
-        if depth < min_depth
-          min_depth = depth
-          arranged.clear
-        end
-        arranged[node] = children if depth == min_depth
+        arranged[node] = children unless node_ids.include?(node.parent_id)
       end
-
-      arranged
     end
 
      # Arrangement to nested array
@@ -221,7 +216,7 @@ module Ancestry
         if defined?(@primary_key_is_an_integer)
           @primary_key_is_an_integer
         else
-          @primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(type_for_attribute(primary_key))
+          @primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(type_for_attribute(primary_key).type)
         end
       end
     end

data/lib/ancestry/version.rb

@@ -1,3 +1,3 @@
 module Ancestry
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord