acts_as_many_trees 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb8cb8fc8407e775471c6e4ebfd45f594a7f7dc
-  data.tar.gz: c97fbb287fa63b841e513e7ec2f2e084c02d5fee
+  metadata.gz: fd3f337c1418d33c73887add48d5bec679c4dc93
+  data.tar.gz: a6e945638bc2e2351b76aa196a55c3e42a29f00c
 SHA512:
-  metadata.gz: 8e75e496a3ffdf8df6ba1f40051239c9d82f5354e5f12ee35b42316c435be014fb15d8690ecb4d1b39681514628f0fa20ef12d9f975aeaf3d4ef31e5999546ae
-  data.tar.gz: f637a0a366f57560efa691fa86a58f8ddb800e21ac437c34ac194d3b663d31da74e6acba57e23087bc852aa28e147e0f2e6a75b1585b49097b44de8153ee2199
+  metadata.gz: 9ea378e205fa97476047c31a321d1af3a5ba268ce2152e1cb7e5de7e98db79461ede251b36503aac1d5cef484081eeb7f02b6108ec0d94ebde1e7b3aca5d588f
+  data.tar.gz: 0df35bdfc480744e0f89d2f48f666c86415e171946ff6e00ee07d18eb06518c4a0bf2565579bbac7e88028402953ad61f5c49d5fba64ee4f327eedbf1c933f3c

data/lib/acts_as_many_trees/base.rb

@@ -25,16 +25,19 @@ module ActsAsManyTrees
     extend ActiveSupport::Concern
     included do
       has_many :unscoped_descendant_links,
+        ->{order(:position)},
         class_name:hierarchy_class.to_s,
         foreign_key: 'ancestor_id',
         dependent: :delete_all,
         inverse_of: :unscoped_ancestor
 
       has_many :unscoped_ancestor_links,
+        ->{order(:position)},
         class_name: hierarchy_class.to_s,
         foreign_key: 'descendant_id',
         dependent: :delete_all,
         inverse_of: :unscoped_descendant
+
       has_many :unscoped_ancestors,through: :unscoped_ancestor_links
       has_many :unscoped_descendants, through: :unscoped_descendant_links
       scope :roots , ->(hierarchy=''){
@@ -42,18 +45,31 @@ module ActsAsManyTrees
                                  .and(hierarchy_class.arel_table[:hierarchy_scope].eq(hierarchy))
                                 )
         outer_join = Arel::Nodes::OuterJoin.new(hierarchy_class.arel_table,on)
-        joins(outer_join).merge(hierarchy_class.where(ancestor_id: nil))
+        joins(outer_join).merge(hierarchy_class.where(generation: 0))
       }
     end
     delegate :hierarchy_class, to: :class
-    def parent=(new_parent,hierarchy_scope='')
-      hierarchy_class.set_parent_of(self,new_parent,hierarchy_scope)
+    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] || ''
+      else
+        new_parent=inpt_parent
+        hierarchy_scope = ''
+      end  
+      hierarchy_class.set_parent_of(self,new_parent,hierarchy_scope,after_node,before_node)
     end
 
     def set_parent(new_parent,hierarchy_scope='')
       hierarchy_class.set_parent_of(self,new_parent,hierarchy_scope)
     end
 
+    def add_child(new_child,hierarchy_scope='')
+      hierarchy_class.set_parent_of(new_child,self,hierarchy_scope)
+    end
+
     def parent(hierarchy_scope='')
       ancestors(hierarchy_scope).where('generation=1').first
     end
@@ -62,6 +78,15 @@ module ActsAsManyTrees
       descendants(hierarchy_scope).where('generation=1')
     end
 
+    def siblings(hierarchy_scope='')
+        parent(hierarchy_scope).children(hierarchy_scope).where.not(id: id)
+    end
+
+    def self_and_siblings(hierarchy_scope='')
+        parent(hierarchy_scope).children(hierarchy_scope)
+    end
+
+
     def ancestors(hierarchy='')
       unscoped_ancestors.merge(hierarchy_class.scope_hierarchy(hierarchy))
     end

data/lib/acts_as_many_trees/hierarchy_table.rb

@@ -1,4 +1,4 @@
-
+require 'bigdecimal'
 module ActsAsManyTrees
   module HierarchyTable 
     extend ActiveSupport::Concern
@@ -25,26 +25,27 @@ module ActsAsManyTrees
         t1 = arel_table
         t2 = arel_table.alias
         t1.project(Arel::star).join(t2,Arel::Nodes::OuterJoin)
