muck-raker 0.1.43 → 0.1.45

data/Rakefile

@@ -62,6 +62,7 @@ begin
     gemspec.add_dependency "mbleigh-acts-as-taggable-on"
     gemspec.add_dependency "mislav-will_paginate"
     gemspec.add_dependency "httparty"
+    gemspec.add_dependency "nokogiri"
     gemspec.add_dependency "muck-feedbag"
     gemspec.add_dependency "pauldix-feedzirra"
     gemspec.add_dependency "muck-engine"

data/VERSION

@@ -1 +1 @@
-0.1.43
+0.1.45

data/app/controllers/muck/topics_controller.rb

@@ -6,6 +6,8 @@ class Muck::TopicsController < ApplicationController
   before_filter :build_tag_feeds, :only => [:show, :rss_discovery]
   
   def show
+    @show_google_search = true
+    @show_combined = false
     respond_to do |format|
       format.html do
         @opml_path = topic_path(params[:id], :service_ids => params[:service_ids], :format => 'opml')
@@ -32,7 +34,7 @@ class Muck::TopicsController < ApplicationController
       format.iphone { render :template => 'topics/photos' }
     end
   end
-  
+
   def videos
     @terms = CGI.unescape(params[:id])
     @page_title = @title = @terms.titleize

data/app/helpers/muck_raker_google_helper.rb

@@ -1,5 +1,60 @@
 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
@@ -21,6 +76,18 @@ module MuckRakerGoogleHelper
                                                                        :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
@@ -171,4 +238,15 @@ module MuckRakerGoogleHelper
     </script>}
   end
   
+  def google_hot_trends
+    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 }
+  end
+  
+  def change_chars(term)
+    term.gsub('+', ' ').gsub('.', '-')
+  end
+  
 end

data/app/models/feed.rb

@@ -35,8 +35,6 @@
 
 class Feed < ActiveRecord::Base
 
-  require 'httparty'
-
   include HTTParty
   format :xml
 
@@ -144,7 +142,7 @@ class Feed < ActiveRecord::Base
     feeds = []
     @available_feeds = discover_feeds(uri)
     @available_feeds.each do |feed|
-      feeds << new_from_feedzirra(Feedzirra::Feed.fetch_and_parse(feed.url)) unless feed.blank?
+      feeds << new_from_feedzirra(fetch_feed(feed.url)) unless feed.blank?
     end
     feeds
   end
@@ -155,11 +153,17 @@ class Feed < ActiveRecord::Base
     feeds = []
     @available_feeds = discover_feeds(uri)
     @available_feeds.each do |feed|
-      feeds << create_from_feedzirra(Feedzirra::Feed.fetch_and_parse(feed.url), user) unless feed.blank?
+      feeds << create_from_feedzirra(fetch_feed(feed.url), user) unless feed.blank?
     end
     feeds
   end
   
+  # Fetch a remote feed
+  def self.fetch_feed(url)
+    return nil if url.blank?
+    Feedzirra::Feed.fetch_and_parse(url)
+  end
+  
   # Turns a feed from feedzirra into a muck feed
   def self.new_from_feedzirra(feed)
     return if feed.blank?

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

@@ -0,0 +1,73 @@
+<% 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_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';
+  }
+  
+  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">
+  <span class="waiting"><%= t('muck.raker.loading_message') %></span>
+  <ul class="combined-feed-list"></ul>
+</div>

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

@@ -0,0 +1,5 @@
+<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

@@ -0,0 +1,39 @@
+<% 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/topics/_form.html.erb

@@ -1,5 +1,5 @@
 <% custom_form_for(:topic, :url => topics_path, :html => {:method => :post}) do |f| -%>
-  <%= text_field_tag :terms, params[:terms] %>
+  <%= text_field_tag :terms, params[:terms] || @terms %>
   <%= f.submit t('muck.raker.build_topic'), :id => 'generate_topic' %>
   <span id="generating_topic_message" style="display:none;">
     <%= t('muck.raker.generating_topic_message') %><img src="/images/spinner.gif" alt="<%= t('muck.raker.discover_feed_message') %>" />

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

@@ -4,27 +4,35 @@
 
 <%= output_errors('', {:class => 'help-box'}) %>
 
-<div class="span-17 column">
-  <h2><%= @title %></h2>
-</div>
-
-<div class="span-7 column">
+<div id="search-header" class="span-24 column center">
   <%= topics_form %>
 </div>
 
 <div class="span-24 column">
   <%= link_to t('muck.raker.photos'), photos_topic_path(params[:id], :service_ids => params[:service_ids]) %>
   <%= link_to t('muck.raker.videos'), videos_topic_path(params[:id], :service_ids => params[:service_ids]) %>
+  <%= link_to t('muck.raker.download_opml', :terms => @title), @opml_path %>
 </div>
 
 <div class="span-14 column datafeeds">
-  <div id="calculated-feeds">
-    <%= google_feeds(@general_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
-  </div>
-
-  <div id="discovered_feeds">
-    <%= google_feeds(@discovered_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
-  </div>
+  
+  <% if @show_google_search -%>
+    <div id="search-results">
+      <%= google_search('Google Search', [], @terms, %w{web video blog news image local book patent}, 'google_search', I18n.locale) %>
+    </div>
+  <% end -%>
+  
+  <% if @show_combined -%>
+    <%= google_combined_feeds(@general_feeds + @discovered_feeds) %>
+  <% else -%>
+    <div id="calculated-feeds">
+      <%= google_feeds(@general_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+    </div>
+    <div id="discovered_feeds">
+      <%= google_feeds(@discovered_feeds, @show_controls, @number_of_items, @number_of_images, @number_of_videos) %>
+    </div>
+  <% end -%>
+  
 </div>
 
 <div class="span-10 column datafeeds">
@@ -36,7 +44,7 @@
 
 <div class="span-24 column">
   <%= link_to t('muck.raker.generate_new_topic'), new_topic_path %>
-  <%= link_to t('muck.raker.download_opml', :terms => @title), @opml_path %>
+  
   <!--
   <a href="http://www.google.com/reader/view/feed/<%=CGI.escape(request.url)%>" title="<%=@title%>">
     <img src="http://buttons.googlesyndication.com/fusion/add.gif" border="0" alt="Add to Google" />
@@ -44,4 +52,5 @@
   -->
 </div>
 
-<%= render :partial => 'google/feeds_scripts' %>
+<%= render :partial => 'google/feeds_scripts' %>
+

data/db/bootstrap/services.yml

@@ -25,6 +25,7 @@ twitter:
   id: 3 
   name: Twitter
   uri: "http://www.twitter.com"
+  uri_key: "twitter.com"
   api_uri: 
   uri_data_template: "http://www.twitter.com/{username}"
   uri_template: "http://www.twitter.com/{username}"
@@ -37,6 +38,7 @@ youtube:
   id: 4 
   name: You Tube
   uri: "http://www.youtube.com"
+  uri_key: "youtube.com"
   api_uri: 
   uri_data_template: "http://gdata.youtube.com/feeds/base/users/{username}/uploads?alt=rss&v=2&orderby=published&client=ytapi-youtube-profile"
   uri_template: "http://www.youtube.com/user/{username}"
@@ -49,6 +51,7 @@ flickr:
   id: 5 
   name: Flickr
   uri: "http://www.flickr.com"
+  uri_key: "flickr.com"
   api_uri: 
   uri_data_template: "http://www.flickr.com/photos/{username}/"
   uri_template: "http://www.flickr.com/photos/{username}/"
@@ -61,6 +64,7 @@ delicious:
   id: 6
   name: delicious
   uri: "http://delicious/"
+  uri_key: "delicious.com"
   api_uri: "https://api.delicious/v1/"
   uri_data_template: "http://delicious.com/{username}"
   uri_template: "http://delicious.com/{username}"
@@ -73,6 +77,7 @@ digg:
   id: 7 
   name: Digg
   uri: "http://www.digg.com"
+  uri_key: "digg.com"
   api_uri: 
   uri_data_template: "http://digg.com/users/{username}/history.rss"
   uri_template: "http://digg.com/users/{username}"
@@ -85,6 +90,7 @@ yelp:
   id: 8
   name: Yelp
   uri: "http://www.yelp.com/"
+  uri_key: "yelp.com"
   api_uri: 
   uri_data_template: "http://{username}.yelp.com/rss"
   uri_template: "http://{username}.yelp.com"
@@ -97,6 +103,7 @@ stumbleupon:
   id: 9
   name: StumbleUpon
   uri: "http://www.stumbleupon.com/"
+  uri_key: "stumbleupon.com"
   api_uri:
   uri_data_template: "http://rss.stumbleupon.com/user/{username}/"
   uri_template: "http://www.stumbleupon.com/stumbler/{username}"
@@ -109,6 +116,7 @@ vimeo:
   sort: 10
   name: Vimeo
   uri: "http://vimeo.com"
+  uri_key: "vimeo.com"
   api_uri: 
   uri_data_template: "http://vimeo.com/{username}/videos/rss"
   uri_template: "http://vimeo.com/{username}"
@@ -121,6 +129,7 @@ lastfm:
   sort: 11
   name: Last.fm
   uri: "http://www.last.fm"
+  uri_key: "last.fm"
   api_uri: 
   uri_data_template: "http://ws.audioscrobbler.com/1.0/user/{username}/recenttracks.rss"
   uri_template: "http://www.last.fm/user/{username}"
@@ -133,6 +142,7 @@ livejournal:
   sort: 12
   name: LiveJournal
   uri: "http://www.livejournal.com"
+  uri_key: "livejournal.com"
   api_uri: 
   uri_data_template: "http://{username}.livejournal.com"
   uri_template: "http://{username}.livejournal.com"
@@ -145,6 +155,7 @@ simpy:
   sort: 13
   name: Simpy
   uri: "http://www.simpy.com"
+  uri_key: "simpy.com"
   api_uri: 
   uri_data_template: "http://www.simpy.com/rss/user/{username}/links/"
   uri_template: "http://www.simpy.com/user/{username}"
@@ -157,6 +168,7 @@ wordpress:
   sort: 14
   name: Wordpress.com
   uri: "http://www.wordpress.com/"
+  uri_key: "wordpress.com/"
   api_uri: 
   uri_data_template: "http://{username}.wordpress.com/"
   uri_template: "http://{username}.wordpress.com/"
@@ -169,6 +181,7 @@ xanga:
   sort: 15
   name: Xanga
   uri: "http://www.xanga.com"
+  uri_key: "xanga.com"
   api_uri: 
   uri_data_template: "http://www.xanga.com/{username}/rss"
   uri_template: "http://{username}.xanga.com"
@@ -181,6 +194,7 @@ citeulike:
   sort: 16
   name: cite u like
   uri: "http://www.citeulike.org"
+  uri_key: "citeulike.org"
   api_uri: 
   uri_data_template: "http://www.citeulike.org/rss/user/{username}"
   uri_template: "http://www.citeulike.org/user/{username}"
@@ -193,6 +207,7 @@ googlenews:
   sort: 17
   name: Google News
   uri: "http://news.google.com/"
+  uri_key: "news.google.com"
   icon: google.png
   use_for: false
   service_category_id: 4
@@ -205,6 +220,7 @@ googleblogsearch:
   sort: 18
   name: Google Blogs
   uri: "http://blogsearch.google.com/"
+  uri_key: "blogsearch.google.com"
   icon: google.png
   use_for: false
   service_category_id: 4
@@ -233,6 +249,7 @@ odeo:
   sort: 21
   name: Odeo Podcasts
   uri: "http://www.odeo.com"
+  uri_key: "odeo.com"
   icon: odeo.png
   use_for: false
   service_category_id: 1
@@ -242,6 +259,7 @@ technorati:
   sort: 22
   name: Technorati
   uri: "http://www.technorati.com/"
+  uri_key: "technorati.com"
   api_uri: 
   uri_data_template: "http://feeds.technorati.com/faves/{username}?format=rss"
   icon: technorati.png
@@ -253,6 +271,7 @@ mixx:
   sort: 23
   name: Mixx
   uri: "http://www.mixx.com"
+  uri_key: "mixx.com"
   api_uri:
   uri_data_template: "http://www.mixx.com/feeds/users/{username}"
   uri_template: "http://www.mixx.com/users/{username}"
@@ -265,6 +284,7 @@ reddit:
   sort: 24
   name: Reddit
   uri: "http://www.reddit.com"
+  uri_key: "reddit.com"
   api_uri:
   uri_data_template: "http://www.reddit.com/user/{username}/.rss"
   uri_template: "http://www.reddit.com/user/{username}"
@@ -277,6 +297,7 @@ facebook:
   sort: 25
   name: Facebook
   uri: "http://www.facebook.com"
+  uri_key: "facebook.com"
   api_uri:
   uri_data_template:
   icon: facebook.png
@@ -290,6 +311,7 @@ pandora:
   sort: 26
   name: pandora
   uri: "http://www.pandora.com"
+  uri_key: "pandora.com"
   api_uri:
   uri_data_template: "http://feeds.pandora.com/feeds/people/{username}/favorites.xml"
   icon: pandora.png
@@ -301,6 +323,7 @@ technorati_tags:
   sort: 27
   name: Technorati
   uri: "http://www.technorati.com/"
+  uri_key: "technorati.com"
   api_uri: 
   uri_data_template: "http://feeds.technorati.com/search/{tag}?language=n"
   uri_template: "http://www.technorati.com/search/{tag}?language=n"
@@ -313,6 +336,7 @@ flickr_tags:
   sort: 28
   name: Flickr
   uri: "http://www.flickr.com"
+  uri_key: "flickr.com"
   api_uri: 
   uri_data_template: 'http://api.flickr.com/services/feeds/photos_public.gne?tags={tag}&lang=en-us&format=rss_200'
   uri_template: 'http://www.flickr.com/search/?q={tag}'
@@ -325,6 +349,7 @@ wordpress_tags:
   sort: 29
   name: Wordpress.com
   uri: "http://www.wordpress.com/"
+  uri_key: "wordpress.com"
   api_uri: 
   uri_data_template: 'http://wordpress.com/tag/{tag}/feed/'
   uri_template: 'http://wordpress.com/tag/{tag}'
@@ -337,6 +362,7 @@ citeulike_tags:
   sort: 30
   name: cite u like
   uri: "http://www.citeulike.org"
+  uri_key: "citeulike.org"
   api_uri: 
   uri_data_template: 'http://www.citeulike.org/rss/tag/{tag}'
   uri_template: 'http://www.citeulike.org/tag/{tag}'
@@ -349,6 +375,7 @@ delicious_tags:
   sort: 31
   name: delicious
   uri: "http://delicious/"
+  uri_key: "delicious.com"
   api_uri: "https://api.delicious/v1/"
   uri_data_template: 'http://feeds.delicious.com/rss/tag/{tag}'
   uri_template: 'http://delicious.com/search?p={tag}'
@@ -360,6 +387,7 @@ netflix:
   id: 32
   name: Netflix
   uri: "http://www.netflix.com"
+  uri_key: "netflix.com"
   api_uri:
   uri_data_template:
   icon: netflix.png
@@ -373,6 +401,7 @@ blogger:
   id: 33
   name: Blogger
   uri: "http://www.blogger.com"
+  uri_key: "blogger.com"
   api_uri:
   uri_data_template:
   icon: blogger.png
@@ -385,6 +414,7 @@ clipmarks:
   id: 34
   name: Clipmarks
   uri: "http://www.clipmarks.com"
+  uri_key: "clipmarks.com"
   api_uri:
   uri_data_template: "http://rss.clipmarks.com/clipper/{username}/"
   uri_template: "http://www.clipmarks.com/clipper/{username}/"
@@ -397,6 +427,7 @@ friendfeed:
   id: 35
   name: Friendfeed
   uri: "http://friendfeed.com"
+  uri_key: "friendfeed.com"
   api_uri:
   uri_data_template:
   icon: friendfeed.png
@@ -410,6 +441,7 @@ linkedin:
   id: 36
   name: LinkedIn
   uri: "http://www.linkedin.com"
+  uri_key: "linkedin.com"
   api_uri:
   uri_data_template:
   icon: linkedin.png
@@ -423,6 +455,7 @@ diigo:
   id: 37
   name: diigo
   uri: "http://www.diigo.com"
+  uri_key: "diigo.com"
   api_uri:
   uri_data_template: "http://www.diigo.com/rss/user/{username}"
   uri_template: "http://www.diigo.com/user/{username}"
@@ -436,6 +469,7 @@ diigo_tags:
   sort: 38
   name: diigo
   uri: "http://www.diigo.org"
+  uri_key: "diigo.org"
   api_uri: 
   uri_data_template: 'http://www.diigo.com/community/tag?tag={tag}'
   uri_template: 'http://www.diigo.com/community/tag?tag={tag}'
@@ -448,6 +482,7 @@ netvibes:
   sort: 39
   name: NetVibes
   uri: "http://www.netvibes.com"
+  uri_key: "netvibes.com"
   api_uri:
   uri_data_template: "http://www.netvibes.com/{username}#General"
   uri_template: "http://www.netvibes.com/{username}#General"
@@ -460,6 +495,7 @@ dailymotion:
   sort: 40
   name: Dailymotion
   uri: "http://www.dailymotion.com"
+  uri_key: "dailymotion.com"
   uri_data_template: "http://www.dailymotion.com/rss/user/{username}/1"
   uri_template: "http://www.dailymotion.com/{username}"
   icon: dailymotion.png
@@ -471,6 +507,7 @@ polyvore:
   sort: 41
   name: Polyvore
   uri: "http://www.polyvore.com"
+  uri_key: "polyvore.com"
   icon: polyvore.png
   active: false
   prompt: polyvore_prompt
@@ -482,6 +519,7 @@ identica:
   sort: 42
   name: "identi.ca"
   uri: "http://identi.ca"
+  uri_key: "identi.ca"
   uri_data_template: "http://identi.ca/api/statuses/user_timeline/{username}.atom"
   uri_template: "http://identi.ca/{username}"
   icon: identica.png
@@ -493,6 +531,7 @@ tumblr:
   sort: 43
   name: "Tumblr"
   uri: "http://www.tumblr.com"
+  uri_key: "tumblr.com"
   uri_data_template: "http://{username}.tumblr.com/"
   uri_template: "http://{username}.tumblr.com/"
   icon: tumblr.png
@@ -504,6 +543,7 @@ joost:
   sort: 44
   name: "Joost"
   uri: "http://www.joost.com"
+  uri_key: "joost.com"
   uri_data_template: "http://www.joost.com/api/events/get/{username}?fmt=atom"
   uri_template: "http://www.joost.com/users/{username}/"
   icon: joost.png
@@ -515,6 +555,7 @@ fotolog:
   sort: 45
   name: "Fotolog"
   uri: "http://www.fotolog.com"
+  uri_key: "fotolog.com"
   uri_data_template: "http://www.fotolog.com/{username}/feed/main/rss20"
   uri_template: "http://www.fotolog.com/{username}"
   icon: fotolog.png
@@ -526,6 +567,7 @@ photobucket_photo_tags:
   sort: 46
   name: Photobucket (Photos)
   uri: "http://www.photobucket.com/"
+  uri_key: "photobucket.com"
   api_uri: 
   uri_data_template: "http://feed.photobucket.com/images/{tag}/feed.rss"
   uri_template: "http://www.photobucket.com/images/{tag}"
@@ -538,6 +580,7 @@ photobucket_video_tags:
   sort: 47
   name: Photobucket (Videos)
   uri: "http://www.photobucket.com/"
+  uri_key: "photobucket.com"
   api_uri: 
   uri_data_template: "http://feed.photobucket.com/videos/{tag}/feed.rss"
   uri_template: "http://www.photobucket.com/videos/{tag}"
@@ -550,6 +593,7 @@ identica_tags:
   sort: 48
   name: "identi.ca"
   uri: "http://identi.ca"
+  uri_key: "identi.ca"
   uri_data_template: "http://identi.ca/api/statusnet/tags/timeline/{tag}.atom"
   uri_template: "http://identi.ca/tag/{tag}"
   icon: identica.png
@@ -561,6 +605,7 @@ smugmug:
   sort: 49
   name: "Smugmug"
   uri: "http://www.smugmug.com"
+  uri_key: "smugmug.com"
   uri_data_template: "http://{username}.smugmug.com/"
   uri_template: "http://{username}.smugmug.com/"
   icon: smugmug.png
@@ -572,6 +617,7 @@ smugmug_tags:
   sort: 50
   name: "Smugmug"
   uri: "http://www.smugmug.com"
+  uri_key: "smugmug.com"
   uri_data_template: "http://www.smugmug.com/hack/feed.mg?Type=search&Data={tag}&format=atom10"
   uri_template: "http://www.smugmug.com/search/index.mg?searchWords={tag}&searchType=global&x=0&y=0"
   icon: smugmug.png
@@ -583,6 +629,7 @@ zooomr:
   sort: 51
   name: "Zooomr"
   uri: "http://www.zooomr.com"
+  uri_key: "zooomr.com"
   uri_data_template: "http://www.zooomr.com/photos/{username}"
   uri_template: "http://www.zooomr.com/photos/{username}"
   icon: zooomr.png
@@ -594,6 +641,7 @@ picasa:
   sort: 52
   name: "Picasa"
   uri: "http://picasaweb.google.com"
+  uri_key: "picasaweb.google.com"
   uri_data_template: "http://picasaweb.google.com/data/feed/base/user/{username}?alt=rss&kind=album&hl=en_US&access=public"
   uri_template: "http://picasaweb.google.com/{username}"
   icon: picasa.png
@@ -605,6 +653,7 @@ picasa_tags:
   sort: 53
   name: "Picasa"
   uri: "http://picasaweb.google.com"
+  uri_key: "picasaweb.google.com"
   uri_data_template: "http://picasaweb.google.com/data/feed/base/all?alt=rss&kind=photo&filter=1&q={tag}&hl=en_US"
   uri_template: "http://picasaweb.google.com/lh/view?q={tag}&psc=G&filter=1#"
   icon: picasa.png
@@ -616,6 +665,7 @@ librarything:
   sort: 54
   name: LibraryThing
   uri: "http://www.librarything.com"
+  uri_key: "librarything.com"
   uri_data_template: "http://www.librarything.com/rss/reviews/{username}"
   uri_template: "http://www.librarything.com/profile/{username}"
   icon: librarything.png
@@ -627,6 +677,7 @@ goodreads:
   sort: 55
   name: Goodreads
   uri: "http://www.goodreads.com"
+  uri_key: "goodreads.com"
   icon: goodreads.png
   use_for: "identity"
   service_category_id: 13
@@ -638,6 +689,7 @@ zotero_groups:
   sort: 56
   name: Zotero Groups
   uri: "http://www.zotero.org"
+  uri_key: "zotero.org"
   icon: zotero.png
   use_for: "identity"
   service_category_id: 8
@@ -649,6 +701,7 @@ zotero:
   sort: 57
   name: Zotero
   uri: "http://www.zotero.org"
+  uri_key: "zotero.org"
   uri_data_template: "http://www.zotero.org/{username}/items"
   uri_template: "http://www.zotero.org/{username}/items"
   icon: zotero.png
@@ -660,6 +713,7 @@ amazon:
   sort: 58
   name: Amazon
   uri: "http://www.amazon.com"
+  uri_key: "amazon.com"
   uri_data_template: "http://www.amazon.com"
   uri_template:
   icon: amazon.png
@@ -671,6 +725,7 @@ twitter_tags:
   id: 59
   name: Twitter
   uri: "http://www.twitter.com"
+  uri_key: "twitter.com"
   api_uri: 
   uri_data_template: "http://search.twitter.com/search.atom?q=+{tag}"
   uri_template: "http://search.twitter.com/search?q=+{tag}"
@@ -683,6 +738,7 @@ youtube_tags:
   id: 60
   name: You Tube
   uri: "http://www.youtube.com"
+  uri_key: "youtube.com"
   api_uri: 
   uri_data_template: "http://gdata.youtube.com/feeds/base/videos?q={tag}&client=ytapi-youtube-search&alt=rss&v=2"
   icon: youtube.png
@@ -694,6 +750,7 @@ icerocket_blogs:
   id: 61
   name: IceRocket Blogs
   uri: "http://www.icerocket.com"
+  uri_key: "icerocket.com"
   api_uri: 
   uri_data_template: "http://www.icerocket.com/search?tab=blog&q={tag}&rss=1"
   uri_template: "http://www.icerocket.com/search?tab=blog&fr=h&q={tag}&x=0&y=0"
@@ -706,6 +763,7 @@ yahoo_search:
   id: 62
   name: Yahoo
   uri: "http://www.yahoo.com"
+  uri_key: "yahoo.com"
   api_uri: 
   uri_data_template: "http://api.search.yahoo.com/WebSearchService/rss/webSearch.xml?appid=yahoosearchwebrss&query={tag}"
   uri_template: "http://search.yahoo.com/search?p={tag}&fr=yfp-t-152&toggle=1&cop=mss&ei=UTF-8"
@@ -718,6 +776,7 @@ bing_search:
   id: 63
   name: Bing
   uri: "http://www.bing.com"
+  uri_key: "bing.com"
   api_uri: 
   uri_data_template: "http://www.bing.com/search?q={tag}&go=&form=QBLH&qs=n&format=rss"
   uri_template: "http://www.bing.com/search?q={tag}&go=&form=QBLH&qs=n"
@@ -730,6 +789,7 @@ bloglines_tags:
   id: 64
   name: Bloglines
   uri: "http://www.bloglines.com"
+  uri_key: "bloglines.com"
   api_uri: 
   uri_data_template: "feed://www.bloglines.com/search?q={tag}&ql=en&s=f&pop=l&news=m&format=rss"
   uri_template: "http://www.bloglines.com/search?q={tag}&ql=en&s=f&pop=l&news=m"
@@ -742,6 +802,7 @@ ask_blog_search:
   id: 65
   name: Ask.com Blogs
   uri: "http://www.ask.com"
+  uri_key: "ask.com"
   api_uri: 
   uri_data_template: "http://ask.bloglines.com/search?q={tag}&ql=&format=rss"
   uri_template: "http://www.ask.com/blogsearch?q={tag}&search=search&qsrc=0&o=0&l=dir"
@@ -754,6 +815,7 @@ ask_news_search:
   id: 66
   name: Ask.com News
   uri: "http://www.ask.com"
+  uri_key: "ask.com"
   api_uri: 
   uri_data_template: "http://news.ask.com/newsrss?q={tag}&n2c=&o=0&l=dir"
   uri_template: "http://news.ask.com/news?qsrc=167&o=0&l=dir&q={tag}"
@@ -766,6 +828,7 @@ icerocket_news:
   id: 67
   name: IceRocket News
   uri: "http://www.icerocket.com"
+  uri_key: "icerocket.com"
   api_uri: 
   uri_data_template: "http://www.icerocket.com/search?tab=news&q={tag}&rss=1"
   uri_template: "http://www.icerocket.com/search?tab=news&fr=h&q={tag}&x=0&y=0"
@@ -778,6 +841,7 @@ icerocket_search:
   id: 68
   name: IceRocket
   uri: "http://www.icerocket.com"
+  uri_key: "icerocket.com"
   api_uri: 
   uri_data_template: "http://www.icerocket.com/search?tab=web&q={tag}&rss=1"
   uri_template: "http://www.icerocket.com/search?tab=web&q={tag}"
@@ -790,6 +854,7 @@ digg_search:
   id: 69
   name: Digg
   uri: "http://www.digg.com"
+  uri_key: "digg.com"
   api_uri: 
   uri_data_template: "feed://digg.com/rss_search?s={tag}"
   uri_template: "http://digg.com/search?s={tag}"
@@ -802,6 +867,7 @@ clipmarks:
   id: 70
   name: Clipmarks
   uri: "http://www.clipmarks.com"
+  uri_key: "clipmarks.com"
   api_uri:
   uri_data_template: "feed://rss.clipmarks.com/search/{tag}/"
   uri_template: "http://clipmarks.com/search/{tag}/"
@@ -815,6 +881,7 @@ simpy:
   sort: 71
   name: Simpy
   uri: "http://www.simpy.com"
+  uri_key: "simpy.com"
   api_uri: 
   uri_data_template: "feed://www.simpy.com/rss/links/search/{tag}/s=d"
   uri_template: "http://www.simpy.com/links/search/{tag}"
@@ -827,6 +894,7 @@ connotea_search:
   sort: 72
   name: Connotea
   uri: "http://www.connotea.org"
+  uri_key: "connotea.org"
   uri_data_template: "http://www.connotea.org/rss/search?q={tag}"
   uri_template: "http://www.connotea.org/search?q={tag}"
   icon: connotea.png
@@ -838,6 +906,7 @@ connotea:
   sort: 73
   name: Connotea
   uri: "http://www.connotea.org"
+  uri_key: "connotea.org"
   uri_data_template: "http://www.connotea.org/rss/user/{username}"
   uri_template: "http://www.connotea.org/user/{username}"
   icon: connotea.png
@@ -848,6 +917,7 @@ twine_search:
   id: 74
   name: Twine
   uri: "http://www.twine.com"
+  uri_key: "twine.com"
   api_uri: 
   uri_data_template: "http://www.twine.com/feed/atom/entries/search?text={tag}&type="
   uri_template: "http://www.twine.com/search?type=&text={tag}"
@@ -861,6 +931,7 @@ bibsonomy:
   sort: 75
   name: Bibsonomy
   uri: "http://www.bibsonomy.org"
+  uri_key: "bibsonomy.org"
   uri_data_template: "feed://www.bibsonomy.org/publrss/author/{username}"
   uri_template: "http://www.bibsonomy.org/author/{username}"
   icon: bibsonomy.png
@@ -872,6 +943,7 @@ bibsonomy_search:
   sort: 76
   name: Bibsonomy
   uri: "http://www.bibsonomy.org"
+  uri_key: "bibsonomy.org"
   uri_data_template: "feed://www.bibsonomy.org/burst/tag/{tag}"
   uri_template: "http://www.bibsonomy.org/tag/{tag}"
   icon: bibsonomy.png
@@ -882,6 +954,7 @@ metacafe:
   id: 77
   name: MetaCafe
   uri: "http://www.metacafe.com"
+  uri_key: "metacafe.com"
   api_uri: 
   uri_data_template: "http://www.metacafe.com/tags/{tag}/rss.xml"
   uri_template: "http://www.metacafe.com/tags/{tag}"