acts_as_dag 1.2.2 → 1.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3d531050423c7ca9be51544e54596e0310b96b2c
+  data.tar.gz: a0ec98ace714701dec05881502ffa834646d9fab
+SHA512:
+  metadata.gz: c618e157390becaede12d0065b237945852cb3d64f5e4400933c10748e64a32bb80b1ecddc7245545b8dacea0c52d996ad74206440001c371f114ec821c55e64
+  data.tar.gz: 59fb1e46422ff35ec92c13b3877be868ce044ce4c50011b3a55f992877bd4965c109076937eb92e5effbf9717803145f872a99d2495e4659c21773c2c19ea66a

data/lib/acts_as_dag/acts_as_dag.rb

@@ -75,7 +75,7 @@ module ActsAsDAG
       after_create :initialize_descendants
 
       extend ActsAsDAG::ClassMethods
-      include ActsAsDAG::InstanceMethods      
+      include ActsAsDAG::InstanceMethods
     end
   end
 
@@ -88,7 +88,7 @@ module ActsAsDAG
     # Can pass a list of categories and only those will be reorganized
     def reorganize(categories_to_reorganize = self.all)
       return if categories_to_reorganize.empty?
-      
+
       reset_hierarchy(categories_to_reorganize)
 
       word_count_groups = categories_to_reorganize.group_by{|category| ActsAsDAG::HelperMethods.word_count(category)}.sort
@@ -101,16 +101,16 @@ module ActsAsDAG
 
         # Try drop each category into each root
         categories.sort_by(&:name).each do |category|
-          start = Time.now
-          suitable_parent = false
-          roots_categories.each do |root|
-            suitable_parent = true if ActsAsDAG::HelperMethods.plinko(root, category)
-          end
-          unless suitable_parent
-            ActiveRecord::Base.logger.info { "Plinko couldn't find a suitable parent for #{category.name}" }
-            categories_with_no_parents << category       
+          ActiveRecord::Base.benchmark "Analyze #{category.name}" do
+            suitable_parent = false
+            roots_categories.each do |root|
+              suitable_parent = true if ActsAsDAG::HelperMethods.plinko(root, category)
+            end
+            unless suitable_parent
+              ActiveRecord::Base.logger.info { "Plinko couldn't find a suitable parent for #{category.name}" }
+              categories_with_no_parents << category
+            end
           end
-          puts "took #{Time.now - start} to analyze #{category.name}"
         end
 
         # Add all categories from this group without suitable parents to the roots
@@ -136,7 +136,7 @@ module ActsAsDAG
         category.send :initialize_links
         category.send :initialize_descendants
       end
-    end    
+    end
   end
 
   module InstanceMethods
@@ -145,6 +145,13 @@ module ActsAsDAG
       self.class.roots.exists? self
     end
 
+    def make_root
+      ancestor_links.delete_all
+      parent_links.delete_all
+      send :initialize_links
+      send :initialize_descendants
+    end
+
     # Adds a category as a parent of this category (self)
     def add_parent(parent)
       ActsAsDAG::HelperMethods.link(parent, self)
@@ -207,7 +214,7 @@ module ActsAsDAG
     def self.plinko(current, other)
       # ActiveRecord::Base.logger.info { "Plinkoing '#{other.name}' into '#{current.name}'..." }
       if should_descend_from?(current, other)
-        # Find the descendants of the current category that +other+ should descend from 
+        # Find the descendants of the current category that +other+ should descend from
         descendants_other_should_descend_from = current.descendants.select{|descendant| should_descend_from?(descendant, other) }
         # Of those, find the categories with the most number of matching words and make +other+ their child
         # We find all suitable candidates to provide support for categories whose names are permutations of each other
@@ -219,7 +226,7 @@ module ActsAsDAG
             other.add_parent(new_parent)
 
             # We've just affected the associations in ways we can not possibly imagine, so let's clear the association cache
-            current.clear_association_cache 
+            current.clear_association_cache
           end
           return true
         end
@@ -235,8 +242,8 @@ module ActsAsDAG
           unless plinko(current, category)
           end
         end
-      end    
-    end    
+      end
+    end
 
     # Returns the portion of this category's name that is not present in any of it's parents
     def self.unique_name_portion(current)
@@ -331,7 +338,7 @@ module ActsAsDAG
       #                 A   F
       #                / \ /
       #               B   C
-      #               |   
+      #               |
       #               |   D
       #                \ /
       #                 E
@@ -350,7 +357,7 @@ module ActsAsDAG
 
     # Create a descendant link to iteself, then iterate through all children
     # We add this node to the ancestor array we received
-    # Then we create a descendant link between it and all nodes in the array we were passed (nodes traversed between it and all its ancestors affected by the unlinking).          
+    # Then we create a descendant link between it and all nodes in the array we were passed (nodes traversed between it and all its ancestors affected by the unlinking).
     # Then iterate to all children of the current node passing the ancestor array along
     def self.rebuild_descendant_links(current, ancestors = [])
       indent = Array.new(ancestors.size, "  ").join
@@ -392,4 +399,4 @@ module ActsAsDAG
 
     validates_presence_of :ancestor_id, :descendant_id
   end
-end
+end

data/spec/acts_as_dag_spec.rb

@@ -5,7 +5,7 @@ describe 'acts_as_dag' do
     before(:each) do
       @klass.destroy_all # Because we're using sqlite3 and it doesn't support transactional specs (afaik)
     end
-    
+
     describe "and" do
       before(:each) do
         @grandpa = @klass.create(:name => 'grandpa')
@@ -81,7 +81,7 @@ describe 'acts_as_dag' do
 
         @grandpa.descendants.should == [@grandpa, @dad, @child]
       end
-      
+
       it "should be able to test descent" do
         @dad.add_child(@child)
         @grandpa.add_child(@dad)
@@ -95,13 +95,40 @@ describe 'acts_as_dag' do
       it "should be a root node immediately after saving" do
         @grandpa.parents.should be_empty
         @grandpa.root?.should be_true
-      end      
+      end
 
       it "should be a child if it has a parent" do
         @grandpa.add_child(@dad)
         @grandpa.add_child(@mom)
         @klass.children.order(:id).should == [@dad, @mom]
-      end      
+      end
+    end
+
+    context "when a record hierarchy exists" do
+      before(:each) do
+        @grandma = @klass.create(:name => 'grandma')
+        @mom = @klass.create(:name => 'mom')
+        @brother = @klass.create(:name => 'brother')
+
+        @grandma.add_child(@mom)
+        @mom.add_child(@brother)
+      end
+
+      it "destroying a record should delete the associated hierarchy-tracking records " do
+        @mom.destroy
+        @mom.descendant_links.should be_empty
+        @mom.ancestor_links.should be_empty
+        @mom.parent_links.should be_empty
+        @mom.child_links.should be_empty
+      end
+
+      it "make_root should make the record a root, but maintain it's children" do
+        @mom.make_root
+
+        @mom.should be_root
+        @mom.parents.should be_empty
+        @mom.children.should be_present
+      end
     end
 
     describe "reorganization" do
@@ -110,7 +137,7 @@ describe 'acts_as_dag' do
         @totem_pole = @klass.create(:name => "totem pole")
         @big_totem_pole = @klass.create(:name => "big totem pole")
         @big_model_totem_pole = @klass.create(:name => "big model totem pole")
-        @big_red_model_totem_pole = @klass.create(:name => "big red model totem pole")      
+        @big_red_model_totem_pole = @klass.create(:name => "big red model totem pole")
       end
 
       it "should reinitialize links and descendants after resetting the hierarchy" do
@@ -121,18 +148,18 @@ describe 'acts_as_dag' do
         @big_totem_pole.descendants.should == [@big_totem_pole]
       end
 
-      it "should be able to determine whether one category is an ancestor of the other by inspecting the name" do 
+      it "should be able to determine whether one category is an ancestor of the other by inspecting the name" do
         ActsAsDAG::HelperMethods.should_descend_from?(@totem_pole, @big_totem_pole).should be_true
         ActsAsDAG::HelperMethods.should_descend_from?(@big_totem_pole, @totem_pole).should be_false
       end
 
-      it "should be able to determine the number of matching words in two categories names" do 
+      it "should be able to determine the number of matching words in two categories names" do
         ActsAsDAG::HelperMethods.matching_word_count(@totem_pole, @big_totem_pole).should == 2
       end
 
       it "should arrange the categories correctly when not passed any arguments" do
         @klass.reorganize
-        
+
         @totem.children.should == [@totem_pole]
         @totem_pole.children.should == [@big_totem_pole]
         @big_totem_pole.children.should == [@big_model_totem_pole]
@@ -141,7 +168,7 @@ describe 'acts_as_dag' do
 
       it "should arrange the categories correctly when passed a set of nodes to reorganize" do
         @klass.reorganize [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole]
-        
+
         @totem.reload.children.should == [@totem_pole]
         @totem_pole.reload.children.should == [@big_totem_pole]
         @big_totem_pole.reload.children.should == [@big_model_totem_pole]
