muck-raker 0.1.45 → 0.1.46

data/VERSION

@@ -1 +1 @@
-0.1.45
+0.1.46

data/app/controllers/muck/topics_controller.rb

@@ -4,10 +4,13 @@ class Muck::TopicsController < ApplicationController
   before_filter :adjust_format_for_iphone
   before_filter :check_terms, :except => [:new]
   before_filter :build_tag_feeds, :only => [:show, :rss_discovery]
+  before_filter :configure_feed_loading, :only => [:show]
   
   def show
-    @show_google_search = true
-    @show_combined = false
+    
+    load_feeds
+    load_combined_feeds
+    
     respond_to do |format|
       format.html do
         @opml_path = topic_path(params[:id], :service_ids => params[:service_ids], :format => 'opml')
@@ -81,15 +84,58 @@ class Muck::TopicsController < ApplicationController
       @video_feeds = Service.build_video_feeds(@terms, current_user, params[:service_ids])
       @bookmark_feeds = Service.build_bookmark_feeds(@terms, current_user, params[:service_ids])
       @music_feeds = Service.build_music_feeds(@terms, current_user, params[:service_ids])
+      @news_feeds = Service.build_news_feeds(@terms, current_user, params[:service_ids])
+      @blog_feeds = Service.build_blog_feeds(@terms, current_user, params[:service_ids])
+      @search_feeds = Service.build_search_feeds(@terms, current_user, params[:service_ids])
+      
       @general_feeds = Service.build_general_feeds(@terms, current_user, params[:service_ids])
 
       @discovered_feeds = GoogleFeedRequest.find_feeds(@terms)
 
-      @feeds = @photo_feeds + @video_feeds + @bookmark_feeds + @music_feeds + @general_feeds + @discovered_feeds
+      @feeds = @photo_feeds + @video_feeds + @bookmark_feeds + @music_feeds + @news_feeds + @blog_feeds + @search_feeds + @general_feeds + @discovered_feeds
     
       @number_of_items = 6
       @number_of_images = 12
       @number_of_videos = 6
     end
     
+    def load_feeds
+      if @load_feeds_on_server
+        @server_loaded_general_feeds = GoogleFeedRequest.load_feeds(@general_feeds + @discovered_feeds)
+        @server_loaded_photo_feeds = GoogleFeedRequest.load_feeds(@photo_feeds)
+        @server_loaded_video_feeds = GoogleFeedRequest.load_feeds(@video_feeds)
+        @server_loaded_bookmark_feeds = GoogleFeedRequest.load_feeds(@bookmark_feeds)
+        @server_loaded_music_feeds = GoogleFeedRequest.load_feeds(@music_feeds)
+        @server_loaded_news_feeds = GoogleFeedRequest.load_feeds(@news_feeds)
+        @server_loaded_blog_feeds = GoogleFeedRequest.load_feeds(@blog_feeds)
+        @server_loaded_search_feeds = GoogleFeedRequest.load_feeds(@search_feeds)
+        if @show_combined
+          @server_loaded_general_feeds = Feed.combine_sort(@server_loaded_general_feeds)
+          @server_loaded_photo_feeds = Feed.combine_sort(@server_loaded_photo_feeds)
+          @server_loaded_video_feeds = Feed.combine_sort(@server_loaded_video_feeds)
+          @server_loaded_bookmark_feeds = Feed.combine_sort(@server_loaded_bookmark_feeds)
+          @server_loaded_music_feeds = Feed.combine_sort(@server_loaded_music_feeds)
+          @server_loaded_news_feeds = Feed.combine_sort(@server_loaded_news_feeds)
+          @server_loaded_blog_feeds = Feed.combine_sort(@server_loaded_blog_feeds)
+          @server_loaded_search_feeds = Feed.combine_sort(@server_loaded_search_feeds)
+        end
+      end
+    end
+    
+    def load_combined_feeds
+      return unless @load_feeds_on_server && @show_combined
+      @server_loaded_feeds = Feed.sort_entries(@server_loaded_general_feeds + @server_loaded_news_feeds + 
+                                               @server_loaded_blog_feeds + @server_loaded_search_feeds + 
+                                               @server_loaded_photo_feeds + @server_loaded_video_feeds + 
+                                               @server_loaded_bookmark_feeds + @server_loaded_music_feeds)
+      @server_loaded_data_feeds = Feed.sort_entries(@server_loaded_general_feeds + @server_loaded_news_feeds + @server_loaded_blog_feeds + @server_loaded_search_feeds)
+      @server_loaded_extended_data_feeds = Feed.sort_entries(@server_loaded_data_feeds + @server_loaded_bookmark_feeds)
+    end
+    
+    def configure_feed_loading
+      @show_google_search = true
+      @show_combined = false
+      @load_feeds_on_server = false
+    end
+    
 end

data/app/helpers/muck_raker_google_helper.rb

@@ -238,11 +238,12 @@ module MuckRakerGoogleHelper
     </script>}
   end
   
-  def google_hot_trends
+  # Renders a partial with the latest trends from google.
+  def google_hot_trends(limit = 10)
     feed = Feed.fetch_feed('http://www.google.com/trends/hottrends/atom/hourly')
     result = Nokogiri::HTML(feed.entries[0].content)
     google_hot_trends_terms = result.css('a').collect{ |a| change_chars(a.text) }.compact
-    render :partial => 'google/hot_trends', :locals => { :google_hot_trends_terms => google_hot_trends_terms }
+    render :partial => 'google/hot_trends', :locals => { :google_hot_trends_terms => google_hot_trends_terms[0, limit] }
   end
   
   def change_chars(term)

data/app/models/feed.rb

@@ -208,4 +208,17 @@ class Feed < ActiveRecord::Base
     uris.collect { |uri| Feed.find_or_create(uri, '', '', '', service.id, user, uri) }
   end
   
+  # Combines entries in a collection of feeds together and sorts the entries by date
+  def self.combine_sort(feeds)
+    return [] if feeds.nil? || feeds.blank?
+    entries = feeds.collect{|feed| feed.entries}.flatten!
+    sort_entries(entries)
+  end
+  
+  # Sorts a collection of entries by date
+  def self.sort_entries(entries)
+    return [] if entries.nil? || entries.blank?
+    entries.sort { |a,b| b.published_at <=> a.published_at }
+  end
+
 end

data/app/models/google_feed_request.rb

@@ -19,17 +19,66 @@ class GoogleFeedRequest
     get('http://ajax.googleapis.com/ajax/services/feed/lookup', :query => build_google_query({:q => uri}))
   end
   
+  # Requests entries for a single feed
   def self.load_feed(uri)
     get('http://ajax.googleapis.com/ajax/services/feed/load', :query => build_google_query({:q => uri}))
   end
   
+  # Requests a set of feeds from Google
+  #
+  # feeds:  An array of objects with the attributes 'uri' and 'service_id' defined
+  def self.load_feeds(feeds)
+    feeds = feeds.collect do |feed|
+      json = load_feed(feed.uri)
+      new_feed = convert_google_feed_json_to_feed(feed, json)
+      new_feed.entries << convert_google_feed_json_to_entries(new_feed, json).compact if new_feed
+      new_feed
+    end
+    if feeds
+      feeds.compact!
+    else
+      []
+    end
+  end
+  
+  # Converts json returned from google into a feed object
+  def self.convert_google_feed_json_to_feed(feed, json)
+    if json['responseStatus'] == 200
+      if json['responseData']['feed']
+        Feed.new( :uri => feed.uri,
+                  :service_id => feed.service_id,
+                  :display_uri => json['responseData']['feed']['link'],
+                  :title => json['responseData']['feed']['title'],
+                  :service => feed.service)
+      end
+    end
+  end
+  
+  # Converts json returned from google into an array of entries
+  def self.convert_google_feed_json_to_entries(feed, json)
+    if json['responseData']['feed']['entries']
+      json['responseData']['feed']['entries'].collect do |entry|
+        published_at = DateTime.parse(entry['publishedDate']) rescue DateTime.now - 1.day
+        Entry.new(:permalink => entry['link'],
+                  :author => entry['author'],
+                  :title => entry['title'],
+                  :description => entry['contentSnippet'],
+                  :content => entry['content'],
+                  :published_at => published_at,
+                  :tag_list => entry['categories'],
+                  :direct_link => entry['link'],
+                  :feed => feed)
+      end
+    end
+  end
+  
   # Search for feeds using google.  This will return 
   # a collection of 'Feed' objects
   def self.find_feeds(query)
     query = query.join('+') if query.is_a?(Array)
     feed_response = find_google_feeds(query)
     if 200 == feed_response['responseStatus']
-      convert_google_json_to_feeds(feed_response)
+      convert_google_find_feeds_json_to_feeds(feed_response)
     else
       []
     end
@@ -42,7 +91,7 @@ class GoogleFeedRequest
   end
   
   # convert the result of a google query to 'Feed' objects
-  def self.convert_google_json_to_feeds(google_feeds)
+  def self.convert_google_find_feeds_json_to_feeds(google_feeds)
     google_feeds['responseData']['entries'].collect do |google_feed|
       Feed.new( :uri => google_feed['url'],
                 :display_uri => google_feed['link'],

data/app/models/service.rb

@@ -25,7 +25,7 @@ class Service < ActiveRecord::Base
   named_scope :identity_services, :conditions => ['use_for = ?', 'identity']
   named_scope :tag_services, :conditions => ['use_for = ?', 'tags']
   named_scope :photo_services, :conditions => ["service_categories.id = services.service_category_id AND service_categories.name = 'Photos'"], :include => ['service_category']
-  
+
   # Indicates whether service is primarily a photo service ie from flick, picasa, etc
   #
   # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
@@ -54,6 +54,27 @@ class Service < ActiveRecord::Base
     Service.get_music_services(refresh_services).include?(self)
   end
   
+  # Indicates whether service is primarily news
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def news?(refresh_services = false)
+    Service.get_news_services(refresh_services).include?(self)
+  end
+  
+  # Indicates whether service is primarily blog related
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def blog?(refresh_services = false)
+    Service.get_blog_services(refresh_services).include?(self)
+  end
+  
+  # Indicates whether service is primarily search related
+  #
+  # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
+  def search?(refresh_services = false)
+    Service.get_search_services(refresh_services).include?(self)
+  end
+  
   # Indicates whether service is general (ie not video, photo, music or bookmark)
   #
   # refresh_services:   Optional parameter indicating whether or not to reload values from the database before checking service type
@@ -120,7 +141,9 @@ class Service < ActiveRecord::Base
     uris = service.generate_uris(username, password, uri)
     uris.collect{ |u| Feed.find_or_create(u.url, u.title, username, password, service.id, contributor) } if uris
   end
-  
+
+
+
   def self.build_photo_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
       service_ids = get_photo_tag_services(refresh_services).map(&:id)
@@ -157,6 +180,33 @@ class Service < ActiveRecord::Base
     build_tag_feeds(terms, user, service_ids, refresh_services)
   end
   
+  def self.build_news_feeds(terms, user, service_ids = nil, refresh_services = false)
+    if service_ids.nil?
+      service_ids = get_news_tag_services(refresh_services).map(&:id)
+    else
+      service_ids = make_int_array(service_ids) & get_news_tag_services(refresh_services).map(&:id)
+    end
+    build_tag_feeds(terms, user, service_ids, refresh_services)
+  end
+  
+  def self.build_blog_feeds(terms, user, service_ids = nil, refresh_services = false)
+    if service_ids.nil?
+      service_ids = get_blog_tag_services(refresh_services).map(&:id)
+    else
+      service_ids = make_int_array(service_ids) & get_blog_tag_services(refresh_services).map(&:id)
+    end
+    build_tag_feeds(terms, user, service_ids, refresh_services)
+  end
+  
+  def self.build_search_feeds(terms, user, service_ids = nil, refresh_services = false)
+    if service_ids.nil?
+      service_ids = get_search_tag_services(refresh_services).map(&:id)
+    else
+      service_ids = make_int_array(service_ids) & get_search_tag_services(refresh_services).map(&:id)
+    end
+    build_tag_feeds(terms, user, service_ids, refresh_services)
+  end
+  
   def self.build_general_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
       service_ids = get_general_tag_services(refresh_services).map(&:id)
@@ -166,6 +216,8 @@ class Service < ActiveRecord::Base
     build_tag_feeds(terms, user, service_ids, refresh_services)
   end
   
+  
+  
   # Get all photo services
   #
   # refresh_services:     By default all tag services are cached.  Setting this value to true
@@ -202,15 +254,44 @@ class Service < ActiveRecord::Base
     @music_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Music' }
   end
 
+  # Get all news services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_news_services(refresh_services = false)
+    @news_services = nil if refresh_services
+    @news_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'News' }
+  end
+  
+  # Get all blog services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_blog_services(refresh_services = false)
+    @blog_services = nil if refresh_services
+    @blog_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Blogging' }
+  end
+  
+  # Get all search services
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_search_services(refresh_services = false)
+    @search_services = nil if refresh_services
+    @search_services ||= get_services(refresh_services).find_all{|service| service.service_category.name == 'Search' }
+  end
+  
   # Get all general services. These are all services except photo, video, bookmark and music.
   #
   # refresh_services:     By default all tag services are cached.  Setting this value to true
   #                       will result in the values being repopulated from the database  
   def self.get_general_services(refresh_services = false)
     @general_services = nil if refresh_services
