acts_as_many_trees 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2620efb1d266d8fe57de7129309644e9864ea88
-  data.tar.gz: d7ae058f539b0c00f30417ca532050faf35e9f61
+  metadata.gz: efa129f338ec6582601314bec7c0c121eed62ea1
+  data.tar.gz: e424e02dd6da7331ae1453c622be5b52ccb2c975
 SHA512:
-  metadata.gz: e6837514c1ccbcb8bafdd2a3ba2c165de3e3d53ccbef3ecf3d47d414a770cd42c9520f041da4196b0ac96cce1d7217ffd929a8dc04cce8081c85037a83d701ac
-  data.tar.gz: f27e589126d637662cf2e6bbb3a80595cd4d95e83791a8593493f4fc33322aa271f1b629fc3093039edf5dfed9ce454f03fe512f857671401ab5fff199e13603
+  metadata.gz: f4589e5f43d8d3897938598b08cfa217f300dd5a9dc1c59b843ff7490bd416e6be668cc6cfb1f2f0bdc428af9cbc373b715b873d21ae2fca80b2430763542c93
+  data.tar.gz: 0b5723cb07c17feccc683a08dbe531c433fa5aabfa1ca945231bfe4023a952fd0446a260e7b76107dec214c2bc5966b2893f590cc24c1ff6e9023b63737c7937

data/lib/acts_as_many_trees/base.rb

@@ -20,6 +20,11 @@ module ActsAsManyTrees
     def hierarchy_table_name
       hierarchy_class.table_name
     end
+
+    def default_tree_name
+      ''
+    end
+
   end
   module InstanceMethods
     extend ActiveSupport::Concern
@@ -55,9 +60,9 @@ module ActsAsManyTrees
          :source=>:item_siblings
         }
 
-        scope :roots , ->(hierarchy=''){
+        scope :roots , ->(tree_name=self.default_tree_name){
           on = Arel::Nodes::On.new(Arel::Nodes::Equality.new(arel_table[:id],hierarchy_class.arel_table[:descendant_id])
-                                   .and(hierarchy_class.arel_table[:hierarchy_scope].eq(hierarchy))
+                                   .and(hierarchy_class.arel_table[:hierarchy_scope].eq(tree_name))
                                    .and(hierarchy_class.arel_table[:generation].not_eq(0))
                                   )
           outer_join = Arel::Nodes::OuterJoin.new(hierarchy_class.arel_table,on)
@@ -66,47 +71,52 @@ module ActsAsManyTrees
         scope :not_this,->(this_id) { where.not(id: this_id)}
     end
     delegate :hierarchy_class, to: :class
+    #can be over-ridden in the instance 
+    def default_tree_name
+      ''
+    end
+
     def parent=(inpt_parent)
       if inpt_parent.is_a?(Hash)
         new_parent=inpt_parent[:new_parent]
         after_node=inpt_parent[:after_node] 
         before_node=inpt_parent[:before_node] 
-        hierarchy_scope=inpt_parent[:hierarchy_scope] || ''
+        tree_name=inpt_parent[:tree_name] || ''
       else
         new_parent=inpt_parent
         after_node=inpt_parent.children.last unless inpt_parent.nil?
         before_node=inpt_parent.next_sibling unless inpt_parent.nil?
-        hierarchy_scope = ''
+        tree_name = inpt_parent ? inpt_parent.default_tree_name : self.default_tree_name
       end  
-      hierarchy_class.set_parent_of(self,new_parent,hierarchy_scope,after_node,before_node)
+      hierarchy_class.set_parent_of(self,new_parent,tree_name,after_node,before_node)
     end
 
-    def set_parent(new_parent,hierarchy_scope='')
-      hierarchy_class.set_parent_of(self,new_parent,hierarchy_scope)
+    def set_parent(new_parent,tree_name=self.default_tree_name)
+      hierarchy_class.set_parent_of(self,new_parent,tree_name)
     end
 
-    def add_child(new_child,hierarchy_scope='')
-      hierarchy_class.set_parent_of(new_child,self,hierarchy_scope)
+    def add_child(new_child,tree_name=self.default_tree_name)
+      hierarchy_class.set_parent_of(new_child,self,tree_name)
     end
 
-    def parent(hierarchy_scope='')
-      ancestors(hierarchy_scope).where('generation=1').first
+    def parent(tree_name=self.default_tree_name)
+      ancestors(tree_name).where('generation=1').first
     end
 
-    def children(hierarchy_scope='')
-      descendants(hierarchy_scope).where('generation=1')
+    def children(tree_name=self.default_tree_name)
+      descendants(tree_name).where('generation=1')
     end
 
-    def self_and_ancestors(hierarchy='')
-      unscoped_ancestors.merge(hierarchy_class.scope_hierarchy(hierarchy))
+    def self_and_ancestors(tree_name=self.default_tree_name)
+      unscoped_ancestors.merge(hierarchy_class.scope_hierarchy(tree_name))
     end
 
-    def ancestors(hierarchy='')
-      self_and_ancestors(hierarchy).not_this(self.id)
+    def ancestors(tree_name=self.default_tree_name)
+      self_and_ancestors(tree_name).not_this(self.id)
     end
 
-    def self_and_descendants(hierarchy='')
-      unscoped_descendants.merge(hierarchy_class.scope_hierarchy(hierarchy))
+    def self_and_descendants(tree_name=self.default_tree_name)
+      unscoped_descendants.merge(hierarchy_class.scope_hierarchy(tree_name))
     end
 
     def siblings
@@ -121,12 +131,12 @@ module ActsAsManyTrees
       siblings_after.first
     end
 
-    def descendants(hierarchy='')
-      self_and_descendants(hierarchy).not_this(self.id)
+    def descendants(tree_name=self.default_tree_name)
+      self_and_descendants(tree_name).not_this(self.id)
     end
 
-    def position(hierarchy='')
-       unscoped_ancestor_links.where(ancestor_id: id,hierarchy_scope: hierarchy).first.position
+    def position(tree_name=self.default_tree_name)
+       unscoped_ancestor_links.where(ancestor_id: id,hierarchy_scope: tree_name).first.position
     end
   end
 end

data/lib/acts_as_many_trees/version.rb

@@ -1,3 +1,3 @@
 module ActsAsManyTrees
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_many_trees
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - John Small
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails