acts_as_dag 1.2.0 → 1.2.1

data/lib/acts_as_dag/acts_as_dag.rb

@@ -48,24 +48,24 @@ module ActsAsDAG
       # Ancestors and descendants returned *include* self, e.g. A's descendants are [A,B,C,D]
       # Ancestors must always be returned in order of most distant to least
       # Descendants must always be returned in order of least distant to most
-      # NOTE: Uniq in order to prevent multiple instance being returned if there are multiple paths between ancestor and descendant
+      # NOTE: Rails 4.0.0 currently ignores the order clause when eager loading, so results may not be returned in the correct order
+      # NOTE: multiple instances of the same descendant/ancestor may be returned if there are multiple paths from ancestor to descendant
       #   A
       #  / \
       # B   C
       #  \ /
       #   D
       #
-      has_many :ancestors,        lambda { select("#{table_name}.*, #{descendant_class.table_name}.distance").order('distance DESC').uniq }, :through => :ancestor_links, :source => :ancestor
-      has_many :descendants,      lambda { select("#{table_name}.*, #{descendant_class.table_name}.distance").order('distance ASC').uniq }, :through => :descendant_links, :source => :descendant
+      has_many :ancestors,        lambda { order("#{descendant_class.table_name}.distance DESC") }, :through => :ancestor_links, :source => :ancestor
+      has_many :descendants,      lambda { order("#{descendant_class.table_name}.distance ASC") }, :through => :descendant_links, :source => :descendant
 
       has_many :ancestor_links,   lambda { where options[:link_conditions] }, :class_name => descendant_class, :foreign_key => 'descendant_id', :dependent => :delete_all
       has_many :descendant_links, lambda { where options[:link_conditions] }, :class_name => descendant_class, :foreign_key => 'ancestor_id', :dependent => :delete_all
 
-      has_many :parent_links,     lambda { where options[:link_conditions] }, :class_name => link_class, :foreign_key => 'child_id', :dependent => :delete_all
-      has_many :child_links,      lambda { where options[:link_conditions] }, :class_name => link_class, :foreign_key => 'parent_id', :dependent => :delete_all
-
       has_many :parents,          :through => :parent_links, :source => :parent
       has_many :children,         :through => :child_links, :source => :child
+      has_many :parent_links,     lambda { where options[:link_conditions] }, :class_name => link_class, :foreign_key => 'child_id', :dependent => :delete_all
+      has_many :child_links,      lambda { where options[:link_conditions] }, :class_name => link_class, :foreign_key => 'parent_id', :dependent => :delete_all
 
       # NOTE: Use select to prevent ActiveRecord::ReadOnlyRecord if the returned records are modified
       scope :roots,               lambda { select("#{table_name}.*").joins(:parent_links).where(link_class.table_name => {:parent_id => nil}) }

data/spec/acts_as_dag_spec.rb

@@ -171,7 +171,7 @@ describe 'acts_as_dag' do
         @big_totem_pole_model.reload.children.should == [@big_red_model_totem_pole]
       end  
 
-      describe "when there is a single long inheritance chain with multiple paths between an ancestor and descendant" do
+      describe "when there is a single long inheritance chain" do
         before(:each) do
           @totem.add_child(@totem_pole)
           @totem_pole.add_child(@big_totem_pole)
@@ -179,14 +179,6 @@ describe 'acts_as_dag' do
           @big_model_totem_pole.add_child(@big_red_model_totem_pole)
         end
 
-        it "should not return multiple instances of any descendants" do
-          @totem.descendants.should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole]
-        end
-
-        it "should not return multiple instances of any ancestors" do
-          @big_red_model_totem_pole.ancestors.should == [@totem, @totem_pole, @big_totem_pole, @big_model_totem_pole, @big_red_model_totem_pole]
-        end
-
         describe "and we are reorganizing the middle of the chain" do
           # Totem
           #   |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_dag
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord