muck-raker 0.1.37 → 0.1.38

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

@@ -81,30 +81,30 @@ class ServiceTest < ActiveSupport::TestCase
     end
     should "set display uri when building a feed" do
       tag = 'identity'
-      feeds = Service.build_feeds(@user, tag)
+      feeds = Service.build_feeds(tag, @user)
       assert feeds.any?{|feed| feed.display_uri == (@uri_template.sub('{tag}', tag))}
     end
     should "build a feed for every tag service" do
       tag = 'cycling'
-      feeds = Service.build_feeds(@user, tag)
+      feeds = Service.build_feeds(tag, @user)
       assert_equal Service.tag_services.length, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "build a limited number of feeds for tag" do
       tag = 'ruby'
-      feeds = Service.build_feeds(@user, tag, [@service.id])
+      feeds = Service.build_feeds(tag, @user, [@service.id])
       assert_equal 1, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "create a feed for every tag service" do
       tag = 'physics'
-      feeds = Service.create_feeds(@user, tag)
+      feeds = Service.create_feeds(tag, @user)
       assert_equal Service.tag_services.length, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
     should "create a limited number of feeds for tag" do
       tag = 'math'
-      feeds = Service.create_feeds(@user, tag, [@service.id])
+      feeds = Service.create_feeds(tag, @user, [@service.id])
       assert_equal 1, feeds.length
       assert feeds.any?{|feed| feed.uri == (@template.sub('{tag}', tag))}
     end
@@ -139,19 +139,89 @@ class ServiceTest < ActiveSupport::TestCase
   context "Find service by uri" do
     setup do
       Service.delete_all
-      @service = Factory(:service, :uri => 'http://www.example.com')
     end
-    after do
+    teardown do
       bootstrap_services
     end
     should "find service when uri is shorter" do
-      service = Service.find_service_by_uri('example.com')
-      assert_equal @service, service
+      foo_service = Factory(:service, :uri => 'http://www.foo.com')
+      service = Service.find_service_by_uri('foo.com', true)
+      assert_equal foo_service, service
     end
     should "find service uri is longer" do
-      service = Service.find_service_by_uri('http://www.example.com/other_stuff')
-      assert_equal @service, service
+      example_service = Factory(:service, :uri => 'http://www.example.com')
+      service = Service.find_service_by_uri('http://www.example.com/other_stuff', true)
+      assert_equal example_service, service
     end
   end
   
+  context "build" do
+    setup do
+      @terms = "ruby"
+      @user = Factory(:user)
+    end
+    context "photo feeds" do
+      setup do
+        @feeds = Service.build_photo_feeds(@terms, @user.id)
+      end
+      should "only create photo feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "Photos" }
+      end
+    end
+    context "video feeds" do
+      setup do
+        @feeds = Service.build_video_feeds(@terms, @user.id)
+      end
+      should "only create video feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "Videos" }
+      end
+    end
+    context "bookmark feeds" do
+      setup do
+        @feeds = Service.build_bookmark_feeds(@terms, @user.id)
+      end
+      should "only create bookmark feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "Bookmarks" }
+      end
+    end
+    context "music feeds" do
+      setup do
+        @feeds = Service.build_music_feeds(@terms, @user.id)
+      end
+      should "only create music feeds" do
+        assert @feeds.length > 0
+        assert @feeds.all? { |feed| feed.service.service_category.name == "Music" }
+      end
+    end
+  end
+  
+  context "service types" do
+    should "get photo services" do
+      assert Service.get_photo_services.length > 0
+      assert Service.get_photo_services.all? { |service| service.service_category.name == "Photo" }
+    end
+    should "get video services" do
+      assert Service.get_video_services.length > 0
+      assert Service.get_video_services.all? { |service| service.service_category.name == "Video" }
+    end
+    should "get bookmark services" do
+      assert Service.get_bookmark_services.length > 0
+      assert Service.get_bookmark_services.all? { |service| service.service_category.name == "Bookmark" }
+    end
+    should "get music services" do
+      assert Service.get_music_services.length > 0
+      assert Service.get_music_services.all? { |service| service.service_category.name == "Music" }
+    end
+    should "get general services" do
+      assert Service.get_general_services.length > 0
+      assert !Service.get_general_services.any? { |service| service.service_category.name == "Photo" }
+      assert !Service.get_general_services.any? { |service| service.service_category.name == "Video" }
+      assert !Service.get_general_services.any? { |service| service.service_category.name == "Bookmark" }
+      assert !Service.get_general_services.any? { |service| service.service_category.name == "Music" }
+    end
+  end
+     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -06:00
+date: 2009-10-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,14 +118,15 @@ files:
 - VERSION
 - app/controllers/admin/muck/feeds_controller.rb
 - app/controllers/admin/muck/oai_endpoints_controller.rb
