Wrap the example #indexes in the apidocs. Also include the api include[] API.

Author: jamesu

app/controllers/api_v1/activities_controller.rb

@@ -20,7 +20,7 @@ def show
     end
 
     if current_user.project_ids.include? @activity.project_id
-      api_respond @activity, :include => [:project, :target, :users]
+      api_respond @activity, :include => [:project, :target, :user]
     else
       api_status :unauthorized
     end

app/controllers/api_v1/comments_controller.rb

@@ -8,7 +8,7 @@ def index
   end
 
   def show
-    api_respond @comment
+    api_respond @comment, :include => [:user]
   end
 
   def create

app/controllers/api_v1/conversations_controller.rb

@@ -9,7 +9,7 @@ def index
   end
 
   def show
-    api_respond @conversation, :include => [:comments, :users]
+    api_respond @conversation, :include => api_include
   end
 
   def create
@@ -91,5 +91,9 @@ def add_watchers(hash)
       end
     end
   end
+    
+  def api_include
+    [:comments, :user] & (params[:include]||{}).map(&:to_sym)
+  end
 
 end

app/controllers/api_v1/dividers_controller.rb

@@ -10,7 +10,7 @@ def index
   end
 
   def show
-    api_respond @divider
+    api_respond @divider, :include => [:page_slot]
   end
 
   def create

app/controllers/api_v1/invitations_controller.rb

@@ -11,7 +11,7 @@ def index
   end
 
   def show
-    api_respond @invitation
+    api_respond @invitation, :include => [:project, :user]
   end
 
   def create

app/controllers/api_v1/memberships_controller.rb

@@ -9,7 +9,7 @@ def index
   end
 
   def show
-    api_respond @membership, :include => [:projects, :members, :people]
+    api_respond @membership, :include => [:user]
   end
 
   def update

app/controllers/api_v1/notes_controller.rb

@@ -10,7 +10,7 @@ def index
   end
 
   def show
-    api_respond @note
+    api_respond @note, :include => [:page_slot]
   end
 
   def create

app/controllers/api_v1/organizations_controller.rb

@@ -5,11 +5,11 @@ class ApiV1::OrganizationsController < ApiV1::APIController
 
   def index
     @organizations = current_user.organizations
-    api_respond current_user.organizations, :include => [:projects, :members], :references => []
+    api_respond current_user.organizations, :references => []
   end
 
   def show
-    api_respond @organization, :include => [:projects, :members, :people]
+    api_respond @organization, :include => api_include
   end
 
   def create
@@ -51,4 +51,8 @@ def can_modify?
     end
   end
 
+  def api_include
+    [:projects, :members] & (params[:include]||{}).map(&:to_sym)
+  end
+  
 end

app/controllers/api_v1/pages_controller.rb

@@ -3,13 +3,9 @@ class ApiV1::PagesController < ApiV1::APIController
   before_filter :check_permissions, :only => [:create,:update,:reorder,:resort,:destroy]
 
   def index
-    @pages = if @current_project
-      @current_project.pages.all(:conditions => api_range, :limit => api_limit, :order => 'id ASC', :include => [:project, :user])
-    else
-      Page.find_all_by_project_id(current_user.project_ids, :conditions => api_range, :limit => api_limit, :include => [:project, :user])
-    end
+    @pages = @current_project.pages.all(:conditions => api_range, :limit => api_limit, :order => 'id ASC', :include => [:project, :user])
 
-    api_respond @pages, :include => :slots, :references => [:project, :user]
+    api_respond @pages, :include => :slots, :references => [:user]
   end
 
   def create

app/controllers/api_v1/people_controller.rb

@@ -5,11 +5,11 @@ class ApiV1::PeopleController < ApiV1::APIController
   def index
     @people = @current_project.people(:include => [:project, :user])
 
-    api_respond @people, :include => [:project, :user], :references => [:project, :user]
+    api_respond @people, :references => [:user]
   end
 
   def show
-    api_respond @person
+    api_respond @person, :include => [:user]
   end
 
   def update