muck-raker 0.1.33 → 0.1.35

data/README.rdoc

@@ -79,6 +79,9 @@ class Comment < ActiveRecord::Base
   acts_as_muck_raker_comment
 end
 
+=== CSS
+Use test/rails_root/public/stylesheets/application.css as a starting place for the css required in your application.
+
 === Frame css
 There is an example css file for the framed page in frame.css.
 

data/VERSION

@@ -1 +1 @@
-0.1.33
+0.1.35

data/app/controllers/admin/muck/feeds_controller.rb

@@ -3,7 +3,7 @@ class Admin::Muck::FeedsController < Admin::Muck::BaseController
   unloadable
 
   def index
-    @feeds = Feed.by_newest.paginate(:page => @page, :per_page => @per_page)
+    @feeds = Feed.find(:all, :order => (params[:order] || 'created_at') + (params[:asc] == 'false' ? ' DESC' : ' ASC') + ', title', :include => [:default_language]).paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'admin/feeds/index' }
       format.xml  { render :xml => @feeds.to_xml }
@@ -12,8 +12,8 @@ class Admin::Muck::FeedsController < Admin::Muck::BaseController
 
   def update
     feed = Feed.find(params[:id])
-    if params[:status] == 'unban'
-      unban(feed)
+    if params[:status] == 'approve'
+      approve(feed)
       flash[:notice] = t('muck.raker.feed_validated_message')
     elsif params[:status] == 'ban'
       ban(feed)
@@ -28,12 +28,12 @@ class Admin::Muck::FeedsController < Admin::Muck::BaseController
   
     def ban(feed)
       feed.entries.destroy_all
-      feed.status = -1
+      feed.status = MuckRaker::Status::BANNED
       feed.save!
     end
 
-    def unban(feed)
-      feed.status = 0
+    def approve(feed)
+      feed.status = MuckRaker::Status::APPROVED
       feed.save!
     end
   

data/app/controllers/admin/muck/oai_endpoints_controller.rb

@@ -0,0 +1,13 @@
+class Admin::Muck::OaiEndpointsController < Admin::Muck::BaseController
+
+  unloadable
+  
+  def index
+    @oai_endpoints = OaiEndpoint.by_newest.paginate(:page => @page, :per_page => @per_page)
+    respond_to do |format|
+      format.html { render :template => 'admin/oai_endpoints/index' }
+      format.xml  { render :xml => @oai_endpoints.to_xml }
+    end
+  end
+
+end

data/app/controllers/muck/aggregations_controller.rb

@@ -1,7 +1,10 @@
 class Muck::AggregationsController < ApplicationController
 
+  unloadable
+  
   require 'cgi'
   
+  before_filter :login_required, :except => [:show]
   before_filter :get_owner, :only => [:index, :new, :create]
   before_filter :has_permission?, :only => [:index, :new, :create]
   
@@ -29,25 +32,18 @@ class Muck::AggregationsController < ApplicationController
   #     format.xml { render :xml => @aggregations }
   #   end
   # end
-  # 
-  # def show
-  #   @aggregation = Aggregation.find(params[:id])
-  #   user_id = -1
-  #   user_id = current_user.id unless current_user.nil?
-  # 
-  #   @rss_title = @aggregation.title
-  #   @rss_description = @aggregation.description
-  # 
-  #   @entries = Entry.get_entries_for_aggregation(@aggregation.id, user_id, :limit => @per_page, :offset => (@per_page * @page))
-  #   @page_title = @aggregation.title
-  #   respond_to do |format|
-  #     format.html { render(:layout => false) }
-  #     format.opml { render(:layout => false) }
-  #     format.xml  { render :xml => @entries }
-  #     format.rss { render(:template => 'aggregations/show', :layout => false) }
-  #   end
-  # end
-  # 
+  
+  def show
+    @aggregation = Aggregation.find(params[:id])  
+    @page_title = @aggregation.title
+    @entries = @aggregation.feeds.entries.paginate(:page => @page, :per_page => @per_page)
+    respond_to do |format|
+      format.html { render(:template => 'aggregations/show') }
+      format.opml { render(:layout => false) }
+      format.rss {}
+    end
+  end
+  
   # def show_marked
   # 
   #   @user = User.find(params[:user_id])
