muck-raker 0.2.7 → 0.2.8

data/Rakefile

@@ -5,9 +5,6 @@ require 'rake/rdoctask'
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Default: run unit tests.'
-task :default => :test
-
 desc 'Test muck-raker.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/app/controllers/muck/aggregations_controller.rb

@@ -68,7 +68,7 @@ class Muck::AggregationsController < ApplicationController
       @music_feeds = Service.build_music_feeds(terms, current_user)
       @general_feeds = Service.build_general_feeds(terms, current_user)
 
-      @discovered_feeds = GoogleFeedRequest.find_feeds(terms)
+      @discovered_feeds = Overlord::GoogleFeedRequest.find_feeds(terms)
       @title = terms.titleize
       @terms = terms
       

data/app/controllers/muck/topics_controller.rb

@@ -90,7 +90,7 @@ class Muck::TopicsController < ApplicationController
       
       @general_feeds = Service.build_general_feeds(@terms, current_user, params[:service_ids])
 
-      @discovered_feeds = GoogleFeedRequest.find_feeds(@terms)
+      @discovered_feeds = Overlord::GoogleFeedRequest.find_feeds(@terms)
 
       @feeds = @photo_feeds + @video_feeds + @bookmark_feeds + @music_feeds + @news_feeds + @blog_feeds + @search_feeds + @general_feeds + @discovered_feeds
     
@@ -98,14 +98,14 @@ class Muck::TopicsController < ApplicationController
     
     def load_feeds
       if @load_feeds_on_server
-        @server_loaded_general_feeds = GoogleFeedRequest.load_feeds(@general_feeds + @discovered_feeds, @number_of_items)
-        @server_loaded_photo_feeds = GoogleFeedRequest.load_feeds(@photo_feeds, @number_of_images)
-        @server_loaded_video_feeds = GoogleFeedRequest.load_feeds(@video_feeds, @number_of_videos)
-        @server_loaded_bookmark_feeds = GoogleFeedRequest.load_feeds(@bookmark_feeds, @number_of_items)
-        @server_loaded_music_feeds = GoogleFeedRequest.load_feeds(@music_feeds, @number_of_items)
-        @server_loaded_news_feeds = GoogleFeedRequest.load_feeds(@news_feeds, @number_of_items)
-        @server_loaded_blog_feeds = GoogleFeedRequest.load_feeds(@blog_feeds, @number_of_items)
-        @server_loaded_search_feeds = GoogleFeedRequest.load_feeds(@search_feeds, @number_of_items)
+        @server_loaded_general_feeds = Overlord::GoogleFeedRequest.load_feeds(@general_feeds + @discovered_feeds, @number_of_items)
+        @server_loaded_photo_feeds = Overlord::GoogleFeedRequest.load_feeds(@photo_feeds, @number_of_images)
+        @server_loaded_video_feeds = Overlord::GoogleFeedRequest.load_feeds(@video_feeds, @number_of_videos)
+        @server_loaded_bookmark_feeds = Overlord::GoogleFeedRequest.load_feeds(@bookmark_feeds, @number_of_items)
+        @server_loaded_music_feeds = Overlord::GoogleFeedRequest.load_feeds(@music_feeds, @number_of_items)
+        @server_loaded_news_feeds = Overlord::GoogleFeedRequest.load_feeds(@news_feeds, @number_of_items)
+        @server_loaded_blog_feeds = Overlord::GoogleFeedRequest.load_feeds(@blog_feeds, @number_of_items)
+        @server_loaded_search_feeds = Overlord::GoogleFeedRequest.load_feeds(@search_feeds, @number_of_items)
         if @show_combined
           @server_combined_general_feeds = Feed.combine_sort(@server_loaded_general_feeds)
           @server_combined_photo_feeds = Feed.combine_sort(@server_loaded_photo_feeds)

data/app/helpers/muck_raker_helper.rb

@@ -1,5 +1,13 @@
 module MuckRakerHelper
 
+  def tag_list(tags)
+    atags = tags.split(',')
+    # get rid of the first two items
+    atags.shift 
+    atags.shift
+    atags.each_slice(2){|tag,frequency| yield tag,frequency }
+  end
+  
   def tag_cloud(tag_list, classes)
     atags = tag_list.split(',')
     min = atags.shift.to_f

data/lib/muck_raker.rb

@@ -9,7 +9,6 @@ ActionController::Base.send :helper, MuckRakerHelper
 ActionController::Base.send :helper, MuckRakerFeedsHelper
 ActionController::Base.send :helper, MuckRakerServicesHelper
 ActionController::Base.send :helper, MuckRakerAggregationsHelper
-ActionController::Base.send :helper, MuckRakerGoogleHelper
 
 ActiveRecord::Base.class_eval { include MuckRaker::Exceptions }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckFeedParent }

data/muck-raker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   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-29}
+  s.date = %q{2009-10-31}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,6 @@ Gem::Specification.new do |s|
      "app/controllers/muck/visits_controller.rb",
      "app/helpers/muck_raker_aggregations_helper.rb",
      "app/helpers/muck_raker_feeds_helper.rb",
-     "app/helpers/muck_raker_google_helper.rb",
      "app/helpers/muck_raker_helper.rb",
      "app/helpers/muck_raker_services_helper.rb",
      "app/models/aggregation.rb",
@@ -45,7 +44,6 @@ Gem::Specification.new do |s|
      "app/models/entry.rb",
      "app/models/feed.rb",
      "app/models/feed_parent.rb",
-     "app/models/google_feed_request.rb",
      "app/models/identity_feed.rb",
      "app/models/oai_endpoint.rb",
      "app/models/raker_mailer.rb",
@@ -99,14 +97,6 @@ Gem::Specification.new do |s|
      "app/views/feeds/new_oai_rss.html.erb",
      "app/views/feeds/show.html.erb",
      "app/views/feeds/unban.html.erb",
-     "app/views/google/_combined_feed.html.erb",
-     "app/views/google/_dynamic_feeds_vertical.html.erb",
-     "app/views/google/_feed.html.erb",
-     "app/views/google/_feed_search.html.erb",
-     "app/views/google/_feeds_scripts.html.erb",
-     "app/views/google/_hot_trends.html.erb",
-     "app/views/google/_search.html.erb",
-     "app/views/google/_slide_show.html.erb",
      "app/views/identity_feeds/_available_service_categories.html.erb",
      "app/views/identity_feeds/_form.html.erb",
      "app/views/identity_feeds/_services_for_user.html.erb",
@@ -888,7 +878,6 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/entry_test.rb",
      "test/rails_root/test/unit/feed_parent_test.rb",
      "test/rails_root/test/unit/feed_test.rb",
-     "test/rails_root/test/unit/google_feed_request_test.rb",
      "test/rails_root/test/unit/identity_feed_test.rb",
      "test/rails_root/test/unit/oai_endpoint_test.rb",
      "test/rails_root/test/unit/raker_mailer_test.rb",

data/test/rails_root/config/environment.rb

@@ -24,6 +24,8 @@ Rails::Initializer.run do |config|
   config.gem "muck-feedbag", :lib => "feedbag", :source => "http://gems.github.com"
   config.gem "pauldix-feedzirra", :lib => 'feedzirra', :source => "http://gems.github.com"
   config.gem "httparty"
+  config.gem "river"
+  config.gem "overlord"
   config.gem "friendly_id", :version => '>=2.1.3'
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -06:00
+date: 2009-10-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,6 @@ files:
 - app/controllers/muck/visits_controller.rb
 - app/helpers/muck_raker_aggregations_helper.rb
 - app/helpers/muck_raker_feeds_helper.rb
-- app/helpers/muck_raker_google_helper.rb
 - app/helpers/muck_raker_helper.rb
 - app/helpers/muck_raker_services_helper.rb
 - app/models/aggregation.rb
@@ -160,7 +159,6 @@ files:
 - app/models/entry.rb
 - app/models/feed.rb
 - app/models/feed_parent.rb
-- app/models/google_feed_request.rb
 - app/models/identity_feed.rb
 - app/models/oai_endpoint.rb
 - app/models/raker_mailer.rb
@@ -214,14 +212,6 @@ files:
 - app/views/feeds/new_oai_rss.html.erb
 - app/views/feeds/show.html.erb
 - app/views/feeds/unban.html.erb
-- app/views/google/_combined_feed.html.erb
-- app/views/google/_dynamic_feeds_vertical.html.erb
-- app/views/google/_feed.html.erb
-- app/views/google/_feed_search.html.erb
-- app/views/google/_feeds_scripts.html.erb
-- app/views/google/_hot_trends.html.erb
-- app/views/google/_search.html.erb
-- app/views/google/_slide_show.html.erb
 - app/views/identity_feeds/_available_service_categories.html.erb
 - app/views/identity_feeds/_form.html.erb
 - app/views/identity_feeds/_services_for_user.html.erb
@@ -1024,7 +1014,6 @@ test_files:
 - test/rails_root/test/unit/entry_test.rb
 - test/rails_root/test/unit/feed_parent_test.rb
 - test/rails_root/test/unit/feed_test.rb
-- test/rails_root/test/unit/google_feed_request_test.rb
 - test/rails_root/test/unit/identity_feed_test.rb
 - test/rails_root/test/unit/oai_endpoint_test.rb
 - test/rails_root/test/unit/raker_mailer_test.rb

data/app/helpers/muck_raker_google_helper.rb

@@ -1,253 +0,0 @@
-module MuckRakerGoogleHelper
-
-  # Render a google custom search control.  If feeds are provided then the search will be restricted to the
-  # 'display_url' for each feed.  If search_for is specified then a default search will be executed.
-  # It is not recommended that you provide feeds and locale since the overlap between the feeds provided
-  # and the languages might be nothing.
-  # Examples:
-  #
-  # Create a custom search over a specific set of feeds:
-  # <%= google_search('Google Search (Search within these results)', [], '', %w{web}, 'google_restricted_search') %>
-  #
-  # Create a general google search based on the current locale:
-  # <%= google_search('Google Search', [], @terms, %w{web video blog news image local book patent}, 'google_search', I18n.locale) %>
-  #
-  # feeds:      An array of feeds to render each with a property 'display_uri' defined
-  # search_for: Terms to search for by default.  If none are specified then no default search will be performed.
-  # search_types: Types of google searches to add to the dialog. Valid values are web video blog news image local book patent
-  # content_id: Name of the div that will hold the widget google generates.
-  #             If this method is called more than once on a given page then you will need to 
-  #             specify different content_ids for each call.
-  # locale:     Locale to restrict searches.  For example, to restrict the search to only German sites specify 'de'
-  #             A complete set of valid Google languages can be found here:
-  #             http://code.google.com/apis/ajaxlanguage/documentation/#SupportedLanguages
-  #             For a list of valid codes you can also look at the babelphish gem.  Codes can be found in languages.rb.
-  def google_search(title, feeds = [], search_for = '', search_types = %w{web video blog news image local book patent}, content_id = 'google_search', locale = nil)
-    render :partial => 'google/search', :locals => { :title => title,
-                                                     :feeds => feeds,
-                                                     :search_for => search_for,
-                                                     :search_types => search_types,
-                                                     :content_id => content_id,
-                                                     :locale => locale }
-  end
-  
-  # Utility method for generating scripts required to to build google search
-  # type:       Type of Google search.  Should be one of web video blog news image local book patent
-  # feeds:      An array of feeds to render each with a property 'display_uri' defined
-  # locale:     Locale to restrict searches.  For example, to restrict the search to only German sites specify 'de'
-  #             A complete set of valid Google languages can be found here:
-  #             http://code.google.com/apis/ajaxlanguage/documentation/#SupportedLanguages
-  #             For a list of valid codes you can also look at the babelphish gem.  Codes can be found in languages.rb.
-  def google_typed_search(type, feeds = [], locale = nil)
-    content = "var #{type}Search = new google.search.#{type.capitalize}Search();\n"
-    if !['video', 'blog'].include?(type)
-      if !locale.blank?
-        content << "#{type}Search.setRestriction(google.search.Search.RESTRICT_EXTENDED_ARGS, {lr:'lang_#{locale}'});\n"
-      end
-    end
-    if !['video', 'local', 'patent', 'book'].include?(type)
-      feeds.each do |feed|
-        if !feed.display_uri.blank?
-          content << "#{type}Search.setSiteRestriction('#{feed.display_uri}');\n"
-        end
-      end
-    end
-    content << "searchControl.addSearcher(#{type}Search);\n"
-  end
-  
-  # Render feeds using Google's api
-  # feeds:            Feed object.
-  # show_controls:    Indicates whether or not to show editing controls. ie Remove
-  # number_of_items:  Number of items to display for the given feed.
-  # number_of_images: Number of images to get from the feed.
-  # number_of_videos: Number of videos to get from the feed.
-  # use_uri_for_control: If set to true then a hidden field will be generated containing the feed's uri.  If false then the hidden field will contain the feed's service id.  This is used to
-  #                      regenerate the feed after submission to the server.
-  # javascript_callback: Name of a javascript method to call after the feed has finished loading.  The 
-  #                      method should accept the feed uri and the content id. ie  feed_callback(uri, content_id).
-  def google_feeds(feeds, show_controls = false, number_of_items = 6, number_of_images = 20, number_of_videos = 6, 
-                  use_uri_for_control = false, run_load_scripts = false, javascript_callback = 'google_load_complete')
-    render :partial => 'google/feed', :collection => feeds, :locals => {:number_of_items => number_of_items,
-                                                                       :number_of_images => number_of_images,
-                                                                       :number_of_videos => number_of_videos,
-                                                                       :javascript_callback => javascript_callback,
-                                                                       :show_controls => show_controls,
-                                                                       :use_uri_for_control => use_uri_for_control,
-                                                                       :run_load_scripts => run_load_scripts}
-  end
-
-  # Render combined feed using Google's api
-  #
-  # feeds:               Array of feeds that have attribute 'uri' defined.
-  # content_id:          Name of the div that will hold the widget google generates.  
-  #                      If this method is called more than once on a given page then you will need to 
-  #                      specify different content_ids for each call.
-  # javascript_callback: Name of a javascript method to call after the feed has finished loading.  The 
-  #                      method should accept the feed uri and the content id. ie  feed_callback(uri, content_id).
-  def google_combined_feeds(feeds, content_id = 'google_combined_feed', javascript_callback = nil)
-    render :partial => 'google/combined_feed', :locals => { :feeds => feeds, :content_id => content_id, :javascript_callback => javascript_callback }
-  end
-  
-  # Render a google dynamic feed control.
-  #
-  # feeds:      An array of feeds to render each with a property 'title' and 'uri' defined
-  # content_id: Name of the div that will hold the widget google generates.  
-  #             If this method is called more than once on a given page then you will need to 
-  #             specify different content_ids for each call.
-  # options:    A hash containing the values to pass to the Google widget. The available options are defined here:
-  #             http://www.google.com/uds/solutions/dynamicfeed/reference.html.
-  def google_dynamic_feeds_vertical(feeds, 
-                                    content_id = 'dynamic_feed_vertical_content', 
-                                    options = { :numResults => 20, :stacked => true, :horizontal => false })
-    render :partial => 'google/dynamic_feeds_vertical', :locals => { :feeds => feeds, :content_id => content_id, :options => options }
-  end
-  
-  # Find and output feeds related to the given query
-  #
-  # query:      A tag or search query to pass to Google.  Google will find feeds that match this value.
-  # content_id: Name of the div that will hold the widget google generates.  
-  #             If this method is called more than once on a given page then you will need to 
-  #             specify different content_ids for each call.
-  def google_feed_search(query, content_id = 'feed_search_content')
-    render :partial => 'google/feed_search', :locals => { :query => query, :content_id => content_id }
-  end
-  
-  # Generate a slide show from a feed
-  # feed:       Url for which to generate the feed.
-  # content_id: Name of the div that will hold the widget google generates.
-  #             If this method is called more than once on a given page then you will need to 
-  #             specify different content_ids for each call.
-  # options:    A hash containing the values to pass to the Google widget. The available options are defined here:
-  #             http://www.google.com/uds/solutions/slideshow/index.html
-  def google_slide_show(feed, 
-                        content_id = 'slide_show_content',
-                        options = { :displayTime => 2000, :transistionTime => 600, :scaleImages => true, :fullControlPanel => true })
-    render :partial => 'google/slide_show', :locals => { :feed => feed, :content_id => content_id, :options => options }
-  end
-
-  # Given a feed attempts to assign an appropriate class
-  def feed_class(feed)
-    if feed.service.photo?
-      "feed-photos"
-    elsif feed.service.bookmark?
-      "feed-bookmarks"
-    elsif feed.service.video?
-      "feed-videos"
-    elsif feed.service.music?
-      "feed-music"
-    end
-  end
-  
-  # Generates a valid dom id for the feed
-  def feed_content_id(feed)
-    "feed_#{feed.id}_#{feed.title.parameterize}_#{feed.service.name.parameterize}".gsub('+', '-')
-  end
-  
-  # Outputs the appropriate script for handling the google response once the feed is loaded
-  # feed:             Url for which to generate the feed.
-  # content_id:       Name of the div that will hold the widget google generates.  
-  #                   If this method is called more than once on a given page then you will need to 
-  #                   specify different content_ids for each call.
-  # javascript_callback: Name of a javascript method to call after the feed has finished loading.  The 
-  #                      method should accept the feed uri and the content id. ie  feed_callback(uri, content_id).
-  def google_muck_load_script(feed, content_id = nil, javascript_callback = nil)
-    if feed.service.photo?
-      google_load_images_script(javascript_callback, feed.uri, content_id)
-    elsif feed.service.bookmark?
-      google_load_bookmarks_script(javascript_callback, feed.uri, content_id)
-    elsif feed.service.video?
-      google_load_videos_script(javascript_callback, feed.uri, content_id)
-    elsif feed.service.music?
-      # TODO need to get music feeds into tag system so that we can search for music feeds and then integrate in a way that can play the tunes.
-      google_load_entries_script(javascript_callback, feed.uri, content_id)
-    else
-      google_load_entries_script(javascript_callback, feed.uri, content_id)
-    end
-  end
-  
-  def google_muck_load_callback_script(feed, content_id, number_of_items = 4, number_of_images = 6, number_of_videos = 6)
-    if feed.service.photo?
-      "google_load_images('#{feed.uri}', '#{content_id}', #{number_of_images});"
-    elsif feed.service.bookmark?
-      "google_load_bookmarks('#{feed.uri}', '#{content_id}', #{number_of_items});"
-    elsif feed.service.video?
-      "google_load_videos('#{feed.uri}', '#{content_id}', #{number_of_videos});"
-    elsif feed.service.music?
-      "google_load_entries('#{feed.uri}', '#{content_id}', #{number_of_items});"
-    else
-      "google_load_entries('#{feed.uri}', '#{content_id}', #{number_of_items});"
-    end
-  end
-  
-  def google_load_videos_script(javascript_callback, uri, content_id)
-    google_load_template_script 'google_load_videos', javascript_callback, uri, content_id do
-      %Q{var link = jQuery(item.content).find('img').parent('a');
-      link.attr('rel', '#{content_id}');
-      link.addClass('feed-video');
-      jQuery('#' + content_id).append(link);}
-    end
-  end
-    
-  def google_load_images_script(javascript_callback, uri, content_id)
-    google_load_template_script 'google_load_images', javascript_callback, uri, content_id do
-      %Q{var link = jQuery(item.content).find('img').parent('a');
-      link.attr('rel', '#{content_id}');
-      link.addClass('feed-photo');
-      jQuery('#' + content_id).append(link);}
-    end
-  end
-  
-  def google_load_entries_script(javascript_callback, uri, content_id)
-    google_load_template_script 'google_load_entries', javascript_callback, uri, content_id do
-      %Q{var status_class = 'even';
-      if(i%2 > 0) { status_class = 'odd'; }
-      jQuery('#' + content_id).append('<div class="hentry ' + status_class + '"><h4 class="title"><a class="entry-link" href="#" target="blank">' + item.title + '</a><span class="entry-close"><a class="entry-link-close" href="#">#{t('muck.raker.close')}</a></span></h4><div class="entry">' + item.content + ' <p><a href="' + item.link + '">#{t('muck.raker.read_more')}</a></p></div></div>');}
-    end
-  end
-
-  def google_load_bookmarks_script(javascript_callback, uri, content_id)
-    google_load_template_script 'google_load_bookmarks', javascript_callback, uri, content_id do
-      %Q{var status_class = 'even';
-      if(i%2 > 0) { status_class = 'odd'; }
-      jQuery('#' + content_id).append('<div class="hentry ' + status_class + '"><h4 class="title"><a class="bookmark-link" href="' + item.link + '" target="_blank">' + item.title + '</a></h4></div>');}
-    end
-  end
-  
-  # Generates the template code used by all the calls to google.
-  def google_load_template_script(method_name, javascript_callback, uri, content_id)
-    included_name = "@#{method_name}_included"
-    return '' if instance_variable_get(included_name) rescue false
-    instance_variable_set(included_name, true)
-    %Q{<script type="text/javascript">
-    function #{method_name}(uri, content_id, number_of_items){
-      jQuery('#' + content_id).html('');
-      var feed = new google.feeds.Feed(uri);
-      feed.setNumEntries(number_of_items);
-      feed.load(function(result) {
-        if (!result.error) {
-          jQuery.each(result.feed.entries, function(i,item){
-            #{yield}
-            #{javascript_callback}('#{uri}', '#{content_id}');
-          });
-        } 
-        if (result.error || result.feed.entries.length <= 0) {
-          jQuery('#' + content_id).append('<div class="hentry">#{t('muck.raker.no_entries_found')}</div>');
-        }
-      });
-    }
-    </script>}
-  end
-  
-  # 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[0, limit] }
-  end
-  
-  def change_chars(term)
-    term.gsub('+', ' ').gsub('.', '-')
-  end
-  
-end