-    @general_services ||= get_services(refresh_services).find_all{|service| !['Photos', 'Videos', 'Bookmarks', 'Music'].include?(service.service_category.name) }
+    @general_services ||= get_services(refresh_services).find_all{|service| !non_general_categories.include?(service.service_category.name) }
   end
-    
+  
+  
+  
   # Get all photo services that are used to generate tag feeds
   #
   # refresh_services:     By default all tag services are cached.  Setting this value to true
@@ -247,15 +328,45 @@ class Service < ActiveRecord::Base
     @music_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Music' }
   end
   
+  # Get all news services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_news_tag_services(refresh_services = false)
+    @news_services = nil if refresh_services
+    @news_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'News' }
+  end
+  
+  # Get all blog services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_blog_tag_services(refresh_services = false)
+    @blog_services = nil if refresh_services
+    @blog_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Blogging' }
+  end
+  
+  # Get all search services that are used to generate tag feeds
+  #
+  # refresh_services:     By default all tag services are cached.  Setting this value to true
+  #                       will result in the values being repopulated from the database
+  def self.get_search_tag_services(refresh_services = false)
+    @search_services = nil if refresh_services
+    @search_services ||= get_tag_services(nil, refresh_services).find_all{|service| service.service_category.name == 'Search' }
+  end
+  
   # Get all general services that are used to generate tag feeds
   #
   # refresh_services:     By default all tag services are cached.  Setting this value to true
   #                       will result in the values being repopulated from the database
   def self.get_general_tag_services(refresh_services = false)
     @general_services = nil if refresh_services
-    @general_services ||= get_tag_services(nil, refresh_services).find_all{|service| !['Photos', 'Videos', 'Bookmarks', 'Music'].include?(service.service_category.name) }
+    @general_services ||= get_tag_services(nil, refresh_services).find_all{|service| !non_general_categories.include?(service.service_category.name) }
   end
   
+  
+  
+  
   # Builds tag based feeds for the given term.  Feeds are not saved to the database. 
   #
   # terms:                Terms for which to generate feeds.  This value can be an array, a single string, 
@@ -362,4 +473,8 @@ class Service < ActiveRecord::Base
     Service.find_by_name('rss') # this will return the default rss service
   end
   
+  def self.non_general_categories
+    ['Photos', 'Videos', 'Bookmarks', 'Music', 'News', 'Blogging', 'Search']
+  end
+  
 end

data/app/views/google/_combined_feed.html.erb

@@ -46,25 +46,6 @@
     }
     return 'feed.png';
   }
-  
-  function apply_show_content(){
-    jQuery('.combined-feed-list .feed-item .feed-title').hover(
-      function () {
-        jQuery(this).next('.combined-feed-list .feed-item .feed-content').show();
-      }, 
-      function () {
-        jQuery(this).next('.combined-feed-list .feed-item .feed-content').hide();
-      }
-    );
-    jQuery('.combined-feed-list .feed-item .feed-content').hover(
-      function () {
-        jQuery(this).show();
-      }, 
-      function () {
-        jQuery(this).hide();
-      }
-    );
-  }
 </script>
 
 <div id="<%= content_id %>" class="combined-feed">

data/app/views/topics/_entry.html.erb

@@ -0,0 +1,19 @@
+<% if entry.feed.service.video? -%>
+  <% link = Nokogiri::HTML(entry.content).css('a').detect{ |link| !link.css('img').blank? } -%>
+  <% link.to_s.gsub('<a', 'class="feed-video" rel="video_' + content_id) if link -%>
+  <%= link %>
+<% elsif entry.feed.service.photo? -%>
+  <% link = Nokogiri::HTML(entry.content).css('a').detect{ |link| !link.css('img').blank? } -%>
+  <% link.to_s.gsub('<a', 'class="feed-photo" rel="photo_' + content_id) if link -%>
+  <%= link %>
+<% elsif entry.feed.service.bookmark? -%>
+  <div class="hentry <%= cycle("even", "odd") -%>"><h4 class="title"><a class="bookmark-link" href="<%= entry.permalink %>" target="_blank"><%= entry.title %></a></h4></div>
+<% else -%>
+  <div class="hentry <%= cycle("even", "odd") -%>">
+    <h4 class="title"><a class="entry-link" href="#" target="blank"><%= entry.title %></a><span class="entry-close"><a class="entry-link-close" href="#"><%= t('muck.raker.close') %></a></span></h4>
+    <div class="entry">
+      <%= entry.content %>
+      <p><a href="<%= entry.permalink %>"><%= t('muck.raker.read_more') %></a></p>
+    </div>
+  </div>
+<% end -%>

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

@@ -0,0 +1,24 @@
+<% content_id ||= feed_content_id(feed) -%>
+<div class="feed">
+  <div class="feed-header">
+    <h3 <%= service_icon_background(feed.service) %>>
+      <%= link_to "#{feed.title.humanize}", feed.display_uri, :target => 'blank' %>
+      <%= link_to "(rss)", feed.uri, :target => 'blank' %>
+      <% if defined?(show_controls) && show_controls -%>
+        <span class="remove-feed feed-control">
+          <%= link_to t('muck.raker.remove'), aggregation_feed_path(0, :aggregation_id => @aggregation.id, :feed_id => feed.id), :class => 'delete-link' %>
+        </span>
+        <% if use_uri_for_control -%>
+          <%= hidden_field_tag "uris[]", feed.uri -%>
+        <% else -%>
+          <%= hidden_field_tag "service_ids[]", feed.service.id -%>
+        <% end -%>
+      <% end -%>
+    </h3>
+  </div>
+  <div class="feed-content">
+    <div id="<%= content_id %>" class="feed-item <%= feed_class(feed) %>">
+      <%= render :partial => 'topics/entry', :collection => feed.entries, :locals => { :content_id => content_id } %>
+    </div>
+  </div>
+</div>

data/app/views/topics/_simple_entry.html.erb

@@ -0,0 +1,7 @@
+<li class="feed-item" <%= service_icon_background(simple_entry.feed.service) %>>
+  <div class="feed-title"><a href="<%= simple_entry.permalink %>" target="_blank"><%= h simple_entry.title %></a></div>
+  <div class="feed-content" style="display:none;">
+  <h3><a href="<%= simple_entry.permalink %>" target="_blank"><%= h simple_entry.title %></a></h3>
+  <%= simple_entry.content %>
+  </div>
+</li>

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

@@ -22,7 +22,20 @@
     </div>
   <% end -%>
   
-  <% if @show_combined -%>
+  <% if @load_feeds_on_server -%>
+    <% if @show_combined -%>
+      <ul class="combined-feed-list">
+        <%= render :partial => 'topics/simple_entry', :collection => @server_loaded_data_feeds %>
+      </ul>
+      <script type="text/javascript">
+        jQuery(document).ready(function() {
+          apply_show_entry_content();
+        });
+      </script>
+    <% else -%>
+      <%= render :partial => 'topics/feed', :collection => @server_loaded_general_feeds %>
+    <% end -%>
+  <% elsif @show_combined -%>
     <%= google_combined_feeds(@general_feeds + @discovered_feeds) %>
   <% else -%>
     <div id="calculated-feeds">

data/muck-raker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.45"
+  s.version = "0.1.46"
 
   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-10-22}
+  s.date = %q{2009-10-23}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -325,9 +325,12 @@ Gem::Specification.new do |s|
      "app/views/services/_new_service.html.erb",
      "app/views/services/_summary.html.erb",
      "app/views/services/_view_service.html.erb",
+     "app/views/topics/_entry.html.erb",
+     "app/views/topics/_feed.html.erb",
      "app/views/topics/_feed_preview.html.erb",
      "app/views/topics/_form.html.erb",
      "app/views/topics/_rss_discover.html.erb",
+     "app/views/topics/_simple_entry.html.erb",
      "app/views/topics/new.html.erb",
      "app/views/topics/photos.html.erb",
      "app/views/topics/show.html.erb",

data/public/javascripts/muck_raker.js

