muck-raker 0.1.21 → 0.1.22

data/app/models/feed.rb

@@ -1,3 +1,43 @@
+# == Schema Information
+#
+# Table name: feeds
+#
+#  id                         :integer(4)      not null, primary key
+#  uri                        :string(2083)
+#  display_uri                :string(2083)
+#  title                      :string(1000)
+#  short_title                :string(100)
+#  description                :text
+#  tag_filter                 :string(1000)
+#  top_tags                   :text
+#  priority                   :integer(4)      default(10)
+#  status                     :integer(4)      default(1)
+#  last_requested_at          :datetime
+#  last_harvested_at          :datetime
+#  harvest_interval           :integer(4)      default(86400)
+#  failed_requests            :integer(4)      default(0)
+#  error_message              :text
+#  service_id                 :integer(4)      default(0)
+#  login                      :string(255)
+#  password                   :string(255)
+#  created_at                 :datetime
+#  updated_at                 :datetime
+#  entries_changed_at         :datetime
+#  harvested_from_display_uri :string(2083)
+#  harvested_from_title       :string(1000)
+#  harvested_from_short_title :string(100)
+#  entries_count              :integer(4)
+#  default_language_id        :integer(4)      default(0)
+#  default_grain_size         :string(255)     default("unknown")
+#  contributor_id             :integer(4)
+#  etag                       :string(255)
+#
+# Indexes
+#
+#  index_feeds_on_service_id  (service_id)
+#  index_feeds_on_uri         (uri)
+#
+
 # == Schema Information
 #
 # Table name: feeds
@@ -32,12 +72,12 @@
 #  contributor_id             :integer(4)
 #
 class Feed < ActiveRecord::Base
-  
+
   require 'httparty'
-  
+
   include HTTParty
   format :xml
-  
+
   validates_presence_of :uri
 
   has_many :feed_parents
@@ -50,34 +90,43 @@ class Feed < ActiveRecord::Base
   named_scope :by_title, :order => "title ASC"
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
   named_scope :by_newest, :order => "created_at DESC"
+
+  attr_protected :status, :last_requested_at, :last_harvested_at, :harvest_interval, :failed_requests,
+                 :created_at, :updated_at, :entries_changed_at, :entries_count, :contributor_id
   
   # named_scope :ready_to_harvest, lambda { |*args| { :conditions => [ "feeds.last_harvested_at < ?", args.first || 1.day.ago.end_of_day ] } }
+
+  def banned?
+    self.status < 0
+  end
   
   def after_create
     if GlobalConfig.inform_admin_of_global_feed && self.feed_parents.empty?
       RakerMailer.deliver_notification_feed_added(self) # Global feed.  Email the admin to let them know a feed has been added
-    end    
+    end
   end
 
   # harvest_interval is stored in seconds
-  def refresh_interval_hours
-    if self.harvest_interval
-      self.harvest_interval/3600
-    else
-      168 # Once a week
-      # Looks like 168 = 24 * 7 (1 week) 
-      # harvest_interval is currently stored in seconds. I'm guessing it used to be stored in hours and this is a relic
-    end
+  # default is 86400 which is one day
+  def harvest_interval_hours
+    self.harvest_interval/3600
   end
-  
-  def refresh_interval_hours=(interval)
-    self.harvest_interval = interval + ":00:00"
+
+  # Converts hours into seconds for harvest_interval
+  def harvest_interval_hours=(interval)
+    self.harvest_interval = interval * 3600
+  end
+
+  def harvest
+    # check to see if the feed has changed
+    feed = Feedzirra::Feed.fetch_and_parse(self.uri)
+    feed.entries
+    # updated_feed = Feedzirra::Feed.update(self)
+    # if updated_feed.updated?
+    #   updated_feed.new_entries # get new entries
+    #   updated_feed.sanitize_entries! # clean up
+    # end
   end
-  
-  # def self.harvest
-  #   feed = Feed.first # .ready_to_harvest.first
-  #   get(feed.uri)
-  # end
 
   # Gathers all available feed uris from the given uri and parses them into
   # feed objects
@@ -85,22 +134,37 @@ class Feed < ActiveRecord::Base
     feeds = []
     @available_feeds = discover_feeds(uri)
     @available_feeds.each do |feed|
