muck-services 0.1.44 → 0.1.45

data/VERSION

@@ -1 +1 @@
-0.1.44
+0.1.45

data/app/controllers/muck/entries_controller.rb

@@ -30,6 +30,7 @@ class Muck::EntriesController < ApplicationController
   def search
     @search = params[:q] || params[:terms]
     @grain_size = params[:grain_size] || 'all'
+    @details = params[:details] || 'true'
     _search
     respond_to do |format|
       format.html { render :template => 'entries/search' }

data/app/controllers/muck/feeds_controller.rb

@@ -6,7 +6,7 @@ class Muck::FeedsController < ApplicationController
   before_filter :get_owner, :except => ['index', 'show']
   
   def index
-    @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)
+    @feeds = Aggregation.global_feeds(params[:order], params[:asc]).paginate(:page => @page, :per_page => @per_page)
     respond_to do |format|
       format.html { render :template => 'feeds/index' }
       format.xml  { render :xml => @feeds.to_xml }

data/app/helpers/muck_services_feeds_helper.rb

@@ -14,18 +14,18 @@ module MuckServicesFeedsHelper
 
   def feed_contributor_link(feed)
     if feed.contributor_id.nil?
-      admin = Feed.find_by_login('admin')
+#      admin = Feed.find_by_login('admin')
       'unknown'
     else
       link_to feed.contributor.display_name, profile_path(feed.contributor)
     end
   end
 
-  def sort_feeds_link(current_order, current_asc, new_order, admin = false)
+  def sort_feeds_url(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')
+      feeds_url(:order => new_order, :asc => (current_order == new_order && (current_asc == 'false' || current_asc == nil)) ? 'true' : 'false')
     end
   end
 

data/app/models/aggregation.rb

@@ -30,7 +30,21 @@ class Aggregation < ActiveRecord::Base
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
   named_scope :newest, :order => "created_at DESC"
 
-    
+
+  def self.global_feeds(order_field = 'title', ascending = 'true')
+    allowed_fields = ['languages.english_name','status','entries_count','harvested_from_title','last_harvested_at','created_at','feed_contributor']
+    order_direction = (ascending == 'false' ? ' DESC' : ' ASC')
+    order_by = allowed_fields.include?(order_field) ? (order_field  + order_direction + ', title') : ('title ' + order_direction)
+
+    Feed.find_by_sql("SELECT users.id feed_contributor_id, users.login feed_contributor, languages.english_name default_language_name, feeds.*, aggregation_id <=> 1 FROM aggregations " +
+            "INNER JOIN aggregation_feeds ON aggregations.id = aggregation_feeds.aggregation_id " +
+            "RIGHT OUTER JOIN feeds ON aggregation_feeds.feed_id = feeds.id " +
+            "INNER JOIN languages ON feeds.default_language_id = languages.id " +
+            "LEFT OUTER JOIN users ON feeds.contributor_id = users.id " +
+#            "WHERE aggregations.title = 'global_feeds' AND feeds.status >= 0 " +
+          "ORDER BY #{order_by}")
+  end
+
   # Builds and then adds feeds for a given terms
   # user:         User to be associated with each feed.  Default is nil which makes each feed global.
   # service_ids:  An array of service ids.  Nil will generate a feed for every available service.

data/app/views/entries/_result.html.erb

@@ -1,6 +1,6 @@
 <% link = visit_path(result) %>
 <p>
-  <%= link_to result.title + " (" + (result.collection.nil? ? result.feed_id.to_s : result.collection) + ")", link, :class => "title_link", :rel => "nofollow" %>
+  <%= link_to result.title + " (" + (@feed.nil? ? result.collection : @feed.short_title) + ")", link, :class => "title_link", :rel => "nofollow" %>
   - <%= link_to t('muck.services.related_resources'), resource_path(result), :class => "related_resources_link", :rel => "nofollow" %>
   <% if !result.direct_link.nil? %> - <%= link_to t('muck.services.metadata'), result.permalink, :class => "catalog_link" %><% end %>
   <% if result.description.length > 0 %><br/><span class="description"><%= truncate_words(result.description) %></span><% end %>

data/app/views/entries/search.pjs.erb

@@ -1,4 +1,6 @@
-<% cache({:locale => Language.locale_id, :format => 'pjs', :grain_size => @grain_size, :q => @search, :omit_feeds => @omit_feeds, :page => @page, :per_page => @per_page}) do %>
+<% cache({:locale => Language.locale_id, :format => 'pjs', :details => @details,
+          :grain_size => @grain_size, :q => @search, :omit_feeds => @omit_feeds,
+          :page => @page, :per_page => @per_page}) do %>
 <% if !@results.blank? %>
 function truncate(text, length) {
     nEnd = text.indexOf(" ", 200);
@@ -15,9 +17,11 @@ for(nRec = 0; nRec < recs.length; nRec++) {
     if (r == null) r = recs[nRec];
 	document.write('<p class="oer_recommender_item">');
 	document.write('<a class="oer_recommender_recommendation_link" href="' + app + 'visits/' + r.id + '">' + r.title + ' (' + r.collection + ')</a>');
+<% if @details == 'true' %>
     if (r.description) document.write('<br/><span class="oer_recommender_description">' + truncate(r.description) + '</span>');
     document.write('<br/><span class="oer_recommender_uri">' + r.permalink + '</span>');
 	document.write('</p>');
+<% end %>
 }
 document.write('</div>');
 document.write('</div>');

data/app/views/feeds/_feed.html.erb

@@ -23,6 +23,6 @@
       <% end -%>
   <% end %>
   <hr/>
-  <%= render :partial => 'feeds/entry', :collection => @entries %>
+  <%= render :partial => 'entries/result', :collection => @entries %>
   <%= will_paginate @entries %>
 </div>

data/app/views/feeds/_feed_row.html.erb

@@ -15,15 +15,16 @@
       <% end -%>
     </td>
   <% end -%>
-  <td><%= feed_row.error_message ? t('muck.services.failed_last_request', :error => feed_row.error_message) : feed_row.banned? ? t('muck.services.banned') : feed_row.pending? ? ('muck.services.pending') : t('muck.services.ok') %></td>
-  <td><%= feed_row.default_language.english_name unless feed_row.default_language.nil? %></td>
   <td><%= feed_row.entries_count.nil? ? "0" : feed_row.entries_count.to_s %></td>
-  <td><%= feed_row.harvested_from_short_title %></td>
   <td>
     <%= link_to image_tag('icons/feed.png'), feed_row.uri, :target => '_blank' %>
-    <%= link_to h(feed_row.title || feed_row.display_uri), feed_path(feed_row) %>
-    <% if feed_row.display_uri != feed_row.uri %><%= link_to image_tag('icons/external.png'), feed_row.display_uri, :target => '_blank' %><% end %>
+    <%= link_to h(feed_row.title.empty? ? (feed_row.display_uri.nil? ? feed_row.uri : feed_row.display_uri) : feed_row.title), feed_path(feed_row) %>
+    <% if (!feed_row.display_uri.nil? && feed_row.display_uri != feed_row.uri) %><%= link_to image_tag('icons/external.png'), feed_row.display_uri, :target => '_blank' %><% end %>
   </td>
-  <td><%= feed_row.last_harvested_at.strftime('%d %b at %H:%M') if feed_row.last_harvested_at %></td>
-  <td><%= feed_row.created_at.strftime('%d %b %y') if feed_row.created_at %></td>
+  <td><%= link_to(feed_row.feed_contributor, profile_path(feed_row.feed_contributor_id)) if feed_row.feed_contributor %></td>
+  <td><%= feed_row.created_at.strftime('%d %b %Y') if feed_row.created_at %></td>
+  <td><%= feed_row.last_harvested_at.strftime('%d %b %Y at %H:%M') if feed_row.last_harvested_at %></td>
+  <td><%= feed_row.default_language_name %></td>
+  <td><%= feed_row.harvested_from_short_title %></td>
+  <td><%= feed_row.error_message ? t('muck.services.failed_last_request', :error => feed_row.error_message) : feed_row.banned? ? t('muck.services.banned') : feed_row.pending? ? ('muck.services.pending') : t('muck.services.ok') %></td>
 </tr>

data/app/views/feeds/index.html.erb

@@ -7,13 +7,14 @@
   </p>
   <table class="feeds">
     <tr>
-      <th><%= link_to t('muck.services.status'), sort_feeds_link(params[:order], params[:asc], 'status') %></th>
-      <th><%= link_to t('muck.services.default_language'), sort_feeds_link(params[:order], params[:asc], 'languages.english_name') %></th>
-      <th><%= link_to t('muck.services.entries_count'), sort_feeds_link(params[:order], params[:asc], 'entries_count') %></th>
-      <th><%= link_to t('muck.services.repository'), sort_feeds_link(params[:order], params[:asc], 'harvested_from_title')  %></th>
-      <th><%= link_to t('muck.services.title'), sort_feeds_link(params[:order], params[:asc], 'title')  %></th>
-      <th><%= link_to t('muck.services.harvested_at'), sort_feeds_link(params[:order], params[:asc], 'last_harvested_at') %></th>
-      <th><%= link_to t('muck.services.added_date'), sort_feeds_link(params[:order], params[:asc], 'created_at') %></th>
+      <th><%= link_to t('muck.services.entries_count'), sort_feeds_url(params[:order], params[:asc], 'entries_count') %></th>
+      <th><%= link_to t('muck.services.title'), sort_feeds_url(params[:order], params[:asc], 'title')  %></th>
+      <th><%= link_to t('muck.services.contributor'), sort_feeds_url(params[:order], params[:asc], 'feed_contributor') %></th>
+      <th width="70px"><%= link_to t('muck.services.added_date'), sort_feeds_url(params[:order], params[:asc], 'created_at') %></th>
+      <th width="120px"><%= link_to t('muck.services.harvested_at'), sort_feeds_url(params[:order], params[:asc], 'last_harvested_at') %></th>
+      <th><%= link_to t('muck.services.default_language'), sort_feeds_url(params[:order], params[:asc], 'languages.english_name') %></th>
+      <th><%= link_to t('muck.services.repository'), sort_feeds_url(params[:order], params[:asc], 'harvested_from_title')  %></th>
+      <th><%= link_to t('muck.services.status'), sort_feeds_url(params[:order], params[:asc], 'status') %></th>
     </tr>
     <%= render :partial => 'feeds/feed_row', :collection => @feeds %>
   </table>

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.44"
+  s.version = "0.1.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-06-01}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.44
+  version: 0.1.45
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -06:00
+date: 2010-06-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency