muck-raker 0.1.11 → 0.1.12

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/app/models/entry.rb

@@ -26,7 +26,7 @@ class Entry < ActiveRecord::Base
   end
   
   def recommendations(limit = 20, order = "relevance", details = false, omit_feeds = nil)
-    sql = "SELECT recommendations.id, dest_entry_id, permalink, entries.title, relevance_calculated_at, relevance, clicks, avg_time_at_dest AS avg_time_on_target, direct_link, feeds.short_title AS collection "
+    sql = "SELECT recommendations.id AS recommendation_id, dest_entry_id AS id, permalink, entries.title, relevance_calculated_at, relevance, clicks, avg_time_at_dest AS avg_time_on_target, direct_link, feeds.short_title AS collection "
     sql << ", entries.description, author, published_at " if details == true
     sql << "FROM recommendations "
     sql << "INNER JOIN entries ON recommendations.dest_entry_id = entries.id "

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

@@ -1,17 +1,15 @@
-<h1><%= link_to @entry_title, @entry.permalink %> <%= link_to "(xml)", "/recommendations.xml?u=" + @entry.permalink, :class=> "catalog_link" %> related resources details</h1>
-
-<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
+<h1><%= link_to @entry_title, @entry.permalink %> <%= link_to "(xml)", "/recommendations.xml?u=" + @entry.permalink, :class=> "catalog_link" %> - details</h1>
 
 <table border="1" cellpadding="3px">
 <tr>
-<th>Related Resource</th>
+<th>Related Resources <span style="color:#888;font-weight:normal;">(<%= t('muck.raker.calculated') %> <%= @entry.relevance_calculated_at.strftime("%d %b %Y") %>)</span></th>
 <th>Relevance</th>
 <th>Clicks</th>
 <th>Avg Time<br/>(seconds)</th>
 </tr>
-<% @entry.ranked_recommendations(@limit, params[:order] || "mixed").each do |r| %>
+<% @entry.ranked_recommendations(@limit, params[:order] || "relevance").each do |r| %>
 <tr>
-<td><%= link_to r["title"] + " (" + r["collection"] + ")", "/r?id=" + r["id"].to_s %></td>
+<td><%= link_to r["title"] + " (" + r["collection"] + ")", "/r?id=" + r["recommendation_id"].to_s %></td>
 <td class="centered"><%= round(r["relevance"]) %></td>
 <td class="centered"><%= r["clicks"] %></td>
 <td class="centered"><%= r["avg_time_on_target"] %></td>

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

@@ -1,18 +1,9 @@
 <% link = @entry.direct_link.nil? ? @entry.permalink : @entry.direct_link %>
 
-<h1>Folksemantic - <%= t('muck.raker.related_resources_title') %></h1>
-
-<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
-
-<%#= render(:partial => "search/search_box") %>
-
-<p><b><%= link_to @entry_title, link %></b> <% if !@entry.direct_link.nil? %> - <%= link_to t('muck.raker.metadata'), @entry.permalink, :class => "catalog_link" %><% end %></p>
-<hr class="divider" />
-
-<p><b><%= t('muck.raker.related_resources_title') %></b> <span style="font-size:85%">(<%= t('muck.raker.calculated') %> <%= @entry.relevance_calculated_at.strftime("%d %b %Y") %>)</span> - <%= link_to t('muck.raker.details'), "?details=true", :class=> "catalog_link" %></p> 
+<h1 style="margin-bottom:20px;"><%= link_to @entry_title, link %> - <%= t('muck.raker.related_resources_title') %> - <%= link_to 'details', "?details=true", :class=> "catalog_link" %></h1>
 
 <div id="results">
-<%= render(:partial => "entries/result", :collection => @entry.ranked_recommendations(@limit, params[:order] || "mixed", true)) %>
+<%= render(:partial => "entries/result", :collection => @entry.ranked_recommendations(@limit, params[:order] || "relevance", true)) %>
 </div>
 
 </body>

data/muck-raker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-08}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -06:00
+date: 2009-07-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency