muck-raker 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/app/controllers/recommender/entries_controller.rb

@@ -14,14 +14,15 @@ class Recommender::EntriesController < ApplicationController
   def browse_by_tags
     @tag_filter = params[:tags]
     @search = @tag_filter.join(' ') if (!@tag_filter.nil? && !@tag_filter.empty?)
+    @tag_filter = @tag_filter.join('/')
     @tag_cloud = TagCloud.language_tags(Language.locale_id, @tag_filter) unless fragment_exist?({:controller => 'entries', :action => 'index', :language => Language.locale_id, :filter => @tag_filter})
-    _search
+    _search(:and)
     respond_to do |format|
       format.html { render :template => 'entries/browse_by_tags' }
     end
   end
   
-  def show
+  def search
     @search = params[:q]
     _search
     respond_to do |format|
@@ -29,19 +30,7 @@ class Recommender::EntriesController < ApplicationController
     end
   end
   
-  def _search
-    @offset = (params[:offset] || 0).to_i
-    @limit = (params[:limit] || 10).to_i
-    @term_list = URI.escape(@search) if !@search.nil?
-    if !@search.nil?
-      results = Entry.search(@search, I18n.locale.to_s, @limit, @offset)
-      @results = results.results
-      @hit_count = results.total
-    end
-  end
-
-  def show_old
-    @languages = Language.find(:all, :order => "name")
+  def show
     @page_title = "Related Resources"
     @entry = Entry.find(params[:id], :include => :feed)
     if @entry.nil?
@@ -49,16 +38,16 @@ class Recommender::EntriesController < ApplicationController
       return
     end
     @entry_title = @entry.title + " (" + @entry.feed.short_title + ")"
-    I18n.locale = @entry.language[0..1]
+#    I18n.locale = @entry.language[0..1]
     @limit = params[:limit] ? params[:limit].to_i : 20
     @limit = 40 if @limit > 40
 
     respond_to do |format|
       format.html { 
       if params[:details] == 'true'
-        render :template => "documents/details", :layout => "default"
+        render :template => "entries/details"
       else
-        render :template => "documents/show", :layout => "default"
+        render :template => "entries/show"
       end
       }# show.html.erb
       format.xml  { render :xml => @entry }
@@ -76,4 +65,19 @@ class Recommender::EntriesController < ApplicationController
     render :template => "documents/collections", :layout => "default"
   end
 
+  protected
+
+  def _search operator = :or
+    @page = (params[:page] || 0).to_i
+    @per_page = (params[:per_page] || 10).to_i
+    @offset = (@page-1)*@per_page
+    if !@search.nil?
+      @term_list = URI.escape(@search) 
+      results = Entry.search(@search, I18n.locale.to_s, @per_page, @offset, operator)
+      @hit_count = results.total
+      @results = results.results
+      @paginated_results = @results.paginate(:page => @page, :per_page => @per_page, :total_entries => @hit_count)
+    end
+  end
+
 end

data/app/helpers/muck_raker_helper.rb

@@ -4,6 +4,28 @@ module MuckRakerHelper
     tag_list.split(',').each_slice(2){|tag,index| yield tag, classes[index.to_i]}
   end
   
+  def tag_link(tag, filter, css_class)
+     link_to h(tag), "/resources/tags/#{filter.nil? ? '' : filter + '/'}#{tag}", :class => css_class
+  end
+  
+  def results_status
+    if @tag_filter.nil?
+        t('muck.raker.search_results_status', 
+        :first => @offset+1, 
+        :last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
+        :total => @hit_count,
+        :filter => @tag_filter,
+        :terms => URI.unescape(@term_list))
+    else
+        t('muck.raker.browse_results_status', 
+        :first => @offset+1, 
+        :last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
+        :total => @hit_count,
+        :filter => @tag_filter,
+        :terms => @tag_filter.split('/').join('</b>, <b>'))
+    end
+  end
+  
   def round(flt)
     return (((flt.to_f*100).to_i.round).to_f)/100.0
   end

data/app/models/entry.rb

@@ -11,8 +11,8 @@ class Entry < ActiveRecord::Base
     
   end
   
-  def self.search(search_terms, language = "en", limit = 10, offset = 0)
-    return find_by_solr(search_terms, :limit => limit, :offset => offset, :scores => true, :select => "entries.id, entries.title, entries.permalink, entries.direct_link, entries.published_at, entries.description, entries.feed_id, feeds.short_title AS collection", :joins => "INNER JOIN feeds ON feeds.id = entries.feed_id", :core => language)
+  def self.search(search_terms, language = "en", limit = 10, offset = 0, operator = :or)
+    return find_by_solr(search_terms, :limit => limit, :offset => offset, :scores => true, :select => "entries.id, entries.title, entries.permalink, entries.direct_link, entries.published_at, entries.description, entries.feed_id, feeds.short_title AS collection", :joins => "INNER JOIN feeds ON feeds.id = entries.feed_id", :core => language, :operator => operator)
   end
 
   def self.normalized_uri(uri)
@@ -26,8 +26,8 @@ class Entry < ActiveRecord::Base
   end
   
   def recommendations(limit = 20, order = "relevance", details = false, omit_feeds = nil)
-    sql = "SELECT recommendations.id, dest_entry_id, permalink AS uri, 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, tag_list " if details == true
+    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 << ", entries.description, author, published_at " if details == true
     sql << "FROM recommendations "
     sql << "INNER JOIN entries ON recommendations.dest_entry_id = entries.id "
     sql << "INNER JOIN feeds ON entries.feed_id = feeds.id "

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

@@ -1,10 +1,7 @@
 <% link = result.direct_link.nil? ? result.permalink : result.direct_link %>
-<p> 
+<p>
   <%= link_to result.title + " (" + result.collection + ")", link, :class => "title_link", :rel => "nofollow" %>
-  - <%= link_to t('muck.raker.related_resources'), "/documents/" + result.id.to_s, :class => "related_resources_link", :rel => "nofollow" %>
-  <!-- <span class='published_at'>(<%= result.published_at.strftime("%d %b %Y") %>)</span>
-  <span class='relevance_score'><%= t('muck.raker.relevance') %>: <%= round(result.solr_score) %></span> -->
+  - <%= link_to t('muck.raker.related_resources'), resource_path(result), :class => "related_resources_link", :rel => "nofollow" %>
   <% if !result.direct_link.nil? %> - <%= link_to t('muck.raker.metadata'), result.permalink, :class => "catalog_link" %><% end %>
   <% if result.description.length > 0 %><br/><span class="description"><%= truncate_words(result.description) %></span><% end %>
-  <!-- <br/><span class="uri"><%= link %></span> - <%= link_to t('muck.raker.related_resources'), "/documents/" + result.id.to_s, :class => "related_resources_link", :rel => "nofollow" %> -->
 </p>

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

@@ -1,14 +1,8 @@
 <div id="results-description" class="block">
-    <div class="column span-5">
-        <input type="radio" name="scope" value="all" checked/><%= t('folksemantic.all_resources') %> &nbsp&nbsp;&nbsp;
-        <input type="radio" name="scope" value="ocws"/><%= t('folksemantic.just_ocws') %><br/>
-    </div>
-    <div class="column span-19 align-right">
-        <%= t('muck.raker.results') %> 
-        <b><%= (@offset+1) %> - <%= (@offset + @limit) < @hit_count ? (@offset + @limit) : @hit_count %></b> 
-        <%= t('muck.raker.of') %> 
-        <b><%= @hit_count %></b> 
-        <%= t('muck.raker.for') %> 
-        <b><%= URI.unescape(@term_list) %></b></p>
+    <div class="column span-24 align-right">
+        <span>
+            <%= results_status %> 
+            <%= ('&nbsp;&nbsp;' + link_to('[' + t('muck.raker.start_over') + ']', {:action => 'index'}) + '&nbsp;') unless @tag_filter.nil? %>
+        </span>
     </div>
 </div>

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

@@ -1,11 +1,11 @@
 <div id="tag-cloud">
     <fieldset>
-        <legend><%= t('folksemantic.tag_cloud_legend') %></legend>
+        <legend><%= @tag_filter.nil? ? t('muck.raker.tag_cloud_legend') : t('muck.raker.narrow_further') %></legend>
         <% if @tag_cloud.blank? -%>
-          <%= t('folksemantic.no_tags') %>
+          <%= t('muck.raker.no_tags') %>
         <% else -%>
           <% tag_cloud @tag_cloud, %w(cloud1 cloud2 cloud3 cloud4 cloud5 cloud6) do |tag, css_class| %>
-              <%= link_to tag, { :action => :browse_by_tags, :tags => tag }, :class => css_class %>
+              <%= tag_link(tag, @tag_filter, css_class) %>
           <% end %>
         <% end -%>
     </fieldset>

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

@@ -3,7 +3,7 @@
     <%= render(:partial => 'entries/result_status') %>
     <div class="column span-15">
         <%= render(:partial => 'entries/results') %>
-        <%= render(:partial => 'entries/result_navigation') %>
+        <div class="results-nav"><%= will_paginate(@paginated_results, :next_label => '<b>' + t('muck.raker.next_label') + ' &raquo;</b>', :previous_label => '<b>&laquo; ' + t('muck.raker.previous_label') + '</b>') %></div>
     </div>
     <div class="column span-9 last">
         <%= render(:partial => 'entries/tag_cloud') %>

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

@@ -1,9 +1,7 @@
-<h1>OER Recommender - Related Resources - Details</h1>
+<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 %>
 
-<h2><%= link_to @document_title, @document.permalink %> <%= link_to "(xml)", "/recommendations.xml?u=" + @document.permalink, :class=> "catalog_link" %></h2>
-
 <table border="1" cellpadding="3px">
 <tr>
 <th>Related Resource</th>
@@ -11,7 +9,7 @@
 <th>Clicks</th>
 <th>Avg Time<br/>(seconds)</th>
 </tr>
-<% @document.ranked_recommendations(@limit, params[:order] || "mixed").each do |r| %>
+<% @entry.ranked_recommendations(@limit, params[:order] || "mixed").each do |r| %>
 <tr>
 <td><%= link_to r["title"] + " (" + r["collection"] + ")", "/r?id=" + r["id"].to_s %></td>
 <td class="centered"><%= round(r["relevance"]) %></td>
@@ -21,19 +19,12 @@
 <% end%>
 </table>
 
-<p>Recommendations are ordered as follows:</p>
+<p>Ranking method:</p>
 <ol>
-	<li><em>Popular items</em> ordered by number of clicks.</li>
-	<li><em>Highly relevant</em> items, ordered randomly.</li>
-	<li><em>Other relevant</em> items, ordered randomly.</li>
+	<li><em>Popular items</em> ordered by number of clicks. These are items that have been clicked on at least 1.5 standard deviations more than the average number of times.</li>
+	<li><em>Highly relevant</em> items, ordered randomly. These are items with a relevance score at least one standard deviation higher than the average relevance score.</li>
+	<li><em>Other relevant</em> items, ordered randomly. These are the rest of the relevant items.</li>
 </ol>
 
-<p>Definitions:</p>
-<ul>
-	<li><em>Popular items</em> - items that have been clicked on at least 1.5 standard deviations more than the average number of times.</li>
-	<li><em>Highly relevant</em> - items with a relevance score at least one standard deviation higher than the average relevance score.</li>
-	<li><em>Other relevant</em> - the rest of the relevant items.</li>
-</ul>
-
 </body>
 </html>

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

@@ -1,9 +1,9 @@
 <div id="search-results">
-    <% if @results.length > 0 %>
+    <% if @hit_count > 0 %>
     <div class="left">
         <%= render(:partial => 'entries/result_status') %>
         <%= render(:partial => 'entries/results') %>
-        <%= render(:partial => 'entries/result_navigation') %>
+        <div class="results-nav"><%= will_paginate(@paginated_results, :next_label => '<b>' + t('muck.raker.next_label') + ' &raquo;</b>', :previous_label => '<b>&laquo; ' + t('muck.raker.previous_label') + '</b>') %></div>
     </div>
     <% else %>
         <p><%= t('muck.raker.no_hits') %></p>

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

@@ -1,18 +1,18 @@
-<% link = @document.direct_link.nil? ? @document.permalink : @document.direct_link %>
+<% link = @entry.direct_link.nil? ? @entry.permalink : @entry.direct_link %>
 
-<h1>OER Recommender - <%= t('muck.raker.related_resources_title') %></h1>
+<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") %>
+<%#= render(:partial => "search/search_box") %>
 
-<p><b><%= link_to @document_title, link %></b> <% if !@document.direct_link.nil? %> - <%= link_to t('muck.raker.metadata'), @document.permalink, :class => "catalog_link" %><% end %></p>
+<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') %> <%= @document.relevance_calculated_at.strftime("%d %b %Y") %>)</span> - <%= link_to t('muck.raker.details'), "?details=true", :class=> "catalog_link" %></p> 
+<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> 
 
 <div id="results">
-<%= render(:partial => "result", :collection => @document.ranked_recommendations(@limit, params[:order] || "mixed", true)) %>
+<%= render(:partial => "entries/result", :collection => @entry.ranked_recommendations(@limit, params[:order] || "mixed", true)) %>
 </div>
 
 </body>

data/config/muck_raker_routes.rb

@@ -9,10 +9,11 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/widgets', :controller => 'recommender/default', :action => 'widgets'
   map.connect '/tour', :controller => 'recommender/default', :action => 'tour'
 
-  map.resources :entries, :controller => 'recommender/entries'
+  map.connect 'resources/search', :controller => 'recommender/entries', :action => 'search'
+  map.connect 'resources/tags/*tags', :controller => 'recommender/entries', :action => 'browse_by_tags'
+  map.resources :resources, :controller => 'recommender/entries'
+
   map.connect 'r', :controller => 'recommender/entries', :action => 'track_clicks'
-  map.connect 'entries/tags/*tags', :controller => 'recommender/entries', :action => 'browse_by_tags'
-  map.connect 'entries/search/*terms', :controller => 'recommender/entries', :action => 'search'
   map.connect 'collections', :controller => 'entries', :action => 'collections'
 
   map.resources :recommendations, :controller => 'recommender/recommendations'

data/locales/en.yml

@@ -39,4 +39,14 @@ en:
         search: search
         search_link: Find Resources!
         search_description: Find learning resources by <span class="highlight">searching</span> and <span class="highlight">browsing</span> over <span class="highlight">110,000</span> open educational resources.
-        welcome_user: "Welcome {{user}}"
+        welcome_user: "Welcome {{user}}"
+        tag_cloud_legend: browse resources using tags
+        narrow_further: narrow results further
+        tags: tags
+        start_over: start over
+        browse_results_status: Results <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for tags <b>{{terms}}</b>  
+        search_results_status: Results <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for <b>{{terms}}</b>
+        next_label: Next
+        previous_label: Previous
+        all_resources: All Resources
+        only_courses: Only Courses

data/muck-raker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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-06-25}
+  s.date = %q{2009-06-29}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -60,8 +60,6 @@ Gem::Specification.new do |s|
      "app/views/default/widgets.html.erb",
      "app/views/entries/_result.html.erb",
      "app/views/entries/_result.html.erb",
-     "app/views/entries/_result_navigation.html.erb",
-     "app/views/entries/_result_navigation.html.erb",
      "app/views/entries/_result_status.html.erb",
      "app/views/entries/_result_status.html.erb",
      "app/views/entries/_results.html.erb",

data/rdoc/created.rid

@@ -1 +1 @@
-Wed, 24 Jun 2009 22:23:01 -0600
+Thu, 25 Jun 2009 22:48:59 -0600

data/rdoc/files/lib/muck_raker/tasks_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Jun 18 16:49:08 -0600 2009</td>
+      <td>Thu Jun 25 22:40:33 -0600 2009</td>
     </tr>
     </table>
   </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-25 00:00:00 -06:00
+date: 2009-06-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,6 @@ files:
 - app/views/default/tour.html.erb
 - app/views/default/widgets.html.erb
 - app/views/entries/_result.html.erb
-- app/views/entries/_result_navigation.html.erb
 - app/views/entries/_result_status.html.erb
 - app/views/entries/_results.html.erb
 - app/views/entries/_tag_cloud.html.erb

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

@@ -1,5 +0,0 @@
-<div>
-<b><%= (link_to(t('muck.raker.previous'), {:action => :browse_by_tags, :tags => URI.unescape(@term_list), :locale => @language, :limit => @limit, :offset => @offset - @limit}, :rel => "nofollow") + "&nbsp;&nbsp;") if @offset > 0 %>
-<%= (link_to(t('muck.raker.next'), {:action => :browse_by_tags, :tags => URI.unescape(@term_list),  :locale => @language,:limit => @limit, :offset => @offset + @limit}, :rel => "nofollow") if @results.size >= @limit )%>
-</b>
-</div>