backlog 0.7.12 → 0.8.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.8.0 2007-09-03
+
+* FEATURE: Added notes and files to tasks.
+* Removed duplicate foreign key extension plugin.
+* Removed duplicate foreign keys from database schema.
+* Made Estimate input more robust.
+* Made server response messages more visible.
+* Shortened release news posting a bit.
+
 == 0.7.12 2007-09-01
 
 * Changed gem description and changes in the Rakefile to generate better news posting. 

data/Rakefile

@@ -15,11 +15,11 @@ require 'version_from_history'
 Hoe.new("backlog", APP::VERSION) do |p|
   p.rubyforge_name = "backlog"
   p.summary = "Application to aid collecting, processing, organizing, reviewing and doing tasks."
-  p.description = p.paragraphs_of('README.txt', 1..2).join("\n\n")
+  p.description = p.paragraphs_of('README.txt', 2..3).join("\n\n")
   p.author = 'Uwe Kubosch'
   p.email = 'uwe@kubosch.no'
   p.remote_rdoc_dir = '' # Release to root
-  p.changes = p.paragraphs_of('History.txt', 0..9).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 0..3).join("\n\n")
   p.rdoc_pattern = /^(app\/(controllers|helpers|models)|lib|bin)|txt$/
   p.clean_globs = ['doc']
   p.spec_extras = {

data/app/controllers/estimates_controller.rb

@@ -2,10 +2,27 @@ class EstimatesController < ApplicationController
   verify :method => :post, :redirect_to => ''
   
   def create
-    if params[:id] && params[:estimate]
+    if params[:id]
       @task = Task.find(params[:id])
-      @task.estimate(params[:estimate][:todo])
-      redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
+      if params[:estimate] && params[:estimate][:todo]
+        begin
+          Float(params[:estimate][:todo])
+          @task.estimate(params[:estimate][:todo])
+          flash[:notice] = 'Estimate updated'
+          rescue ArgumentError => e
+          @task.errors.add :estimate, "was not numeric"
+          render :file => "public/500.html", :layout => true, :status => 500
+          return
+        end
+        redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id
+      else
+        @task.errors.add :task, 'Estimate is missing.'
+        render :file => "public/500.html", :layout => true, :status => 500
+      end
+    else
+      @estimate = Estimate.new
+      @estimate.errors.add :task, 'Id is missing.'
+      render :file => "public/500.html", :layout => true, :status => 500
     end
   end
 end

data/app/controllers/task_files_controller.rb

@@ -0,0 +1,19 @@
+class TaskFilesController < ApplicationController
+  def show
+    @task_file = TaskFile.find(params[:id])
+    send_data(@task_file.content_data,
+        :disposition => @task_file.image? ? 'inline' : 'attachment',
+        :type => @task_file.content_type,
+        :filename => @task_file.name)
+  end
+  
+  def destroy
+    @task_file = TaskFile.find(params[:id])
+    @task_file.destroy
+    
+    respond_to do |format|
+      format.html { redirect_to(:controller => 'tasks', :action => :edit, :id => @task_file.task) }
+      format.xml  { head :ok }
+    end
+  end
+end

data/app/controllers/tasks_controller.rb

@@ -54,7 +54,7 @@ class TasksController < ApplicationController
       return
     end
     @task = Task.find(params[:id])
-    unless (@task.period && @task.period.active?) || (params[:task] && params[:task][:period_id] && params[:task][:period_id].to_i > 0 && (period = Period.find_by_id(params[:task][:period_id])) && period.active?)
+    unless (@task.period && @task.period.active_or_future?) || (params[:task] && params[:task][:period_id] && params[:task][:period_id].to_i > 0 && (period = Period.find_by_id(params[:task][:period_id])) && period.active?)
       @task.errors.add(:period_id, "You may not update a task in an inactive period.  Move the task to an active period first.")
       back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
       return
@@ -76,9 +76,14 @@ class TasksController < ApplicationController
         end
       end
     end
+
+    file_name = params[:task].delete(:file)
     
     if params[:task] && @task.update_attributes(params[:task])
       flash[:notice] = 'Task was successfully updated.'
+      if file_name
+        @task.task_files.create! :name => file_name.original_filename, :content_data => file_name.read, :content_type => file_name.content_type
+      end
       if params[:task][:todo] && params[:task][:todo].to_i == 0
         unless @task.finished_at
           next_task = @task.lower_item || @task.higher_item
@@ -237,7 +242,7 @@ class TasksController < ApplicationController
   
   def specify
     parent_task = Task.find(params[:id])
-    raise "Task is not open" unless parent_task.active?
+    raise "Task is not open" unless parent_task.active? && (parent_task.period.nil? || parent_task.period.active_or_future?)
     if parent_task.children.empty?
       subtask_estimate = (parent_task.todo / 4).ceil
       no_of_subtasks = (parent_task.todo / subtask_estimate).to_i

data/app/helpers/task_files_helper.rb

@@ -0,0 +1,2 @@
+module TaskFilesHelper
+end

data/app/models/task.rb

@@ -11,11 +11,11 @@ class Task < ActiveRecord::Base
   belongs_to :period
   belongs_to :ancestor_task, :class_name => 'Task', :foreign_key => 'previous_task_id' 
   has_many :descendant_tasks, :class_name => 'Task', :foreign_key => 'previous_task_id', :dependent => :destroy
-  
-  #before_validation_on_create {|task| task.position = -1}
-  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : parent_id.nil? ? "period_id IS NULL AND backlog_id = #{backlog_id}" : "parent_id = #{parent_id}"} AND finished_at IS NULL'
   has_many :estimates, :order => 'created_at', :dependent => :destroy
   has_many :works, :order => 'completed_at', :dependent => :destroy
