muck-activity 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/muck/activities_controller.rb

@@ -9,10 +9,10 @@ class Muck::ActivitiesController < ApplicationController
 
   def index
     if @parent.can_view?(current_user)
-      if params[:latest_activity_id]
-        @activities = @parent.activities.after(params[:latest_activity_id]).paginate(:page => @page, :per_page => @per_page)
+      if !params[:latest_activity_id].blank?
+        @activities = @parent.activities.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).paginate(:page => @page, :per_page => @per_page)
       else
-        @activities = @parent.activities.paginate(:page => @page, :per_page => @per_page)
+        @activities = @parent.activities.filter_by_template(params[:activity_filter]).paginate(:page => @page, :per_page => @per_page)
       end
       respond_to do |format|
         format.js do

data/app/helpers/muck_activity_helper.rb

@@ -1,7 +1,7 @@
 module MuckActivityHelper
 
   def activity_feed_for(activities_object)
-    activities = activities_object.activities.filter_by_template(params[:template_filter]).paginate(:page => @page, :per_page => @per_page)
+    activities = activities_object.activities.filter_by_template(params[:activity_filter]).paginate(:page => @page, :per_page => @per_page)
     render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
   end
 
@@ -22,4 +22,20 @@ module MuckActivityHelper
     render :partial => 'activities/template_filter', :locals => { :activity_types => activity_types }
   end
 
+  def is_current_filter?(template)
+    if params[:activity_filter] == template
+      'current'
+    end
+  end
+  
+  def no_filter?
+    if params[:activity_filter].blank?
+      'current'
+    end
+  end
+  
+  def all_activities_url
+    request.url.gsub(request.query_string, '')
+  end
+  
 end

data/app/models/activity.rb

@@ -28,7 +28,7 @@ class Activity < ActiveRecord::Base
   named_scope :recent, :order => "activities.created_at DESC"
   named_scope :after, lambda {|id| {:conditions => ["activities.id > ?", id] } }
   named_scope :only_public, :conditions => ["activities.is_public = true"]
-  named_scope :filter_by_template, lambda { |template| {:conditions => ["activities.template = ?", template || '%'] } }
+  named_scope :filter_by_template, lambda { |template| { :conditions => ["activities.template = ?", template] } unless template.blank? }
   
   def validate
     errors.add_to_base(I18n.t('muck.activities.template_or_item_required')) if template.blank? && item.blank?

data/app/views/activities/_activity_feed.html.erb

@@ -8,7 +8,7 @@
   jQuery(document).ready(function(){
     setup_submit_delete();
     <% if GlobalConfig.enable_live_activity_updates -%>
-    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);},url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
+    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);},url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
     <% end -%>
   });
   function get_latest_activity_id(){

data/app/views/activities/_template_filter.html.erb

@@ -1,5 +1,6 @@
 <ul id="activity-filter">
+  <li class="all-activities <%=no_filter?%>"><a href="<%=all_activities_url%>"><%=t('muck.activities.all_activities')%></a></li>
   <% activity_types.each do |type| -%>
-    <li class="<%= type.template%>"><a href="?template_filter=<%= type.template%>"><%= type.template.titleize.pluralize %></a></li>
+    <li class="<%= type.template%> <%=is_current_filter?(type.template)%>"><a href="?activity_filter=<%= type.template%>"><%= type.template.titleize.pluralize %></a></li>
   <% end -%>
 </ul>

data/locales/ar.yml

@@ -3,6 +3,7 @@ ar:
   muck: 
     activities: 
       activity_feed_title: "النشاط الأخير"
+      all_activities: "جميع الأنشطة"
       clear: واضح
       invite_friends: "دعوة الأصدقاء"
       item_could_not_be_removed: "البند لا يمكن شطبها من قائمة الأنشطة الأخيرة."

data/locales/bg.yml

@@ -3,6 +3,7 @@ bg:
   muck: 
     activities: 
       activity_feed_title: "Скорошна активност"
+      all_activities: "Всички дейности"
       clear: Ясен
       invite_friends: "Поканете приятели"
       item_could_not_be_removed: "Точка не могат да бъдат отстранени от последните дейности списък."

data/locales/ca.yml

@@ -3,6 +3,7 @@ ca:
   muck: 
     activities: 
       activity_feed_title: "Activitat recent"
+      all_activities: "Totes les activitats"
       clear: Clar
       invite_friends: "Convidar amics"
       item_could_not_be_removed: "Tema no pot ser eliminat de la llista d'activitats recents."

data/locales/cs.yml

@@ -3,6 +3,7 @@ cs:
   muck: 
     activities: 
       activity_feed_title: "Poslední aktivita"
+      all_activities: "Všechny aktivity"
       clear: Jasný
       invite_friends: "Pozvat přátele"
       item_could_not_be_removed: "Bod nemohl být odstraněn z posledních aktivit seznamu."

data/locales/da.yml

@@ -3,6 +3,7 @@ da:
   muck: 
     activities: 
       activity_feed_title: "Seneste aktivitet"
+      all_activities: "Alle aktiviteter"
       clear: Klar
       invite_friends: "Inviter venner"
       item_could_not_be_removed: "Konto ikke kunne fjernes fra de seneste aktiviteter listen."

data/locales/de.yml

@@ -3,6 +3,7 @@ de:
   muck: 
     activities: 
       activity_feed_title: "Letzte Aktivitäten"
+      all_activities: "Alle Aktivitäten"
       clear: Klar
       invite_friends: "Freunde einladen"
       item_could_not_be_removed: "Punkt konnte nicht entfernt werden aus den jüngsten Aktivitäten Liste."

data/locales/el.yml

@@ -3,6 +3,7 @@ el:
   muck: 
     activities: 
       activity_feed_title: "Πρόσφατη δραστηριότητα"
+      all_activities: "Όλες οι δραστηριότητες"
       clear: Καθαρός
       invite_friends: "Πρόσκληση φίλων"
       item_could_not_be_removed: "Το σημείο δεν μπορούσε να αφαιρεθεί από τον κατάλογο πρόσφατες δραστηριότητες."

data/locales/en.yml

@@ -19,4 +19,5 @@ en:
       time_ago: "{{time_in_words}} ago"
       template_or_item_required: "An activity requires a template or an item to display correctly"
       paging_newer: '« Newer'
-      paging_older: 'Older »'
+      paging_older: 'Older »'
+      all_activities: All Activities

data/locales/es.yml

@@ -3,6 +3,7 @@ es:
   muck: 
     activities: 
       activity_feed_title: "Actividad reciente"
+      all_activities: "Todas las actividades"
       clear: Claro
       invite_friends: "Invitar a amigos"
       item_could_not_be_removed: "Tema no puede ser removido de la lista de actividades recientes."

data/locales/fr.yml

@@ -3,6 +3,7 @@ fr:
   muck: 
     activities: 
       activity_feed_title: "Activité récente"
+      all_activities: "Toutes les activités"
       clear: Clair
       invite_friends: "Inviter des amis"
       item_could_not_be_removed: "Point ne peut pas être retiré de la liste des activités récentes."

data/locales/it.yml

@@ -3,6 +3,7 @@ it:
   muck: 
     activities: 
       activity_feed_title: "Attività recenti"
+      all_activities: "Tutte le attività"
       clear: Chiaro
       invite_friends: "Invita Amici"
       item_could_not_be_removed: "Voce non può essere rimosso dalla lista delle attività recenti."

data/locales/iw.yml

@@ -3,6 +3,7 @@ iw:
   muck: 
     activities: 
       activity_feed_title: "פעילות אחרונה"
+      all_activities: "כל הפעילויות"
       clear: ברור
       invite_friends: "הזמן חברים"
       item_could_not_be_removed: "פריט שלא ניתן היה להסיר את רשימת הפעילויות האחרונות."

data/locales/ja.yml

@@ -3,6 +3,7 @@ ja:
   muck: 
     activities: 
       activity_feed_title: 最近のアクティビティ
+      all_activities: すべてのアクティビティ
       clear: 片付ける
       invite_friends: 友だちを招待
       item_could_not_be_removed: アイテムは、最近の活動をリストから削除されませんでした。

data/locales/ko.yml

@@ -3,6 +3,7 @@ ko:
   muck: 
     activities: 
       activity_feed_title: "최근 활동"
+      all_activities: "모든 활동"
       clear: 맑은
       invite_friends: "친구 초대"
       item_could_not_be_removed: "상품은 최근 활동을 목록에서 제거되지 않을 수있습니다."

data/locales/lt.yml

@@ -3,6 +3,7 @@ lt:
   muck: 
     activities: 
       activity_feed_title: "Recent Activity"
+      all_activities: "Visi Veikla"
       clear: Aiškus
       invite_friends: "Pakviesti draugų"
       item_could_not_be_removed: "Punktas negali būti pašalinta iš paskutinių veiklos sąrašas."

data/locales/lv.yml

@@ -3,6 +3,7 @@ lv:
   muck: 
     activities: 
       activity_feed_title: "Jaunākās darbības"
+      all_activities: "Visas darbības"
       clear: Skaidrs
       invite_friends: "Uzaicināt draugu"
       item_could_not_be_removed: "Postenis nevarēja izņemt no neseno darbību sarakstu."

data/locales/nl.yml

@@ -3,6 +3,7 @@ nl:
   muck: 
     activities: 
       activity_feed_title: "Recente activiteit"
+      all_activities: "Alle activiteiten"
       clear: Helder
       invite_friends: "Vrienden uitnodigen"
       item_could_not_be_removed: "Post kan niet worden verwijderd uit de recente activiteiten lijst."

data/locales/no.yml

@@ -4,6 +4,7 @@
   muck: 
     activities: 
       activity_feed_title: "Nylig aktivitet"
+      all_activities: "Alle Aktiviteter"
       clear: Klar
       invite_friends: "Inviter venner"
       item_could_not_be_removed: "Elementet kan ikke bli fjernet fra det siste aktiviteter listen."

data/locales/pl.yml

@@ -3,6 +3,7 @@ pl:
   muck: 
     activities: 
       activity_feed_title: "Recent Activity"
+      all_activities: "Wszystkie działania"
       clear: Jasny
       invite_friends: "Zaproś przyjaciół"
       item_could_not_be_removed: "Pozycja nie może być usunięty z listy ostatnich działań."

data/locales/pt.yml

@@ -3,6 +3,7 @@ pt:
   muck: 
     activities: 
       activity_feed_title: "Atividade recente"
+      all_activities: "Todas as actividades"
       clear: Apagar
       invite_friends: "Convidar amigos"
       item_could_not_be_removed: "O ponto não pode ser removido da lista recentes actividades."

data/locales/ro.yml

@@ -3,6 +3,7 @@ ro:
   muck: 
     activities: 
       activity_feed_title: "Activitate recentă"
+      all_activities: "Toate activităţile"
       clear: Limpede
       invite_friends: "Invitaţi prieteni"
       item_could_not_be_removed: "Postul nu a putut fi eliminate de pe lista de activităţi recente."

data/locales/ru.yml

@@ -3,6 +3,7 @@ ru:
   muck: 
     activities: 
       activity_feed_title: "Последние действия"
+      all_activities: "Все мероприятия"
       clear: Ясный
       invite_friends: "Пригласить друзей"
       item_could_not_be_removed: "Пункт не может быть исключена из списка последних мероприятий."

data/locales/sk.yml

@@ -3,6 +3,7 @@ sk:
   muck: 
     activities: 
       activity_feed_title: "Posledná aktivita"
+      all_activities: "Všetky aktivity"
       clear: Jasný
       invite_friends: "Pozvať priateľov"
       item_could_not_be_removed: "Bod nemohol byť odstránený z posledných aktivít zoznamu."

data/locales/sl.yml

@@ -3,6 +3,7 @@ sl:
   muck: 
     activities: 
       activity_feed_title: "Zadnja aktivnost"
+      all_activities: "Vse aktivnosti"
       clear: Jasen
       invite_friends: "Povabi prijatelje"
       item_could_not_be_removed: "Postavka ni mogoče odstraniti s seznama nedavnih dejavnosti."

data/locales/sr.yml

@@ -3,6 +3,7 @@ sr:
   muck: 
     activities: 
       activity_feed_title: "Рецент Ацтивиты"
+      all_activities: "Све активности"
       clear: Јасно
       invite_friends: "Позови пријатеље"
       item_could_not_be_removed: "Предмет није могао бити скинут са списка недавних активности."

data/locales/sv.yml

@@ -3,6 +3,7 @@ sv:
   muck: 
     activities: 
       activity_feed_title: "Senaste aktiviteter"
+      all_activities: "Alla aktiviteter"
       clear: Klar
       invite_friends: "Bjud in vänner"
       item_could_not_be_removed: "Punkt kunde inte flyttas från den senaste listan över verksamhetsområden."

data/locales/tl.yml

@@ -3,6 +3,7 @@ tl:
   muck: 
     activities: 
       activity_feed_title: "Kamakailan-lamang na Aktibidad"
+      all_activities: "Ang lahat ng gawain"
       clear: Malinaw
       invite_friends: "Imbitahan ang mga Kaibigan"
       item_could_not_be_removed: "Item ay hindi maaaring tanggalin mula sa listahan ng mga kamakailan-lamang na mga gawain."

data/locales/uk.yml

@@ -3,6 +3,7 @@ uk:
   muck: 
     activities: 
       activity_feed_title: "Останні дії"
+      all_activities: "Усі заходи"
       clear: Ясний
       invite_friends: "Запросити друзів"
       item_could_not_be_removed: "Пункт не може бути виключена зі списку останніх заходів."

data/locales/vi.yml

@@ -3,6 +3,7 @@ vi:
   muck: 
     activities: 
       activity_feed_title: "Hoạt động gần đây"
+      all_activities: "Tất cả các hoạt động"
       clear: "Rõ ràng"
       invite_friends: "Mời bạn bè"
       item_could_not_be_removed: "Khoản có thể không được gỡ bỏ khỏi danh sách các hoạt động gần đây."

data/locales/zh-CN.yml

@@ -3,6 +3,7 @@ zh-CN:
   muck: 
     activities: 
       activity_feed_title: 近期活动
+      all_activities: 所有活动
       clear: 清楚的
       invite_friends: 邀请朋友
       item_could_not_be_removed: 项目不能从最近的活动清单。

data/locales/zh-TW.yml

@@ -3,6 +3,7 @@ zh-TW:
   muck: 
     activities: 
       activity_feed_title: 近期活動
+      all_activities: 所有活動
       clear: 清楚的
       invite_friends: 邀請朋友
       item_could_not_be_removed: 項目不能從最近的活動清單。

data/locales/zh.yml

@@ -3,6 +3,7 @@ zh:
   muck: 
     activities: 
       activity_feed_title: 近期活动
+      all_activities: 所有活动
       clear: 清楚的
       invite_friends: 邀请朋友
       item_could_not_be_removed: 项目不能从最近的活动清单。

data/muck-activity.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activity}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
@@ -32,11 +32,13 @@ Gem::Specification.new do |s|
      "app/views/activities/_current_status.html.erb",
      "app/views/activities/_current_status.html.erb",
      "app/views/activities/_current_status_wrapper.html.erb",
+     "app/views/activities/_current_status_wrapper.html.erb",
      "app/views/activities/_delete.html.erb",
      "app/views/activities/_delete.html.erb",
      "app/views/activities/_status_update.html.erb",
      "app/views/activities/_status_update.html.erb",
      "app/views/activities/_template_filter.html.erb",
+     "app/views/activities/_template_filter.html.erb",
      "app/views/activity_templates/_status_update.html.erb",
      "app/views/activity_templates/_status_update.html.erb",
      "config/muck_activity_routes.rb",
@@ -115,6 +117,7 @@ Gem::Specification.new do |s|
      "locales/zh.yml",
      "locales/zh.yml",
      "muck-activity.gemspec",
+     "pkg/muck-activity-0.1.3.gem",
      "public/images/loading.gif",
      "rails/init.rb",
      "rails/init.rb",

data/test/test_helper.rb

@@ -1,9 +1,11 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 #require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+require 'rubygems'
 require 'factory_girl'
 require 'ruby-debug'
 require 'mocha'
+require 'authlogic'
 require 'authlogic/test_case'
 require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')

data/test/unit/activity_test.rb

@@ -46,4 +46,12 @@ class ActivityTest < ActiveSupport::TestCase
     assert !activity.can_edit?(user)
   end
   
-end
+  should "filter the activities by template" do
+    @template_name = 'test_template'
+    user = Factory(:user)
+    activity = Factory(:activity, :source => user, :template => @template_name)
+    user.activities << activity
+    assert user.activities.filter_by_template(@template_name).include?(activity)
+  end
+  
+end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activity
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -96,6 +96,7 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-activity.gemspec
+- pkg/muck-activity-0.1.3.gem
 - public/images/loading.gif
 - rails/init.rb
 - rdoc/classes/ActionController.html