@@ -202,28 +198,39 @@ class Muck::AggregationsController < ApplicationController
     end
   end
 
-  # def edit
-  #   @aggregation = Aggregation.find(params[:id])
-  #   @page_title = 'Editing ' + @aggregation.title
-  # end
-  # 
-  # def create
-  #   @aggregation = Aggregation.new(params[:aggregation])
-  #   @aggregation.name = make_safe_uri(@aggregation.title)
-  #   @aggregation.user = current_user
-  # 
-  #   respond_to do |format|
-  #     if @aggregation.save
-  #       flash[:notice] = @aggregation.title + ' created.  Now add some feeds:'
-  #       format.html { redirect_to(new_aggregation_feed_path(@aggregation)) }
-  #       format.xml  { render :xml => @aggregation, :status => :created, :location => @aggregation }
-  #     else
-  #       format.html { render :action => "new" }
-  #       format.xml  { render :xml => @aggregation.errors }
-  #     end
-  #   end
-  # end
-  # 
+  def create
+    @aggregation = Aggregation.new(params[:aggregation])
+    @aggregation.title = @aggregation.terms.humanize if @aggregation.terms
+    @aggregation.save!
+
+    # 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
+
+    respond_to do |format|
+      flash[:notice] = I18n.t('muck.raker.add_feeds_to_aggregation', :title => @aggregation.title)
+      format.html { redirect_to(edit_aggregation_path(@aggregation)) }
+      format.xml  { render :xml => @aggregation, :status => :created, :location => @aggregation }
+    end
+
+  rescue ActiveRecord::RecordInvalid => ex
+    respond_to do |format|
+      format.html { render :action => "aggregations/new" }
+      format.xml  { render :xml => @aggregation.errors }
+    end
+  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)
+    respond_to do |format|
+      format.html { render :template => 'aggregations/edit' }
+    end
+  end
+
   # def update
   #   @aggregation = Aggregation.find(params[:id])
   # 
@@ -303,7 +310,10 @@ class Muck::AggregationsController < ApplicationController
   protected
     
     def get_owner
-      setup_parent
+      @parent = get_parent
+      unless has_permission?
+        permission_denied
+      end
     end
     
     def get_aggregation
@@ -324,7 +334,11 @@ class Muck::AggregationsController < ApplicationController
     end
     
     def has_permission?
-      @parent.can_edit?(current_user)
+      if @parent.blank?
+        admin?
+      else
+        @parent.can_edit?(current_user)
+      end
     end
     
 end

data/app/controllers/muck/feeds_controller.rb

@@ -2,10 +2,10 @@ class Muck::FeedsController < ApplicationController
 
   unloadable
   
-  before_filter :get_parent
+  before_filter :get_owner
   
   def index
-    @feeds = Feed.valid.by_title.paginate(:page => @page, :per_page => @per_page)
+    @feeds = Feed.find(:all, :conditions => 'status >= 0', :order => (params[:order] || 'title') + (params[:asc] == 'false' ? ' DESC' : ' ASC') + ', title', :include => [:default_language]).paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'feeds/index' }
       format.xml  { render :xml => @feeds.to_xml }
@@ -15,20 +15,35 @@ class Muck::FeedsController < ApplicationController
   # pass layout=popup to remove most of the chrome
   def show
     @feed = Feed.find(params[:id])
-    @entries = @feed.entries
+    @entries = @feed.entries.paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'feeds/show', :layout => params[:layout] || true  }
-      format.pjs { render :template => 'feeds/show', :layout => false }
+      format.pjs do
+        render :update do |page|
+          page.replace_html('feed-container', :partial => 'feeds/feed', :object => @feed)
+        end
+      end
       format.json { render :json => @feed.as_json }
     end
   end
 
   def new
     respond_to do |format|
-      format.html { render :template => 'feeds/new', :layout => 'popup' }
+      format.html { render :template => 'feeds/new', :layout => params[:layout] || true }
     end
   end
 
+  def new_oai_rss
+    @feed = Feed.new
+    @feed.default_language = Language.find_by_locale('en')
+    @feed.service_id = MuckRaker::Services::RSS
+    @oai_endpoint = OaiEndpoint.new
+    @oai_endpoint.default_language = @feed.default_language
+    respond_to do |format|
+      format.html { render :template => 'feeds/new_oai_rss', :layout => 'popup' }
+    end
+  end
+  
   def new_extended
     respond_to do |format|
       format.html { render :template => 'feeds/new_extended', :layout => 'popup' }
@@ -36,6 +51,9 @@ class Muck::FeedsController < ApplicationController
   end
 
   def create
+
+    Feed.discover_feeds(params[:feed][:uri])
+    
     @feed = Feed.new(params[:feed])
     @feed.contributor = current_user # record the user that submitted the feed for auditing purposes
     @feed.harvested_from_display_uri = @feed.display_uri
@@ -73,12 +91,8 @@ class Muck::FeedsController < ApplicationController
   
   protected
 
-    def get_parent
-      if !params[:parent_type] || !params[:parent_id]
-        return
-      end
-      @klass = params[:parent_type].to_s.constantize
-      @parent = @klass.find(params[:parent_id])
+    def get_owner
+      @parent = get_parent
       unless has_permission_to_add_feed(current_user, @parent)
         permission_denied
       end
@@ -90,19 +104,22 @@ class Muck::FeedsController < ApplicationController
     
     # Handles render and redirect after success or failure of the
     # create action.  Override to perform a different action
+    # fail_template determines which 'new' is rendered in the event that
+    # the create is not successful.
     def after_create_response(success)
       if success
         flash[:notice] = t('muck.raker.feed_successfully_created')
         respond_to do |format|
           format.html { redirect_to feed_path(@feed) }
-          format.pjs { render :template => 'feeds/show', :layout => false }
+          format.pjs { redirect_to feed_path(@feed, :layout => 'popup') }
           format.json { render :json => @feed.as_json }
           format.xml  { head :created, :location => feed_url(@feed) }
         end
       else
+        fail_template = params[:new_template] || 'feeds/new'
         respond_to do |format|
-          format.html { render :template => "feeds/new" }
-          format.pjs { render :template => "feeds/new", :layout => false }
+          format.html { render :template => fail_template }
+          format.pjs { render :template => fail_template, :layout => false }
           format.json { render :json => @feed.as_json }
           format.xml  { render :xml => @feed.errors.to_xml }
         end

data/app/controllers/muck/identity_feeds_controller.rb

@@ -29,7 +29,7 @@ class Muck::IdentityFeedsController < ApplicationController
   def create
     @service = Service.find(params[:service_id])
     @feed = Feed.new(:uri => params[:uri], :login => params[:username])
-    feeds = Feed.create_service_feeds(@service, params[:uri], params[:username], params[:password], current_user.id)
+    feeds = Service.create_feeds_for_service(@service, params[:uri], params[:username], params[:password], current_user.id)
     if feeds.blank?
       success = false
       if params[:username]
@@ -118,13 +118,13 @@ class Muck::IdentityFeedsController < ApplicationController
     
     def get_new_html(service, parent, feed)
       render_as_html do
-        render_to_string(:partial=> 'identity_feeds/form', :locals => { :service => service, :parent => parent, :feed => feed })
+        render_to_string(:partial => 'identity_feeds/form', :locals => { :service => service, :parent => parent, :feed => feed })
       end
     end
     
     def get_edit_html(identity_feed)
       render_as_html do
-        render_to_string(:partial=> 'identity_feeds/form', :locals => { :service => identity_feed.feed.service, :parent => identity_feed.ownable, :feed => identity_feed.feed })
+        render_to_string(:partial => 'identity_feeds/form', :locals => { :service => identity_feed.feed.service, :parent => identity_feed.ownable, :feed => identity_feed.feed })
       end
     end
     

data/app/controllers/muck/oai_endpoints_controller.rb

@@ -0,0 +1,96 @@
+class Muck::OaiEndpointsController < ApplicationController
+
+  unloadable
+
+  # pass layout=popup to remove most of the chrome
+  def show
+    @oai_endpoint = OaiEndpoint.find(params[:id])
+    respond_to do |format|
+      format.html { render :template => 'oai_endpoints/show', :layout => params[:layout] || true  }
+      format.json { render :json => @oai_endpoint.as_json }
+    end
+  end
+
+  def new
+    respond_to do |format|
+      format.html { render :template => 'oai_endpoints/new', :layout => params[:layout] || true }
+    end
+  end
+  
+  def create
+    @oai_endpoint = OaiEndpoint.new(params[:oai_endpoint])
+    @oai_endpoint.contributor = current_user # record the user that submitted the oai_endpoint for auditing purposes
+    @oai_endpoint.inform_admin # let an admin know that a global oai_endpoint was added.
+    after_create_response(@oai_endpoint.save)
+  end
+
+  def edit
+    @oai_endpoint = OaiEndpoint.find(params[:id])
+    respond_to do |format|
+      format.html { render :template => 'oai_endpoints/edit', :layout => 'popup' }
+    end
+  end
+  
+  def update
+    @oai_endpoint = OaiEndpoint.find(params[:id])
+    after_update_response(@oai_endpoint.update_attributes(params[:oai_endpoint]))
+  end
+
+  def destroy
+    @oai_endpoint = OaiEndpoint.find(params[:id])
+    @oai_endpoint.destroy
+    after_destroy_response
+  end
+  
+  protected
+  
+    def has_permission_to_add_oai_endpoint(user, parent)
+      user == parent || parent.can_add_oai_endpoint?(user)
+    end
+    
+    # Handles render and redirect after success or failure of the
+    # create action.  Override to perform a different action
+    def after_create_response(success)
+      if success
+        flash[:notice] = t('muck.raker.oai_endpoint_successfully_created')
+        respond_to do |format|
+          format.html { redirect_to oai_endpoint_path(@oai_endpoint) }
+          format.pjs { redirect_to oai_endpoint_path(@oai_endpoint, :layout => 'popup') }
+          format.json { render :json => @oai_endpoint.as_json }
+          format.xml  { head :created, :location => oai_endpoint_url(@oai_endpoint) }
+        end
+      else
+        respond_to do |format|
+          format.html { render :template => "oai_endpoints/new" }
+          format.pjs { render :template => "oai_endpoints/new", :layout => false }
+          format.json { render :json => @oai_endpoint.as_json }
+          format.xml  { render :xml => @oai_endpoint.errors.to_xml }
+        end
+      end
+    end
+  
+    # Handles render and redirect after success or failure of the
+    # update action.  Override to perform a different action
+    def after_update_response(success)
+      respond_to do |format|
+        if success
+          flash[:notice] = t('muck.raker.oai_endpoint_successfully_updated')
+          format.html { redirect_to oai_endpoint_path(@oai_endpoint) }
+          format.xml  { head :ok }
+        else
+          format.html { render :template => "oai_endpoints/edit" }
+          format.xml  { render :xml => @oai_endpoint.errors.to_xml }
+        end
+      end
+    end
+    
+    # Handles render and redirect after the delete action.
+    # Override to perform a different action
+    def after_destroy_response
+      respond_to do |format|
+        format.html { redirect_to oai_endpoints_path }
+        format.xml  { head :ok }
+      end
+    end
+    
+end

data/app/controllers/muck/opmls_controller.rb

@@ -0,0 +1,29 @@
+class Muck::OpmlsController < ApplicationController
+
+  unloadable
+  
+  def index
+    if params[:terms].blank?
+      flash[:error] = I18n.t('muck.raker.no_terms_error')
+      redirect_to new_opml_path
+    else
+      @feeds = Service.build_feeds(current_user, params[:terms], params[:service_ids])
+      @discovered_feeds = GoogleRequest.find_feeds(params[:terms])
+      @title = params[:terms]
+      @terms = params[:terms]
+      respond_to do |format|
+        format.html { render :template => 'opmls/index' }
+        format.opml { render(:layout => false) }
+      end
+    end
+  end
+  
+  def new
+    @page_title = I18n.t('muck.raker.generate_opml')
+    @service_categories = ServiceCategory.sorted.find(:all, :include => [:tag_services])
+    respond_to do |format|
+      format.html { render :template => 'opmls/new' }
+    end
+  end
+
+end

data/app/controllers/muck/recommendations_controller.rb

@@ -5,6 +5,9 @@ class Muck::RecommendationsController < ApplicationController
   # GET /recommendations
   # GET /recommendations.xml
   def index
+
+    @real_time == params[:rtr]
+    
     @details = params[:details] == "true"
 
     @uri = params[:u] || request.env['HTTP_REFERER']
@@ -37,11 +40,11 @@ class Muck::RecommendationsController < ApplicationController
         end
       end
       format.xml  { 
-        render(:template => @entry.id.nil? ? '/recommendations/index_real_time.xml.builder' : '/recommendations/index.xml.builder', :layout => false) 
+        render(:template => @entry.id.nil? && real_time == true ? '/recommendations/index_real_time.xml.builder' : '/recommendations/index.xml.builder', :layout => false)
       }
       format.pjs {
         @host = "http://#{URI.parse(@uri).host}"
-        render(:template => @entry.id.nil? ? 'recommendations/index_real_time.pjs.erb' : 'recommendations/index.pjs.erb', :layout => false)
+        render(:template => @entry.id.nil? && real_time == true ? 'recommendations/index_real_time.pjs.erb' : 'recommendations/index.pjs.erb', :layout => false)
       }
       format.rss {
         render(:template => 'recommendations/index.rss.builder', :layout => false)  

data/app/controllers/muck/visits_controller.rb

@@ -7,7 +7,7 @@ class Muck::VisitsController < ApplicationController
   def show
     @entry = Entry.find(params[:id])
     @page_title = @entry.title
-    @resource_uri = @entry.resource_uri
+    @resource_uri = @entry.resource_uri + (@entry.resource_uri.include?('?') ? "&" : "?") + "show_recs=true";
     @share = Share.new(:title => @entry.title, :uri => @resource_uri, :entry_id => @entry.id) if GlobalConfig.enable_raker_shares
 
     if GlobalConfig.enable_raker_comments

data/app/helpers/muck_raker_feeds_helper.rb

@@ -1,27 +1,44 @@
 module MuckRakerFeedsHelper
-  
+
   def add_feed(parent = nil)
     render :partial => 'parts/add_feed', :locals => {:parent => parent}
   end
-  
-  def add_single_feed(parent = nil)
-    render :partial => 'parts/add_single_feed', :locals => {:parent => parent}
-  end
-  
-  def add_extended_feed(parent = nil)
-    render :partial => 'parts/add_extended_feed', :locals => {:parent => parent}
-  end
 
-  def new_feed_path_with_parent(parent)
+  def new_feed_path_with_parent(parent, options = {})
     if parent
-      feeds_path(make_parent_params(parent))
+      feeds_path(make_parent_params(parent).merge(options))
     else
-      feeds_path
+      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
-  
-end
+
+  def feed_contributor_link(feed)
+    if feed.contributor_id.nil?
+      admin = Feed.find_by_login('admin')
+      'unknown'
+    else
+      link_to feed.contributor.display_name, user_path(feed.contributor_id)
+    end
+  end
+
+  def sort_feeds_link(current_order, current_asc, new_order, admin = false)
+    if admin == true
+      admin_feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'true' || current_asc == nil)) ? 'false' : 'true')
+    else
+      feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'true' || current_asc == nil)) ? 'false' : 'true')
+    end
+  end
+
+end