Merge branch 'with_id_check_optimizations'

Author: igal

CHANGES.txt

@@ -7,6 +7,7 @@ OpenConferenceWare stable releases and changes included, with latest at top:
 - FIXED Event, added uniqueness validations to slug and title fields.
 - Improved models, added cascade deletes to avoid leaving orphaned records after parents are deleted.
 - Improved "README", described the various custom environmental variables that affect the application's behavior.
+- Improved performance of event loading code by checking identifiers rather than loading entire objects.
 - Added QueryTrace plugin, it shows where database queries are done. Set QUERYTRACE=1 environmental variable to use.
 
 * v0.20100429

app/helpers/application_helper.rb

@@ -211,7 +211,7 @@ def assigned_events
 
   # Return array of non-child events assigned to this request.
   def assigned_nonchild_events
-    return self.assigned_events.compact.uniq.reject(&:parent)
+    return self.assigned_events.compact.uniq.reject(&:parent_id)
   end
 
   # Return array of non-child events assigned to this request sorted by end-date.

app/models/event.rb

@@ -205,6 +205,8 @@ def end_date
 
   # Return the parent event or this Event.
   def parent_or_self
-    return self.parent || self
+    return self.parent_id ?
+      self.parent :
+      self
   end
 end

spec/helpers/application_helper_spec.rb

@@ -25,8 +25,8 @@ def assign_events(events)
 
     describe "assigned_nonchild_events" do
       it "should return only nonchild events" do
-        parent = mock_model(Event, :parent => nil)
-        child  = mock_model(Event, :parent => parent)
+        parent = mock_model(Event, :parent => nil, :parent_id => nil)
+        child  = mock_model(Event, :parent => parent, :parent_id => parent.id)
 
         assign_events [parent, child]
 
@@ -36,9 +36,18 @@ def assign_events(events)
 
     describe "assigned_nonchild_events_by_date" do
       it "should return only nonchild events sorted by date" do
-        first  = mock_model(Event, :parent => nil, :end_date => Time.parse('2001/1/1'))
-        second = mock_model(Event, :parent => nil, :end_date => Time.parse('2002/2/2'))
-        child  = mock_model(Event, :parent => second, :end_date => Time.parse('2002/2/2'))
+        first  = mock_model(Event,
+          :parent => nil,
+          :parent_id => nil,
+          :end_date => Time.parse('2001/1/1'))
+        second = mock_model(Event,
+          :parent => nil,
+          :parent_id => nil,
+          :end_date => Time.parse('2002/2/2'))
+        child  = mock_model(Event,
+          :parent => second,
+          :parent_id => second.id,
+          :end_date => Time.parse('2002/2/2'))
 
         assign_events [second, child, first]
 

spec/models/event_spec.rb

@@ -118,4 +118,20 @@
       Event.new(:start_date => Date.today).dates.should == []
     end
   end
+
+  describe "#parent_or_self" do
+    it "should find a parent when there is one" do
+      parent = Event.create!(:title => "Mommy!", :slug => "mommy", :deadline => Time.now, :open_text => "Open!", :closed_text => "Closed!")
+      child  = Event.create!(:title => "Baby!",  :slug => "baby",  :deadline => Time.now, :open_text => "Open!", :closed_text => "Closed!", :parent => parent)
+
+      child.parent_or_self.should == parent
+    end
+
+    it "should find self when there's no parent" do
+      event = Event.create!(:title => "Event!", :slug => "event", :deadline => Time.now, :open_text => "Open!", :closed_text => "Closed!")
+
+      event.parent_or_self.should == event
+    end
+  end
+
 end