+- app/controllers/muck/aggregation_feeds_controller.rb
 - app/controllers/muck/aggregations_controller.rb
 - app/controllers/muck/entries_controller.rb
 - app/controllers/muck/feed_previews_controller.rb
 - app/controllers/muck/feeds_controller.rb
 - app/controllers/muck/identity_feeds_controller.rb
 - app/controllers/muck/oai_endpoints_controller.rb
-- app/controllers/muck/opmls_controller.rb
 - app/controllers/muck/recommendations_controller.rb
+- app/controllers/muck/topics_controller.rb
 - app/controllers/muck/visits_controller.rb
 - app/helpers/muck_raker_aggregations_helper.rb
 - app/helpers/muck_raker_feeds_helper.rb
@@ -154,10 +155,18 @@ files:
 - app/views/activity_templates/_entry_share.html.erb
 - app/views/admin/feeds/index.html.erb
 - app/views/admin/oai_endpoints/index.html.erb
+- app/views/aggregations/_aggregation.html.erb
 - app/views/aggregations/_data_source.html.erb
 - app/views/aggregations/_data_sources.html.erb
+- app/views/aggregations/_feeds.html.erb
+- app/views/aggregations/_preview_form.html.erb
 - app/views/aggregations/edit.html.erb
+- app/views/aggregations/index.html.erb
+- app/views/aggregations/index.iphone.erb
 - app/views/aggregations/new.html.erb
+- app/views/aggregations/preview.html.erb
+- app/views/aggregations/preview.iphone.erb
+- app/views/aggregations/rss_discovery.html.erb
 - app/views/aggregations/show.html.erb
 - app/views/default/_language_list.html.erb
 - app/views/entries/_related_entry.html.erb
@@ -189,11 +198,7 @@ files:
 - app/views/feeds/unban.html.erb
 - app/views/google/_dynamic_feeds_vertical.html.erb
 - app/views/google/_feed.html.erb
-- app/views/google/_feed_bookmarks.html.erb
-- app/views/google/_feed_display.html.erb
-- app/views/google/_feed_photos.html.erb
 - app/views/google/_feed_search.html.erb
-- app/views/google/_feeds_display.html.erb
 - app/views/google/_feeds_scripts.html.erb
 - app/views/google/_slide_show.html.erb
 - app/views/identity_feeds/_available_service_categories.html.erb
@@ -206,10 +211,6 @@ files:
 - app/views/oai_endpoints/_oai_endpoint_row.html.erb
 - app/views/oai_endpoints/new.html.erb
 - app/views/oai_endpoints/show.html.erb
-- app/views/opmls/_rss_discover.html.erb
-- app/views/opmls/index.html.erb
-- app/views/opmls/index.opml.builder
-- app/views/opmls/new.html.erb
 - app/views/parts/_add_feed.html.erb
 - app/views/parts/_select_feed.html.erb
 - app/views/raker_mailer/notification_feed_added.text.ar.html.erb
