muck-activity 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/helpers/muck_activity_helper.rb

@@ -1,16 +1,25 @@
 module MuckActivityHelper
 
   def activity_feed_for(activities_object)
-    activities = activities_object.activities.paginate(:page => @page, :per_page => @per_page)
+    activities = activities_object.activities.filter_by_template(params[:template_filter]).paginate(:page => @page, :per_page => @per_page)
     render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
   end
-  
+
   def status_update(activities_object)
     render :partial => 'activities/status_update', :locals => { :activities_object => activities_object }
   end
+
+  def current_status(activities_object)
+    render :partial => 'activities/current_status_wrapper', :locals => { :activities_object => activities_object }
+  end
   
   def delete_activity(activity, button_type = :button, button_text = t("muck.activities.clear"))
     render :partial => 'activities/delete', :locals => { :activity => activity, :button_type => button_type, :button_text => button_text }
   end
 
+  def activity_filter(activities_object)
+    activity_types = activities_object.activities.all(:select => "DISTINCT activities.template")
+    render :partial => 'activities/template_filter', :locals => { :activity_types => activity_types }
+  end
+
 end

data/app/models/activity.rb

@@ -28,7 +28,8 @@ 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 || '%'] } }
+  
   def validate
     errors.add_to_base(I18n.t('muck.activities.template_or_item_required')) if template.blank? && item.blank?
   end

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

@@ -1,5 +1,4 @@
 <div id="activity-feed">
-  <h2><%= t('muck.activities.activity_feed_title') %></h2>
   <div id="activity-feed-content">
     <%= render( :partial => "activities/cached_activities", :locals => {:activities => activities}) %>
   </div>

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

@@ -5,8 +5,7 @@ else
   status = t('muck.activities.update_status_message')
   time = false
 end -%>
-<span id="current-status-name"><%= activities_object.display_name %></span>
-<span id="current-status-text"><%= status %></span>
+<p id="current-status-text"><span id="current-status-name"><%= activities_object.display_name %></span> <%= status %></p>
 <span id="status-time" class="status-time"><%= t('muck.activities.time_ago', :time_in_words => time_ago_in_words(time)) if time %></span>
 <span id="status-clear">
   <% if activities_object.status -%>

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

@@ -0,0 +1,4 @@
+<div id="current-status-wrapper">
+  <div id="activity-icon"><%= icon activities_object %></div>
+  <div id="current-status"><%= render :partial => 'activities/current_status', :locals => {:activities_object => activities_object} %></div>
+</div>

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

@@ -1,11 +1,8 @@
 <div id="status-update">
   <%= output_errors(t('muck.users.problem_with_status'), {:class => 'help-box'}, @activity) %>
-  
-  <div id="activity-icon"><%= icon activities_object %></div>
-  <div id="current-status"><%= render :partial => 'activities/current_status', :locals => {:activities_object => activities_object} %></div>
   <% remote_form_for(:activity, 
                      :url => activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :format => 'js'), 
-                     :html => { :id => 'status_update_form', 
+                     :html => { :id => 'status_update_form', :class => 'clear',
                                 :action => activities_path(:parent_id => activities_object, :parent_type => activities_object.type) } ) do |f| -%>
     <div id="progress-bar" style="display:none;">
       <h3><%= t('muck.activities.updating_status_message') %></h3>

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

@@ -0,0 +1,5 @@
+<ul id="activity-filter">
+  <% activity_types.each do |type| -%>
+    <li class="<%= type.template%>"><a href="?template_filter=<%= type.template%>"><%= type.template.titleize.pluralize %></a></li>
+  <% end -%>
+</ul>

data/app/views/activity_templates/_status_update.html.erb

@@ -1,6 +1,8 @@
-<div class="activity-status-update delete-container" id="<%= activity.dom_id %>">
-  <%= icon activity.source %> <%= link_to activity.source.display_name, activity.source %>  <%= activity.content %>
-  <span class="activity-time"><%= t("muck.activities.time_ago", :time_in_words => time_ago_in_words(activity.created_at)) %></span>
-  <%= delete_activity(activity, :image) %>
-  <div class="clear"></div>
+<div class="activity activity-status-update delete-container" id="<%= activity.dom_id %>">
+  <div class="actor-icon"><%= icon activity.source %></div>
+  <div class="activity-content">
+    <p><span class="actor"><%= link_to activity.source.display_name, activity.source %></span> <%= activity.content %></p>
+    <span class="activity-time"><%= t("muck.activities.time_ago", :time_in_words => time_ago_in_words(activity.created_at)) %></span>
+    <%= delete_activity(activity, :image) %>
+  </div>
 </div>

data/muck-activity.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activity}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
@@ -31,10 +31,12 @@ Gem::Specification.new do |s|
      "app/views/activities/_cached_activities.html.erb",
      "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/_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/activity_templates/_status_update.html.erb",
      "app/views/activity_templates/_status_update.html.erb",
      "config/muck_activity_routes.rb",
@@ -113,7 +115,6 @@ Gem::Specification.new do |s|
      "locales/zh.yml",
      "locales/zh.yml",
      "muck-activity.gemspec",
-     "pkg/muck-activity-0.1.2.gem",
      "public/images/loading.gif",
      "rails/init.rb",
      "rails/init.rb",

data/rdoc/created.rid

@@ -1 +1 @@
-Thu, 11 Jun 2009 23:59:14 -0600
+Fri, 12 Jun 2009 00:15:11 -0600

data/test/unit/activity_test.rb

@@ -14,7 +14,7 @@ class ActivityTest < ActiveSupport::TestCase
     should_have_named_scope :before
     should_have_named_scope :recent
     should_have_named_scope :only_public
-
+    should_have_named_scope :filter_by_template
   end
 
   should "require template or item" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activity
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Justin Ball
@@ -52,8 +52,10 @@ files:
 - app/views/activities/_activity_feed.html.erb
 - app/views/activities/_cached_activities.html.erb
 - app/views/activities/_current_status.html.erb
+- app/views/activities/_current_status_wrapper.html.erb
 - app/views/activities/_delete.html.erb
 - app/views/activities/_status_update.html.erb
+- app/views/activities/_template_filter.html.erb
 - app/views/activity_templates/_status_update.html.erb
 - config/muck_activity_routes.rb
 - db/migrate/20090402033319_add_muck_activities.rb
@@ -94,7 +96,6 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-activity.gemspec
-- pkg/muck-activity-0.1.2.gem
 - public/images/loading.gif
 - rails/init.rb
 - rdoc/classes/ActionController.html