-          .on(t1[:ancestor_id]
-          .eq(t2[:descendant_id])
-          .and(t1[:hierarchy_scope].eq(t2[:hierarchy_scope])
-              )
-             )
-          .where(t2[:ancestor_id].eq(nil)
+        .on(t1[:ancestor_id]
+            .eq(t2[:descendant_id])
+            .and(t1[:hierarchy_scope].eq(t2[:hierarchy_scope])
                 )
-             
+           )
+        .where(t2[:ancestor_id].eq(nil)
+              )
+
       end
 
-      def self.set_parent_of(item,new_parent,hierarchy_scope='')
-        self.delete_ancestors(item,hierarchy_scope)
-        self.fill_in_ancestors_for(new_parent,item,hierarchy_scope)
-        self.delete_ancestors_of_item_children(item,hierarchy_scope)
-        self.set_new_ancestors_of_item_children(item,hierarchy_scope)
+      def self.set_parent_of(item,new_parent,hierarchy_scope='',after_node=nil,before_node=nil)
+        self.delete_ancestors(item,hierarchy_scope) if item
+        self.fill_in_parent_for(new_parent,item,hierarchy_scope,after_node,before_node) if item || new_parent
+        self.fill_in_ancestors_for(new_parent,item,hierarchy_scope) if item && new_parent
+        self.delete_ancestors_of_item_children(item,hierarchy_scope) if item
+        self.set_new_ancestors_of_item_children(item,hierarchy_scope) if item
       end
 
       private
       def self.delete_ancestors(item,hierarchy_scope)
-        delete_all(descendant_id: item.id,hierarchy_scope: hierarchy_scope)
+        delete_all(descendant_id: item.id,hierarchy_scope: hierarchy_scope )
       end
 
       def self.delete_ancestors_of_item_children(item,hierarchy_scope)
@@ -61,8 +62,8 @@ module ActsAsManyTrees
 
       def self.set_new_ancestors_of_item_children(item,hierarchy_scope)
         sql=<<-SQL
-       insert into #{table_name}(ancestor_id,descendant_id,generation,hierarchy_scope)
-       select it.ancestor_id,ct.descendant_id,it.generation+ct.generation,it.hierarchy_scope 
+       insert into #{table_name}(ancestor_id,descendant_id,generation,hierarchy_scope,position)
+       select it.ancestor_id,ct.descendant_id,it.generation+ct.generation,ct.hierarchy_scope,ct.position 
        from #{table_name} it 
        join #{table_name} ct 
        on ct.ancestor_id = it.descendant_id
@@ -73,19 +74,65 @@ module ActsAsManyTrees
         connection.execute(sql)
       end
 
+      def self.fill_in_parent_for(new_parent,item,hierarchy_scope='',after_node=nil,before_node=nil)
+        if new_parent
+          p_rec = find_by(descendant_id: new_parent.id,hierarchy_scope: hierarchy_scope)
+          unless p_rec
+            p_rec=create!(ancestor_id: new_parent.id,descendant_id: new_parent.id,hierarchy_scope: hierarchy_scope,generation:0,position:Random.rand(1000000))
+          end
+          #          p "p_rec.position = #{p_rec.position}"
+          a_rec = nil
+          if after_node
+            a_rec = after_node
+            a_rec_h = find_by(ancestor_id: new_parent.id, descendant_id:a_rec.id,hierarchy_scope: hierarchy_scope)
+            a_rec_pos = a_rec_h.position
+          elsif new_parent.children.last
+            a_rec = new_parent.children.last
+            a_rec_h = find_by(ancestor_id: new_parent.id, descendant_id:a_rec.id,hierarchy_scope: hierarchy_scope)
+            a_rec_pos = a_rec_h.position
+          else
+            a_rec_pos = p_rec.position
+          end
+
+          if before_node 
+            b_rec = find_by(descendant_id: before_node.id,hierarchy_scope: hierarchy_scope,generation: 1)
+            if b_rec
+              b_position = b_rec.position
+            end
+          end
+          if b_position && !after_node
+            #            p "b_position #{b_position} parent position #{p_rec.position}"
+            new_position = (Random.rand(10)*(b_position - p_rec.position)/11)+p_rec.position
+          elsif b_position && after_node
+            #            p "b_position #{b_position}  after position #{a_rec_pos}"
+            new_position = (Random.rand(10)*(b_position - a_rec_pos)/11)+a_rec_pos
+          else
+            new_position = a_rec_pos + Random.rand(1000000)
+          end
+          #create(ancestor_id: item.id,descendant_id: item.id,hierarchy_scope: hierarchy_scope,position:new_position,generation:0)
+          if item
+            #          p "id = #{item.id} position=#{new_position}"
+            create(ancestor_id: new_parent.id,descendant_id: item.id,generation: 1,hierarchy_scope: hierarchy_scope,position:new_position)
+          end
+        end
+      end
+
       def self.fill_in_ancestors_for(new_parent,item,hierarchy_scope)
         if new_parent
-          create(ancestor_id: new_parent.id,descendant_id: item.id,generation: 1,hierarchy_scope: hierarchy_scope)
           sql=<<-SQL
-       insert into #{table_name}(ancestor_id,descendant_id,generation,hierarchy_scope)
-       select it.ancestor_id,#{item.id},it.generation+1,it.hierarchy_scope
+       insert into #{table_name}(ancestor_id,descendant_id,generation,hierarchy_scope,position)
+       select it.ancestor_id,new_itm.descendant_id,it.generation+1,it.hierarchy_scope,new_itm.position
        from #{table_name} it 
-       where it.descendant_id=#{new_parent.id}
+       join #{table_name} new_itm on it.descendant_id = new_itm.ancestor_id and it.hierarchy_scope=new_itm.hierarchy_scope
+       where new_itm.ancestor_id=#{new_parent.id}
+       and new_itm.descendant_id=#{item.id}
+       and (it.ancestor_id <> it.descendant_id)
        and it.hierarchy_scope = '#{hierarchy_scope}'
           SQL
           ActiveRecord::Base.connection.execute(sql)
         end
       end
+
     end
   end
 end

data/lib/acts_as_many_trees/version.rb

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

data/lib/generators/acts_as_many_trees/templates/create_hierarchies_table.rb.erb

@@ -1,4 +1,5 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
+  #[TO DO], if schema_plus is installed then we have to change the table the foreign keys look for
   def change
     create_table :<%= hierarchy_table_name %>, id: false do |t|
       t.integer :ancestor_id, null: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_many_trees
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Small