muck-raker 0.1.37 → 0.1.38

Sign up to get free protection for your applications and to get access to all the features.
Files changed (303) hide show
  1. data/README.rdoc +4 -2
  2. data/VERSION +1 -1
  3. data/app/controllers/muck/aggregation_feeds_controller.rb +43 -0
  4. data/app/controllers/muck/aggregations_controller.rb +150 -260
  5. data/app/controllers/muck/topics_controller.rb +93 -0
  6. data/app/helpers/muck_raker_aggregations_helper.rb +21 -0
  7. data/app/helpers/muck_raker_feeds_helper.rb +0 -12
  8. data/app/helpers/muck_raker_google_helper.rb +70 -80
  9. data/app/models/aggregation.rb +63 -17
  10. data/app/models/aggregation_feed.rb +2 -1
  11. data/app/models/feed.rb +29 -2
  12. data/app/models/google_feed_request.rb +7 -1
  13. data/app/models/identity_feed.rb +2 -2
  14. data/app/models/service.rb +125 -31
  15. data/app/views/aggregations/_aggregation.html.erb +1 -0
  16. data/app/views/aggregations/_data_source.html.erb +2 -2
  17. data/app/views/aggregations/_feeds.html.erb +1 -0
  18. data/app/views/aggregations/_preview_form.html.erb +12 -0
  19. data/app/views/aggregations/edit.html.erb +60 -14
  20. data/app/views/aggregations/index.html.erb +17 -0
  21. data/app/views/aggregations/index.iphone.erb +0 -0
  22. data/app/views/aggregations/new.html.erb +3 -4
  23. data/app/views/aggregations/preview.html.erb +46 -0
  24. data/app/views/aggregations/preview.iphone.erb +0 -0
  25. data/app/views/aggregations/rss_discovery.html.erb +3 -0
  26. data/app/views/feeds/_form.html.erb +1 -1
  27. data/app/views/feeds/new.html.erb +1 -1
  28. data/app/views/feeds/new_extended.html.erb +1 -1
  29. data/app/views/feeds/new_oai_rss.html.erb +1 -1
  30. data/app/views/google/_feed.html.erb +33 -1
  31. data/app/views/google/_feeds_scripts.html.erb +19 -0
  32. data/app/views/raker_mailer/notification_feed_added.text.ar.html.erb +2 -1
  33. data/app/views/raker_mailer/notification_feed_added.text.ar.plain.erb +3 -1
  34. data/app/views/raker_mailer/notification_feed_added.text.bg.html.erb +3 -2
  35. data/app/views/raker_mailer/notification_feed_added.text.bg.plain.erb +4 -2
  36. data/app/views/raker_mailer/notification_feed_added.text.ca.html.erb +1 -0
  37. data/app/views/raker_mailer/notification_feed_added.text.ca.plain.erb +2 -0
  38. data/app/views/raker_mailer/notification_feed_added.text.cs.html.erb +2 -1
  39. data/app/views/raker_mailer/notification_feed_added.text.cs.plain.erb +3 -1
  40. data/app/views/raker_mailer/notification_feed_added.text.da.html.erb +2 -1
  41. data/app/views/raker_mailer/notification_feed_added.text.da.plain.erb +3 -1
  42. data/app/views/raker_mailer/notification_feed_added.text.de.html.erb +1 -0
  43. data/app/views/raker_mailer/notification_feed_added.text.de.plain.erb +2 -0
  44. data/app/views/raker_mailer/notification_feed_added.text.el.html.erb +3 -2
  45. data/app/views/raker_mailer/notification_feed_added.text.el.plain.erb +4 -2
  46. data/app/views/raker_mailer/notification_feed_added.text.es.html.erb +1 -0
  47. data/app/views/raker_mailer/notification_feed_added.text.es.plain.erb +2 -0
  48. data/app/views/raker_mailer/notification_feed_added.text.et.html.erb +2 -1
  49. data/app/views/raker_mailer/notification_feed_added.text.et.plain.erb +3 -1
  50. data/app/views/raker_mailer/notification_feed_added.text.fa.html.erb +2 -1
  51. data/app/views/raker_mailer/notification_feed_added.text.fa.plain.erb +3 -1
  52. data/app/views/raker_mailer/notification_feed_added.text.fi.html.erb +2 -1
  53. data/app/views/raker_mailer/notification_feed_added.text.fi.plain.erb +3 -1
  54. data/app/views/raker_mailer/notification_feed_added.text.fr.html.erb +2 -1
  55. data/app/views/raker_mailer/notification_feed_added.text.fr.plain.erb +3 -1
  56. data/app/views/raker_mailer/notification_feed_added.text.gl.html.erb +3 -2
  57. data/app/views/raker_mailer/notification_feed_added.text.gl.plain.erb +4 -2
  58. data/app/views/raker_mailer/notification_feed_added.text.hi.html.erb +2 -1
  59. data/app/views/raker_mailer/notification_feed_added.text.hi.plain.erb +3 -1
  60. data/app/views/raker_mailer/notification_feed_added.text.hr.html.erb +3 -2
  61. data/app/views/raker_mailer/notification_feed_added.text.hr.plain.erb +4 -2
  62. data/app/views/raker_mailer/notification_feed_added.text.hu.html.erb +3 -2
  63. data/app/views/raker_mailer/notification_feed_added.text.hu.plain.erb +4 -2
  64. data/app/views/raker_mailer/notification_feed_added.text.id.html.erb +2 -1
  65. data/app/views/raker_mailer/notification_feed_added.text.id.plain.erb +3 -1
  66. data/app/views/raker_mailer/notification_feed_added.text.it.html.erb +2 -1
  67. data/app/views/raker_mailer/notification_feed_added.text.it.plain.erb +3 -1
  68. data/app/views/raker_mailer/notification_feed_added.text.iw.html.erb +2 -1
  69. data/app/views/raker_mailer/notification_feed_added.text.iw.plain.erb +3 -1
  70. data/app/views/raker_mailer/notification_feed_added.text.ja.html.erb +4 -3
  71. data/app/views/raker_mailer/notification_feed_added.text.ja.plain.erb +5 -3
  72. data/app/views/raker_mailer/notification_feed_added.text.ko.html.erb +1 -0
  73. data/app/views/raker_mailer/notification_feed_added.text.ko.plain.erb +2 -0
  74. data/app/views/raker_mailer/notification_feed_added.text.lt.html.erb +2 -1
  75. data/app/views/raker_mailer/notification_feed_added.text.lt.plain.erb +3 -1
  76. data/app/views/raker_mailer/notification_feed_added.text.lv.html.erb +3 -2
  77. data/app/views/raker_mailer/notification_feed_added.text.lv.plain.erb +4 -2
  78. data/app/views/raker_mailer/notification_feed_added.text.mt.html.erb +2 -1
  79. data/app/views/raker_mailer/notification_feed_added.text.mt.plain.erb +3 -1
  80. data/app/views/raker_mailer/notification_feed_added.text.nl.html.erb +1 -0
  81. data/app/views/raker_mailer/notification_feed_added.text.nl.plain.erb +2 -0
  82. data/app/views/raker_mailer/notification_feed_added.text.no.html.erb +1 -0
  83. data/app/views/raker_mailer/notification_feed_added.text.no.plain.erb +2 -0
  84. data/app/views/raker_mailer/notification_feed_added.text.pl.html.erb +2 -1
  85. data/app/views/raker_mailer/notification_feed_added.text.pl.plain.erb +3 -1
  86. data/app/views/raker_mailer/notification_feed_added.text.pt-PT.html.erb +3 -2
  87. data/app/views/raker_mailer/notification_feed_added.text.pt-PT.plain.erb +4 -2
  88. data/app/views/raker_mailer/notification_feed_added.text.ro.html.erb +2 -1
  89. data/app/views/raker_mailer/notification_feed_added.text.ro.plain.erb +3 -1
  90. data/app/views/raker_mailer/notification_feed_added.text.ru.html.erb +1 -0
  91. data/app/views/raker_mailer/notification_feed_added.text.ru.plain.erb +2 -0
  92. data/app/views/raker_mailer/notification_feed_added.text.sk.html.erb +2 -1
  93. data/app/views/raker_mailer/notification_feed_added.text.sk.plain.erb +3 -1
  94. data/app/views/raker_mailer/notification_feed_added.text.sl.html.erb +2 -1
  95. data/app/views/raker_mailer/notification_feed_added.text.sl.plain.erb +3 -1
  96. data/app/views/raker_mailer/notification_feed_added.text.sq.html.erb +3 -2
  97. data/app/views/raker_mailer/notification_feed_added.text.sq.plain.erb +4 -2
  98. data/app/views/raker_mailer/notification_feed_added.text.sr.html.erb +3 -2
  99. data/app/views/raker_mailer/notification_feed_added.text.sr.plain.erb +4 -2
  100. data/app/views/raker_mailer/notification_feed_added.text.sv.html.erb +1 -0
  101. data/app/views/raker_mailer/notification_feed_added.text.sv.plain.erb +2 -0
  102. data/app/views/raker_mailer/notification_feed_added.text.th.html.erb +4 -3
  103. data/app/views/raker_mailer/notification_feed_added.text.th.plain.erb +5 -3
  104. data/app/views/raker_mailer/notification_feed_added.text.tl.html.erb +2 -1
  105. data/app/views/raker_mailer/notification_feed_added.text.tl.plain.erb +3 -1
  106. data/app/views/raker_mailer/notification_feed_added.text.tr.html.erb +3 -2
  107. data/app/views/raker_mailer/notification_feed_added.text.tr.plain.erb +4 -2
  108. data/app/views/raker_mailer/notification_feed_added.text.uk.html.erb +2 -1
  109. data/app/views/raker_mailer/notification_feed_added.text.uk.plain.erb +3 -1
  110. data/app/views/raker_mailer/notification_feed_added.text.vi.html.erb +2 -1
  111. data/app/views/raker_mailer/notification_feed_added.text.vi.plain.erb +3 -1
  112. data/app/views/raker_mailer/notification_feed_added.text.zh-CN.html.erb +4 -3
  113. data/app/views/raker_mailer/notification_feed_added.text.zh-CN.plain.erb +5 -3
  114. data/app/views/raker_mailer/notification_feed_added.text.zh-TW.html.erb +4 -3
  115. data/app/views/raker_mailer/notification_feed_added.text.zh-TW.plain.erb +5 -3
  116. data/app/views/raker_mailer/notification_feed_added.text.zh.html.erb +4 -3
  117. data/app/views/raker_mailer/notification_feed_added.text.zh.plain.erb +5 -3
  118. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ar.html.erb +4 -0
  119. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ar.plain.erb +4 -0
  120. data/app/views/raker_mailer/notification_oai_endpoint_added.text.bg.html.erb +4 -0
  121. data/app/views/raker_mailer/notification_oai_endpoint_added.text.bg.plain.erb +4 -0
  122. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ca.html.erb +4 -0
  123. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ca.plain.erb +4 -0
  124. data/app/views/raker_mailer/notification_oai_endpoint_added.text.cs.html.erb +4 -0
  125. data/app/views/raker_mailer/notification_oai_endpoint_added.text.cs.plain.erb +4 -0
  126. data/app/views/raker_mailer/notification_oai_endpoint_added.text.da.html.erb +4 -0
  127. data/app/views/raker_mailer/notification_oai_endpoint_added.text.da.plain.erb +4 -0
  128. data/app/views/raker_mailer/notification_oai_endpoint_added.text.de.html.erb +4 -0
  129. data/app/views/raker_mailer/notification_oai_endpoint_added.text.de.plain.erb +4 -0
  130. data/app/views/raker_mailer/notification_oai_endpoint_added.text.el.html.erb +4 -0
  131. data/app/views/raker_mailer/notification_oai_endpoint_added.text.el.plain.erb +4 -0
  132. data/app/views/raker_mailer/notification_oai_endpoint_added.text.es.html.erb +4 -0
  133. data/app/views/raker_mailer/notification_oai_endpoint_added.text.es.plain.erb +4 -0
  134. data/app/views/raker_mailer/notification_oai_endpoint_added.text.et.html.erb +4 -0
  135. data/app/views/raker_mailer/notification_oai_endpoint_added.text.et.plain.erb +4 -0
  136. data/app/views/raker_mailer/notification_oai_endpoint_added.text.fa.html.erb +4 -0
  137. data/app/views/raker_mailer/notification_oai_endpoint_added.text.fa.plain.erb +4 -0
  138. data/app/views/raker_mailer/notification_oai_endpoint_added.text.fi.html.erb +4 -0
  139. data/app/views/raker_mailer/notification_oai_endpoint_added.text.fi.plain.erb +4 -0
  140. data/app/views/raker_mailer/notification_oai_endpoint_added.text.fr.html.erb +4 -0
  141. data/app/views/raker_mailer/notification_oai_endpoint_added.text.fr.plain.erb +4 -0
  142. data/app/views/raker_mailer/notification_oai_endpoint_added.text.gl.html.erb +4 -0
  143. data/app/views/raker_mailer/notification_oai_endpoint_added.text.gl.plain.erb +4 -0
  144. data/app/views/raker_mailer/notification_oai_endpoint_added.text.hi.html.erb +4 -0
  145. data/app/views/raker_mailer/notification_oai_endpoint_added.text.hi.plain.erb +4 -0
  146. data/app/views/raker_mailer/notification_oai_endpoint_added.text.hr.html.erb +4 -0
  147. data/app/views/raker_mailer/notification_oai_endpoint_added.text.hr.plain.erb +4 -0
  148. data/app/views/raker_mailer/notification_oai_endpoint_added.text.hu.html.erb +4 -0
  149. data/app/views/raker_mailer/notification_oai_endpoint_added.text.hu.plain.erb +4 -0
  150. data/app/views/raker_mailer/notification_oai_endpoint_added.text.id.html.erb +4 -0
  151. data/app/views/raker_mailer/notification_oai_endpoint_added.text.id.plain.erb +4 -0
  152. data/app/views/raker_mailer/notification_oai_endpoint_added.text.it.html.erb +4 -0
  153. data/app/views/raker_mailer/notification_oai_endpoint_added.text.it.plain.erb +4 -0
  154. data/app/views/raker_mailer/notification_oai_endpoint_added.text.iw.html.erb +4 -0
  155. data/app/views/raker_mailer/notification_oai_endpoint_added.text.iw.plain.erb +4 -0
  156. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ja.html.erb +4 -0
  157. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ja.plain.erb +4 -0
  158. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ko.html.erb +4 -0
  159. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ko.plain.erb +4 -0
  160. data/app/views/raker_mailer/notification_oai_endpoint_added.text.lt.html.erb +4 -0
  161. data/app/views/raker_mailer/notification_oai_endpoint_added.text.lt.plain.erb +4 -0
  162. data/app/views/raker_mailer/notification_oai_endpoint_added.text.lv.html.erb +4 -0
  163. data/app/views/raker_mailer/notification_oai_endpoint_added.text.lv.plain.erb +4 -0
  164. data/app/views/raker_mailer/notification_oai_endpoint_added.text.mt.html.erb +4 -0
  165. data/app/views/raker_mailer/notification_oai_endpoint_added.text.mt.plain.erb +4 -0
  166. data/app/views/raker_mailer/notification_oai_endpoint_added.text.nl.html.erb +4 -0
  167. data/app/views/raker_mailer/notification_oai_endpoint_added.text.nl.plain.erb +4 -0
  168. data/app/views/raker_mailer/notification_oai_endpoint_added.text.no.html.erb +4 -0
  169. data/app/views/raker_mailer/notification_oai_endpoint_added.text.no.plain.erb +4 -0
  170. data/app/views/raker_mailer/notification_oai_endpoint_added.text.pl.html.erb +4 -0
  171. data/app/views/raker_mailer/notification_oai_endpoint_added.text.pl.plain.erb +4 -0
  172. data/app/views/raker_mailer/notification_oai_endpoint_added.text.pt-PT.html.erb +4 -0
  173. data/app/views/raker_mailer/notification_oai_endpoint_added.text.pt-PT.plain.erb +4 -0
  174. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ro.html.erb +4 -0
  175. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ro.plain.erb +4 -0
  176. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ru.html.erb +4 -0
  177. data/app/views/raker_mailer/notification_oai_endpoint_added.text.ru.plain.erb +4 -0
  178. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sk.html.erb +4 -0
  179. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sk.plain.erb +4 -0
  180. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sl.html.erb +4 -0
  181. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sl.plain.erb +4 -0
  182. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sq.html.erb +4 -0
  183. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sq.plain.erb +4 -0
  184. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sr.html.erb +4 -0
  185. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sr.plain.erb +4 -0
  186. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sv.html.erb +4 -0
  187. data/app/views/raker_mailer/notification_oai_endpoint_added.text.sv.plain.erb +4 -0
  188. data/app/views/raker_mailer/notification_oai_endpoint_added.text.th.html.erb +4 -0
  189. data/app/views/raker_mailer/notification_oai_endpoint_added.text.th.plain.erb +4 -0
  190. data/app/views/raker_mailer/notification_oai_endpoint_added.text.tl.html.erb +4 -0
  191. data/app/views/raker_mailer/notification_oai_endpoint_added.text.tl.plain.erb +4 -0
  192. data/app/views/raker_mailer/notification_oai_endpoint_added.text.tr.html.erb +4 -0
  193. data/app/views/raker_mailer/notification_oai_endpoint_added.text.tr.plain.erb +4 -0
  194. data/app/views/raker_mailer/notification_oai_endpoint_added.text.uk.html.erb +4 -0
  195. data/app/views/raker_mailer/notification_oai_endpoint_added.text.uk.plain.erb +4 -0
  196. data/app/views/raker_mailer/notification_oai_endpoint_added.text.vi.html.erb +4 -0
  197. data/app/views/raker_mailer/notification_oai_endpoint_added.text.vi.plain.erb +4 -0
  198. data/app/views/raker_mailer/notification_oai_endpoint_added.text.zh-CN.html.erb +4 -0
  199. data/app/views/raker_mailer/notification_oai_endpoint_added.text.zh-CN.plain.erb +4 -0
  200. data/app/views/raker_mailer/notification_oai_endpoint_added.text.zh-TW.html.erb +4 -0
  201. data/app/views/raker_mailer/notification_oai_endpoint_added.text.zh-TW.plain.erb +4 -0
  202. data/app/views/raker_mailer/notification_oai_endpoint_added.text.zh.html.erb +4 -0
  203. data/app/views/raker_mailer/notification_oai_endpoint_added.text.zh.plain.erb +4 -0
  204. data/app/views/topics/_feed_preview.html.erb +18 -0
  205. data/app/views/topics/_form.html.erb +15 -0
  206. data/app/views/{opmls → topics}/_rss_discover.html.erb +0 -0
  207. data/app/views/{opmls → topics}/new.html.erb +7 -7
  208. data/app/views/topics/photos.html.erb +14 -0
  209. data/app/views/topics/show.html.erb +47 -0
  210. data/app/views/{opmls/index.opml.builder → topics/show.opml.builder} +0 -0
  211. data/app/views/topics/videos.html.erb +14 -0
  212. data/config/muck_raker_routes.rb +4 -3
  213. data/db/bootstrap/service_categories.yml +1 -1
  214. data/db/bootstrap/services.yml +15 -1
  215. data/db/migrate/20091006183742_add_feed_count_to_aggregation.rb +9 -0
  216. data/lib/muck_raker.rb +0 -4
  217. data/locales/ar.yml +27 -6
  218. data/locales/bg.yml +28 -7
  219. data/locales/ca.yml +30 -9
  220. data/locales/cs.yml +27 -6
  221. data/locales/da.yml +27 -6
  222. data/locales/de.yml +28 -7
  223. data/locales/el.yml +27 -6
  224. data/locales/en.yml +27 -6
  225. data/locales/es.yml +28 -7
  226. data/locales/et.yml +28 -7
  227. data/locales/fa.yml +27 -6
  228. data/locales/fi.yml +27 -6
  229. data/locales/fr.yml +27 -6
  230. data/locales/gl.yml +31 -10
  231. data/locales/hi.yml +27 -6
  232. data/locales/hr.yml +29 -8
  233. data/locales/hu.yml +29 -8
  234. data/locales/id.yml +27 -6
  235. data/locales/it.yml +29 -8
  236. data/locales/iw.yml +29 -8
  237. data/locales/ja.yml +29 -8
  238. data/locales/ko.yml +29 -8
  239. data/locales/lt.yml +30 -9
  240. data/locales/lv.yml +30 -9
  241. data/locales/mt.yml +32 -11
  242. data/locales/nl.yml +28 -7
  243. data/locales/no.yml +30 -9
  244. data/locales/pl.yml +27 -6
  245. data/locales/pt-PT.yml +27 -6
  246. data/locales/ro.yml +28 -7
  247. data/locales/ru.yml +27 -6
  248. data/locales/sk.yml +27 -6
  249. data/locales/sl.yml +30 -9
  250. data/locales/sq.yml +28 -7
  251. data/locales/sr.yml +27 -6
  252. data/locales/sv.yml +27 -6
  253. data/locales/th.yml +28 -7
  254. data/locales/tl.yml +27 -6
  255. data/locales/tr.yml +27 -6
  256. data/locales/uk.yml +27 -6
  257. data/locales/vi.yml +27 -6
  258. data/locales/zh-CN.yml +28 -7
  259. data/locales/zh-TW.yml +28 -7
  260. data/locales/zh.yml +28 -7
  261. data/muck-raker.gemspec +126 -13
  262. data/public/images/service_icons/16/metacafe.png +0 -0
  263. data/public/images/service_icons/24/metacafe.png +0 -0
  264. data/public/images/service_icons/48/metacafe.png +0 -0
  265. data/public/images/service_icons/60/metacafe.png +0 -0
  266. data/public/images/service_icons/source/bibsonomy.psd +0 -0
  267. data/public/images/service_icons/source/metacafe.psd +0 -0
  268. data/public/stylesheets/frame.css +10 -6
  269. data/public/stylesheets/muck-raker.css +77 -0
  270. data/test/rails_root/app/views/layouts/default.html.erb +1 -1
  271. data/test/rails_root/db/bootstrap/service_categories.yml +1 -1
  272. data/test/rails_root/db/bootstrap/services.yml +18 -2
  273. data/test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb +9 -0
  274. data/test/rails_root/public/images/service_icons/16/metacafe.png +0 -0
  275. data/test/rails_root/public/images/service_icons/24/metacafe.png +0 -0
  276. data/test/rails_root/public/images/service_icons/48/metacafe.png +0 -0
  277. data/test/rails_root/public/images/service_icons/60/metacafe.png +0 -0
  278. data/test/rails_root/public/images/service_icons/source/bibsonomy.psd +0 -0
  279. data/test/rails_root/public/images/service_icons/source/metacafe.psd +0 -0
  280. data/test/rails_root/public/javascripts/muck_activities.js +1 -2
  281. data/test/rails_root/public/stylesheets/application.css +0 -117
  282. data/test/rails_root/public/stylesheets/frame.css +10 -6
  283. data/test/rails_root/public/stylesheets/muck-activities.css +39 -0
  284. data/test/rails_root/public/stylesheets/muck-raker.css +77 -0
  285. data/test/rails_root/test/factories.rb +5 -0
  286. data/test/rails_root/test/functional/aggregation_feeds_controller_test.rb +67 -0
  287. data/test/rails_root/test/functional/aggregations_controller_test.rb +37 -3
  288. data/test/rails_root/test/functional/topics_controller_test.rb +46 -0
  289. data/test/rails_root/test/unit/aggregation_feed_test.rb +8 -0
  290. data/test/rails_root/test/unit/aggregation_test.rb +95 -0
  291. data/test/rails_root/test/unit/comment_test.rb +1 -1
  292. data/test/rails_root/test/unit/entry_test.rb +3 -0
  293. data/test/rails_root/test/unit/feed_test.rb +3 -0
  294. data/test/rails_root/test/unit/oai_endpoint_test.rb +3 -0
  295. data/test/rails_root/test/unit/service_test.rb +81 -11
  296. metadata +126 -13
  297. data/app/controllers/muck/opmls_controller.rb +0 -28
  298. data/app/views/google/_feed_bookmarks.html.erb +0 -13
  299. data/app/views/google/_feed_display.html.erb +0 -13
  300. data/app/views/google/_feed_photos.html.erb +0 -13
  301. data/app/views/google/_feeds_display.html.erb +0 -2
  302. data/app/views/opmls/index.html.erb +0 -19
  303. data/test/rails_root/test/functional/opmls_controller_test.rb +0 -37
data/muck-raker.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{muck-raker}
8
- s.version = "0.1.37"
8
+ s.version = "0.1.38"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Joel Duffin Justin Ball"]
12
- s.date = %q{2009-10-01}
12
+ s.date = %q{2009-10-16}
13
13
  s.description = %q{The aggregation and recommendation engine for the muck system.}
14
14
  s.email = %q{justinball@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -23,14 +23,15 @@ Gem::Specification.new do |s|
23
23
  "VERSION",
24
24
  "app/controllers/admin/muck/feeds_controller.rb",
25
25
  "app/controllers/admin/muck/oai_endpoints_controller.rb",
26
+ "app/controllers/muck/aggregation_feeds_controller.rb",
26
27
  "app/controllers/muck/aggregations_controller.rb",
27
28
  "app/controllers/muck/entries_controller.rb",
28
29
  "app/controllers/muck/feed_previews_controller.rb",
29
30
  "app/controllers/muck/feeds_controller.rb",
30
31
  "app/controllers/muck/identity_feeds_controller.rb",
31
32
  "app/controllers/muck/oai_endpoints_controller.rb",
32
- "app/controllers/muck/opmls_controller.rb",
33
33
  "app/controllers/muck/recommendations_controller.rb",
34
+ "app/controllers/muck/topics_controller.rb",
34
35
  "app/controllers/muck/visits_controller.rb",
35
36
  "app/helpers/muck_raker_aggregations_helper.rb",
36
37
  "app/helpers/muck_raker_feeds_helper.rb",
@@ -59,10 +60,18 @@ Gem::Specification.new do |s|
59
60
  "app/views/activity_templates/_entry_share.html.erb",
60
61
  "app/views/admin/feeds/index.html.erb",
61
62
  "app/views/admin/oai_endpoints/index.html.erb",
63
+ "app/views/aggregations/_aggregation.html.erb",
62
64
  "app/views/aggregations/_data_source.html.erb",
63
65
  "app/views/aggregations/_data_sources.html.erb",
66
+ "app/views/aggregations/_feeds.html.erb",
67
+ "app/views/aggregations/_preview_form.html.erb",
64
68
  "app/views/aggregations/edit.html.erb",
69
+ "app/views/aggregations/index.html.erb",
70
+ "app/views/aggregations/index.iphone.erb",
65
71
  "app/views/aggregations/new.html.erb",
72
+ "app/views/aggregations/preview.html.erb",
73
+ "app/views/aggregations/preview.iphone.erb",
74
+ "app/views/aggregations/rss_discovery.html.erb",
66
75
  "app/views/aggregations/show.html.erb",
67
76
  "app/views/default/_language_list.html.erb",
68
77
  "app/views/entries/_related_entry.html.erb",
@@ -94,11 +103,7 @@ Gem::Specification.new do |s|
94
103
  "app/views/feeds/unban.html.erb",
95
104
  "app/views/google/_dynamic_feeds_vertical.html.erb",
96
105
  "app/views/google/_feed.html.erb",
97
- "app/views/google/_feed_bookmarks.html.erb",
98
- "app/views/google/_feed_display.html.erb",
99
- "app/views/google/_feed_photos.html.erb",
100
106
  "app/views/google/_feed_search.html.erb",
101
- "app/views/google/_feeds_display.html.erb",
102
107
  "app/views/google/_feeds_scripts.html.erb",
103
108
  "app/views/google/_slide_show.html.erb",
104
109
  "app/views/identity_feeds/_available_service_categories.html.erb",
@@ -111,10 +116,6 @@ Gem::Specification.new do |s|
111
116
  "app/views/oai_endpoints/_oai_endpoint_row.html.erb",
112
117
  "app/views/oai_endpoints/new.html.erb",
113
118
  "app/views/oai_endpoints/show.html.erb",
114
- "app/views/opmls/_rss_discover.html.erb",
115
- "app/views/opmls/index.html.erb",
116
- "app/views/opmls/index.opml.builder",
117
- "app/views/opmls/new.html.erb",
118
119
  "app/views/parts/_add_feed.html.erb",
119
120
  "app/views/parts/_select_feed.html.erb",
120
121
  "app/views/raker_mailer/notification_feed_added.text.ar.html.erb",
@@ -205,8 +206,94 @@ Gem::Specification.new do |s|
205
206
  "app/views/raker_mailer/notification_feed_added.text.zh-TW.plain.erb",
206
207
  "app/views/raker_mailer/notification_feed_added.text.zh.html.erb",
207
208
  "app/views/raker_mailer/notification_feed_added.text.zh.plain.erb",
209
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ar.html.erb",
210
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ar.plain.erb",
211
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.bg.html.erb",
212
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.bg.plain.erb",
213
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ca.html.erb",
214
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ca.plain.erb",
215
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.cs.html.erb",
216
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.cs.plain.erb",
217
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.da.html.erb",
218
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.da.plain.erb",
219
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.de.html.erb",
220
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.de.plain.erb",
221
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.el.html.erb",
222
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.el.plain.erb",
223
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.es.html.erb",
224
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.es.plain.erb",
225
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.et.html.erb",
226
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.et.plain.erb",
227
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.fa.html.erb",
228
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.fa.plain.erb",
229
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.fi.html.erb",
230
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.fi.plain.erb",
231
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.fr.html.erb",
232
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.fr.plain.erb",
233
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.gl.html.erb",
234
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.gl.plain.erb",
235
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.hi.html.erb",
236
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.hi.plain.erb",
237
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.hr.html.erb",
238
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.hr.plain.erb",
208
239
  "app/views/raker_mailer/notification_oai_endpoint_added.text.html.erb",
240
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.hu.html.erb",
241
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.hu.plain.erb",
242
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.id.html.erb",
243
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.id.plain.erb",
244
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.it.html.erb",
245
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.it.plain.erb",
246
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.iw.html.erb",
247
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.iw.plain.erb",
248
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ja.html.erb",
249
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ja.plain.erb",
250
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ko.html.erb",
251
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ko.plain.erb",
252
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.lt.html.erb",
253
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.lt.plain.erb",
254
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.lv.html.erb",
255
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.lv.plain.erb",
256
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.mt.html.erb",
257
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.mt.plain.erb",
258
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.nl.html.erb",
259
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.nl.plain.erb",
260
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.no.html.erb",
261
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.no.plain.erb",
262
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.pl.html.erb",
263
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.pl.plain.erb",
209
264
  "app/views/raker_mailer/notification_oai_endpoint_added.text.plain.erb",
265
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.pt-PT.html.erb",
266
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.pt-PT.plain.erb",
267
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ro.html.erb",
268
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ro.plain.erb",
269
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ru.html.erb",
270
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.ru.plain.erb",
271
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sk.html.erb",
272
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sk.plain.erb",
273
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sl.html.erb",
274
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sl.plain.erb",
275
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sq.html.erb",
276
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sq.plain.erb",
277
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sr.html.erb",
278
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sr.plain.erb",
279
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sv.html.erb",
280
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.sv.plain.erb",
281
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.th.html.erb",
282
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.th.plain.erb",
283
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.tl.html.erb",
284
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.tl.plain.erb",
285
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.tr.html.erb",
286
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.tr.plain.erb",
287
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.uk.html.erb",
288
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.uk.plain.erb",
289
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.vi.html.erb",
290
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.vi.plain.erb",
291
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.zh-CN.html.erb",
292
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.zh-CN.plain.erb",
293
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.zh-TW.html.erb",
294
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.zh-TW.plain.erb",
295
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.zh.html.erb",
296
+ "app/views/raker_mailer/notification_oai_endpoint_added.text.zh.plain.erb",
210
297
  "app/views/recommendations/index.html.erb",
211
298
  "app/views/recommendations/index.pjs.erb",
212
299
  "app/views/recommendations/index.rss.builder",
@@ -235,6 +322,14 @@ Gem::Specification.new do |s|
235
322
  "app/views/services/_new_service.html.erb",
236
323
  "app/views/services/_summary.html.erb",
237
324
  "app/views/services/_view_service.html.erb",
325
+ "app/views/topics/_feed_preview.html.erb",
326
+ "app/views/topics/_form.html.erb",
327
+ "app/views/topics/_rss_discover.html.erb",
328
+ "app/views/topics/new.html.erb",
329
+ "app/views/topics/photos.html.erb",
330
+ "app/views/topics/show.html.erb",
331
+ "app/views/topics/show.opml.builder",
332
+ "app/views/topics/videos.html.erb",
238
333
  "app/views/visits/_comments_tool.html.erb",
239
334
  "app/views/visits/_frame_scripts.html.erb",
240
335
  "app/views/visits/_share_tool.html.erb",
@@ -313,6 +408,7 @@ Gem::Specification.new do |s|
313
408
  "db/migrate/20090922231552_add_dates_to_oai_endpoints.rb",
314
409
  "db/migrate/20090923150807_rename_name_in_aggregation.rb",
315
410
  "db/migrate/20090924200750_add_uri_data_template_to_services.rb",
411
+ "db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
316
412
  "install.rb",
317
413
  "lib/active_record/acts/muck_aggregation_owner.rb",
318
414
  "lib/active_record/acts/muck_feed_owner.rb",
@@ -405,6 +501,7 @@ Gem::Specification.new do |s|
405
501
  "public/images/service_icons/16/livejournal.png",
406
502
  "public/images/service_icons/16/magnolia.png",
407
503
  "public/images/service_icons/16/mendeley.png",
504
+ "public/images/service_icons/16/metacafe.png",
408
505
  "public/images/service_icons/16/mixx.png",
409
506
  "public/images/service_icons/16/myspace.png",
410
507
  "public/images/service_icons/16/netflix.png",
@@ -469,6 +566,7 @@ Gem::Specification.new do |s|
469
566
  "public/images/service_icons/24/livejournal.png",
470
567
  "public/images/service_icons/24/magnolia.png",
471
568
  "public/images/service_icons/24/mendeley.png",
569
+ "public/images/service_icons/24/metacafe.png",
472
570
  "public/images/service_icons/24/mixx.png",
473
571
  "public/images/service_icons/24/myspace.png",
474
572
  "public/images/service_icons/24/netflix.png",
@@ -533,6 +631,7 @@ Gem::Specification.new do |s|
533
631
  "public/images/service_icons/48/livejournal.png",
534
632
  "public/images/service_icons/48/magnolia.png",
535
633
  "public/images/service_icons/48/mendeley.png",
634
+ "public/images/service_icons/48/metacafe.png",
536
635
  "public/images/service_icons/48/mixx.png",
537
636
  "public/images/service_icons/48/myspace.png",
538
637
  "public/images/service_icons/48/netflix.png",
@@ -597,6 +696,7 @@ Gem::Specification.new do |s|
597
696
  "public/images/service_icons/60/livejournal.png",
598
697
  "public/images/service_icons/60/magnolia.png",
599
698
  "public/images/service_icons/60/mendeley.png",
699
+ "public/images/service_icons/60/metacafe.png",
600
700
  "public/images/service_icons/60/mixx.png",
601
701
  "public/images/service_icons/60/myspace.png",
602
702
  "public/images/service_icons/60/netflix.png",
@@ -643,6 +743,7 @@ Gem::Specification.new do |s|
643
743
  "public/images/service_icons/source/clipmarks.png",
644
744
  "public/images/service_icons/source/connotea.psd",
645
745
  "public/images/service_icons/source/icerocket.psd",
746
+ "public/images/service_icons/source/metacafe.psd",
646
747
  "public/images/service_icons/source/netflix.png",
647
748
  "public/images/service_icons/source/oai.png",
648
749
  "public/images/service_icons/source/odeo.png",
@@ -654,6 +755,7 @@ Gem::Specification.new do |s|
654
755
  "public/images/service_icons/source/xanga.png",
655
756
  "public/javascripts/muck_raker.js",
656
757
  "public/stylesheets/frame.css",
758
+ "public/stylesheets/muck-raker.css",
657
759
  "rails/init.rb",
658
760
  "raker/lib/aggregatord.jar",
659
761
  "raker/lib/aggregatord.properties",
@@ -827,6 +929,7 @@ Gem::Specification.new do |s|
827
929
  "test/rails_root/db/migrate/20090922231552_add_dates_to_oai_endpoints.rb",
828
930
  "test/rails_root/db/migrate/20090923150807_rename_name_in_aggregation.rb",
829
931
  "test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb",
932
+ "test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
830
933
  "test/rails_root/features/feeds.feature",
831
934
  "test/rails_root/features/step_definitions/common_steps.rb",
832
935
  "test/rails_root/features/step_definitions/visit_steps.rb",
@@ -916,6 +1019,7 @@ Gem::Specification.new do |s|
916
1019
  "test/rails_root/public/images/service_icons/16/livejournal.png",
917
1020
  "test/rails_root/public/images/service_icons/16/magnolia.png",
918
1021
  "test/rails_root/public/images/service_icons/16/mendeley.png",
1022
+ "test/rails_root/public/images/service_icons/16/metacafe.png",
919
1023
  "test/rails_root/public/images/service_icons/16/mixx.png",
920
1024
  "test/rails_root/public/images/service_icons/16/myspace.png",
921
1025
  "test/rails_root/public/images/service_icons/16/netflix.png",
@@ -980,6 +1084,7 @@ Gem::Specification.new do |s|
980
1084
  "test/rails_root/public/images/service_icons/24/livejournal.png",
981
1085
  "test/rails_root/public/images/service_icons/24/magnolia.png",
982
1086
  "test/rails_root/public/images/service_icons/24/mendeley.png",
1087
+ "test/rails_root/public/images/service_icons/24/metacafe.png",
983
1088
  "test/rails_root/public/images/service_icons/24/mixx.png",
984
1089
  "test/rails_root/public/images/service_icons/24/myspace.png",
985
1090
  "test/rails_root/public/images/service_icons/24/netflix.png",
@@ -1044,6 +1149,7 @@ Gem::Specification.new do |s|
1044
1149
  "test/rails_root/public/images/service_icons/48/livejournal.png",
1045
1150
  "test/rails_root/public/images/service_icons/48/magnolia.png",
1046
1151
  "test/rails_root/public/images/service_icons/48/mendeley.png",
1152
+ "test/rails_root/public/images/service_icons/48/metacafe.png",
1047
1153
  "test/rails_root/public/images/service_icons/48/mixx.png",
1048
1154
  "test/rails_root/public/images/service_icons/48/myspace.png",
1049
1155
  "test/rails_root/public/images/service_icons/48/netflix.png",
@@ -1108,6 +1214,7 @@ Gem::Specification.new do |s|
1108
1214
  "test/rails_root/public/images/service_icons/60/livejournal.png",
1109
1215
  "test/rails_root/public/images/service_icons/60/magnolia.png",
1110
1216
  "test/rails_root/public/images/service_icons/60/mendeley.png",
1217
+ "test/rails_root/public/images/service_icons/60/metacafe.png",
1111
1218
  "test/rails_root/public/images/service_icons/60/mixx.png",
1112
1219
  "test/rails_root/public/images/service_icons/60/myspace.png",
1113
1220
  "test/rails_root/public/images/service_icons/60/netflix.png",
@@ -1156,6 +1263,7 @@ Gem::Specification.new do |s|
1156
1263
  "test/rails_root/public/images/service_icons/source/clipmarks.png",
1157
1264
  "test/rails_root/public/images/service_icons/source/connotea.psd",
1158
1265
  "test/rails_root/public/images/service_icons/source/icerocket.psd",
1266
+ "test/rails_root/public/images/service_icons/source/metacafe.psd",
1159
1267
  "test/rails_root/public/images/service_icons/source/netflix.png",
1160
1268
  "test/rails_root/public/images/service_icons/source/oai.png",
1161
1269
  "test/rails_root/public/images/service_icons/source/odeo.png",
@@ -1292,6 +1400,8 @@ Gem::Specification.new do |s|
1292
1400
  "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png",
1293
1401
  "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png",
1294
1402
  "test/rails_root/public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css",
1403
+ "test/rails_root/public/stylesheets/muck-activities.css",
1404
+ "test/rails_root/public/stylesheets/muck-raker.css",
1295
1405
  "test/rails_root/public/stylesheets/reset.css",
1296
1406
  "test/rails_root/public/stylesheets/styles.css",
1297
1407
  "test/rails_root/public/stylesheets/themes/blue/styles.css",
@@ -1317,12 +1427,13 @@ Gem::Specification.new do |s|
1317
1427
  "test/rails_root/test/functional/.keep",
1318
1428
  "test/rails_root/test/functional/admin/feeds_controller_test.rb",
1319
1429
  "test/rails_root/test/functional/admin/oai_endpoints_controller_test.rb",
1430
+ "test/rails_root/test/functional/aggregation_feeds_controller_test.rb",
1320
1431
  "test/rails_root/test/functional/aggregations_controller_test.rb",
1321
1432
  "test/rails_root/test/functional/feed_previews_controller_test.rb",
1322
1433
  "test/rails_root/test/functional/feeds_controller_test.rb",
1323
1434
  "test/rails_root/test/functional/identity_feeds_controller_test.rb",
1324
1435
  "test/rails_root/test/functional/oai_endpoints_controller_test.rb",
1325
- "test/rails_root/test/functional/opmls_controller_test.rb",
1436
+ "test/rails_root/test/functional/topics_controller_test.rb",
1326
1437
  "test/rails_root/test/functional/visits_controller_test.rb",
1327
1438
  "test/rails_root/test/integration/.keep",
1328
1439
  "test/rails_root/test/mocks/development/.keep",
@@ -1446,6 +1557,7 @@ Gem::Specification.new do |s|
1446
1557
  "test/rails_root/db/migrate/20090922231552_add_dates_to_oai_endpoints.rb",
1447
1558
  "test/rails_root/db/migrate/20090923150807_rename_name_in_aggregation.rb",
1448
1559
  "test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb",
1560
+ "test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
1449
1561
  "test/rails_root/features/step_definitions/common_steps.rb",
1450
1562
  "test/rails_root/features/step_definitions/visit_steps.rb",
1451
1563
  "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -1456,12 +1568,13 @@ Gem::Specification.new do |s|
1456
1568
  "test/rails_root/test/factories.rb",
1457
1569
  "test/rails_root/test/functional/admin/feeds_controller_test.rb",
1458
1570
  "test/rails_root/test/functional/admin/oai_endpoints_controller_test.rb",
1571
+ "test/rails_root/test/functional/aggregation_feeds_controller_test.rb",
1459
1572
  "test/rails_root/test/functional/aggregations_controller_test.rb",
1460
1573
  "test/rails_root/test/functional/feed_previews_controller_test.rb",
1461
1574
  "test/rails_root/test/functional/feeds_controller_test.rb",
1462
1575
  "test/rails_root/test/functional/identity_feeds_controller_test.rb",
1463
1576
  "test/rails_root/test/functional/oai_endpoints_controller_test.rb",
1464
- "test/rails_root/test/functional/opmls_controller_test.rb",
1577
+ "test/rails_root/test/functional/topics_controller_test.rb",
1465
1578
  "test/rails_root/test/functional/visits_controller_test.rb",
1466
1579
  "test/rails_root/test/shoulda_macros/controller.rb",
1467
1580
  "test/rails_root/test/shoulda_macros/forms.rb",
data/public/stylesheets/frame.css CHANGED
@@ -1,11 +1,12 @@
1
1
  /* iFrame */
2
2
  .framed_content{height:100%;margin-bottom:-1px;width:100%;}
3
3
  #content_iframe{display:block;display:block;}
4
- #toolbar{height:30px;border-bottom:1px solid #999;background-image:url('/images/folksemantic/bg-toolbar.jpg');}
5
- #toolbar .section{padding:4px 20px;}
6
- #toolbar-logo {float:left;margin-left:30px;}
4
+ #toolbar{height:30px;background:#EFF1E5;border-bottom:1px solid #999;}
5
+ #toolbar .section{padding:5px 20px;}
6
+ #toolbar #profile{float:left;}
7
7
  #toolbar #search{float:right;padding:5px 0px;}
8
8
  #toolbar #search input{font-size:1em;}
9
+ #toolbar-logo {float:left;margin-left:30px;}
9
10
  #toolbar #tools{float:right;}
10
11
  #toolbar #tools img{vertical-align:bottom;padding-right:4px;}
11
12
  #toolbar #tools a{margin-right:5px;padding-left:18px;font-weight:bolder;font-size:1em;color:#54493F;}
@@ -16,6 +17,8 @@
16
17
  a#close_frame{-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background:transparent url('/images/icons/close.png') no-repeat scroll left top;display:block;height:19px;width:19px;}
17
18
  a#close_frame:hover{background-position:left bottom;}
18
19
  a#close_frame_text{display:none;}
20
+ a#comment{background:transparent url('/images/icons/comment.png') no-repeat scroll left top;}
21
+ a#share{background:transparent url('/images/icons/add.png') no-repeat scroll left top;}
19
22
  #toolbar #search #search_go{display:none;}
20
23
  #toolbar #search #search_box{width:150px;height:21px;background:transparent url('/images/icons/search_box.png') no-repeat scroll left bottom;}
21
24
  #toolbar #search #search_box:hover{background:transparent url('/images/icons/search_box.png') no-repeat scroll left top;}
@@ -30,10 +33,10 @@ a.close_link:hover{background:transparent url('/images/icons/hide.png') no-repea
30
33
  .tool input{font-size:1em;}
31
34
  .tool label{font-size:1em;}
32
35
  /* shares tool in frame */
33
- #share_tool .share-form-wrapper{border:1px solid #ccc;margin:2px auto;padding:.5em;background-color:#eee;width:90%;}
36
+ #share_tool .share-form-wrapper, #share_tool #shares_control{border:1px solid #ccc;margin:2px auto;padding:.5em;background-color:#eee;width:90%;}
34
37
  /* comments tool in frame */
35
38
  #comments_tool #activity-icon, .actor-icon {margin:0 10px 0 0;}
36
- #comments_tool .comment_holder{border:1px solid #ccc;margin:30px 10px 0 5px;padding:.5em;background-color:#eee;width:90%;}
39
+ #comments_tool .comment-form-wrapper, #comments_tool .comment_holder{border:1px solid #ccc;margin:2px auto;padding:.5em;background-color:#eee;width:90%;}
37
40
  #comments_tool .comment_holder p{margin:0;}
38
41
  #comments_tool .comment_holder .commentor-icon{width:40px;float:left;margin:0 5px 0 0;}
39
42
  #comments_tool .comment_holder .commentor-icon img{width:40px;height:40px;}
@@ -41,6 +44,7 @@ a.close_link:hover{background:transparent url('/images/icons/hide.png') no-repea
41
44
  #comments_tool .comment_holder .comment-time{color:#777777;font-size:.9em;}
42
45
  #comments_tool #comments_control{border:1px solid #ccc;margin:2px auto;padding:.5em;background-color:#eee;width:90%;}
43
46
  #comments_tool .comment-form-wrapper{height:116px;display:inline;}
47
+ #comments_tool .comment-form input{float:right;}
44
48
  #comments_tool .activity-comment .comment-form textarea.max {height:50px;width:200px;margin:0px;}
45
49
  #comments_tool .activity-comment .comment-form textarea.min {height:15px;width:90%;}
46
50
  #comments_tool form.comment-delete {position:relative;display:inline;float:right;}
@@ -49,4 +53,4 @@ a.close_link:hover{background:transparent url('/images/icons/hide.png') no-repea
49
53
  #comments_tool .comment-hover form.comment-delete{display:block;}
50
54
  #comments_tool .activity-comment{margin:5px 10px 2px 60px;}
51
55
  #comments_tool .activity{margin:8px 10px 2px 10px;}
52
- #comments_tool #comments_control{margin:20px 5px;}
56
+ #comments_tool #comments_control{margin:20px 5px;}
data/public/stylesheets/muck-raker.css ADDED
@@ -0,0 +1,77 @@
1
+ #fancy_outer{width:80%;height:80%;margin:auto auto;}
2
+ /* services */
3
+ #available-services{border:solid 1px #ccc;background-color:#eee;}
4
+ .services-main {float:left;display:inline-block;padding:10px;margin:10px;}
5
+ .services-main h3{margin:0;}
6
+ .services-main .service-category{margin:0 20px 20px 0;display:inline-block;float:left;height:160px;width:130px;}
7
+ .services-main ul.services-list{margin:0;padding:0;list-style:none;}
8
+ .services-main a.service-link{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-decoration:none;}
9
+ .services-main a:hover.service-link{text-decoration:underline;}
10
+ .identity-service{font-size:1em;font-weight:bold;}
11
+ .identity-service-title{font-size:1.2em;font-weight:bold;padding:2px 0 5px 28px;}
12
+ #identity-feed{margin:auto;}
13
+ #identity-feed input[type="text"] {width:380px;}
14
+ ul#my-services-list li {position:relative;}
15
+ ul#my-services-list li form {right:-25px;position:absolute;top:3px;}
16
+ ul.service-summary{margin:0;padding:0;list-style:none;}
17
+ ul.service-summary a.service-link{display:inline-block;margin:2px 0;padding:2px 0 5px 28px;text-decoration:none;}
18
+ #data-sources #sources-list ul {float:left;display:inline-block;height:170px;margin:0 20px;width:150px;}
19
+ #edit-data-sources ul{}
20
+ #sources-list ul li{padding:2px 0 5px 25px;}
21
+ #sources-list ul li input{margin:0;}
22
+ #sources-list ul li.source-title{font-weight:bolder;font-size:1.4em;margin:10px 0 0 0;padding:0;}
23
+ /* feed formating */
24
+ .feed{padding:0px 4px;}
25
+ .feed-header{background-color:#f4f8fb;padding:3px;margin-top:20px;}
26
+ .feed-header h3{margin:0;padding:2px 0 10px 25px;}
27
+ .feed-header h3 a{text-decoration:none;color:#333;}
28
+ .feed-header h3 a:hover{color:#000;}
29
+ .feed-item{margin:0 15px 0 20px;}
30
+ .feed-item h4{margin:0;padding:2px;}
31
+ .feed-item h4 a{text-decoration:none;color:#555;}
32
+ .feed-item h4 a:hover{color:#000;}
33
+ .feed-item .hentry .entry{display:none;}
34
+ .even{background-color:#f6f8f9;}
35
+ .odd{background-color:#fff;}
36
+ .entry-close{float:right;font-size:.8em;}
37
+ .hentry{padding:0 10px;}
38
+ /* entry comment in activity feed */
39
+ .entry-comment-contents{font-weight:bolder;}
40
+ /* entries tag browsing */
41
+ fieldset{border:solid 1px #CCC;margin:0px;padding:10px;}
42
+ #tag-cloud{margin-top:0px;line-height:28px;}
43
+ #tag-cloud a{padding:6px;text-decoration:none;}
44
+ #tag-cloud a:visited{text-decoration:none;}
45
+ #tag-cloud a:hover{text-decoration:underline;}
46
+ .cloud1{font-size:15px;}
47
+ .cloud2{font-size:19px;}
48
+ .cloud3{font-size:23px;}
49
+ .cloud4{font-size:27px;}
50
+ .cloud5{font-size:31px;}
51
+ .cloud6{font-size:35px;}
52
+ .cloud7{font-size:39px;}
53
+ .cloud8{font-size:43px;}
54
+ .cloud9{font-size:47px;}
55
+ /* css for google widgets */
56
+ .slide_show_content {width:250px;height:200px;margin-bottom:40px;padding:5px;}
57
+ .datafeeds .calculated-feeds{border:solid 1px #eee;}
58
+ .datafeeds .feed{padding:0px 4px;}
59
+ .datafeeds .feed-header{background-color:#eee;padding:3px;margin-top:20px;}
60
+ .datafeeds .feed-header h3{margin:0;padding:2px 0 5px 25px;}
61
+ .datafeeds .feed-header h3 a{text-decoration:none;color:#333;}
62
+ .datafeeds .feed-header h3 a:hover{color:#000;}
63
+ .datafeeds .feed-item{margin:0 15px 0 20px;}
64
+ .datafeeds .feed-item h4{margin:0;padding:2px;}
65
+ .datafeeds .feed-item h4 a{text-decoration:none;color:#555;}
66
+ .datafeeds .feed-item h4 a:hover{color:#000;}
67
+ .datafeeds .feed-item .hentry .entry{display:none;}
68
+ .datafeeds .even{background-color:#f6f8f9;}
69
+ .datafeeds .odd{background-color:#fff;}
70
+ .datafeeds .feed-photos a, .datafeeds .feed-photos img{width:100px;height:100px;overflow:hidden;display:inline-block;}
71
+ .datafeeds .feed-photos {margin:0;}
72
+ .datafeeds .feed-videos img{width:100px;height:100px;}
73
+ .datafeeds .feed-videos {margin:0;}
74
+ .remove-feed{float:right;}
75
+ .entry-close{float:right;font-size:.8em;}
76
+ /* edit aggregation */
77
+ #edit-aggregation-controls .box{margin:10px 0;}
data/test/rails_root/app/views/layouts/default.html.erb CHANGED
@@ -10,7 +10,7 @@
10
10
  <meta name="MSSmartTagsPreventParsing" content="true" />
11
11
  <%= stylesheet_link_tag 'blueprint/print.css', :media => "print" %>
12
12
  <!--[if IE]><link rel="stylesheet" href="/stylesheets/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
13
- <%= stylesheet_link_tag %W{ reset blueprint/liquid_screen.css jquery/jquery.fancybox.css styles }, :cache => true %>
13
+ <%= stylesheet_link_tag %W{ reset blueprint/liquid_screen.css jquery/jquery.fancybox.css styles muck-raker muck-activities }, :cache => true %>
14
14
  <%= stylesheet_link_tag 'application' %>
15
15
  <%= javascript_include_tag %w{
16
16
  jquery/jquery.js
data/test/rails_root/db/bootstrap/service_categories.yml CHANGED
@@ -24,7 +24,7 @@ photos:
24
24
  sort: 60
25
25
  video:
26
26
  id: 7
27
- name: Video
27
+ name: Videos
28
28
  sort: 70
29
29
  academics:
30
30
  id: 8
data/test/rails_root/db/bootstrap/services.yml CHANGED
@@ -84,7 +84,7 @@ digg:
84
84
  yelp:
85
85
  id: 8
86
86
  name: Yelp
87
- uri: "http://allconsuming.net/"
87
+ uri: "http://www.yelp.com/"
88
88
  api_uri:
89
89
  uri_data_template: "http://{username}.yelp.com/rss"
90
90
  uri_template: "http://{username}.yelp.com"
@@ -660,6 +660,8 @@ amazon:
660
660
  sort: 58
661
661
  name: Amazon
662
662
  uri: "http://www.amazon.com"
663
+ uri_data_template: "http://www.amazon.com"
664
+ uri_template:
663
665
  icon: amazon.png
664
666
  use_for: "identity"
665
667
  service_category_id: 12
@@ -875,4 +877,18 @@ bibsonomy_search:
875
877
  icon: bibsonomy.png
876
878
  use_for: "tags"
877
879
  service_category_id: 8
878
- active: true
880
+ active: true
881
+ metacafe:
882
+ id: 77
883
+ name: MetaCafe
884
+ uri: "http://www.metacafe.com"
885
+ api_uri:
886
+ uri_data_template: "http://www.metacafe.com/tags/{tag}/rss.xml"
887
+ uri_template: "http://www.metacafe.com/tags/{tag}"
888
+ icon: metacafe.png
889
+ sort: 77
890
+ use_for: "tags"
891
+ service_category_id: 7
892
+ active: true
893
+
894
+
data/test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb ADDED
@@ -0,0 +1,9 @@
1
+ class AddFeedCountToAggregation < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :aggregations, :feed_count, :integer, :default => 0
4
+ end
5
+
6
+ def self.down
7
+ remove_column :aggregations, :feed_count
8
+ end
9
+ end
data/test/rails_root/public/javascripts/muck_activities.js CHANGED
@@ -7,8 +7,7 @@ function apply_activity_ajax_methods(){
7
7
  hide_comment_boxes();
8
8
  apply_comment_hover();
9
9
  apply_activity_hover();
10
- jQuery('.activity-no-comments').hide();
11
-
10
+ jQuery('.activity-no-comments').hide();
12
11
  jQuery('.activity-has-comments').find('textarea').click(function(){
13
12
  show_comment_box(this);
14
13
  });