muck-comments 0.1.11 → 0.1.12

data/Rakefile

@@ -60,6 +60,7 @@ begin
   Jeweler::RubyforgeTasks.new do |rubyforge|
     rubyforge.doc_task = "rdoc"
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/app/helpers/muck_comments_helper.rb

@@ -33,4 +33,17 @@ module MuckCommentsHelper
                                                          :delete_path => comment_path(comment, :format => 'js') }
   end
   
+  # outputs a partial that will embed disqus into any page with a unique url
+  #  
+  # Extra instructions from the disqus site:
+  # Append #disqus_thread to the end of permalinks. The comment count code will replace the text of these links with the comment count.
+  # For example, you may have a link with this HTML:
+  # <a href="http://example.com/my_article.html#disqus_thread">Comments</a>
+  # The comment count code will replace the text "Comments" with the number of comments on the page http://example.com/my_article.html
+  #
+  # disqus_short_name: The short name you selected when setting up your site.
+  def disqus(disqus_short_name)
+    render :partial => 'external/disqus', :locals => { :disqus_short_name => disqus_short_name }
+  end
+  
 end

data/app/views/external/_disqus.html.erb

@@ -0,0 +1,21 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript" src="http://disqus.com/forums/<%= disqus_short_name %>/embed.js"></script>
+<noscript><a href="http://<%= disqus_short_name %>.disqus.com/?url=ref"><%= t('muck.comments.view_thread') %></a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+
+<% content_for :javascript do -%>
+<script type="text/javascript">
+//<![CDATA[
+(function() {
+	var links = document.getElementsByTagName('a');
+	var query = '?';
+	for(var i = 0; i < links.length; i++) {
+	if(links[i].href.indexOf('#disqus_thread') >= 0) {
+		query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
+	}
+	}
+	document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/<%= disqus_short_name %>/get_num_replies.js' + query + '"></' + 'script>');
+})();
+//]]>
+</script>
+<% end -%>

data/lib/muck_comments.rb

@@ -2,6 +2,4 @@ require 'acts_as_commentable_with_threading'
 
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckComment }
 ActionController::Base.send :helper, MuckCommentsHelper
-I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
-
-Mime::Type.register "text/javascript", :pjs
+I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]

data/locales/ar.yml

@@ -16,3 +16,4 @@ ar:
       new_comment_no_title: "إضافة تعليق جديد"
       new_comment_with_title: "إضافة تعليق جديد ل{{title}}"
       problem_adding_comment: "كانت هناك مشكلة مضيفا تعليقك"
+      view_thread: "عرض ومناقشة الموضوع."

data/locales/bg.yml

@@ -16,3 +16,4 @@ bg:
       new_comment_no_title: "Добавяне на нов коментар"
       new_comment_with_title: "Добавяне на нов коментар към {{title}}"
       problem_adding_comment: "Имаше проблем при добавяне на коментар"
+      view_thread: "Преглед на дискусия конец."

data/locales/ca.yml

@@ -7,7 +7,7 @@ ca:
       add_comment: Comentari
       add_comment_button: "Afegir comentari"
       anonymous: Anònim
-      cant_delete_comment: "No esteu autoritzat a eliminar aquest comentari"
+      cant_delete_comment: "Vostè no té permís per eliminar aquest comentari"
       comment_removed: "Comentari eliminat amb èxit."
       create_error: "No s'ha pogut crear l'{{errors}} comentari"
       create_success: "Ha afegit un comentari"
@@ -16,3 +16,4 @@ ca:
       new_comment_no_title: "Afegeix un comentari nou"
       new_comment_with_title: "Afegir un nou comentari a l'{{title}}"
       problem_adding_comment: "Hi va haver un problema en afegir el seu comentari"
+      view_thread: "Veure el fil de discussió."

data/locales/cs.yml

@@ -16,3 +16,4 @@ cs:
       new_comment_no_title: "Přidat nový komentář"
       new_comment_with_title: "Přidat nový komentář {{title}}"
       problem_adding_comment: "Tam byl problém přidat svůj komentář"
+      view_thread: "Zobrazit diskusi vlákno."

data/locales/da.yml

@@ -16,3 +16,4 @@ da:
       new_comment_no_title: "Tilføj en ny kommentar"
       new_comment_with_title: "Tilføj en ny kommentar til {{title}}"
       problem_adding_comment: "Der var et problem at tilføje din kommentar"
+      view_thread: "Vis diskussionen tråd."

data/locales/de.yml

@@ -16,3 +16,4 @@ de:
       new_comment_no_title: "Fügen Sie einen neuen Beitrag"
       new_comment_with_title: "Fügen Sie einen neuen Kommentar zu {{title}}"
       problem_adding_comment: "Es gab ein Problem du deine Kommentar"
+      view_thread: "View the discussion thread."

data/locales/el.yml

@@ -16,3 +16,4 @@ el:
       new_comment_no_title: "Προσθέστε ένα νέο σχόλιο"
       new_comment_with_title: "Προσθέστε ένα νέο σχόλιο για την {{title}}"
       problem_adding_comment: "Υπήρξε ένα πρόβλημα προσθέτοντας το σχόλιό σας"
+      view_thread: "Δείτε το νήμα συζήτηση."

data/locales/en.yml

@@ -13,5 +13,6 @@ en:
       problem_adding_comment: "There was a problem adding your comment"
       new_comment_email_subject: "New comment from {{name}} on {{application_name}}"
       anonymous: anonymous
+      view_thread: "View the discussion thread."
     activity_templates:
       comment: Comments

data/locales/es.yml

@@ -16,3 +16,4 @@ es:
       new_comment_no_title: "Añade un comentario nuevo"
       new_comment_with_title: "Añadir un nuevo comentario al {{title}}"
       problem_adding_comment: "Hubo un problema al añadir su comentario"
+      view_thread: "Ver el hilo de discusión."

data/locales/et.yml

@@ -16,3 +16,4 @@ et:
       new_comment_no_title: "Lisa uus kommentaar"
       new_comment_with_title: "Lisa uus kommentaar {{title}}"
       problem_adding_comment: "Probleem, lisades oma kommentaar"
+      view_thread: "Vaata arutelu teema."

data/locales/fa.yml

@@ -16,3 +16,4 @@ fa:
       new_comment_no_title: "اضافه کردن نظر جدید"
       new_comment_with_title: "اضافه کردن نظر جدید به {{title}}"
       problem_adding_comment: "بود مشکل اضافه کردن نظر شما وجود دارد."
+      view_thread: "نمایش موضوع بحث."

data/locales/fi.yml

@@ -16,3 +16,4 @@ fi:
       new_comment_no_title: "Lisää uusi kommentti"
       new_comment_with_title: "Lisää uusi kommentti {{title}}"
       problem_adding_comment: "Oli ongelma lisäämällä kommenttisi"
+      view_thread: "Näytä keskustelu säiettä."

data/locales/fr.yml

@@ -16,3 +16,4 @@ fr:
       new_comment_no_title: "Ajouter un commentaire"
       new_comment_with_title: "Ajouter un nouveau commentaire à {{title}}"
       problem_adding_comment: "Il y avait un problème en ajoutant vos commentaires"
+      view_thread: "Voir le fil de discussion."

data/locales/gl.yml

@@ -10,9 +10,10 @@ gl:
       cant_delete_comment: "Non ten permiso para borrar este comentario"
       comment_removed: "Comentario eliminado correctamente."
       create_error: "Non se puido crear o {{errors}} comentario"
-      create_success: "Engadiu comentarios"
-      missing_comment_template_error: "Não se puido atopar un {{partial}}. parcial nomeado Por favor, cree un comentario parcial e ténteo de novo."
+      create_success: "Engadir comentario"
+      missing_comment_template_error: "Non se puido atopar un {{partial}}. parcial nomeado Por favor, cree un comentario parcial e ténteo de novo."
       new_comment_email_subject: "Novo comentario de {{name}} en {{application_name}}"
       new_comment_no_title: "Engadir un novo comentario"
       new_comment_with_title: "Engadir un novo comentario para {{title}}"
-      problem_adding_comment: "Produciuse un erro ó engadir o seu comentario"
+      problem_adding_comment: "Houbo un problema ao engadir o teu comentario"
+      view_thread: "Ver tema a debate."

data/locales/hi.yml

@@ -16,3 +16,4 @@ hi:
       new_comment_no_title: "एक नई टिप्पणी जोड़ें"
       new_comment_with_title: "{{title}} के लिए एक नई टिप्पणी जोड़ें"
       problem_adding_comment: "वहाँ एक अपनी टिप्पणी जोड़ने समस्या थी"
+      view_thread: "सारे चर्चा धागा."

data/locales/hr.yml

@@ -16,3 +16,4 @@ hr:
       new_comment_no_title: "Dodaj novi komentar"
       new_comment_with_title: "Dodaj novi komentar {{title}}"
       problem_adding_comment: "Došlo je do problema dodajući Vaš komentar"
+      view_thread: "Prikaz rasprava nit."

data/locales/hu.yml

@@ -4,9 +4,9 @@ hu:
     activity_templates: 
       comment: Észrevételeket
     comments: 
-      add_comment: Kommentáld
+      add_comment: Megjegyzést
       add_comment_button: "Add Comment"
-      anonymous: Anonim
+      anonymous: névtelenek
       cant_delete_comment: "Önnek nincs jogosultsága törölni ezt a megjegyzést"
       comment_removed: "Comment sikeresen eltávolították."
       create_error: "Nem sikerült létrehozni a megjegyzés {{errors}}"
@@ -16,3 +16,4 @@ hu:
       new_comment_no_title: "Hozzáadása Új hozzászólás"
       new_comment_with_title: "Új hozzászólás a {{title}}"
       problem_adding_comment: "Hiba történt a hozzáadja a comment"
+      view_thread: "Tekintse meg a téma megvitatását."

data/locales/id.yml

@@ -16,3 +16,4 @@ id:
       new_comment_no_title: "Tambah komentar baru"
       new_comment_with_title: "Tambah komentar baru untuk {{title}}"
       problem_adding_comment: "Ada masalah menambahkan komentar Anda"
+      view_thread: "Lihat diskusi thread."

data/locales/it.yml

@@ -16,3 +16,4 @@ it:
       new_comment_no_title: "Aggiungi un nuovo commento"
       new_comment_with_title: "Aggiungi un nuovo commento a {{title}}"
       problem_adding_comment: "C'è stato un problema di aggiungere il tuo commento"
+      view_thread: "Vedi il thread di discussione."

data/locales/iw.yml

@@ -16,3 +16,4 @@ iw:
       new_comment_no_title: "הוסף הערה חדש"
       new_comment_with_title: "הוסף תגובה חדשה {{title}}"
       problem_adding_comment: "היתה בעיה להוסיף את ההערה שלך"
+      view_thread: "הצג את חוט הדיון."

data/locales/ja.yml

@@ -16,3 +16,4 @@ ja:
       new_comment_no_title: 新しいコメントの追加
       new_comment_with_title: "{{title}}に新しいコメントを追加"
       problem_adding_comment: 問題があるあなたのコメントを追加されました
+      view_thread: ビューには、議論のスレッド。

data/locales/ko.yml

@@ -16,3 +16,4 @@ ko:
       new_comment_no_title: "새 덧글 추가"
       new_comment_with_title: "{{title}}에 새로운 코멘트를 추가하십시오"
       problem_adding_comment: "거기에 문제가 귀하의 코멘트를 추가했습니다"
+      view_thread: "토론 스레드보기."

data/locales/lt.yml

@@ -16,3 +16,4 @@ lt:
       new_comment_no_title: "Pridėti naują komentarą"
       new_comment_with_title: "Pridėti naują komentarą {{title}}"
       problem_adding_comment: "Iškilo problema pridėti savo komentarą"
+      view_thread: "Žiūrėti diskusijų temoje."

data/locales/lv.yml

@@ -16,3 +16,4 @@ lv:
       new_comment_no_title: "Pievienot jaunu komentāru"
       new_comment_with_title: "Pievienot jaunu komentāru {{title}}"
       problem_adding_comment: "Radās problēma, pievienojot savu komentāru"
+      view_thread: "Apskatīt diskusiju pavedienu."

data/locales/mt.yml

@@ -7,7 +7,7 @@ mt:
       add_comment: Kumment
       add_comment_button: "Add Comment"
       anonymous: anonima
-      cant_delete_comment: "Int ma jkollhomx permess li tħassar dan il-kumment"
+      cant_delete_comment: "Inti ma għandekx permess li tħassar dan il-kumment"
       comment_removed: "Kumment jitneħħew b'suċċess."
       create_error: "Tista 'ma toħloq l-{{errors}} kumment"
       create_success: "Għaddew miżjud kumment"
@@ -16,3 +16,4 @@ mt:
       new_comment_no_title: "Żid kumment"
       new_comment_with_title: "Żid kumment li {{title}}"
       problem_adding_comment: "Kien hemm problema żżid kumment tiegħek"
+      view_thread: "Ara l-ħajt diskussjoni."

data/locales/nl.yml

@@ -16,3 +16,4 @@ nl:
       new_comment_no_title: "Voeg een nieuwe reactie"
       new_comment_with_title: "Voeg een nieuw commentaar te {{title}}"
       problem_adding_comment: "Er was een probleem het toevoegen van uw reactie"
+      view_thread: "Bekijk de discussie draad."

data/locales/no.yml

@@ -17,3 +17,4 @@
       new_comment_no_title: "Legg til en ny kommentar"
       new_comment_with_title: "Legg til en ny kommentar til {{title}}"
       problem_adding_comment: "Det var et problem å legge inn din kommentar"
+      view_thread: "Se diskusjonen tråden."

data/locales/pl.yml

@@ -16,3 +16,4 @@ pl:
       new_comment_no_title: "Dodaj nowy komentarz"
       new_comment_with_title: "Dodaj nowy komentarz {{title}}"
       problem_adding_comment: "Nie było problemu dodawania komentarza"
+      view_thread: "Zobacz wątku dyskusji."

data/locales/pt-PT.yml

@@ -16,3 +16,4 @@ pt-PT:
       new_comment_no_title: "Adicionar um novo comentário"
       new_comment_with_title: "Adicionar um novo comentário para {{title}}"
       problem_adding_comment: "Houve um problema ao adicionar o seu comentário"
+      view_thread: "Ver tema a discussão."

data/locales/ro.yml

@@ -16,3 +16,4 @@ ro:
       new_comment_no_title: "Adauga un comentariu nou"
       new_comment_with_title: "Adauga un comentariu nou pentru a {{title}}"
       problem_adding_comment: "Nu a fost o problemă adăugarea comentariul tau"
+      view_thread: "Vizualizaţi şirul de discuţii."

data/locales/ru.yml

@@ -16,3 +16,4 @@ ru:
       new_comment_no_title: "Добавить новый комментарий"
       new_comment_with_title: "Добавить новый комментарий к {{title}}"
       problem_adding_comment: "Был проблема добавить свой комментарий"
+      view_thread: "Посмотреть обсуждение поток."

data/locales/sk.yml

@@ -16,3 +16,4 @@ sk:
       new_comment_no_title: "Pridať nový komentár"
       new_comment_with_title: "Pridať nový komentár {{title}}"
       problem_adding_comment: "Tam bol problém pridať svoj komentár"
+      view_thread: "Zobraziť diskusiu vlákno."

data/locales/sl.yml

@@ -16,3 +16,4 @@ sl:
       new_comment_no_title: "Dodaj nov komentar"
       new_comment_with_title: "Dodaj nov komentar {{title}}"
       problem_adding_comment: "Prišlo je do težave dodal svoj komentar"
+      view_thread: "Prikaži nit razprave."

data/locales/sq.yml

@@ -16,3 +16,4 @@ sq:
       new_comment_no_title: "Shto një koment të ri"
       new_comment_with_title: "Shto një koment të ri për të {{title}}"
       problem_adding_comment: "Nuk ishte një problem duke shtuar komentin tuaj"
+      view_thread: "View thread diskutim."

data/locales/sr.yml

@@ -16,3 +16,4 @@ sr:
       new_comment_no_title: "Додај нови коментар"
       new_comment_with_title: "Додај нови коментар на {{title}}"
       problem_adding_comment: "Дошло је до проблема додати ваш коментар"
+      view_thread: "Погледај расправу нит."

data/locales/sv.yml

@@ -16,3 +16,4 @@ sv:
       new_comment_no_title: "Lägg till en ny kommentar"
       new_comment_with_title: "Lägg till en ny kommentar till {{title}}"
       problem_adding_comment: "Det uppstod ett problem att lägga till din kommentar"
+      view_thread: "Se diskussionen tråd."

data/locales/th.yml

@@ -16,3 +16,4 @@ th:
       new_comment_no_title: เพิ่มความคิดเห็นใหม่
       new_comment_with_title: "เพิ่มความคิดเห็นใหม่ {{title}}"
       problem_adding_comment: มีปัญหาการเพิ่มข้อคิดเห็นของคุณได้
+      view_thread: ดูหัวข้อสนทนา.

data/locales/tl.yml

@@ -16,3 +16,4 @@ tl:
       new_comment_no_title: "Magdagdag ng isang bagong puna"
       new_comment_with_title: "Magdagdag ng isang bagong puna sa {{title}}"
       problem_adding_comment: "Nagkaroon ng problema sa pagdagdag ng iyong puna"
+      view_thread: "Tingnan ang discussion thread."

data/locales/tr.yml

@@ -16,3 +16,4 @@ tr:
       new_comment_no_title: "Yeni bir yorum ekle"
       new_comment_with_title: "{{title}} Yeni yorum ekle"
       problem_adding_comment: "Bir sorun yorum ekleme oldu"
+      view_thread: "Profili tartışma thread."

data/locales/uk.yml

@@ -16,3 +16,4 @@ uk:
       new_comment_no_title: "Додати новий коментар"
       new_comment_with_title: "Додати новий коментар до {{title}}"
       problem_adding_comment: "Був проблема додати свій коментар"
+      view_thread: "Переглянути обговорення потік."

data/locales/vi.yml

@@ -16,3 +16,4 @@ vi:
       new_comment_no_title: "Thêm một comment mới"
       new_comment_with_title: "Thêm một comment mới để {{title}}"
       problem_adding_comment: "Có vấn đề thêm bình luận của bạn"
+      view_thread: "Xem các chủ đề thảo luận."

data/locales/zh-CN.yml

@@ -16,3 +16,4 @@ zh-CN:
       new_comment_no_title: 添加新评论
       new_comment_with_title: "添加对{{title}}新评论"
       problem_adding_comment: 有一个问题，加入您的评论
+      view_thread: 查看讨论线程。

data/locales/zh-TW.yml

@@ -16,3 +16,4 @@ zh-TW:
       new_comment_no_title: 添加新評論
       new_comment_with_title: "添加新的評論，{{title}}"
       problem_adding_comment: 有一個問題，加入您的評論
+      view_thread: 查看討論線程。

data/locales/zh.yml

@@ -16,3 +16,4 @@ zh:
       new_comment_no_title: 添加新评论
       new_comment_with_title: "添加对{{title}}新评论"
       problem_adding_comment: 有一个问题，加入您的评论
+      view_thread: 查看讨论线程。

data/muck-comments.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-comments}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-10-01}
+  s.date = %q{2009-10-27}
   s.description = %q{The comment engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "app/views/comments/_form.html.erb",
      "app/views/comments/index.html.erb",
      "app/views/comments/new.html.erb",
+     "app/views/external/_disqus.html.erb",
      "config/muck_comments_routes.rb",
      "db/migrate/20090613173314_create_comments.rb",
      "db/migrate/20090730154102_allow_null_user.rb",
@@ -118,6 +119,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
@@ -131,6 +133,8 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
      "test/rails_root/db/migrate/20090730074858_add_comment_count_to_users.rb",
      "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
+     "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
+     "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
      "test/rails_root/features/comments.feature",
      "test/rails_root/features/step_definitions/comment_steps.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
@@ -144,8 +148,10 @@ Gem::Specification.new do |s|
      "test/rails_root/public/500.html",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/public/favicon.ico",
+     "test/rails_root/public/images/arrow_down.gif",
      "test/rails_root/public/images/arrow_left.gif",
      "test/rails_root/public/images/arrow_right.gif",
+     "test/rails_root/public/images/arrow_up.gif",
      "test/rails_root/public/images/fancybox/fancy_closebox.png",
      "test/rails_root/public/images/fancybox/fancy_left.png",
      "test/rails_root/public/images/fancybox/fancy_progress.png",
@@ -163,7 +169,23 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/fancybox/fancy_title_right.png",
      "test/rails_root/public/images/icons/accept.png",
      "test/rails_root/public/images/icons/add.png",
+     "test/rails_root/public/images/icons/blue_guy.png",
+     "test/rails_root/public/images/icons/button_background.png",
+     "test/rails_root/public/images/icons/cancel.png",
+     "test/rails_root/public/images/icons/close.png",
+     "test/rails_root/public/images/icons/comment.png",
      "test/rails_root/public/images/icons/delete.png",
+     "test/rails_root/public/images/icons/exclaim.png",
+     "test/rails_root/public/images/icons/grey_guy.png",
+     "test/rails_root/public/images/icons/hide.png",
+     "test/rails_root/public/images/icons/information.png",
+     "test/rails_root/public/images/icons/minus.png",
+     "test/rails_root/public/images/icons/question.png",
+     "test/rails_root/public/images/icons/search_box.png",
+     "test/rails_root/public/images/icons/star.png",
+     "test/rails_root/public/images/icons/stop.png",
+     "test/rails_root/public/images/icons/thumb_down.png",
+     "test/rails_root/public/images/icons/thumb_up.png",
      "test/rails_root/public/images/icons/vote.png",
      "test/rails_root/public/images/loading.gif",
      "test/rails_root/public/images/nothing.png",
@@ -186,6 +208,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/jquery/jquery.tips.js",
      "test/rails_root/public/javascripts/muck.js",
      "test/rails_root/public/javascripts/muck_activities.js",
+     "test/rails_root/public/javascripts/muck_time/en.js",
      "test/rails_root/public/javascripts/prototype.js",
      "test/rails_root/public/javascripts/scriptaculous.js",
      "test/rails_root/public/javascripts/slider.js",
@@ -364,6 +387,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
@@ -377,6 +401,8 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
      "test/rails_root/db/migrate/20090730074858_add_comment_count_to_users.rb",
      "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
+     "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
+     "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
      "test/rails_root/features/step_definitions/comment_steps.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",

data/test/rails_root/Rakefile

@@ -12,4 +12,12 @@ require 'tasks/rails'
 require 'muck_comments/tasks'
 require 'muck_engine/tasks'
 require 'muck_users/tasks'
-require 'muck_activities/tasks'
+require 'muck_activities/tasks'
+
+namespace :muck do
+  
+  def muck_gems
+    ['../../muck-engine', '../../muck-users', '../../muck-activities', '../../muck-comments']
+  end
+  
+end

data/test/rails_root/db/migrate/20090327231918_create_users.rb

@@ -0,0 +1,40 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users, :force => true do |t|
+      t.string   :login
+      t.string   :email
+      t.string   :first_name
+      t.string   :last_name
+      t.string   :crypted_password
+      t.string   :password_salt
+      t.string   :persistence_token,   :null => false
+      t.string   :single_access_token, :null => false
+      t.string   :perishable_token,    :null => false
+      t.integer  :login_count,         :null => false, :default => 0
+      t.integer  :failed_login_count,  :null => false, :default => 0
+      t.datetime :last_request_at                                   
+      t.datetime :current_login_at                                  
+      t.datetime :last_login_at                                     
+      t.string   :current_login_ip                                  
+      t.string   :last_login_ip
+      t.boolean  :terms_of_service,          :default => false, :null => false
+      t.string   :time_zone,                 :default => "UTC"
+      t.datetime :disabled_at
+      t.datetime :created_at
+      t.datetime :activated_at
+      t.datetime :updated_at
+      t.string   :identity_url
+      t.string   :url_key
+    end
+
+    add_index :users, :login
+    add_index :users, :email
+    add_index :users, :persistence_token
+    add_index :users, :last_request_at
+
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb

@@ -0,0 +1,9 @@
+class AddActivityIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :activities, ["source_id", "source_type"]
+  end
+
+  def self.down
+    remove_index :activities, ["source_id", "source_type"]
+  end
+end

data/test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb

@@ -0,0 +1,13 @@
+class AddAttachableToActivities < ActiveRecord::Migration
+  def self.up
+    add_column :activities, :attachable_id, :integer
+    add_column :activities, :attachable_type, :string
+    add_index :activities, ["attachable_id", "attachable_type"]
+  end
+
+  def self.down
+    remove_column :activities, :attachable_id
+    remove_column :activities, :attachable_type
+    remove_index :activities, ["attachable_id", "attachable_type"]
+  end
+end

data/test/rails_root/public/javascripts/muck.js

@@ -69,12 +69,13 @@ jQuery(document).ready(function() {
 	jQuery("#global-login").focus(function() {
 		jQuery("#global-login").val("");
 	});
-	
+
 	jQuery("#global-password").focus(function() {
 		jQuery("#global-password").val("");
 	});
-	
+
 	jQuery("#quick-login-submit").click(function() {
 		jQuery("#quick-login").submit();
-	});	
+	});
+	
 });

data/test/rails_root/public/javascripts/muck_activities.js

@@ -1,14 +1,13 @@
 jQuery(document).ready(function() {
-	apply_comment_methods();
+	apply_activity_ajax_methods();
 });
 
-function apply_comment_methods(){
+function apply_activity_ajax_methods(){
 	setup_comment_submit();
 	hide_comment_boxes();
 	apply_comment_hover();
 	apply_activity_hover();
-	jQuery('.activity-no-comments').hide();
-	
+	jQuery('.activity-no-comments').hide();	
 	jQuery('.activity-has-comments').find('textarea').click(function(){
 		show_comment_box(this);
 	});
@@ -57,7 +56,7 @@ function setup_comment_submit(){
 					comment_box.removeClass('activity-no-comments');
 					comment_box.addClass('activity-has-comments');
 					comment_box.find('textarea').show();
-					apply_comment_methods();
+					apply_activity_ajax_methods();
 				}
       });
     return false;

data/test/rails_root/public/javascripts/muck_time/en.js

@@ -0,0 +1,53 @@
+// from http://blog.peelmeagrape.net/2008/7/26/time-ago-in-words-javascript-part-1
+function distanceOfTimeInWords(fromTime, toTime, includeSeconds) {
+  var fromSeconds = fromTime.getTime();
+  var toSeconds = toTime.getTime();
+  var distanceInSeconds = Math.round(Math.abs(fromSeconds - toSeconds) / 1000)
+  var distanceInMinutes = Math.round(distanceInSeconds / 60)
+  if (distanceInMinutes <= 1) {
+    if (!includeSeconds)
+      return (distanceInMinutes == 0) ? 'less than a minute' : '1 minute'
+    if (distanceInSeconds < 5)
+      return 'less than 5 seconds'
+    if (distanceInSeconds < 10)
+      return 'less than 10 seconds'
+    if (distanceInSeconds < 20)
+      return 'less than 20 seconds'
+    if (distanceInSeconds < 40)
+      return 'half a minute'
+    if (distanceInSeconds < 60)
+      return 'less than a minute'
+    return '1 minute'
+  }
+  if (distanceInMinutes < 45)
+    return distanceInMinutes + ' minutes'
+  if (distanceInMinutes < 90)
+    return "about 1 hour" 
+  if (distanceInMinutes < 1440)
+    return "about " + (Math.round(distanceInMinutes / 60)) + ' hours'
+  if (distanceInMinutes < 2880)
+    return "1 day" 
+  if (distanceInMinutes < 43200)
+    return (Math.round(distanceInMinutes / 1440)) + ' days'
+  if (distanceInMinutes < 86400)
+    return "about 1 month" 
+  if (distanceInMinutes < 525600)
+    return (Math.round(distanceInMinutes / 43200)) + ' months'
+  if (distanceInMinutes < 1051200)
+    return "about 1 year" 
+  return "over " + (Math.round(distanceInMinutes / 525600)) + ' years'
+}
+
+if ( typeof jQuery != "undefined" )
+	jQuery.fn.readableDate = function(){
+		return this.each(function(){
+			var span = jQuery(this);
+			var date = distanceOfTimeInWords(new Date(span.text()), new Date(), true);
+			if (date)
+				jQuery(this).text(date + ' ago');
+		});
+	};
+
+jQuery(document).ready(function() {
+	jQuery(".readable-time").readableDate();
+});

data/test/rails_root/public/stylesheets/styles.css

@@ -1,6 +1,7 @@
 /* general */
 .center{text-align:center;}
 #popup_wrapper{width:auto;}
+.waiting{margin:3px 0;padding-left:20px;background:transparent url('/images/spinner.gif') no-repeat scroll left bottom;}
 
 /* forms */
 input{margin:0 10px 5px 0;padding:4px;font-size:1.3em;}
@@ -23,6 +24,7 @@ form fieldset input[type="text"],form fieldset input[type="password"]{width:500p
 .button-link {background-color:transparent;border-top-width: 0px;border-left-width: 0px;border-right-width: 0px;border-bottom-width: 0px;}
 
 /*images*/
+.tiny{width:24px;height:24px;}
 .icon{width:50px;height:50px;}
 .thumb{width:100px;height:100px;}
 .medium{width:300px;height:300px;}
@@ -82,8 +84,3 @@ div.jGrowl div.jGrowl-notification h2{text-align:left;font-weight:bold;padding:5
 #errorExplanation h2{text-align:left;font-weight:bold;padding:5px 5px 5px 15px;font-size:16px;background-color:#B61E12;color:#fff;}
 #errorExplanation p{color:#333;margin-bottom:0;padding:5px;}
 #errorExplanation ul li{list-style:square;}
-
-/* iFrame */
-.inner_shadow {-moz-background-clip:border;-moz-background-inline-policy:continuous;-moz-background-origin:padding;background:transparent url(/images/nothing.png) repeat-x scroll left bottom;height:3px;width:100%;}
-.framed_content{height:100%;margin-bottom:-1px;width:100%;}
-#content_iframe{border-top:1px solid #BCC5D3;border-width:1px 0 0;display:block;display:block;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-comments
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -06:00
+date: 2009-10-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ files:
 - app/views/comments/_form.html.erb
 - app/views/comments/index.html.erb
 - app/views/comments/new.html.erb
+- app/views/external/_disqus.html.erb
 - config/muck_comments_routes.rb
 - db/migrate/20090613173314_create_comments.rb
 - db/migrate/20090730154102_allow_null_user.rb
@@ -143,6 +144,7 @@ files:
 - test/rails_root/config/routes.rb
 - test/rails_root/db/.keep
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090327231918_create_users.rb
 - test/rails_root/db/migrate/20090402033319_add_muck_activities.rb
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
 - test/rails_root/db/migrate/20090426041056_create_countries.rb
@@ -156,6 +158,8 @@ files:
 - test/rails_root/db/migrate/20090730044139_add_comment_cache.rb
 - test/rails_root/db/migrate/20090730074858_add_comment_count_to_users.rb
 - test/rails_root/db/migrate/20090730154102_allow_null_user.rb
+- test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb
+- test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb
 - test/rails_root/features/comments.feature
 - test/rails_root/features/step_definitions/comment_steps.rb
 - test/rails_root/features/step_definitions/common_steps.rb
@@ -169,8 +173,10 @@ files:
 - test/rails_root/public/500.html
 - test/rails_root/public/dispatch.rb
 - test/rails_root/public/favicon.ico
+- test/rails_root/public/images/arrow_down.gif
 - test/rails_root/public/images/arrow_left.gif
 - test/rails_root/public/images/arrow_right.gif
+- test/rails_root/public/images/arrow_up.gif
 - test/rails_root/public/images/fancybox/fancy_closebox.png
 - test/rails_root/public/images/fancybox/fancy_left.png
 - test/rails_root/public/images/fancybox/fancy_progress.png
@@ -188,7 +194,23 @@ files:
 - test/rails_root/public/images/fancybox/fancy_title_right.png
 - test/rails_root/public/images/icons/accept.png
 - test/rails_root/public/images/icons/add.png
+- test/rails_root/public/images/icons/blue_guy.png
+- test/rails_root/public/images/icons/button_background.png
+- test/rails_root/public/images/icons/cancel.png
+- test/rails_root/public/images/icons/close.png
+- test/rails_root/public/images/icons/comment.png
 - test/rails_root/public/images/icons/delete.png
+- test/rails_root/public/images/icons/exclaim.png
+- test/rails_root/public/images/icons/grey_guy.png
+- test/rails_root/public/images/icons/hide.png
+- test/rails_root/public/images/icons/information.png
+- test/rails_root/public/images/icons/minus.png
+- test/rails_root/public/images/icons/question.png
+- test/rails_root/public/images/icons/search_box.png
+- test/rails_root/public/images/icons/star.png
+- test/rails_root/public/images/icons/stop.png
+- test/rails_root/public/images/icons/thumb_down.png
+- test/rails_root/public/images/icons/thumb_up.png
 - test/rails_root/public/images/icons/vote.png
 - test/rails_root/public/images/loading.gif
 - test/rails_root/public/images/nothing.png
@@ -211,6 +233,7 @@ files:
 - test/rails_root/public/javascripts/jquery/jquery.tips.js
 - test/rails_root/public/javascripts/muck.js
 - test/rails_root/public/javascripts/muck_activities.js
+- test/rails_root/public/javascripts/muck_time/en.js
 - test/rails_root/public/javascripts/prototype.js
 - test/rails_root/public/javascripts/scriptaculous.js
 - test/rails_root/public/javascripts/slider.js
@@ -410,6 +433,7 @@ test_files:
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090327231918_create_users.rb
 - test/rails_root/db/migrate/20090402033319_add_muck_activities.rb
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
 - test/rails_root/db/migrate/20090426041056_create_countries.rb
@@ -423,6 +447,8 @@ test_files:
 - test/rails_root/db/migrate/20090730044139_add_comment_cache.rb
 - test/rails_root/db/migrate/20090730074858_add_comment_count_to_users.rb
 - test/rails_root/db/migrate/20090730154102_allow_null_user.rb
+- test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb
+- test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb
 - test/rails_root/features/step_definitions/comment_steps.rb
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb