nobrainer-tree 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7bca7cff2679bd8fbd69bc4ccdbeba8e59f50d
-  data.tar.gz: 75eae734d058953c9e63840e07176b1e325defde
+  metadata.gz: 8b0da9c069f27d701c609229cb9314bb700bd7b0
+  data.tar.gz: acd265d5bb336c210235e4dbc9a254fb16f28680
 SHA512:
-  metadata.gz: 3149e67069144dfd3bf675501c7d8ce41f7eb33e152396e07ff14b8cdce77d722f258a3212a6106b536b9ddbf3d34177062916c985b2ae4c0c78d3a030dd8799
-  data.tar.gz: 3eb4a08d9067691283368b9cc04e04f1a64c947366ad7902ae5ffb11e6a4a721ee7a5b40d3a7051e186c2f0e46902eea6b345b96ff34b8c58563a25ae2b54b03
+  metadata.gz: 61d96c610a56e8b9358ee506118125d16a4b6c8564462c6a38e5b8a3ed721e921f684356610befd7f71d08e247b923320ed3efe4098faab683d00314f605dbea
+  data.tar.gz: fd9d8dcee8cc0d7e2cbd7c490e7fcacc9f7c98bc545dc7b6e09bee97e948619921fdafa4b8bdebb1949c0ff2e200bcf774e959ac1440a59d04dc37c1c977d810

data/lib/nobrainer/tree.rb

@@ -86,8 +86,6 @@ module NoBrainer
 
     included do
       has_many :children, :class_name => self.name, :foreign_key => :parent_id
-
-      # TODO: Use index when nil is allowed in index queries
       belongs_to :parent, :class_name => self.name
 
       field :parent_ids, :type => Array, :default => []
@@ -132,7 +130,7 @@ module NoBrainer
       #
       # @return [NoBrainer::Criteria] NoBrainer criteria to retrieve all root documents
       def roots
-        where(:parent_id => nil)
+        where(:or => [:parent_id.defined => false, :parent_id => nil])
       end
 
       ##

data/lib/nobrainer/tree/ordering.rb

@@ -35,7 +35,7 @@ module NoBrainer
       included do
         field :position, :type => Integer
 
-        default_scope -> { order_by(:position => :asc) }
+        default_scope -> { order_by(:depth => :asc, :position => :asc) }
 
         before_save :assign_default_position,    :if => :assign_default_position?
         before_save :reposition_former_siblings, :if => :sibling_reposition_required?
@@ -44,7 +44,6 @@ module NoBrainer
 
       def inc(increments)
         update(increments.symbolize_keys.map{ |field, value| { field => (self[field] || 0) + value } }.first)
-        self
       end
 
       ##
@@ -52,7 +51,7 @@ module NoBrainer
       #
       # @return [NoBrainer::Criteria] NoBrainer criteria to retrieve the document's ancestors
       def ancestors
-        base_class.unscoped.without_index.where(:id.in => self.parent_ids).order_by(:depth => :asc)
+        base_class.without_index.unscoped.where(:id.in => self.parent_ids).order_by(:depth => :asc)
       end
 
       ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer-tree
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Steven Eksteen