muck-raker 0.1.43 → 0.1.45

data/db/migrate/20091022150615_add_uri_key_to_services.rb

@@ -0,0 +1,9 @@
+class AddUriKeyToServices < ActiveRecord::Migration
+  def self.up
+    add_column :services, :uri_key, :string
+  end
+
+  def self.down
+    remove_column :services, :uri_key
+  end
+end

data/lib/muck_raker.rb

@@ -2,6 +2,9 @@ require 'muck_raker/muck_custom_form_builder'
 require 'muck_raker/services'
 require 'muck_raker/languages'
 
+require 'nokogiri'
+require 'httparty'
+
 ActionController::Base.send :helper, MuckRakerHelper
 ActionController::Base.send :helper, MuckRakerFeedsHelper
 ActionController::Base.send :helper, MuckRakerServicesHelper

data/locales/en.yml

@@ -169,7 +169,7 @@ en:
         edit_aggregation_title: "Editing {{title}}"
         cant_modify_aggregation: "You don't have permission to access the specified aggregation."
         aggregation_deleted: "{{title}} deleted"
-        build_topic: "Discover Topic"
+        build_topic: "Live Search"
         search_for: "Search for:"
         new_topic_title: "Search for a new topic and build the results page."
         add_aggregation: "Add Aggregation"
@@ -185,9 +185,11 @@ en:
         topic_generated: "Results for `{{terms}}`."
         no_terms_error: "Please specify a term or list of terms."
         download_opml: "Download OPML file for {{terms}}"
+        opml_generated: "Feeds for {{terms}}"
+        opml_feeds_for: "Feeds for {{terms}}"
         generate_new_topic: "Generate a new topic"
         topic_feeds_for: "Feeds for {{terms}}"
-        generating_topic_message: "Generating topic file.  This might take a minute or so...."
+        generating_topic_message: "Searching.  This might take a minute or so...."
         service_feed_name: "{{term}} on {{service}}"
         related_feeds: "Related Feeds"
         no_entries_found: "No entries found"
@@ -203,7 +205,7 @@ en:
         photos: "Photos"
         videos: "Videos"
         back: "Back"
-        explore: "Explore {{topic}}"
+        explore: "Search for {{topic}}"
         language_not_supported: "The requested language is not supported"
         comment_entries_count:
           one: "1 Comment"

data/muck-raker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.1.43"
+  s.version = "0.1.45"
 
   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-19}
+  s.date = %q{2009-10-22}
   s.description = %q{The aggregation and recommendation engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -101,10 +101,13 @@ 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",
@@ -409,6 +412,7 @@ Gem::Specification.new do |s|
      "db/migrate/20090923150807_rename_name_in_aggregation.rb",
      "db/migrate/20090924200750_add_uri_data_template_to_services.rb",
      "db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
+     "db/migrate/20091022150615_add_uri_key_to_services.rb",
      "install.rb",
      "lib/active_record/acts/muck_aggregation_owner.rb",
      "lib/active_record/acts/muck_feed_owner.rb",
@@ -931,6 +935,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090923150807_rename_name_in_aggregation.rb",
      "test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb",
      "test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
+     "test/rails_root/db/migrate/20091022150615_add_uri_key_to_services.rb",
      "test/rails_root/features/feeds.feature",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/visit_steps.rb",
@@ -1559,6 +1564,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090923150807_rename_name_in_aggregation.rb",
      "test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb",
      "test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
+     "test/rails_root/db/migrate/20091022150615_add_uri_key_to_services.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/visit_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -1619,6 +1625,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
       s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<muck-feedbag>, [">= 0"])
       s.add_runtime_dependency(%q<pauldix-feedzirra>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
@@ -1629,6 +1636,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
       s.add_dependency(%q<mislav-will_paginate>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<muck-feedbag>, [">= 0"])
       s.add_dependency(%q<pauldix-feedzirra>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
@@ -1640,6 +1648,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
     s.add_dependency(%q<mislav-will_paginate>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<muck-feedbag>, [">= 0"])
     s.add_dependency(%q<pauldix-feedzirra>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])

data/public/stylesheets/muck-raker.css

@@ -71,7 +71,20 @@ fieldset{border:solid 1px #CCC;margin:0px;padding:10px;}
 .datafeeds .feed-photos {margin:0;}
 .datafeeds .feed-videos img{width:100px;height:100px;}
 .datafeeds .feed-videos {margin:0;}
+/* combined list */
+ul.combined-feed-list{list-style:none;margin:0;}
+ul.combined-feed-list .feed-title{margin:0;padding:2px 0 5px 25px;}
+ul.combined-feed-list .feed-content h3{font-size:1.1em;}
+ul.combined-feed-list .feed-content h3 a{text-decoration:none;color:000;}
+ul.combined-feed-list .feed-content h3 a:hover;{text-decoration:underline;}
+ul.combined-feed-list .feed-content{border:solid 2px #E5E5E5;background-color:#F7F7F7;margin:-15px 0 0 60px;z-index:1;position:absolute;padding:10px;width:500px;-moz-border-radius-bottomleft:6px;-moz-border-radius-bottomright:6px;-moz-border-radius-topleft:6px;-moz-border-radius-topright:6px;}
+
 .remove-feed{float:right;}
 .entry-close{float:right;font-size:.8em;}
+#search-header{margin:20px;}
+.google-header{background: transparent url(/images/service_icons/24/google.png) no-repeat scroll left top;}
+ul.google-trends{margin:0;padding:0;list-style:none;}
+
+.search-container .gsc-control{width:100%;}
 /* edit aggregation */
-#edit-aggregation-controls .box{margin:10px 0;}
+#edit-aggregation-controls .box{margin:10px 0;}

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

@@ -12,6 +12,8 @@
   <!--[if IE]><link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->  		
   <%= stylesheet_link_tag %W{ reset blueprint/liquid_screen.css jquery/jquery.fancybox.css styles muck-raker muck-activities }, :cache => true %>
   <%= stylesheet_link_tag 'application' %>
+  <%#= google_load_jquery %>
+  <%#= google_load_jquery_ui %>
   <%= javascript_include_tag %w{
               jquery/jquery.js
               jquery/jquery-ui.js

data/test/rails_root/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}"
@@ -891,4 +964,3 @@ metacafe:
   service_category_id: 7
   active: true
   
-