dagnabit 2.2.2 → 2.2.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:patch: 3
+:build: 
 :major: 2
 :minor: 2
-:patch: 2
-:build: 

data/dagnabit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dagnabit}
-  s.version = "2.2.2"
+  s.version = "2.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Yip"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-02-17}
   s.default_executable = %q{dagnabit-test}
   s.email = %q{yipdw@northwestern.edu}
   s.executables = ["dagnabit-test"]
@@ -75,9 +75,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Directed acyclic graph plugin for ActiveRecord}
   s.test_files = [
-    "test/benchmark/helper.rb",
-     "test/benchmark/linear_benchmark.rb",
-     "test/connections/native_postgresql/connection.rb",
+    "test/connections/native_postgresql/connection.rb",
      "test/connections/native_sqlite3/connection.rb",
      "test/dagnabit/link/test_associations.rb",
      "test/dagnabit/link/test_class_methods.rb",

data/lib/dagnabit/link/transitive_closure_recalculation/on_destroy.rb

@@ -17,7 +17,7 @@ module Dagnabit
 
           with_temporary_edge_tables('suspect', 'trusty', 'new') do |suspect, trusty, new|
             connection.execute <<-END
-              INSERT INTO #{suspect} 
+              INSERT INTO #{suspect} (#{tc_aid}, #{tc_did}, #{tc_atype}, #{tc_dtype})
                 SELECT * FROM (
                   SELECT
                     TC1.#{tc_aid}, TC2.#{tc_did}, TC1.#{tc_atype}, TC2.#{tc_dtype}
@@ -54,7 +54,7 @@ module Dagnabit
             END
 
             connection.execute <<-END
-              INSERT INTO #{trusty}
+              INSERT INTO #{trusty} (#{tc_aid}, #{tc_did}, #{tc_atype}, #{tc_dtype})
                 SELECT
                   #{tc_aid}, #{tc_did}, #{tc_atype}, #{tc_dtype}
                   FROM (
@@ -84,9 +84,9 @@ module Dagnabit
             END
 
             connection.execute <<-END
-              INSERT INTO #{new}
+              INSERT INTO #{new} (#{tc_aid}, #{tc_did}, #{tc_atype}, #{tc_dtype})
                 SELECT * FROM (
-                  SELECT * FROM #{trusty}
+                  SELECT #{tc_aid}, #{tc_did}, #{tc_atype}, #{tc_dtype} FROM #{trusty}
                   UNION
                   SELECT
                     T1.#{tc_aid}, T2.#{tc_aid}, T1.#{tc_atype}, T2.#{tc_dtype}

data/test/dagnabit/link/test_transitive_closure_recalculation.rb

@@ -54,6 +54,34 @@ module Dagnabit
         assert_nil tc, 'expected to not find path from n1 to n3'
       end
 
+      should 'recalculate transitive closure when destroying links with custom data' do
+        n1 = ::Node.create
+        n2 = ::Node.create
+        n3 = ::Node.create
+        n4 = ::Node.create
+
+        l1 = CustomDataLink.create(:ancestor => n1, :descendant => n2, :data => 'foo')
+        l2 = CustomDataLink.create(:ancestor => n2, :descendant => n3, :data => 'bar')
+        l3 = CustomDataLink.create(:ancestor => n3, :descendant => n4, :data => 'baz')
+
+        l2.destroy
+
+        tc1 = TransitiveClosureCustomDataLink.find(:first, :conditions => { :ancestor_id => n1.id, :descendant_id => n2.id })
+        assert_not_nil tc1, 'expected to find path from n1 to n2'
+        assert_equal 'foo', tc1.data, 'expected to find custom data attribute on n1->n2 edge'
+
+        tc2 = TransitiveClosureCustomDataLink.find(:first, :conditions => { :ancestor_id => n3.id, :descendant_id => n4.id })
+        assert_not_nil tc2, 'expected to find path from n3 to n4'
+        assert_equal 'baz', tc2.data, 'expected to find custom data attribute on n3->n4 edge'
+
+        tc = TransitiveClosureCustomDataLink.find(:first, :conditions => { :ancestor_id => n1.id, :descendant_id => n3.id })
+        assert_nil tc, 'expected to not find path from n1 to n3'
+        tc = TransitiveClosureCustomDataLink.find(:first, :conditions => { :ancestor_id => n2.id, :descendant_id => n4.id })
+        assert_nil tc, 'expected to not find path from n2 to n4'
+        tc = TransitiveClosureCustomDataLink.find(:first, :conditions => { :ancestor_id => n1.id, :descendant_id => n4.id })
+        assert_nil tc, 'expected to not find path from n1 to n4'
+      end
+
       should 'include edges in the graph when reconstructing the transitive closure on destroy' do
         n1 = ::Node.create
         n2 = ::Node.create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dagnabit
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors: 
 - David Yip
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -06:00
+date: 2010-02-17 00:00:00 -06:00
 default_executable: dagnabit-test
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,8 +141,6 @@ signing_key:
 specification_version: 3
 summary: Directed acyclic graph plugin for ActiveRecord
 test_files: 
-- test/benchmark/helper.rb
-- test/benchmark/linear_benchmark.rb
 - test/connections/native_postgresql/connection.rb
 - test/connections/native_sqlite3/connection.rb
 - test/dagnabit/link/test_associations.rb

data/test/benchmark/helper.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_record'
-require 'active_support/test_case'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'dagnabit'
-
-ActiveRecord::Base.logger = Logger.new("benchmark.log")
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-ActiveRecord::Schema.define do
-  [:links, :links_transitive_closure_tuples].each do |table|
-    create_table table do |t|
-      t.integer :ancestor_id
-      t.integer :descendant_id
-      t.string :ancestor_type
-      t.string :descendant_type
-    end
-  end
-
-  create_table :nodes do |t|
-    t.string :data
-  end
-end
-
-class Link < ActiveRecord::Base
-  acts_as_dag_link
-end
-
-class Node < ActiveRecord::Base
-  acts_as_dag_node_linked_by 'Link'
-end
-
-REPETITIONS = 5
-
-class BenchmarkTestCase < ActiveSupport::TestCase
-  def teardown
-    Node.delete_all
-    Link.delete_all
-  end
-end

data/test/benchmark/linear_benchmark.rb

@@ -1,41 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-class LinearBenchmark < BenchmarkTestCase
-  def test_speed
-    Benchmark.bm do |x|
-      root = Node.create
-      last_node = root
-
-      100.times do |i|
-        target = Node.create
-        
-        x.report("Graph depth: #{i+1}") { Link.connect(last_node, target) }
-
-        assert_equal 1, last_node.children.length
-        assert_equal i+1, root.descendants.length
-
-        last_node = target
-      end
-    end
-  end
-
-  def test_deletion_from_long_list
-    nodes = []
-    last_node = Node.create
-    
-    puts 'Building long list...'
-    50.times do |i|
-      target = Node.create
-      Link.connect(last_node, target)
-      last_node = target
-
-      nodes << target
-    end
-    
-    Benchmark.bm do |x|
-      nodes.each_with_index do |node, i|
-        x.report("Destroying node #{i}") { node.destroy }
-      end
-    end
-  end
-end