+  has_many :task_files, :dependent => :destroy
+  
+  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : parent_id.nil? ? "period_id IS NULL AND backlog_id = #{backlog_id}" : "parent_id = #{parent_id}"} AND finished_at IS NULL'
   acts_as_tree :order => 'position'
   
   validates_presence_of :backlog_id, :if => Proc.new { |task| task.parent_id.nil? }

data/app/models/task_file.rb

@@ -0,0 +1,7 @@
+class TaskFile < ActiveRecord::Base
+  belongs_to :task
+  
+  def image?
+    content_type =~ /^image\//
+  end
+end

data/app/views/layouts/_left_top.rhtml

@@ -13,8 +13,18 @@
       <% if user? %>| <%=link_to user.email, :controller => 'user', :action => :edit%><% end %>
     </div>
     <div id="header">
-      <%= flash[:notice] + ' |' if flash[:notice] %>
-      <%= error_messages_for :backlog, :user, :group, :period, :task, :work, :estimate %>
+      <% if flash[:notice] %>
+      <div id="notice">
+        <%=flash[:notice]%>
+	  </div>
+	  <% end %>
+      <%= error_messages_for :backlog %>
+      <%= error_messages_for :estimate %>
+      <%= error_messages_for :group %>
+      <%= error_messages_for :period %>
+      <%= error_messages_for :task %>
+      <%= error_messages_for :user %>
+      <%= error_messages_for :work %>
 
       <div id="introtext">
         <h1><%=@application_title%></h1>

data/app/views/tasks/_form.rhtml

@@ -41,10 +41,25 @@
 <%= text_field 'task', 'initial_estimate', :size => 4  %></p>
 <% end %>
 
+<p><label for="task_notes"><%=l :notes%></label><br/>
+<%= text_area 'task', 'notes', :cols => '72', :rows => 16 %></p>
+
+<p><label for="task_file"><%=l :files%></label><br/>
+<%=@task.task_files.map do |task_file|
+  file_url = url_for(:controller => 'task_files', :action => :show, :id => task_file)
+  if task_file.image?
+    image_url = file_url
+  else
+    image_url = 'text-x-generic'
+  end
+  image_link_to(image_url, task_file.name, file_url, :extension => 'png', :height => 22)
+end.join(' ')%><br clear="all"/>
+<%= file_field 'task', 'file' %></p>
+
 <% end %>
 <!--[eoform:task]-->
 
 
 <script type="text/JavaScript">
-document.forms[0].elements[<%=@task.backlog.nil? ? 0 : @task.period.nil? ? 1 : 2%>].focus();
+document.getElementById('<%=@task.backlog.nil? ? 'task_backlog_id' : @task.period.nil? ? 'task_period_id' : @task.description.nil? ? 'task_description' : 'task_notes' %>').focus();
 </script>

data/app/views/tasks/edit.rhtml

@@ -1,7 +1,7 @@
 <div id="spotlight">
 <% @page_title = "#{l :editing} #{l :task}" %>
 
-<% form_tag :action => 'update', :id => @task do %>
+<% form_tag({:action => 'update', :id => @task}, :multipart => true) do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:save) %>
   <%= back_or_link_to l(:back), :action => 'list' %>

data/db/migrate/020_create_task_files.rb

@@ -0,0 +1,17 @@
+class CreateTaskFiles < ActiveRecord::Migration
+  def self.up
+    add_column :tasks, :notes, :text
+
+    create_table :task_files do |t|
+      t.column :task_id, :integer, :null => false
+      t.column :name, :string, :limit => 64, :null => false
+      t.column :content_type, :string, :null => false
+      t.column :content_data, :binary, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :task_files
+    remove_column :tasks, :notes
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 19) do
+ActiveRecord::Schema.define(:version => 20) do
 
   create_table "backlogs", :force => true do |t|
     t.string  "name",            :limit => 64,                    :null => false
@@ -44,6 +44,13 @@ ActiveRecord::Schema.define(:version => 19) do
     t.integer "party_id"
   end
 
+  create_table "task_files", :force => true do |t|
+    t.integer "task_id",                    :null => false
+    t.string  "name",         :limit => 64, :null => false
+    t.string  "content_type",               :null => false
+    t.binary  "content_data",               :null => false
+  end
+
   create_table "tasks", :force => true do |t|
     t.integer  "position"
     t.string   "description",      :limit => 80,                                                :null => false
@@ -56,6 +63,7 @@ ActiveRecord::Schema.define(:version => 19) do
     t.integer  "previous_task_id"
     t.string   "customer",         :limit => 64
     t.integer  "backlog_id"
+    t.text     "notes"
   end
 
   create_table "users", :primary_key => "party_id", :force => true do |t|
@@ -81,26 +89,6 @@ ActiveRecord::Schema.define(:version => 19) do
     t.boolean  "invoice"
   end
 
-  add_foreign_key_constraint "estimates", "task_id", "tasks", "id", :name => "estimates_task_id_fkey", :on_update => nil, :on_delete => nil
-  add_foreign_key_constraint "estimates", "user_id", "users", "party_id", :name => "estimates_user_id_fkey", :on_update => nil, :on_delete => nil
-
-  add_foreign_key_constraint "groups", "party_id", "parties", "id", :name => "groups_party_id_fkey", :on_update => nil, :on_delete => nil
-
-  add_foreign_key_constraint "groups_users", "group_id", "groups", "party_id", :name => "groups_users_group_id_fkey", :on_update => nil, :on_delete => nil
-  add_foreign_key_constraint "groups_users", "user_id", "users", "party_id", :name => "groups_users_user_id_fkey", :on_update => nil, :on_delete => nil
-
-  add_foreign_key_constraint "periods", "party_id", "parties", "id", :name => "periods_party_id_fkey", :on_update => nil, :on_delete => nil
-
-  add_foreign_key_constraint "tasks", "period_id", "periods", "id", :name => "tasks_period_id_fkey", :on_update => nil, :on_delete => nil
-  add_foreign_key_constraint "tasks", "parent_id", "tasks", "id", :name => "tasks_parent_id_fkey", :on_update => nil, :on_delete => nil
-  add_foreign_key_constraint "tasks", "previous_task_id", "tasks", "id", :name => "tasks_previous_task_id_fkey", :on_update => nil, :on_delete => nil
-  add_foreign_key_constraint "tasks", "backlog_id", "backlogs", "id", :name => "tasks_backlog_id_fkey", :on_update => nil, :on_delete => nil
-
-  add_foreign_key_constraint "users", "party_id", "parties", "id", :name => "users_party_id_fkey", :on_update => nil, :on_delete => nil
-
-  add_foreign_key_constraint "works", "task_id", "tasks", "id", :name => "works_task_id_fkey", :on_update => nil, :on_delete => nil
-  add_foreign_key_constraint "works", "user_id", "users", "party_id", :name => "works_user_id_fkey", :on_update => nil, :on_delete => nil
-
   add_foreign_key "estimates", ["task_id"], "tasks", ["id"]
   add_foreign_key "estimates", ["user_id"], "users", ["party_id"]
 
@@ -111,6 +99,8 @@ ActiveRecord::Schema.define(:version => 19) do
 
   add_foreign_key "periods", ["party_id"], "parties", ["id"]
 
+  add_foreign_key "task_files", ["task_id"], "tasks", ["id"]
+
   add_foreign_key "tasks", ["period_id"], "periods", ["id"]
   add_foreign_key "tasks", ["parent_id"], "tasks", ["id"]
   add_foreign_key "tasks", ["previous_task_id"], "tasks", ["id"]

data/doc/classes/ActiveRecord/Base.html

@@ -97,14 +97,14 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000431">class_table_inheritance</a>&nbsp;&nbsp;
-      <a href="#M000427">class_table_inheritance</a>&nbsp;&nbsp;
-      <a href="#M000426">find_with_default_eager_loading</a>&nbsp;&nbsp;
-      <a href="#M000430">find_with_default_eager_loading</a>&nbsp;&nbsp;
-      <a href="#M000432">has_extra_columns_from</a>&nbsp;&nbsp;
-      <a href="#M000428">has_extra_columns_from</a>&nbsp;&nbsp;
-      <a href="#M000429">reloadable?</a>&nbsp;&nbsp;
-      <a href="#M000433">reloadable?</a>&nbsp;&nbsp;
+      <a href="#M000437">class_table_inheritance</a>&nbsp;&nbsp;
+      <a href="#M000433">class_table_inheritance</a>&nbsp;&nbsp;
+      <a href="#M000432">find_with_default_eager_loading</a>&nbsp;&nbsp;
+      <a href="#M000436">find_with_default_eager_loading</a>&nbsp;&nbsp;
+      <a href="#M000438">has_extra_columns_from</a>&nbsp;&nbsp;
+      <a href="#M000434">has_extra_columns_from</a>&nbsp;&nbsp;
+      <a href="#M000435">reloadable?</a>&nbsp;&nbsp;
+      <a href="#M000439">reloadable?</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -144,12 +144,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000431" class="method-detail">
-        <a name="M000431"></a>
+      <div id="method-M000437" class="method-detail">
+        <a name="M000437"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000431.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000431.html');return false;">
+          <a href="Base.src/M000437.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000437.html');return false;">
           <span class="method-name">class_table_inheritance</span><span class="method-args">(options = {})</span>
           </a>
         </div>
@@ -158,12 +158,12 @@
         </div>
       </div>
 
-      <div id="method-M000427" class="method-detail">
-        <a name="M000427"></a>
+      <div id="method-M000433" class="method-detail">
+        <a name="M000433"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000427.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000427.html');return false;">
+          <a href="Base.src/M000433.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000433.html');return false;">
           <span class="method-name">class_table_inheritance</span><span class="method-args">(options = {})</span>
           </a>
         </div>
@@ -172,12 +172,12 @@
         </div>
       </div>
 
-      <div id="method-M000426" class="method-detail">
-        <a name="M000426"></a>
+      <div id="method-M000432" class="method-detail">
+        <a name="M000432"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000426.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000426.html');return false;">
+          <a href="Base.src/M000432.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000432.html');return false;">
           <span class="method-name">find_with_default_eager_loading</span><span class="method-args">(*params)</span>
           </a>
         </div>
@@ -186,12 +186,12 @@
         </div>
       </div>
 
-      <div id="method-M000430" class="method-detail">
-        <a name="M000430"></a>
+      <div id="method-M000436" class="method-detail">
+        <a name="M000436"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000430.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000430.html');return false;">
+          <a href="Base.src/M000436.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000436.html');return false;">
           <span class="method-name">find_with_default_eager_loading</span><span class="method-args">(*params)</span>
           </a>
         </div>
@@ -200,12 +200,12 @@
         </div>
       </div>
 
-      <div id="method-M000432" class="method-detail">
-        <a name="M000432"></a>
+      <div id="method-M000438" class="method-detail">
+        <a name="M000438"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000432.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000432.html');return false;">
+          <a href="Base.src/M000438.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000438.html');return false;">
           <span class="method-name">has_extra_columns_from</span><span class="method-args">(options, &amp;block)</span>
           </a>
         </div>
@@ -214,12 +214,12 @@
         </div>
       </div>
 
-      <div id="method-M000428" class="method-detail">
-        <a name="M000428"></a>
+      <div id="method-M000434" class="method-detail">
+        <a name="M000434"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000428.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000428.html');return false;">
+          <a href="Base.src/M000434.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000434.html');return false;">
           <span class="method-name">has_extra_columns_from</span><span class="method-args">(options, &amp;block)</span>
           </a>
         </div>
@@ -228,12 +228,12 @@
         </div>
       </div>
 
-      <div id="method-M000429" class="method-detail">
-        <a name="M000429"></a>
+      <div id="method-M000435" class="method-detail">
+        <a name="M000435"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000429.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000429.html');return false;">
+          <a href="Base.src/M000435.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000435.html');return false;">
           <span class="method-name">reloadable?</span><span class="method-args">()</span>
           </a>
         </div>
@@ -242,12 +242,12 @@
         </div>
       </div>
 
-      <div id="method-M000433" class="method-detail">
-        <a name="M000433"></a>
+      <div id="method-M000439" class="method-detail">
+        <a name="M000439"></a>
 
         <div class="method-heading">
-          <a href="Base.src/M000433.html" target="Code" class="method-signature"
-            onclick="popupCode('Base.src/M000433.html');return false;">
+          <a href="Base.src/M000439.html" target="Code" class="method-signature"
+            onclick="popupCode('Base.src/M000439.html');return false;">
           <span class="method-name">reloadable?</span><span class="method-args">()</span>
           </a>
         </div>

data/doc/classes/ActiveRecord/Base.src/M000432.html

@@ -5,68 +5,25 @@
 
 <html>
 <head>
-  <title>has_extra_columns_from (ActiveRecord::Base)</title>
+  <title>find_with_default_eager_loading (ActiveRecord::Base)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/class_table_inheritance.rb, line 37</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">has_extra_columns_from</span>(<span class="ruby-identifier">options</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
-      <span class="ruby-identifier">table_name</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:table</span>]
-      <span class="ruby-identifier">primary_key_name</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:foreign_key</span>] <span class="ruby-operator">||</span> <span class="ruby-node">&quot;#{name.demodulize.underscore}_id&quot;</span>
-      
-      <span class="ruby-identifier">proxy_class_name</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:proxy_class_name</span>] <span class="ruby-operator">||</span> <span class="ruby-node">&quot;ExtraColumnsFor#{table_name.camelize}&quot;</span>
-      <span class="ruby-identifier">proxy_class_namespace</span> = (<span class="ruby-identifier">options</span>[<span class="ruby-identifier">:proxy_class_namespace</span>] <span class="ruby-operator">||</span> <span class="ruby-identifier">name</span>).<span class="ruby-identifier">constantize</span>
-      <span class="ruby-identifier">proxy_symbol</span> = <span class="ruby-node">&quot;extra_columns_for_#{table_name}&quot;</span>.<span class="ruby-identifier">to_sym</span>
-      
-      <span class="ruby-identifier">proxy_class</span> = <span class="ruby-identifier">proxy_class_namespace</span>.<span class="ruby-identifier">const_get</span>(<span class="ruby-identifier">proxy_class_name</span>) <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
-      <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">proxy_class</span>
-        <span class="ruby-identifier">proxy_class</span> = <span class="ruby-identifier">proxy_class_namespace</span>.<span class="ruby-identifier">const_set</span>(<span class="ruby-identifier">proxy_class_name</span>, <span class="ruby-constant">Class</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Base</span>))    
-        <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">class_eval</span> <span class="ruby-keyword kw">do</span>
-          <span class="ruby-identifier">set_table_name</span> <span class="ruby-identifier">table_name</span>
-          <span class="ruby-identifier">set_primary_key</span> <span class="ruby-identifier">primary_key_name</span>
-          <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">reloadable?</span>; <span class="ruby-keyword kw">false</span>; <span class="ruby-keyword kw">end</span>
+  <pre><span class="ruby-comment cmt"># File lib/class_table_inheritance.rb, line 7</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">find_with_default_eager_loading</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">params</span>)
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">default_eager_loading</span>
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>.<span class="ruby-identifier">last</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Hash</span>)
+          <span class="ruby-identifier">opts</span> = <span class="ruby-identifier">params</span>.<span class="ruby-identifier">last</span>
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-identifier">opts</span> = {}
+          <span class="ruby-identifier">params</span>.<span class="ruby-identifier">push</span>(<span class="ruby-identifier">opts</span>)
         <span class="ruby-keyword kw">end</span>
-        <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">class_eval</span>(<span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
-      <span class="ruby-keyword kw">end</span>
-      
-      <span class="ruby-identifier">has_one_without_cti</span> <span class="ruby-identifier">proxy_symbol</span>, <span class="ruby-identifier">:class_name</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">name</span>, <span class="ruby-identifier">:foreign_key</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">primary_key_name</span>, <span class="ruby-identifier">:dependent</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">true</span>
-      
-      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:save_before_superclass_callbacks</span>] <span class="ruby-operator">||</span> <span class="ruby-keyword kw">true</span>
-        <span class="ruby-comment cmt"># We need the after_save filter for this association to run /before/ any other after_save's already registered on a superclass,</span>
-        <span class="ruby-comment cmt"># and before any after_creates or after_updates. This calls for some hackery:</span>
-        <span class="ruby-identifier">proxy_save_callback</span> = <span class="ruby-ivar">@inheritable_attributes</span>[<span class="ruby-identifier">:after_save</span>].<span class="ruby-identifier">pop</span>
-        <span class="ruby-ivar">@inheritable_attributes</span>[<span class="ruby-identifier">:after_create</span>] <span class="ruby-operator">||=</span> []
-        <span class="ruby-ivar">@inheritable_attributes</span>[<span class="ruby-identifier">:after_create</span>].<span class="ruby-identifier">unshift</span>(<span class="ruby-identifier">proxy_save_callback</span>)
-        <span class="ruby-ivar">@inheritable_attributes</span>[<span class="ruby-identifier">:after_update</span>] <span class="ruby-operator">||=</span> []
-        <span class="ruby-ivar">@inheritable_attributes</span>[<span class="ruby-identifier">:after_update</span>].<span class="ruby-identifier">unshift</span>(<span class="ruby-identifier">proxy_save_callback</span>)
-      <span class="ruby-keyword kw">end</span>
-      
-      <span class="ruby-comment cmt"># adds this to the class-inheritable array of default eager loads:</span>
-      <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">default_eager_loading</span> = [<span class="ruby-identifier">proxy_symbol</span>] <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:default_eager_loading</span>] <span class="ruby-operator">==</span> <span class="ruby-keyword kw">false</span>
-      
-      <span class="ruby-identifier">class_eval</span> <span class="ruby-value str">&quot;alias_method :\#{proxy_symbol}_old, :\#{proxy_symbol}\ndef \#{proxy_symbol}\n\#{proxy_symbol}_old or self.\#{proxy_symbol} = \#{proxy_class.name}.new\nend\ndef save(*args)\nself.\#{proxy_symbol} ||= \#{proxy_class.name}.new\nsuper\nend\n# this doesn't happen automatically on update, so we'll make it:\nafter_update {|record| record.\#{proxy_symbol}.save }\n\nalias_method :write_attribute_super, :write_attribute\ndef write_attribute(attr_name, attr_value)\nif self.class.columns.find {|c| c.name == attr_name}\nwrite_attribute_super(attr_name, attr_value)\nelse\nself.\#{proxy_symbol}.write_attribute(attr_name, attr_value)\nend\nend\n\nalias_method :old_attributes, :attributes\ndef attributes\nall_attributes = old_attributes.update(self.\#{proxy_symbol}.attributes)\nall_attributes.delete(\#{proxy_class_name}.primary_key) if self.class.primary_key != \#{proxy_class_name}.primary_key\nall_attributes\nend\n\nclass &lt;&lt; self\nalias_method :method_missing_super, :method_missing\ndef method_missing(method_symbol, *parameters)\nif method_symbol.to_s =~ /^find_by_(.+)/\nattributes = $1.split('_and_')\nsuper_attributes = attributes &amp; columns.map {|c| c.name}\nsub_attributes = attributes - super_attributes\nif super_attributes.size &gt; 0\n# TODO (uwe): Only use super attributes first\n# then filter by sub_attributes\nmethod_missing_super(method_symbol, parameters)\nelse\nresult = \#{proxy_class_name}.method_missing(method_symbol, parameters)\nif result\nif result.is_a? Array\nresult.map {|entry| entry.base}\nelse\nresult = result.base\nend\nelse\nresult\nend\nend\nelse\nmethod_missing_super(method_symbol, parameters)\nend\nend\n\ndelegate :foreign_keys, :validates_uniqueness_of, {:to =&gt; \#{proxy_class_name}}\nend\n&quot;</span>
-      
-      <span class="ruby-identifier">delegate_methods</span> = <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">column_names</span>
-      <span class="ruby-identifier">delegate_methods</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">column_names</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;#{name}=&quot;</span>.<span class="ruby-identifier">to_sym</span> }
-      <span class="ruby-identifier">delegate_methods</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">column_names</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;#{name}?&quot;</span>.<span class="ruby-identifier">to_sym</span> }
-      <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">reflect_on_all_associations</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">reflection</span><span class="ruby-operator">|</span>
-        <span class="ruby-identifier">delegate_methods</span> <span class="ruby-operator">+=</span> <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">reflection</span>.<span class="ruby-identifier">macro</span>
-        <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:has_many</span>, <span class="ruby-identifier">:has_and_belongs_to_many</span>
-          [<span class="ruby-identifier">reflection</span>.<span class="ruby-identifier">name</span>, <span class="ruby-node">&quot;#{reflection.name}=&quot;</span>.<span class="ruby-identifier">to_sym</span>, <span class="ruby-node">&quot;#{reflection.name.to_s.singularize}_ids=&quot;</span>.<span class="ruby-identifier">to_sym</span>]
-        <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:has_one</span>
-          [<span class="ruby-identifier">reflection</span>.<span class="ruby-identifier">name</span>, <span class="ruby-node">&quot;#{reflection.name}=&quot;</span>.<span class="ruby-identifier">to_sym</span>, <span class="ruby-node">&quot;build_#{reflection.name}&quot;</span>.<span class="ruby-identifier">to_sym</span>, <span class="ruby-node">&quot;create_#{reflection.name}&quot;</span>.<span class="ruby-identifier">to_sym</span>]
-        <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:belongs_to</span>
-          [<span class="ruby-identifier">reflection</span>.<span class="ruby-identifier">name</span>, <span class="ruby-node">&quot;#{reflection.name}=&quot;</span>.<span class="ruby-identifier">to_sym</span>, <span class="ruby-node">&quot;#{reflection.name}?&quot;</span>.<span class="ruby-identifier">to_sym</span>, <span class="ruby-node">&quot;build_#{reflection.name}&quot;</span>.<span class="ruby-identifier">to_sym</span>, <span class="ruby-node">&quot;create_#{reflection.name}&quot;</span>.<span class="ruby-identifier">to_sym</span>]
-        <span class="ruby-keyword kw">end</span>
-      <span class="ruby-keyword kw">end</span>
-      <span class="ruby-identifier">delegate</span> <span class="ruby-operator">*</span>(<span class="ruby-identifier">delegate_methods</span> <span class="ruby-operator">&lt;&lt;</span> {<span class="ruby-identifier">:to</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">proxy_symbol</span>})
-      
-      <span class="ruby-identifier">proxy_class</span>.<span class="ruby-identifier">belongs_to</span>(<span class="ruby-identifier">:base</span>, <span class="ruby-identifier">:class_name</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:proxy_class_belongs_to</span>], <span class="ruby-identifier">:foreign_key</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">primary_key_name</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:proxy_class_belongs_to</span>]
-      
-      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:delegate_new_associations</span>]
-        <span class="ruby-identifier">class_eval</span> <span class="ruby-value str">&quot;# associations on this subclass get added to the proxy class, and then the relevant methods delegated to the proxy object\ndef self.belongs_to(name, *params)\nExtraColumns.belongs_to(name, *params)\ndelegate name, \&quot;\\\#{name}=\&quot;.to_sym, \&quot;\\\#{name}?\&quot;.to_sym, \&quot;build_\\\#{name}\&quot;.to_sym, \&quot;create_\\\#{name}\&quot;.to_sym, :to =&gt; :\#{proxy_symbol}\nend\n\ndef self.has_one(name, *params)\nExtraColumns.has_one(name, *params)\ndelegate name, \&quot;\\\#{name}=\&quot;.to_sym, \&quot;build_\\\#{name}\&quot;.to_sym, \&quot;create_\\\#{name}\&quot;.to_sym, :to =&gt; :\#{proxy_symbol}\nend\n\ndef self.has_many(name, *params)\nExtraColumns.has_many(name, *params)\ndelegate name, \&quot;\\\#{name}=\&quot;.to_sym, \&quot;\\\#{name.to_s.singularize}_ids=\&quot;.to_sym, :to =&gt; :\#{proxy_symbol}\nend\n\ndef self.has_and_belongs_to_many(name, *params)\nExtraColumns.has_and_belongs_to_many(name, *params)\ndelegate name, \&quot;\\\#{name}=\&quot;.to_sym, \&quot;\\\#{name.to_s.singularize}_ids=\&quot;.to_sym, :to =&gt; :\#{proxy_symbol}\nend\n&quot;</span>
+        <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:include</span>] <span class="ruby-operator">||=</span> []
+        <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:include</span>] = [<span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:include</span>]] <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:include</span>].<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Array</span>)
+        <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:include</span>] <span class="ruby-operator">+=</span> <span class="ruby-identifier">default_eager_loading</span>
       <span class="ruby-keyword kw">end</span>
+      <span class="ruby-identifier">find_without_default_eager_loading</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">params</span>)
     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>