@@ -300,8 +301,94 @@ files:
 - app/views/raker_mailer/notification_feed_added.text.zh-TW.plain.erb
 - app/views/raker_mailer/notification_feed_added.text.zh.html.erb
 - app/views/raker_mailer/notification_feed_added.text.zh.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ar.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ar.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.bg.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.bg.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ca.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ca.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.cs.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.cs.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.da.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.da.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.de.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.de.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.el.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.el.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.es.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.es.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.et.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.et.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.fa.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.fa.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.fi.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.fi.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.fr.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.fr.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.gl.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.gl.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.hi.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.hi.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.hr.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.hr.plain.erb
 - app/views/raker_mailer/notification_oai_endpoint_added.text.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.hu.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.hu.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.id.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.id.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.it.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.it.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.iw.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.iw.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ja.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ja.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ko.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ko.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.lt.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.lt.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.lv.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.lv.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.mt.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.mt.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.nl.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.nl.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.no.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.no.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.pl.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.pl.plain.erb
 - app/views/raker_mailer/notification_oai_endpoint_added.text.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.pt-PT.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.pt-PT.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ro.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ro.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ru.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.ru.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sk.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sk.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sl.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sl.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sq.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sq.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sr.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sr.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sv.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.sv.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.th.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.th.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.tl.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.tl.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.tr.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.tr.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.uk.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.uk.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.vi.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.vi.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.zh-CN.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.zh-CN.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.zh-TW.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.zh-TW.plain.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.zh.html.erb
+- app/views/raker_mailer/notification_oai_endpoint_added.text.zh.plain.erb
 - app/views/recommendations/index.html.erb
 - app/views/recommendations/index.pjs.erb
 - app/views/recommendations/index.rss.builder
@@ -330,6 +417,14 @@ files:
 - app/views/services/_new_service.html.erb
 - app/views/services/_summary.html.erb
 - app/views/services/_view_service.html.erb
+- app/views/topics/_feed_preview.html.erb
+- app/views/topics/_form.html.erb
+- app/views/topics/_rss_discover.html.erb
+- app/views/topics/new.html.erb
+- app/views/topics/photos.html.erb
+- app/views/topics/show.html.erb
+- app/views/topics/show.opml.builder
+- app/views/topics/videos.html.erb
 - app/views/visits/_comments_tool.html.erb
 - app/views/visits/_frame_scripts.html.erb
 - app/views/visits/_share_tool.html.erb
@@ -408,6 +503,7 @@ files:
 - db/migrate/20090922231552_add_dates_to_oai_endpoints.rb
 - 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
 - install.rb
 - lib/active_record/acts/muck_aggregation_owner.rb
 - lib/active_record/acts/muck_feed_owner.rb
@@ -500,6 +596,7 @@ files:
 - public/images/service_icons/16/livejournal.png
 - public/images/service_icons/16/magnolia.png
 - public/images/service_icons/16/mendeley.png
+- public/images/service_icons/16/metacafe.png
 - public/images/service_icons/16/mixx.png
 - public/images/service_icons/16/myspace.png
 - public/images/service_icons/16/netflix.png
@@ -564,6 +661,7 @@ files:
 - public/images/service_icons/24/livejournal.png
 - public/images/service_icons/24/magnolia.png
 - public/images/service_icons/24/mendeley.png
+- public/images/service_icons/24/metacafe.png
 - public/images/service_icons/24/mixx.png
 - public/images/service_icons/24/myspace.png
 - public/images/service_icons/24/netflix.png
@@ -628,6 +726,7 @@ files:
 - public/images/service_icons/48/livejournal.png
 - public/images/service_icons/48/magnolia.png
 - public/images/service_icons/48/mendeley.png
+- public/images/service_icons/48/metacafe.png
 - public/images/service_icons/48/mixx.png
 - public/images/service_icons/48/myspace.png
 - public/images/service_icons/48/netflix.png
@@ -692,6 +791,7 @@ files:
 - public/images/service_icons/60/livejournal.png
 - public/images/service_icons/60/magnolia.png
 - public/images/service_icons/60/mendeley.png
+- public/images/service_icons/60/metacafe.png
 - public/images/service_icons/60/mixx.png
 - public/images/service_icons/60/myspace.png
 - public/images/service_icons/60/netflix.png
@@ -738,6 +838,7 @@ files:
 - public/images/service_icons/source/clipmarks.png
 - public/images/service_icons/source/connotea.psd
 - public/images/service_icons/source/icerocket.psd
+- public/images/service_icons/source/metacafe.psd
 - public/images/service_icons/source/netflix.png
 - public/images/service_icons/source/oai.png
 - public/images/service_icons/source/odeo.png
@@ -749,6 +850,7 @@ files:
 - public/images/service_icons/source/xanga.png
 - public/javascripts/muck_raker.js
 - public/stylesheets/frame.css
+- public/stylesheets/muck-raker.css
 - rails/init.rb
 - raker/lib/aggregatord.jar
 - raker/lib/aggregatord.properties
@@ -922,6 +1024,7 @@ files:
 - test/rails_root/db/migrate/20090922231552_add_dates_to_oai_endpoints.rb
 - 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/features/feeds.feature
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/visit_steps.rb
@@ -1011,6 +1114,7 @@ files:
 - test/rails_root/public/images/service_icons/16/livejournal.png
 - test/rails_root/public/images/service_icons/16/magnolia.png
 - test/rails_root/public/images/service_icons/16/mendeley.png
+- test/rails_root/public/images/service_icons/16/metacafe.png
 - test/rails_root/public/images/service_icons/16/mixx.png
 - test/rails_root/public/images/service_icons/16/myspace.png
 - test/rails_root/public/images/service_icons/16/netflix.png
@@ -1075,6 +1179,7 @@ files:
 - test/rails_root/public/images/service_icons/24/livejournal.png
 - test/rails_root/public/images/service_icons/24/magnolia.png
 - test/rails_root/public/images/service_icons/24/mendeley.png
+- test/rails_root/public/images/service_icons/24/metacafe.png
 - test/rails_root/public/images/service_icons/24/mixx.png
 - test/rails_root/public/images/service_icons/24/myspace.png
 - test/rails_root/public/images/service_icons/24/netflix.png
@@ -1139,6 +1244,7 @@ files:
 - test/rails_root/public/images/service_icons/48/livejournal.png
 - test/rails_root/public/images/service_icons/48/magnolia.png
 - test/rails_root/public/images/service_icons/48/mendeley.png
+- test/rails_root/public/images/service_icons/48/metacafe.png
 - test/rails_root/public/images/service_icons/48/mixx.png
 - test/rails_root/public/images/service_icons/48/myspace.png
 - test/rails_root/public/images/service_icons/48/netflix.png
@@ -1203,6 +1309,7 @@ files:
 - test/rails_root/public/images/service_icons/60/livejournal.png
 - test/rails_root/public/images/service_icons/60/magnolia.png
 - test/rails_root/public/images/service_icons/60/mendeley.png
+- test/rails_root/public/images/service_icons/60/metacafe.png
 - test/rails_root/public/images/service_icons/60/mixx.png
 - test/rails_root/public/images/service_icons/60/myspace.png
 - test/rails_root/public/images/service_icons/60/netflix.png
@@ -1251,6 +1358,7 @@ files:
 - test/rails_root/public/images/service_icons/source/clipmarks.png
 - test/rails_root/public/images/service_icons/source/connotea.psd
 - test/rails_root/public/images/service_icons/source/icerocket.psd
+- test/rails_root/public/images/service_icons/source/metacafe.psd
 - test/rails_root/public/images/service_icons/source/netflix.png
 - test/rails_root/public/images/service_icons/source/oai.png
 - test/rails_root/public/images/service_icons/source/odeo.png
@@ -1387,6 +1495,8 @@ files:
 - test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png
 - test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png
 - test/rails_root/public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css
+- test/rails_root/public/stylesheets/muck-activities.css
+- test/rails_root/public/stylesheets/muck-raker.css
 - test/rails_root/public/stylesheets/reset.css
 - test/rails_root/public/stylesheets/styles.css
 - test/rails_root/public/stylesheets/themes/blue/styles.css
@@ -1412,12 +1522,13 @@ files:
 - test/rails_root/test/functional/.keep
 - test/rails_root/test/functional/admin/feeds_controller_test.rb
 - test/rails_root/test/functional/admin/oai_endpoints_controller_test.rb
+- test/rails_root/test/functional/aggregation_feeds_controller_test.rb
 - test/rails_root/test/functional/aggregations_controller_test.rb
 - test/rails_root/test/functional/feed_previews_controller_test.rb
 - test/rails_root/test/functional/feeds_controller_test.rb
 - test/rails_root/test/functional/identity_feeds_controller_test.rb
 - test/rails_root/test/functional/oai_endpoints_controller_test.rb
-- test/rails_root/test/functional/opmls_controller_test.rb
+- test/rails_root/test/functional/topics_controller_test.rb
 - test/rails_root/test/functional/visits_controller_test.rb
 - test/rails_root/test/integration/.keep
 - test/rails_root/test/mocks/development/.keep
@@ -1562,6 +1673,7 @@ test_files:
 - test/rails_root/db/migrate/20090922231552_add_dates_to_oai_endpoints.rb
 - 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/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/visit_steps.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
@@ -1572,12 +1684,13 @@ test_files:
 - test/rails_root/test/factories.rb
 - test/rails_root/test/functional/admin/feeds_controller_test.rb
 - test/rails_root/test/functional/admin/oai_endpoints_controller_test.rb
+- test/rails_root/test/functional/aggregation_feeds_controller_test.rb
 - test/rails_root/test/functional/aggregations_controller_test.rb
 - test/rails_root/test/functional/feed_previews_controller_test.rb
 - test/rails_root/test/functional/feeds_controller_test.rb
 - test/rails_root/test/functional/identity_feeds_controller_test.rb
 - test/rails_root/test/functional/oai_endpoints_controller_test.rb
-- test/rails_root/test/functional/opmls_controller_test.rb
+- test/rails_root/test/functional/topics_controller_test.rb
 - test/rails_root/test/functional/visits_controller_test.rb
 - test/rails_root/test/shoulda_macros/controller.rb
 - test/rails_root/test/shoulda_macros/forms.rb

data/app/controllers/muck/opmls_controller.rb

@@ -1,28 +0,0 @@
-class Muck::OpmlsController < ApplicationController
-  unloadable
-  
-  def index
-    if params[:terms].blank?
-      flash[:error] = I18n.t('muck.raker.no_terms_error')
-      redirect_to new_opml_path
-    else
-      @feeds = Service.build_feeds(current_user, params[:terms], params[:service_ids])
-      @discovered_feeds = GoogleFeedRequest.find_feeds(params[:terms])
-      @title = params[:terms]
-      @terms = params[:terms]
-      respond_to do |format|
-        format.html { render :template => 'opmls/index' }
-        format.opml { render :template => 'opmls/index' }
-      end
-    end
-  end
-  
-  def new
-    @page_title = I18n.t('muck.raker.generate_opml')
-    @service_categories = ServiceCategory.sorted.find(:all, :include => [:tag_services])
-    respond_to do |format|
-      format.html { render :template => 'opmls/new' }
-    end
-  end
-
-end

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

@@ -1,13 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_feeds -%>
-  <%= google_load_bookmarks_script(javascript_callback, feed.uri, content_id) %>
-<% end -%>
-<% content_for :javascript do -%>
-google.setOnLoadCallback(function() {
-  google_load_bookmarks("<%= feed.uri %>", "<%= content_id %>", <%= number_of_items %>);
-});
-<% end -%>
-<div id="<%= content_id %>" class="feed-item">
-  <span class="waiting"><%= t('muck.raker.loading_message') %></span>
-</div>

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

@@ -1,13 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_feeds -%>
-  <%= google_load_entries_script(javascript_callback, feed.uri, content_id) %>
-<% end -%>
-<% content_for :javascript do -%>
-google.setOnLoadCallback(function() {
-  google_load_entries("<%= feed.uri %>", "<%= content_id %>", <%= number_of_items %>);
-});
-<% end -%>
-<div id="<%= content_id %>" class="feed-item">
-  <span class="waiting"><%= t('muck.raker.loading_message') %></span>
-</div>

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

@@ -1,13 +0,0 @@
-<% content_for :head do -%>
-  <%= google_ajax_api_scripts -%>
-  <%= google_load_feeds -%>
-  <%= google_load_images_script(javascript_callback, feed.uri, content_id) -%>
-<% end -%>
-<% content_for :javascript do -%>
-google.setOnLoadCallback(function() {
-  google_load_images("<%= feed.uri %>", "<%= content_id %>", <%= number_of_images %>);
-});
-<% end -%>
-<div id="<%= content_id %>" class="feed-photos feed-item">
-  <span class="waiting"><%= t('muck.raker.loading_message') %></span>
-</div>

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

@@ -1,2 +0,0 @@
-<%= render :partial => 'google/feed', :collection => data_feeds, :locals => {:number_of_items => number_of_items, :number_of_images => number_of_images, :content_id => nil, :javascript_callback => javascript_callback } %>
-<%= render :partial => 'google/feed', :collection => photo_feeds, :locals => {:number_of_items => number_of_items, :number_of_images => number_of_images, :content_id => nil, :javascript_callback => javascript_callback } %>

data/app/views/opmls/index.html.erb

@@ -1,19 +0,0 @@
-<% content_for :head do -%>
-  <%= render :partial => 'opmls/rss_discover', :collection => @feeds %>
-<% end -%>
-<div id="opml">
-  <h2><%= t('muck.raker.opml_generated', :terms => @title) %></h2>
-  <%= link_to t('muck.raker.generate_new_opml'), new_opml_path %>
-  <%= link_to t('muck.raker.download_opml', :terms => @terms), opmls_path(:terms => params[:terms], :service_ids => params[:service_ids], :format => 'opml') %>  
-  <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" />
-  </a>
-  <div id="opml-feeds">
-    <%= render :partial => 'google/feed', :collection => @feeds, :locals => {:number_of_items => 5, :number_of_images => 20, :content_id => nil, :javascript_callback => 'google_load_complete'} %>
-  </div>
-  <h2><%= t('muck.raker.related_feeds') %></h2>
-  <div id="discovered_feeds">
-    <%= render :partial => 'google/feed', :collection => @discovered_feeds, :locals => {:number_of_items => 5, :number_of_images => 20, :content_id => nil, :javascript_callback => 'google_load_complete'} %>
-  </div>
-</div>
-<%= render :partial => 'google/feeds_scripts' %>

data/test/rails_root/test/functional/opmls_controller_test.rb

@@ -1,37 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class Muck::OpmlsControllerTest < ActionController::TestCase
-
-  tests Muck::OpmlsController
-
-  context "opmls controller" do
-
-    context "GET new" do
-      setup do
-        get :new
-      end
-      should_not_set_the_flash
-      should_respond_with :success
-      should_render_template :new
-    end
-
-    context "GET index with term defined" do
-      setup do
-        get :index, :terms => 'ruby,rails'
-      end
-      should_not_set_the_flash
-      should_respond_with :success
-      should_render_template :index
-    end
-        
-    context "GET index without terms" do
-      setup do
-        get :index
-      end
-      should_set_the_flash_to(I18n.t('muck.raker.no_terms_error'))
-      should_redirect_to("new opml") { new_opml_path }
-    end
-    
-  end
-  
-end