data/app/models/google_feed_request.rb

@@ -1,114 +0,0 @@
-# Google ajax feed api reference:
-# http://code.google.com/apis/ajaxfeeds/documentation/reference.html
-#
-# Google code playground:
-# http://code.google.com/apis/ajax/playground/?exp=search#load_feed
-#
-class GoogleFeedRequest
-  include HTTParty
-  format :json
-  
-  # Initialize Google Request.
-  # Parameters:
-  # api_key_id:     Valid Google access key (optional)
-  def initialize(api_key_id = nil)
-    @api_key_id = api_key_id
-  end
-  
-  # Lookup a given feed.  
-  def self.lookup_feed(uri)
-    get('http://ajax.googleapis.com/ajax/services/feed/lookup', :query => build_google_query({:q => uri}))
-  end
-  
-  # Requests entries for a single feed
-  #
-  # uri:             Uri of the feed to load
-  # number_of_items: Number of items to load from the feed
-  def self.load_feed(uri, number_of_items = 5)
-    get('http://ajax.googleapis.com/ajax/services/feed/load', :query => build_google_query({:q => uri, :num => number_of_items}))
-  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, number_of_items = 5)
-    feeds = feeds.collect do |feed|
-      json = load_feed(feed.uri, number_of_items)
-      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_find_feeds_json_to_feeds(feed_response)
-    else
-      []
-    end
-  end
-  
-  # Search for feeds using google.  This will return 
-  # a hash with the results
-  def self.find_google_feeds(query, number_of_items = 5)
-    get('http://ajax.googleapis.com/ajax/services/feed/find', :query => build_google_query({:q => query}))
-  end
-  
-  # convert the result of a google query to 'Feed' objects
-  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'],
-                :title => google_feed['title'],
-                :service_id => Service.find_service_by_uri(google_feed['link']).id)
-    end
-  end
-
-  # Add standard items to the google query
-  def self.build_google_query(query_options)
-    query_options[:v] = '1.0'
-    query_options[:key] = GlobalConfig.google_ajax_api_key if GlobalConfig.google_ajax_api_key
-    query_options
-  end
-  
-end

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