@@ -158,7 +185,7 @@ describe 'acts_as_dag' do
         @big_totem_pole.children.should == [@big_model_totem_pole]
         @big_model_totem_pole.reload.children.should == [@big_red_model_totem_pole]
       end
-    
+
       it "should still work when there are categories that are permutations of each other" do
         @big_totem_pole_model = @klass.create(:name => "big totem pole model")
 
@@ -169,7 +196,7 @@ describe 'acts_as_dag' do
         (@big_totem_pole.children - [@big_model_totem_pole, @big_totem_pole_model]).should == []
         @big_model_totem_pole.reload.children.should == [@big_red_model_totem_pole]
         @big_totem_pole_model.reload.children.should == [@big_red_model_totem_pole]
-      end  
+      end
 
       describe "when there is a single long inheritance chain" do
         before(:each) do
@@ -195,14 +222,14 @@ describe 'acts_as_dag' do
           end
 
           it "should return multiple instances of descendants before breaking the old link" do
-            @totem.descendants.sort_by(&:id).should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole, @big_red_model_totem_pole].sort_by(&:id)        
+            @totem.descendants.sort_by(&:id).should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole, @big_red_model_totem_pole].sort_by(&:id)
           end
 
           it "should return the correct inheritance chain after breaking the old link" do
             @totem_pole.remove_child(@big_model_totem_pole)
 
-            @totem_pole.children.sort_by(&:id).should == [@big_totem_pole].sort_by(&:id)        
-            @totem.descendants.sort_by(&:id).should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole].sort_by(&:id)        
+            @totem_pole.children.sort_by(&:id).should == [@big_totem_pole].sort_by(&:id)
+            @totem.descendants.sort_by(&:id).should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole].sort_by(&:id)
           end
 
           it "should return the correct inheritance chain after breaking the old link when there is are two ancestor root nodes" do
@@ -215,7 +242,7 @@ describe 'acts_as_dag' do
             @totem.descendants.sort_by(&:id).should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole].sort_by(&:id)
           end
         end
-      end    
+      end
     end
 
     describe "and two paths of the same length exist to the same node" do
@@ -229,14 +256,14 @@ describe 'acts_as_dag' do
         @grandpa.add_child(@dad)
         @dad.add_child(@child)
         @child.add_parent(@mom)
-        @mom.add_parent(@grandpa)      
+        @mom.add_parent(@grandpa)
       end
 
       it "descendants should not return multiple instances of a child" do
         @grandpa.descendants.sort_by(&:id).should == [@grandpa, @dad, @mom, @child].sort_by(&:id)
-      end      
+      end
 
-      describe "and a link between parent and ancestor is removed" do 
+      describe "and a link between parent and ancestor is removed" do
         before(:each) do
           # the incest is undone!
           @dad.remove_parent(@grandpa)
@@ -253,7 +280,7 @@ describe 'acts_as_dag' do
           @mom.descendants.sort_by(&:id).should == [@mom, @child].sort_by(&:id)
           @dad.descendants.sort_by(&:id).should == [@dad, @child].sort_by(&:id)
           @grandpa.descendants.sort_by(&:id).should == [@grandpa, @mom, @child].sort_by(&:id)
-        end      
+        end
       end
     end
   end
@@ -269,7 +296,6 @@ describe 'acts_as_dag' do
   describe "models with unified link tables" do
     before(:each) do
       @klass = UnifiedLinkModel
-      @klass.logger = Logger.new(STDOUT)
     end
 
     it_should_behave_like "DAG Model"
@@ -280,5 +306,5 @@ describe 'acts_as_dag' do
       record.parent_links.first.category_type.should == @klass.name
       record.descendant_links.first.category_type.should == @klass.name
     end
-  end  
-end
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":me
 ActiveRecord::Schema.define(:version => 0) do
 
   # MODEL TABLES
-  
+
   create_table :separate_link_models, :force => true do |t|
     t.string :name
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_dag
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.2.3
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -10,22 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: 
@@ -34,34 +31,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/acts_as_dag/acts_as_dag.rb
+- LICENSE
+- README.rdoc
 - lib/acts_as_dag.rb
+- lib/acts_as_dag/acts_as_dag.rb
 - spec/acts_as_dag_spec.rb
 - spec/spec_helper.rb
-- LICENSE
-- README.rdoc
 homepage: http://github.com/rrn/acts_as_dag
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds directed acyclic graph functionality to ActiveRecord.
 test_files: []