muck-raker 0.1.37 → 0.1.38

data/README.rdoc

@@ -80,7 +80,9 @@ class Comment < ActiveRecord::Base
 end
 
 === CSS
-Use test/rails_root/public/stylesheets/application.css as a starting place for the css required in your application.
+Running rake muck:raker:sync will copy a default css file called muck-raker.css into your stylesheets directory.  
+You can include that file in your layout or copy it and modify it to meet your needs. 
+(Don't change the file as each time you run rake muck:raker:sync it will overwrite any changes you might have made.)
 
 === Frame css
 There is an example css file for the framed page in frame.css.
@@ -90,4 +92,4 @@ You will need to have mysql setup to run the migrations for the test database.
 
 
 
-Copyright (c) 2009 Justin Ball and Joel Duffin, released under the MIT license
+Copyright (c) 2009 Tatemae.com, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.1.37
+0.1.38

data/app/controllers/muck/aggregation_feeds_controller.rb

@@ -0,0 +1,43 @@
+class Muck::AggregationFeedsController < ApplicationController
+
+  unloadable
+  
+  before_filter :login_required
+
+  def destroy
+    @aggregation_feed = AggregationFeed.find(params[:id]) rescue nil if params[:id] && params[:id].to_i > 0
+    @aggregation_feed ||= AggregationFeed.find_by_feed_id_and_aggregation_id(params[:feed_id], params[:aggregation_id])
+    @aggregation = @aggregation_feed.aggregation
+    if has_aggregation_permission?
+      @aggregation_feed.destroy
+      respond_to do |format|
+        message = I18n.t('muck.raker.feed_remove')
+        format.html do
+          flash[:notice] = message
+          redirect_to polymorphic_url([@aggregation.ownable, @aggregation])
+        end
+        format.json { render :json => { :success => true, :message => message }.as_json }
+        format.xml  { head :ok }
+      end
+    end
+  end
+
+  protected
+  
+    def has_aggregation_permission?
+      if !@aggregation.can_edit?(current_user)
+        message = I18n.t('muck.raker.cant_modify_aggregation')
+        respond_to do |format|
+          format.html do
+            flash[:notice] = message
+            redirect_to polymorphic_url([@aggregation.ownable, @aggregation])
+          end
+          format.js { render(:update) {|page| page.alert message} }
+          format.json { render :json => { :success => false, :message => message }.as_json }
+        end
+      else
+        true
+      end
+    end
+  
+end

data/app/controllers/muck/aggregations_controller.rb

@@ -2,41 +2,49 @@ class Muck::AggregationsController < ApplicationController
 
   unloadable
   
-  require 'cgi'
+  #before_filter :adjust_format_for_iphone
   
-  before_filter :login_required, :except => [:show]
-  before_filter :get_owner, :only => [:index, :new, :create]
-  before_filter :has_permission?, :only => [:index, :new, :create]
+  require 'cgi'
   
-  before_filter :get_aggregation, :only => [:destroy, :update]
-  before_filter :has_aggregation_permission?, :only => [:destroy, :update]
+  before_filter :login_required, :except => [:index, :show, :preview, :rss_discovery]
+  before_filter :get_owner, :only => [:index, :preview, :new, :create]
+  before_filter :check_user_permissions, :only => [:create]
+  before_filter :get_aggregation, :only => [:destroy, :edit, :update, :show, :rss_discovery]
+  before_filter :has_aggregation_permission?, :only => [:destroy, :edit, :update]
+  before_filter :setup_feed_display_variables, :only => [:preview, :update]
+  def index
+    if @parent
+      @aggregations = @parent.aggregations.by_title
+    else
+      @aggregations = Aggregation.newest
+    end
+    respond_to do |format|
+      format.html { render(:template => 'aggregations/index') }
+      format.iphone { render(:template => 'aggregations/index') }
+    end
+  end
   
-  # def index
-  #   @page_title = 'My Aggregations'
-  #   respond_to do |format|
-  #     format.html {   @aggregations = Aggregation.find_all_by_user_id(current_user.id, :order => 'title ASC')
-  #       render(:layout => 'reader') }
-  #     format.opml {   @aggregations = Aggregation.find_all_by_user_id(current_user.id, :include =>:feeds, :order => 'feeds.title ASC')
-  #       render(:layout => false) }
-  #     format.xml  {   @aggregations = Aggregation.find_all_by_user_id(current_user.id, :order => 'title ASC')
-  #       render :xml => @aggregations }
-  #   end
-  # end
-  # 
-  # def manage
-  #   @page_title = 'Manage'
-  #   @user = current_user
-  #   @aggregations = Aggregation.find_all_by_user_id(@user.id, :order => 'title ASC')
-  #   respond_to do |format|
-  #     format.html
-  #     format.xml { render :xml => @aggregations }
-  #   end
-  # end
+  def rss_discovery
+    @feeds = @aggregation.feeds
+    render :template => 'aggregations/rss_discovery'
+  end
   
   def show
-    @aggregation = Aggregation.find(params[:id])  
     @page_title = @aggregation.title
-    @entries = @aggregation.feeds.entries.paginate(:page => @page, :per_page => @per_page)
+    
+    @photo_feeds = @aggregation.photo_feeds
+    @video_feeds = @aggregation.video_feeds
+    @bookmark_feeds = @aggregation.bookmark_feeds
+    @music_feeds = @aggregation.music_feeds
+    @general_feeds = @aggregation.general_feeds
+    
+    if GlobalConfig.render_feeds_client_side
+      
+    elsif GlobalConfig.render_feeds_server_side
+      @feeds = @aggregation.feeds
+    else
+      @entries = @aggregation.feeds.entries.paginate(:page => @page, :per_page => @per_page)
+    end
     respond_to do |format|
       format.html { render(:template => 'aggregations/show') }
       format.opml { render(:layout => false) }
@@ -44,152 +52,34 @@ class Muck::AggregationsController < ApplicationController
     end
   end
   
-  # def show_marked
-  # 
-  #   @user = User.find(params[:user_id])
-  #   @aggregation = Aggregation.find(params[:id])
-  # 
-  #   @rss_title = @aggregation.title
-  #   @rss_description = 'View entries from all entries marked by ' + @user.login + ' in the aggregation ' + @aggregation.title
-  #   @entries = Entry.get_marked_entries_for_aggregation_and_user(@aggregation.id, @user.id, :limit => @per_page, :offset => (@per_page * @page))
-  #   @page_title = 'Entries marked for ' + @aggregation.title
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/show', :layout => false) }
-  #     format.xml  { render :xml => @entries }
-  #     format.rss { render(:template => 'aggregations/show', :layout => false) }
-  #   end
-  # end
-  # 
-  # def all
-  #   @page_title = 'View entries from all aggregations'
-  # 
-  #   @aggregation = Aggregation.new
-  #   @aggregation.title = @page_title
-  # 
-  #   @rss_title = @aggregation.title
-  #   @rss_description = 'View entries from all aggregations'
-  # 
-  #   @entries = Entry.get_entries_for_user(params[:user_id], :limit => @per_page, :offset => (@per_page * @page))        
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/show', :layout => false) }
-  #     format.xml  { render :xml => @entries }
-  #     format.rss { render(:template => 'aggregations/show', :layout => false) }
-  #   end
-  # end
-  # 
-  # def all_photos
-  #   @page_title = 'View photos from all aggregations'
-  #   @aggregation = Aggregation.new
-  #   @aggregation.title = @page_title
-  #   @photos = EntryImage.get_photos_for_user(params[:user_id], :limit => @per_page, :offset => (@per_page * @page))        
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/photos', :layout => false) }
-  #     format.xml  { render :xml => @photos }
-  #   end
-  # end
-  # 
-  # def photos
-  #   @aggregation = Aggregation.find(params[:id])
-  #   @page_title = "View photos from #{@aggregation.title}"
-  #   @photos = EntryImage.get_entry_images_for_aggregation(@aggregation.id, :limit => @per_page, :offset => (@per_page * @page))       
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/photos', :layout => false) }
-  #     format.xml  { render :xml => @photos }
-  #   end
-  # end  
-  # 
-  # def bookmarks
-  #   @aggregation = Aggregation.find(params[:id])
-  #   @page_title = "View bookmarks from #{@aggregation.title}"
-  #   @entries = Entry.get_bookmarks_for_aggregation(@aggregation.id, -1, :limit => @per_page, :offset => (@per_page * @page))       
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/bookmarks', :layout => false) }
-  #     format.xml  { render :xml => @entries }
-  #   end
-  # end
-  # 
-  # def read_photos
-  #   @page_title = 'View photos from read entries'
-  #   @aggregation = Aggregation.new
-  #   @aggregation.title = @page_title
-  #   @photos = EntryImage.get_read_photos_for_user(params[:user_id], :limit => @per_page, :offset => (@per_page * @page)) | []      
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/photos', :layout => false) }
-  #     format.xml  { render :xml => @photos }
-  #   end
-  # end
-  # 
-  # def marked_photos
-  #   @page_title = 'View photos from marked entries'
-  #   @aggregation = Aggregation.new
-  #   @aggregation.title = @page_title
-  #   @photos = EntryImage.get_marked_photos_for_user(params[:user_id], :limit => @per_page, :offset => (@per_page * @page)) | []
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/photos', :layout => false) }
-  #     format.xml  { render :xml => @photos }
-  #   end    
-  # end
-  # 
-  # def marked
-  #   @page_title = 'View entries that I have marked'
-  #   @aggregation = Aggregation.new
-  #   @aggregation.title = @page_title
-  #   @user = User.find(params[:user_id])
-  # 
-  #   @rss_title = @aggregation.title
-  #   @rss_description = 'View entries from all entries marked by ' + @user.login
-  # 
-  #   @entries = Entry.get_marked_entries_for_user(@user.id, :limit => @per_page, :offset => (@per_page * @page))
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/show', :layout => false) }
-  #     format.xml  { render :xml => @entries }
-  #     format.rss { render(:template => 'aggregations/show', :layout => false) }
-  #   end
-  # end
-  # 
-  # def read
-  #   @page_title = 'View entries I have read'
-  #   @aggregation = Aggregation.new
-  #   @aggregation.title = @page_title
-  #   @entries = Entry.get_entries_read_for_user(current_user.id, :limit => @per_page, :offset => (@per_page * @page))
-  #   respond_to do |format|
-  #     format.html { render(:template => 'aggregations/show', :layout => false) }
-  #     format.xml  { render :xml => @entries }
-  #   end
-  # end
-  # 
-  # def duplicate
-  #   @page_title = 'Duplicate Aggregation'
-  # 
-  #   @aggregation = Aggregation.find(params[:id], :include => 'feeds')
-  #   @new_aggregation = Aggregation.new
-  # 
-  #   @new_aggregation.title = @aggregation.title
-  #   @new_aggregation.description = @aggregation.description
-  #   @new_aggregation.user_id = current_user.id
-  # 
-  #   success = false
-  #   if @new_aggregation.save
-  #     @page_title = 'Added aggregation ' + @new_aggregation.title
-  #     @aggregation.feeds.each do |feed|
-  #       @new_aggregation.feeds << feed
-  #     end
-  #     success = true
-  #   end
-  # 
-  #   respond_to do |format|
-  #     if success
-  #       flash[:notice] = "Successfully added the " + @new_aggregation.title + " to your aggregations"
-  #       format.html { redirect_to(CGI::unescape(params[:return_page])) if params[:return_page] }
-  #       format.xml  { render :xml => @new_aggregation, :status => :created, :location => @new_aggregation }
-  #     else
-  #       flash[:notice] = "Some kind of bad thing happened when we tried to add the requested aggregation to your account.  We'll look into it.  If you want press the back button and try again.  If that doesn't work yell at the computer for a bit, it always helps me feel better.  Believe me we are just as upset about all this as you are."
-  #       format.html 
-  #       format.xml  { render :xml => @new_aggregation.errors }
-  #     end
-  #   end
-  # end
-  
+  def preview
+    if params[:terms].blank?
+      flash[:error] = I18n.t('muck.raker.no_terms_error')
+      redirect_to new_polymorphic_url([@parent, :aggregation])
+    else
+      terms = params[:terms]
+      terms = terms.join(' ') if terms.is_a?(Array)
+      
+      #@feeds = Service.build_feeds(terms, current_user, params[:service_ids])
+      
+      @photo_feeds = Service.build_photo_feeds(terms, current_user)
+      @video_feeds = Service.build_video_feeds(terms, current_user)
+      @bookmark_feeds = Service.build_bookmark_feeds(terms, current_user)
+      @music_feeds = Service.build_music_feeds(terms, current_user)
+      @general_feeds = Service.build_general_feeds(terms, current_user)
+
+      @discovered_feeds = GoogleFeedRequest.find_feeds(terms)
+      @title = terms.titleize
+      @terms = terms
+      
+      @aggregation = Aggregation.new(:title => @title, :terms => @terms)
+
+      respond_to do |format|
+        format.html { render :template => 'aggregations/preview' }
+      end
+    end
+  end
+
   def new
     @page_title = I18n.t('muck.raker.new_aggregation')
     @service_categories = ServiceCategory.sorted.find(:all, :include => [:tag_services])
@@ -197,17 +87,14 @@ class Muck::AggregationsController < ApplicationController
       format.html { render :template => 'aggregations/new' }
     end
   end
-
+  
   def create
-    @aggregation = Aggregation.new(params[:aggregation])
-    @aggregation.title = @aggregation.terms.humanize if @aggregation.terms
-    @aggregation.save!
-
+    @aggregation = Aggregation.create(params[:aggregation])
+    @parent.aggregations << @aggregation if @parent # associate the parent if present
+    
     # build a list of feeds and associate them with the aggregation
     @aggregation.add_feeds(current_user, params[:service_ids])
-    
-    # associate the parent if present
-    @parent.aggregations << @aggregation if @parent
+    @aggregation.add_feeds_by_uri(current_user, params[:uris])
 
     respond_to do |format|
       flash[:notice] = I18n.t('muck.raker.add_feeds_to_aggregation', :title => @aggregation.title)
@@ -223,94 +110,79 @@ class Muck::AggregationsController < ApplicationController
   end
   
   def edit
-    @aggregation = Aggregation.find(params[:id])
-    @service_categories = ServiceCategory.sorted.find(:all, :include => [:tag_services])
-    @page_title = I18n.t('muck.raker.edit_aggregation_title', :title => @aggregation.title)
+    setup_edit
     respond_to do |format|
       format.html { render :template => 'aggregations/edit' }
     end
   end
 
-  # def update
-  #   @aggregation = Aggregation.find(params[:id])
-  # 
-  #   respond_to do |format|
-  #     if @aggregation.update_attributes(params[:aggregation])
-  #       flash[:notice] = 'Aggregation was successfully updated.'
-  #       format.html { redirect_to(manage_user_aggregations_path(:user_id => current_user.id)) }
-  #       format.xml  { head :ok }
-  #     else
-  #       format.html { render :action => "edit" }
-  #       format.xml  { render :xml => @aggregation.errors }
-  #     end
-  #   end
-  # end
-  # 
-  # def destroy
-  #   @aggregation = Aggregation.find(params[:id])
-  #   @aggregation.destroy
-  # 
-  #   respond_to do |format|
-  #     flash[:notice] = @aggregation.title + ' has been removed.'
-  #     format.html { redirect_to(manage_user_aggregations_url(current_user)) }
-  #     format.xml  { head :ok }
-  #   end
-  # end
+  def update
+    if params[:aggregation]
+      @aggregation.update_attributes!(params[:aggregation])
+      flash[:notice] = I18n.t('muck.raker.aggregation_updated')
+    end
+    @feeds = []
+    if params[:uri]
+      @feeds = Feed.feeds_from_uri(params[:uri], current_user)
+      @aggregation.safe_add_feeds(@feeds)
+    elsif params[:service_ids]
+      @aggregation.terms = @aggregation.terms + ",#{params[:terms]}"
+      @aggregation.save!
+      @feeds = @aggregation.add_feeds(current_user, params[:service_ids])
+    end
+    
+    message = I18n.t('muck.raker.no_feeds_found') if @feeds.blank?
+    
+    respond_to do |format|
+      format.html { redirect_to edit_polymorphic_url([@aggregation.ownable, @aggregation]) }
+      format.xml  { head :ok }
+      format.json do
+        render :json => { :aggregation => @aggregation,
+                          :feeds => @feeds,
+                          :message => message,
+                          :success => true,
+                          :html => get_google_feed_html }.as_json
+      end
+    end
+  rescue ActiveRecord::RecordInvalid => ex
+    respond_to do |format|
+      format.html do
+        setup_edit
+        render :template => "aggregations/edit"
+      end
+      format.json { render :json => { :aggregation => @aggregation, 
+                                      :feeds => @feeds, 
+                                      :message => ex.to_s, 
+                                      :success => false, 
+                                      :html => '' }.as_json }
+      format.xml  { render :xml => @aggregation.errors }
+    end
+  end
 
-  # # associate an existing feed with an aggregation
-  # def associate_feed
-  #   @aggregation = Aggregation.find(params[:id])
-  #   @feed = Feed.find(params[:feed_id])
-  #   current_feed = @aggregation.feeds.find(@feed) rescue nil
-  # 
-  #   if current_feed.nil?
-  #     @aggregation.feeds << @feed
-  #     notice =  @feed.title + ' was successfully added to ' + @aggregation.title
-  #   else
-  #     notice =  @feed.title + ' is already a part of ' + @aggregation.title
-  #   end
-  # 
-  #   respond_to do |format|
-  #     if params[:search_terms]
-  #       redirect_path = url_for({:controller => 'feeds', :action => 'search', :aggregation_id => @aggregation, :id => @feed, :search_terms => params[:search_terms]})
-  #     else
-  #       redirect_path = aggregation_feeds_url(@aggregation)
-  #     end
-  # 
-  #     if @aggregation.save
-  #       flash[:notice] = notice
-  #       format.html { redirect_to(redirect_path) }
-  #       format.xml  { render :xml => @aggregation, :status => :added_feed, :location => @aggregation }
-  #     else
-  #       flash[:notice] = 'Could not add ' + @feed.title + ' to ' + @aggregation.title
-  #       format.html { redirect_to(redirect_path) }
-  #       format.xml  { render :xml => @aggregation.errors }
-  #     end
-  #   end
-  # end
-  # 
-  # #disassciates a feed from an aggregation
-  # def remove_feed
-  #   @aggregation = Aggregation.find(params[:id])
-  #   @feed = Feed.find(params[:feed_id])
-  #   @aggregation.feeds.delete(@feed)
-  #   respond_to do |format|
-  #     if @aggregation.save
-  #       flash[:notice] = @feed.title + ' was successfully removed from ' + @aggregation.title
-  #       format.html { redirect_to(aggregation_feeds_path(@aggregation)) }
-  #       format.xml  { render :xml => @aggregation, :status => :removed_feed, :location => @aggregation }
-  #     else
-  #       flash[:notice] = 'Could not remove ' + @feed.title + ' from ' + @aggregation.title
-  #       format.html { redirect_to(aggregation_feeds_path(@aggregation)) }
-  #       format.xml  { render :xml => @aggregation.errors }
-  #     end
-  #   end
-  # end
+  def destroy
+    @aggregation = Aggregation.find(params[:id])
+    @aggregation.destroy
+    respond_to do |format|
+      flash[:notice] = I18n.t('muck.raker.aggregation_deleted', :title => @aggregation.title)
+      format.html { redirect_to polymorphic_url([@aggregation.ownable, :aggregations]) }
+      format.xml  { head :ok }
+    end
+  end
 
   protected
     
+    def setup_edit
+      @feeds = @aggregation.all_feeds
+      setup_feed_display_variables
+      @service_categories = ServiceCategory.sorted.find(:all, :include => [:tag_services])
+      @page_title = I18n.t('muck.raker.edit_aggregation_title', :title => @aggregation.title)
+    end
+    
     def get_owner
       @parent = get_parent
+    end
+    
+    def check_user_permissions
       unless has_permission?
         permission_denied
       end
@@ -340,5 +212,23 @@ class Muck::AggregationsController < ApplicationController
         @parent.can_edit?(current_user)
       end
     end
+  
+    def setup_feed_display_variables
+      @show_controls = show_controls?
+      @number_of_items = 4
+      @number_of_images = 6
+      @number_of_videos = 6
+    end
+    
+    # determines whether or not to show admin controls (ie save aggregation)
+    def show_controls?
+      logged_in?
+    end
+    
+    def get_google_feed_html
+      render_as_html do
+        render_to_string(:partial => 'aggregations/feeds')
+      end
+    end
     
 end

data/app/controllers/muck/topics_controller.rb

@@ -0,0 +1,93 @@
+class Muck::TopicsController < ApplicationController
+  unloadable
+  
+  before_filter :adjust_format_for_iphone
+  before_filter :check_terms, :except => [:new]
+  before_filter :build_feeds, :only => [:show, :rss_discovery]
+  
+  def show
+    respond_to do |format|
+      format.html do
+        @opml_path = topic_path(params[:id], :service_ids => params[:service_ids], :format => 'opml')
+        render :template => 'topics/show'
+      end
+      format.opml { render :template => 'topics/show' }
+      format.iphone { render :template => 'topics/show' }
+    end
+  end
+
+  def rss_discovery
+    render :template => 'aggregations/rss_discovery'
+  end
+
+  def photos
+    @terms = CGI.unescape(params[:id])
+    @page_title = @title = @terms.titleize
+    @photo_feeds = Service.build_photo_feeds(@terms, current_user, params[:service_ids])
+    @number_of_images = 36
+    respond_to do |format|
+      format.html do
+        render :template => 'topics/photos'
+      end
+      format.iphone { render :template => 'topics/photos' }
+    end
+  end
+  
+  def videos
+    @terms = CGI.unescape(params[:id])
+    @page_title = @title = @terms.titleize
+    @videos_feeds = Service.build_video_feeds(@terms, current_user, params[:service_ids])
+    @number_of_videos = 36
+    respond_to do |format|
+      format.html do
+        render :template => 'topics/videos'
+      end
+      format.iphone { render :template => 'topics/videos' }
+    end
+  end
+  
+  def new
+    @page_title = I18n.t('muck.raker.new_topic_title')
+    @service_categories = ServiceCategory.sorted.find(:all, :include => [:tag_services])
+    respond_to do |format|
+      format.html { render :template => 'topics/new' }
+    end
+  end
+
+  def create
+    @terms = CGI.escape(params[:terms])
+    respond_to do |format|
+      format.html { redirect_to topic_path(@terms, :service_ids => params[:service_ids]) }
+      format.opml { redirect_to topic_path(@terms, :service_ids => params[:service_ids], :format => 'opml') }
+    end
+  end
+  
+  protected
+    
+    def check_terms
+      if params[:id].blank? && params[:terms].blank?
+        flash[:error] = I18n.t('muck.raker.no_terms_error')
+        redirect_to new_topic_path
+      end
+    end
+    
+    def build_feeds
+      @terms = CGI.unescape(params[:id])
+      @page_title = @title = @terms.titleize
+    
+      @photo_feeds = Service.build_photo_feeds(@terms, current_user, params[:service_ids])
+      @video_feeds = Service.build_video_feeds(@terms, current_user, params[:service_ids])
+      @bookmark_feeds = Service.build_bookmark_feeds(@terms, current_user, params[:service_ids])
+      @music_feeds = Service.build_music_feeds(@terms, current_user, params[:service_ids])
+      @general_feeds = Service.build_general_feeds(@terms, current_user, params[:service_ids])
+
+      @discovered_feeds = GoogleFeedRequest.find_feeds(@terms)
+
+      @feeds = @photo_feeds + @video_feeds + @bookmark_feeds + @music_feeds + @general_feeds + @discovered_feeds
+    
+      @number_of_items = 6
+      @number_of_images = 12
+      @number_of_videos = 6
+    end
+    
+end

data/app/helpers/muck_raker_aggregations_helper.rb

@@ -8,4 +8,25 @@ module MuckRakerAggregationsHelper
     true
   end
   
+  def feed_preview(feeds, discovered_feeds, related_title = nil, number_of_items = 5, number_of_images = 20, content_id = nil)
+    render :partial => 'topics/feed_preview', :locals => {:feeds => feeds,
+                                                         :related_title => related_title,
+                                                         :discovered_feeds => discovered_feeds,
+                                                         :number_of_items => number_of_items,
+                                                         :number_of_images => number_of_images,
+                                                         :content_id => content_id }
+  end
+  
+  def aggregation_parent_name(parent)
+    if @parent
+      "#{@parent.to_s.underscore}"
+    else
+      'Aggregation'
+    end
+  end
+  
+  def topics_form
+    render :partial => 'topics/form'
+  end
+  
 end

data/app/helpers/muck_raker_feeds_helper.rb

@@ -11,18 +11,6 @@ module MuckRakerFeedsHelper
       feeds_path(options)
     end
   end
-    
-  def new_aggregation_path_with_parent(parent, options = {})
-    if parent
-      aggregations_path(make_parent_params(parent).merge(options))
-    else
-      aggregations_path(options)
-    end
-  end
-  
-  def make_parent_params(parent)
-    { :parent_id => parent.id, :parent_type => parent.class.to_s }
-  end
 
   def feed_contributor_link(feed)
     if feed.contributor_id.nil?