@@ -1,54 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_feeds -%>
-<% end -%>
-
-<script type="text/javascript">
-  entries = [];
-  function feed_loaded(result) {
-    if (!result.error) {
-      jQuery('#<%= content_id %> .waiting').hide();
-      jQuery('#<%= content_id %> ul').html('');
-      new_entries = result.feed.entries;
-      for (var i=0; i<new_entries.length; i++){
-        new_entries[i].feed = result.feed;
-      }
-      entries = jQuery.merge(entries, new_entries);
-      entries = entries.sort(function(a,b){
-        return a.publishedDate > b.publishedDate;
-      });
-      for (var i=0; i<entries.length; i++) {
-        var html = '<li class="feed-item" style="background: transparent url(/images/service_icons/24/' + get_service_name(entries[i]) + ') no-repeat scroll left top;">';
-        html += '<div class="feed-title"><a href="' + entries[i].link + '" target="_blank">' + entries[i].title + '</a></div>';
-        html += '<div class="feed-content" style="display:none;">';
-        html += '<h3><a href="' + entries[i].link + '" target="_blank">' + entries[i].title + '</a></h3>';
-        html +=  entries[i].content;
-        html +=  '</div>';
-        html += '</li>';
-        jQuery('#<%= content_id %> ul').append(html);
-      }
-      apply_show_entry_content();
-      <%= "#{javascript_callback}('#{content_id}');" if javascript_callback -%>
-    }
-  }
-  google.setOnLoadCallback(function(){
-    <% feeds.each do |feed| -%>
-      new google.feeds.Feed("<%=feed.uri%>").load(feed_loaded);
-    <% end -%>
-  });
-  
-  function get_service_name(entry) {
-    var services = eval(<%= Service.all.to_json(:only => [ :uri_key, :icon ]) %>);
-    for(var i=0; i<services.length; i++){
-      if(services[i].uri_key && (entry.link.indexOf(services[i].uri_key) >= 0 || entry.feed.link.indexOf(services[i].uri_key) >= 0)){
-        return services[i].icon;
-      }
-    }
-    return 'feed.png';
-  }
-</script>
-
-<div id="<%= content_id %>" class="combined-feed">
-  <span class="waiting"><%= t('muck.raker.loading_message') %></span>
-  <ul class="combined-feed-list"></ul>
-</div>

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

@@ -1,22 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <script src="http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js" type="text/javascript"></script>
-  <style type="text/css">
-    @import url("http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css");
-  </style>
-  <%= google_load_feeds -%>
-<% end -%>
-<% content_for :javascript do -%>
-google.setOnLoadCallback(function() {
-  var feeds = [
-    <%= feeds.collect { |feed|
-      "{ title: '#{feed.title}', url: '#{feed.uri}' }"
-    }.join(',') -%>
-  ];
-  new GFdynamicFeedControl(feeds, '<%= content_id %>', <%= options.to_json %>);
-});
-<% end -%>
-<div id="<%= content_id %>">
-  <%= t('muck.raker.loading_message') %>
-  <img src="/images/spinner.gif" alt="<%= t('muck.raker.loading_image') %>" />
-</div>

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

@@ -1,43 +0,0 @@
-<% content_id ||= feed_content_id(feed) -%>
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_feeds -%>
-  <%= google_muck_load_script(feed, content_id, javascript_callback) %>
-<% end -%>
-
-<% if run_load_scripts -%>
-  <script type="text/javascript">
-    <%= google_muck_load_callback_script(feed, content_id, number_of_items, number_of_images, number_of_videos) %>
-    setup_delete_links();
-  </script>
-<% else -%>
-  <% content_for :javascript do -%>
-    google.setOnLoadCallback(function() {
-      <%= google_muck_load_callback_script(feed, content_id, number_of_items, number_of_images, number_of_videos) %>
-    });
-  <% end -%>
-<% end -%>
-
-<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) %>">
-      <span class="waiting"><%= t('muck.raker.loading_message') %></span>
-    </div>
-  </div>
-</div>

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

@@ -1,26 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_feeds -%>
-<% end -%>
-<% content_for :javascript do -%>
-google.setOnLoadCallback(function() {
-  google.feeds.findFeeds('<%= query %>', findDone);
-});
-function findDone(result) {
-  // Make sure we didn't get an error.
-  if (!result.error) {
-    // Get content div
-    var content = document.getElementById('<%= content_id %>');
-    var html = '';
-    for (var i = 0; i < result.entries.length; i++) {
-      var entry = result.entries[i];
-      html += '<p><a href="' + entry.url + '">' + entry.title + '</a></p>';
-    }
-    content.innerHTML = html;
-  }
-}
-<% end -%>
-<div id="<%= content_id %>">
-  <%= t('muck.raker.loading_message') %>
-  <img src="/images/spinner.gif" alt="Loading content image" />
-</div>

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

@@ -1,36 +0,0 @@
-<% content_for :javascript do -%>
-function google_load_complete(uri, content_id) {
-  jQuery('.hentry .entry').hide();
-  jQuery('.hentry h4 .entry-close').hide();
-  jQuery('.hentry h4 a.entry-link-close').click(function(){
-    jQuery(this).parent().parent().siblings('.entry').hide();
-    jQuery(this).parent().hide();
-    return false;
-  });
-  jQuery('.hentry h4 a.entry-link').click(function(){
-    jQuery(this).parent().siblings('.entry').show();
-    jQuery(this).siblings('.entry-close').show();
-    return false;
-  });
-}
-function setup_delete_links() {
-  jQuery(".delete-link").click(function() {
-    var container = jQuery(this).parents('div.feed');
-    container.fadeOut(500, function() {
-      jQuery(this).remove();
-    });
-    jQuery.post(jQuery(this).attr('href'), { '_method': 'delete', 'format': 'json' },
-      function(data){
-        var json = eval('(' + data + ')');
-        if(!json.success){
-          <%= jquery_message('#ajax-messages') %>
-        }
-      });
-    return false;
-  });
-}
-jQuery(document).ready(function() {
-  google_load_complete('','');
-  setup_delete_links();  
-});
-<% end -%>

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

@@ -1,5 +0,0 @@
-<ul class="google-trends">
-  <% google_hot_trends_terms.each do |term| -%>
-    <li><%= link_to h(term).titleize, topic_path(CGI.escape(term)) %></li>
-  <% end -%>
-</ul>

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

@@ -1,39 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_search -%>
-<% end -%>
-<script type="text/javascript">
-function google_load_search() {
-  var searchControl = new google.search.SearchControl();
-  
-  <% search_types.each do |type| -%>
-    <%= google_typed_search(type, feeds, locale) %>
-  <% end -%>
-  
-  <% if GlobalConfig.google_ad_partner_pub -%>
-    searchControl.enableAds('<%= GlobalConfig.google_ad_partner_pub %>');
-  <% end -%>
-  
-  <% if search_types.length > 1 -%>
-    var drawOptions = new google.search.DrawOptions();
-    drawOptions.setDrawMode(google.search.SearchControl.DRAW_MODE_TABBED);
-    searchControl.draw(document.getElementById("<%= content_id %>"), drawOptions);
-  <% else -%>
-    searchControl.draw(document.getElementById("<%= content_id %>"));
-  <% end -%>
-  
-  searchControl.execute('<%=search_for%>');
-}
-google.setOnLoadCallback(google_load_search);
-</script>
-<div class="feed">
-  <div class="feed-header">
-    <h3 class="google-header"><%= title %></h3>
-  </div>
-  <div class="feed-content">
-    <div id="<%= content_id %>" class="search-container">
-      <span class="waiting"><%= t('muck.raker.loading_message') %></span>
-    </div>
-  </div>
-</div>
-

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

@@ -1,14 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_ajax_slideshow_scripts -%>
-  <%= google_load_feeds -%>
-<% end -%>
-<% content_for :javascript do -%>
-google.setOnLoadCallback(function() {
-  new GFslideShow("<%= feed.uri %>", "<%= content_id %>", <%= options.to_json %>);
-});
-<% end -%>
-<div id="<%= content_id %>" class="slide_show_content">
-  <%= t('muck.raker.loading_message') %>
-  <img src="/images/spinner.gif" alt="<%= t('muck.raker.loading_image') %>" />
-</div>

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

@@ -1,57 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class GoogleFeedRequestTest < ActiveSupport::TestCase
-  
-  context "google feed requests" do
-
-    context "find feeds" do
-      setup do
-        @feeds = GoogleFeedRequest.find_feeds('ruby')
-      end
-      should "get feeds related to ruby" do
-        assert @feeds.length > 0
-      end
-      should "build objects of type 'Feed'" do
-        assert @feeds[0].is_a?(Feed)
-      end
-    end
-  
-    context "find feeds (raw results)" do
-      setup do
-        @feeds = GoogleFeedRequest.find_google_feeds('ruby')
-      end
-      should "get feeds related to ruby" do
-        assert @feeds.length > 0
-      end
-    end
-  
-    context "lookup feed" do
-      setup do
-        @result = GoogleFeedRequest.lookup_feed('http://www.justinball.com')
-      end
-      should "discover rss feed using uri" do
-        assert_equal 'http://www.justinball.com/feed/', @result['responseData']['url']
-      end
-    end
-    
-    context "load feed" do
-      setup do
-        @entries = GoogleFeedRequest.load_feed('http://www.justinball.com')
-      end
-      should "get entries from feed" do
-        assert @entries.length > 0
-      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