-      feeds << make_feed(Feedzirra::Feed.fetch_and_parse(feed.url))
+      feeds << from_feedzirra(Feedzirra::Feed.fetch_and_parse(feed.url))
     end
     feeds
   end
-  
+
   # Turns a feed from feedzirra into a muck feed
-  def self.make_feed(feed)
+  def self.from_feedzirra(feed)
     Feed.new(:short_title => feed.title,
              :title => feed.title,
              :display_uri => feed.url,
              :uri => feed.feed_url)
   end
-  
+
+  # provided to make feed quack like a feedzirra feed
+  def url
+    display_uri
+  end
+
+  # provided to make feed quack like a feedzirra feed
+  def feed_url
+    uri
+  end
+
+  # provided to make feed quack like a feedzirra feed
+  def last_modified
+    entries_changed_at
+  end
+
   # Looks for feeds from a given url
   def self.discover_feeds(uri)
     Feedbag.find(uri)
   end
-  
+
 end

data/app/models/feed_parent.rb

@@ -9,6 +9,11 @@
 #  created_at   :datetime
 #  updated_at   :datetime
 #
+# Indexes
+#
+#  index_feed_parents_on_feed_id                      (feed_id)
+#  index_feed_parents_on_ownable_id_and_ownable_type  (ownable_id,ownable_type)
+#
 
 class FeedParent < ActiveRecord::Base
   unloadable

data/app/models/recommendation.rb

@@ -10,6 +10,11 @@
 #  clicks           :integer(4)      default(0)
 #  avg_time_at_dest :integer(4)      default(60)
 #
+# Indexes
+#
+#  index_recommendations_on_dest_entry_id  (dest_entry_id)
+#  index_recommendations_on_entry_id       (entry_id)
+#
 
 class Recommendation < ActiveRecord::Base
 end

data/app/models/tag_cloud.rb

@@ -8,6 +8,10 @@
 #  tag_list    :string(5000)
 #  grain_size  :string(255)     default("all")
 #
+# Indexes
+#
+#  index_tag_clouds_on_grain_size_and_language_id_and_filter  (grain_size,language_id,filter) UNIQUE
+#
 
 class TagCloud < ActiveRecord::Base
   

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

@@ -1,65 +1,35 @@
-<h1>OER Recommender - Registered Collections</h1>
+<h1><%= t('muck.raker.feeds_title') %></h1>
 <div>
-  <p><a href="/feeds/new">Register a New Collection</a></p>
-  <%= render :partial => 'feeds/feeds', :object => @feeds %>
-
-  <% if @banned_feeds.size > 0 %>
-    <h1>Banned Feeds</h1>
-    <%= render :partial => 'feeds/feeds', :object => @banned_feeds %>  
-  <table>
-
-    <% for feed in @banned_feeds %>
+  <p>
+    <%= link_to t('muck.raker.discover_feed'), new_feed_preview_path, :class => 'iframe lightbox' %>
+    <%= link_to t('muck.raker.add_feed'), new_feed_path, :class => 'iframe lightbox' %>
+    <%= link_to t('muck.raker.add_feed_advanced'), new_extended_feeds_path, :class => 'iframe lightbox' %>
+  </p>
+  <table class="feeds">
     <tr>
-      <td><%= link_to feed.title, "/feeds/" + feed.id.to_s + "/entries" %> <%= link_to "[go]", feed.display_uri, :style => "color:red" %></td>
-      <td>
-        <%= link_to 'Edit', edit_feed_path(feed) %>
-        <%
-        =begin %>	
-        <% if feed.status >= 0 %>
-        <%= link_to 'Ban', ban_feed_path(feed), :confirm => 'Are you sure?', :method => :post %>
-        <% else %>
-        <%= link_to 'Unban', unban_feed_path(feed), :confirm => 'Are you sure?', :method => :post %>
-        <% end %>
-        <%= link_to 'Harvest', harvest_now_feed_path(feed), :method => :post %>
-        <%= link_to 'Delete', feed_path(feed), :method => :delete %>
-        <%
-        =end %>	
-      </td>
-      <td><%=h feed.description %></td>
-      <td><%=h feed.harvest_interval %></td>
-      <td><%=h feed.last_harvested_at %></td>
-      <td><%=h feed.failed_requests %></td>
-      <td><%=h feed.error_message ? "Failed last request:" + feed.error_message : feed.status >= 0 ? "Ok" : "Banned" %></td>
-      <td><%=h feed.uri %></td>
+      <th></th>
+      <th><%= t('muck.raker.title') %></th>
+      <th><%= t('muck.raker.description') %></th>
+      <th><%= t('muck.raker.harvest_interval') %></th>
+      <th><%= t('muck.raker.harvested_at') %></th>
+      <th><%= t('muck.raker.failed_harvests') %></th>
+      <th><%= t('muck.raker.status') %></th>
+      <th><%= t('muck.raker.uri') %></th>
     </tr>
-    <% end %>
+    <%= render :partial => 'feeds/feed', :collection => @feeds, :locals => { :show_admin => true } %>
   </table>
+  <div class="clear">
+  <%= will_paginate @feeds %>
+  </div>
 </div>
-<% end %>
-
-
-
 
-<tr>
-  <td><%= link_to feed.title, "/feeds/" + feed.id.to_s + "/entries" %> <%= link_to "[go]", feed.display_uri, :style => "color:red" %></td>
-  <td>
-    <%= link_to 'Edit', edit_feed_path(feed) %>
-    <%
-    =begin %>	
-    <% if feed.status >= 0 %>
-    <%= link_to 'Ban', ban_feed_path(feed), :confirm => 'Are you sure?', :method => :post %>
-    <% else %>
-    <%= link_to 'Unban', unban_feed_path(feed), :confirm => 'Are you sure?', :method => :post %>
-    <% end %>
-    <%= link_to 'Harvest', harvest_now_feed_path(feed), :method => :post %>
-    <%= link_to 'Delete', feed_path(feed), :method => :delete %>
-    <%
-    =end %>	
-  </td>
-  <td><%=h feed.description %></td>
-  <td><%=h feed.refresh_interval_hours %></td>
-  <td><%=h feed.last_harvested_at %></td>
-  <td><%=h feed.failed_requests %></td>
-  <td><%=h feed.error_message ? "Failed last request:" + feed.error_message : feed.status >= 0 ? "Ok" : "Banned" %></td>
-  <td><%=h feed.uri %></td>
-</tr>
+<% content_for :javascript do -%>
+jQuery(document).ready(function() {
+    jQuery('a.lightbox').fancybox({
+        'hideOnContentClick': true,
+        'overlayShow': true,
+        'frameWidth': 700,
+        'frameHeight': 600
+    });
+});
+<% end -%>

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

@@ -1,4 +1,4 @@
-<%= link_to related_entry.title + " (" + related_entry.collection + ")", "/r?id=#{related_entry.id}", :class => "title_link", :rel => "nofollow" %>
+<%= link_to related_entry.title + " (" + related_entry.collection + ")", visit_path(:id => related_entry.id), :class => "title_link", :rel => "nofollow" %>
 - <%= link_to t('muck.raker.related_resources'), resource_path(related_entry.dest_entry_id), :class => "related_resources_link", :rel => "nofollow" %>
 <% if !related_entry.direct_link.nil? %> - <%= link_to t('muck.raker.metadata'), "/r?id=#{related_entry.id}&target=metadata", :class => "catalog_link" %><% end %>
 <% if related_entry.description.length > 0 %><br/><span class="description"><%= truncate_words(related_entry.description) %></span><% end %>

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

@@ -1,4 +1,4 @@
-<% link = result.direct_link.nil? ? result.permalink : result.direct_link %>
+<% link = visit_path(result) %>
 <p>
   <%= link_to result.title + " (" + result.collection + ")", link, :class => "title_link", :rel => "nofollow" %>
   - <%= link_to t('muck.raker.related_resources'), resource_path(result), :class => "related_resources_link", :rel => "nofollow" %>

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

@@ -1,7 +1,20 @@
 <tr>
+  <% if defined?(show_admin) && show_admin -%>
+    <td>
+      <% form_for(feed, :url => admin_feed_path(feed), :html => { :method => :put }) do |f| -%>
+        <% if feed.banned? -%>
+          <%= hidden_field_tag :status, 'unban' %>
+          <%= image_submit_tag '/images/icons/exclaim.png', {:width => '15', :height => '15', :alt => t('muck.raker.validate_feed') } %>
+        <% else -%>
+          <%= hidden_field_tag :status, 'ban' %>
+          <%= image_submit_tag '/images/icons/accept.png', {:width => '15', :height => '15', :alt => t('muck.raker.ban_feed') } %>
+        <% end -%>
+      <% end -%>
+    </td>
+  <% end -%>
   <td><%= link_to h(feed.title || feed.display_uri), feed_path(feed) %> <%= link_to t('muck.raker.visit'), feed.display_uri, :target => '_blank' %></td>
   <td><%= h feed.description %></td>
-  <td><%= feed.refresh_interval_hours %></td>
+  <td><%= feed.harvest_interval_hours %></td>
   <td><%= feed.last_harvested_at %></td>
   <td><%= feed.failed_requests %></td>
   <td><%= feed.error_message ? t('muck.raker.failed_last_request', :error => feed.error_message) : feed.status >= 0 ? t('muck.raker.ok') : t('muck.raker.banned') %></td>

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

@@ -96,7 +96,7 @@ function validate()
 
   <p>
     <b>How Often to Harvest the Collection</b><br />
-    <%= select :feed, "refresh_interval_hours", [["Once a day", "24"], ["Once a week", "168"], ["Once a month", "672"]] %>
+    <%= select :feed, "harvest_interval_hours", [["Once a day", "24"], ["Once a week", "168"], ["Once a month", "672"]] %>
   </p>
 
   <p>

data/app/views/parts/_add_feed.html.erb

@@ -12,9 +12,9 @@
 </div>
 <% content_for :javascript do -%>
 jQuery(document).ready(function() {
-    jQuery('#add_feed_uri').onclick({
-        jQuery(this).hide();
-        jQuery('#finding_uri_message').show();
-    });
+  jQuery('#add_feed_uri').onclick({
+    jQuery(this).hide();
+    jQuery('#finding_uri_message').show();
+  });
 });
 <% end -%>

data/app/views/recommendations/index.pjs.erb

@@ -1,12 +1,12 @@
 <%
-@json_recommendations = @document.json_recommendations(@limit, params[:order] || "mixed", true, params[:omit_feeds] || nil) 
+@json_recommendations = @entry.json_recommendations(@limit, params[:order] || "mixed", true, params[:omit_feeds] || nil) 
 if !@json_recommendations.nil? 
-@direct_link_text = params[:direct_link_text] || t(:direct_link)
+@direct_link_text = params[:direct_link_text] || t('muck.raker.direct_link')
 %>
-var catalog_page = <%= !@document.direct_link.nil? and @uri == @document.permalink %>;
+var catalog_page = <%= !@entry.direct_link.nil? and @uri == @entry.permalink %>;
 var document_host = '<%= @host %>';
 var recs = <%= @json_recommendations %>;
-var app = "http://www.oerrecommender.org/"; 
+var app = "http://folksemantic.com/"; 
 <% if @details == true -%>
 function truncate(text, length) {
 	nEnd = text.indexOf(" ", 200);
@@ -21,10 +21,10 @@ function format_date(published_at) {
 }
 <% end %>
 document.write('<div class="oer_recommender_container">');
-<% if params[:title] %>document.write('<div class="oer_recommender_title"><%= t(:gm_title) %></div>');<% end %>
+<% if params[:title] %>document.write('<div class="oer_recommender_title"><%= t('muck.raker.gm_title') %></div>');<% end %>
 document.write('<div class="oer_recommender_list">');
 for(nRec = 0; nRec < recs.length; nRec++) {
-	r = recs[nRec];
+	r = recs[nRec].entry;
 	metadata_link = catalog_page && document_host == r.uri.substring(0, document_host.length);
 	direct_link = metadata_link && r.direct_link;
 	document.write('<p class="oer_recommender_item">');
@@ -32,13 +32,13 @@ for(nRec = 0; nRec < recs.length; nRec++) {
 	if (direct_link) document.write(' <a class="oer_recommender_direct_link" href="' + app + 'r?id=' + r.id + '&target=direct_link"><%= @direct_link_text %></a>');
 <% if @details == true -%>
 	document.write(' <span class="oer_recommender_published_at">(' + format_date(r.published_at) + ')</span>');
-	document.write(' <span class="oer_recommender_relevance_score"><%= t(:relevance)%>: ' + Math.round(r.relevance*100)/100 + '</span>');
+	document.write(' <span class="oer_recommender_relevance_score"><%= t('muck.raker.relevance')%>: ' + Math.round(r.relevance*100)/100 + '</span>');
 	document.write('<br/><span class="oer_recommender_description">' + truncate(r.description) + '</span>');
 	document.write('<br/><span class="oer_recommender_uri">' + r.uri + '</span>');
 <% end -%>	
 	document.write('</a></p>');
 }
 document.write('</div>');	
-<% if params[:more_link] %>document.write('<div class="oer_recommender_more_link"><a href="' + app + 'documents/<%= @document.id %>"><%= t(:gm_more_prompt) %></a></div>');<% end %>	
+<% if params[:more_link] %>document.write('<div class="oer_recommender_more_link"><a href="' + app + 'documents/<%= @entry.id %>"><%= t('muck.raker.gm_more_prompt') %></a></div>');<% end %>	
 document.write('</div>');	
 <% end %>

data/app/views/recommendations/index.rss.builder

@@ -1,7 +1,7 @@
-if @document.nil?
+if @entry.nil?
 	@recommendations = Array.new
 else 
-	@recommendations = @document.ranked_recommendations(@limit, params[:order] || "mixed")
+	@recommendations = @entry.ranked_recommendations(@limit, params[:order] || "mixed")
 end
 
 headers["Content-Type"] = "application/rss+xml"
@@ -10,7 +10,7 @@ xml.instruct!
 xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/", "xmlns:oerr" => "http://www.oerrecommender.org/oerr/elements/1.0/" do
     xml.channel do
 
-    xml.title       "OER Recommender recommendations for " + @document.permalink
+    xml.title       "OER Recommender recommendations for " + @entry.permalink
     xml.link        url_for(request.env["REQUEST_URI"])
 #    xml.pubDate     CGI.rfc1123_date @entries.first.updated_at if @entries.any?
 #    xml.description "Blog posts for " + @event.title

data/app/views/recommendations/index.xml.builder

@@ -1,23 +1,23 @@
 xml.instruct!
 
-if @document.nil?
+if @entry.nil?
 	xml.recommendations
 else
 
-@recommendations = @document.ranked_recommendations(@limit, params[:order] || "mixed", @details)
-#xml.recommendations(:document_id => @document.nil? ? "" : @document.id, :uri => @uri, :title => t(:gm_title), :more_prompt => t(:gm_more_prompt), :direct_link_text => t(:direct_link), :locale => @document.language) do
-xml.recommendations(:document_id => @document.nil? ? "" : @document.id, :uri => @uri, :title => t("muck.raker.gm_title"), :more_prompt => t("muck.raker.gm_more_prompt"), :direct_link_text => t("muck.raker.direct_link")) do
+@recommendations = @entry.ranked_recommendations(@limit, params[:order] || "mixed", @details)
+#xml.recommendations(:document_id => @entry.nil? ? "" : @entry.id, :uri => @uri, :title => t(:gm_title), :more_prompt => t(:gm_more_prompt), :direct_link_text => t(:direct_link), :locale => @entry.language) do
+xml.recommendations(:document_id => @entry.nil? ? "" : @entry.id, :uri => @uri, :title => t("muck.raker.gm_title"), :more_prompt => t("muck.raker.gm_more_prompt"), :direct_link_text => t("muck.raker.direct_link")) do
     @recommendations.each do |recommendation|
         xml.recommendation do
             xml.title recommendation["title"]
             xml.collection recommendation["collection"]
-#            xml.link "http://www.folksemantic.com/r?id=" + recommendation["id"].to_s  
-            xml.link "http://localhost:3000/r?id=" + recommendation["id"].to_s
+            xml.link "http://folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s  
+#            xml.link "http://localhost:3000/r?id=" + recommendation["recommendation_id"].to_s
             xml.has_direct_link "true" if (recommendation["direct_link"] != nil and @uri[0..20] == recommendation["uri"][0..20]) 
             
             if @details == true
-#	            xml.direct_link "http://www.folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
-	            xml.direct_link "http://localhost:3000/r?id=" + recommendation["id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
+	            xml.direct_link "http://www.folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
+#	            xml.direct_link "http://localhost:3000/r?id=" + recommendation["id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
 	            xml.uri recommendation["uri"]
 	            xml.direct_uri recommendation["direct_link"]
 	            xml.description recommendation["description"]