@@ -1,3 +1,22 @@
+function apply_show_entry_content(){
+  jQuery('.combined-feed-list .feed-item .feed-title').hover(
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').show();
+    }, 
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').hide();
+    }
+  );
+  jQuery('.combined-feed-list .feed-item .feed-content').hover(
+    function () {
+      jQuery(this).show();
+    }, 
+    function () {
+      jQuery(this).hide();
+    }
+  );
+}
+
 function show_tool(tool) {
   jQuery('.tool').hide();
   jQuery("#content_iframe").width('75%');

data/test/rails_root/app/views/layouts/default.html.erb

@@ -23,6 +23,7 @@
               jquery/jquery.easing.js
               jquery/jquery.fancybox.js
               muck.js
+              muck_raker.js
               application.js }, :cache => 'all_js_cached' %>
   <%= javascript_tag %[var AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>
   <%= yield :head -%>

data/test/rails_root/public/javascripts/muck_raker.js

@@ -1,3 +1,22 @@
+function apply_show_entry_content(){
+  jQuery('.combined-feed-list .feed-item .feed-title').hover(
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').show();
+    }, 
+    function () {
+      jQuery(this).next('.combined-feed-list .feed-item .feed-content').hide();
+    }
+  );
+  jQuery('.combined-feed-list .feed-item .feed-content').hover(
+    function () {
+      jQuery(this).show();
+    }, 
+    function () {
+      jQuery(this).hide();
+    }
+  );
+}
+
 function show_tool(tool) {
   jQuery('.tool').hide();
   jQuery("#content_iframe").width('75%');

data/test/rails_root/test/unit/google_feed_request_test.rb

@@ -43,6 +43,15 @@ class GoogleFeedRequestTest < ActiveSupport::TestCase
       end      
     end
     
+    context "load an array of feeds" do
+      setup do
+        @feeds = [ Factory(:feed, :uri => 'http://www.justinball.com/feed'), Factory(:feed, :uri => 'http://www.engadget.com/rss.xml'), Factory(:feed, :uri => 'http://www.example.com') ]
+      end
+      should "load feeds" do
+        @feeds = GoogleFeedRequest.load_feeds(@feeds)
+        assert @feeds.entries.length > 0
+      end
+    end
   end
   
 end

data/test/rails_root/test/unit/service_test.rb

@@ -68,6 +68,36 @@ class ServiceTest < ActiveSupport::TestCase
       end
     end
     
+    context "news" do
+      setup do
+        service_category = Factory(:service_category, :name => 'News')
+        @service = Factory(:service, :service_category_id => service_category.id)
+      end
+      should "be a news service" do
+        assert @service.news?(true)
+      end
+    end
+    
+    context "blog" do
+      setup do
+        service_category = Factory(:service_category, :name => 'Blogging')
+        @service = Factory(:service, :service_category_id => service_category.id)
+      end
+      should "be a blog service" do
+        assert @service.blog?(true)
+      end
+    end
+    
+    context "search" do
+      setup do
+        service_category = Factory(:service_category, :name => 'Search')
+        @service = Factory(:service, :service_category_id => service_category.id)
+      end
+      should "be a search service" do
+        assert @service.search?(true)
+      end
+    end
+    
     context "general" do
       setup do
         service_category = Factory(:service_category, :name => 'RSS')
@@ -228,6 +258,33 @@ class ServiceTest < ActiveSupport::TestCase
         assert @feeds.all? { |feed| feed.service.service_category.name == "Music" }
       end
     end
+    context "news feeds" do
+      setup do
+        @feeds = Service.build_news_feeds(@terms, @user.id, nil, true) # We build the news service above so we have to force a cache refresh
+      end
+      should "only create news feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "News" }
+      end
+    end
+    context "blog feeds" do
+      setup do
+        @feeds = Service.build_blog_feeds(@terms, @user.id, nil, true) # We build the blog service above so we have to force a cache refresh
+      end
+      should "only create blog feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "Blogging" }
+      end
+    end
+    context "search feeds" do
+      setup do
+        @feeds = Service.build_search_feeds(@terms, @user.id, nil, true) # We build the search service above so we have to force a cache refresh
+      end
+      should "only create search feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "Search" }
+      end
+    end
   end
   
   context "service types" do
@@ -250,6 +307,18 @@ class ServiceTest < ActiveSupport::TestCase
       assert Service.get_music_tag_services(true).length > 0
       assert Service.get_music_tag_services.all? { |service| service.service_category.name == "Music" }
     end
+    should "get news services" do
+      assert Service.get_news_tag_services(true).length > 0
+      assert Service.get_news_tag_services.all? { |service| service.service_category.name == "News" }
+    end
+    should "get blog services" do
+      assert Service.get_blog_tag_services(true).length > 0
+      assert Service.get_blog_tag_services.all? { |service| service.service_category.name == "Blogging" }
+    end
+    should "get search services" do
+      assert Service.get_search_tag_services(true).length > 0
+      assert Service.get_search_tag_services.all? { |service| service.service_category.name == "Search" }
+    end
     should "get general services" do
       assert Service.get_general_tag_services(true).length > 0
       assert !Service.get_general_tag_services.any? { |service| service.service_category.name == "Photos" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.45
+  version: 0.1.46
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -06:00
+date: 2009-10-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -430,9 +430,12 @@ files:
 - app/views/services/_new_service.html.erb
 - app/views/services/_summary.html.erb
 - app/views/services/_view_service.html.erb
+- app/views/topics/_entry.html.erb
+- app/views/topics/_feed.html.erb
 - app/views/topics/_feed_preview.html.erb
 - app/views/topics/_form.html.erb
 - app/views/topics/_rss_discover.html.erb
+- app/views/topics/_simple_entry.html.erb
 - app/views/topics/new.html.erb
 - app/views/topics/photos.html.erb
 - app/views/topics/show.html.erb