muck-activity 0.1.4 → 0.1.5

data/README.rdoc

@@ -54,7 +54,11 @@ you might add a can_view? method like this:
     self.member?(check_object) || (check_object.is_a?(User) && check_object.admin?)
   end
 
-== Live Updates
+== Configuration
+If you would like to enable comments for your project's activities feeds you can do so by adding an entry to GlobalConfig.yml (configuration file added by muck)
+
+  enable_activity_comments: true
+
 If you would like to add live updates to the user's activity feed you can do so by adding an entry to GlobalConfig.yml (configuration file added by muck)
 
   enable_live_activity_updates: true

data/Rakefile

@@ -34,6 +34,7 @@ begin
     gemspec.rubyforge_project = 'muck-activity'
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"
+    gemspec.add_dependency "muck-comments"
     gemspec.files.include %w( 
                           tasks/*
                           db/migrate/*.rb
@@ -42,7 +43,8 @@ begin
                           locales/*
                           rails/*
                           test/*
-                          lib/**/* )
+                          lib/**/*
+                          public/**/* )
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/muck/activities_controller.rb

@@ -1,19 +1,16 @@
 class Muck::ActivitiesController < ApplicationController
   unloadable
-
+  
   include ApplicationHelper
-
+  include MuckActivityHelper
+  
   before_filter :login_required
   before_filter :find_parent, :only => [:index, :create]
   before_filter :get_activity, :only => [:destroy]
 
   def index
     if @parent.can_view?(current_user)
-      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.filter_by_template(params[:activity_filter]).paginate(:page => @page, :per_page => @per_page)
-      end
+      @activities = get_activities(@parent)
       respond_to do |format|
         format.js do
           render :partial => "activities/cached_activities", :locals => {:activities => @activities}
@@ -61,7 +58,7 @@ class Muck::ActivitiesController < ApplicationController
       end
     end
 
-  rescue => ex
+  rescue ActiveRecord::RecordInvalid => ex
 
     if @activity
       errors = @activity.errors.full_messages.to_sentence
@@ -95,7 +92,7 @@ class Muck::ActivitiesController < ApplicationController
         if @activity.is_status_update
           @new_status = get_status_html(@activities_object)
           render(:update) do |page|
-            page << "jQuery('#activity_#{@activity.id}').fadeOut();"
+            page << "jQuery('##{@activity.dom_id}').fadeOut();"
             page.replace_html 'current-status', @new_status if @new_status
           end
         end
@@ -149,7 +146,6 @@ class Muck::ActivitiesController < ApplicationController
         format.js { render(:update){|page| page_alert(page, t("muck.activities.permission_denied"))}}
       end
     end
-
   end
 
 end

data/app/helpers/muck_activity_helper.rb

@@ -1,7 +1,25 @@
 module MuckActivityHelper
 
+  def activity_comments(activity)
+    render :partial => 'activities/comments', :locals => { :activity => activity }
+  end
+  
+  def activity_comment_link(activity, comment = nil)
+    if GlobalConfig.enable_activity_comments
+      comment_form(activity, comment = nil)
+    end
+  end
+  
+  def has_comments_css(activity)
+    if activity.has_comments?
+      'activity-has-comments'
+    else
+      'activity-no-comments'
+    end
+  end
+  
   def activity_feed_for(activities_object)
-    activities = activities_object.activities.filter_by_template(params[:activity_filter]).paginate(:page => @page, :per_page => @per_page)
+    activities = get_activities(activities_object)
     render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
   end
 
@@ -38,4 +56,12 @@ module MuckActivityHelper
     request.url.gsub(request.query_string, '')
   end
   
+  def get_activities(activities_object)
+    if !params[:latest_activity_id].blank?
+      activities_object.activities.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    else
+      activities_object.activities.filter_by_template(params[:activity_filter]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    end
+  end
+  
 end

data/app/models/activity.rb

@@ -15,12 +15,15 @@
 #  updated_at    :datetime
 #
 
-class Activity < ActiveRecord::Base  
-
+class Activity < ActiveRecord::Base
+  unloadable
+  
   belongs_to :item, :polymorphic => true
   belongs_to :source, :polymorphic => true
   has_many :activity_feeds
   
+  acts_as_commentable
+    
   validates_presence_of :source
       
   named_scope :since, lambda { |time| {:conditions => ["activities.created_at > ?", time] } }
@@ -41,11 +44,19 @@ class Activity < ActiveRecord::Base
     template || item.class.name.underscore
   end
 
+  def has_comments?
+    @has_comments ||= !self.comments.blank?
+  end
+    
   # Checks to see if the specified object can edit this activity.
   # Most likely check_object will be a user
   def can_edit?(check_object)
-    return true if check_object.is_a?(User) && check_object.admin?
-    source == check_object
+    if check_object.is_a?(User)
+      return true if check(check_object, :source_id)
+    else
+      source == check_object
+    end
+    false
   end
   
 end

data/app/models/activity_feed.rb

@@ -9,6 +9,8 @@
 #
 
 class ActivityFeed < ActiveRecord::Base
+  unloadable
+  
   belongs_to :activity
   belongs_to :ownable, :polymorphic => true
 end

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

@@ -4,6 +4,9 @@
   </div>
 </div>
 <%= will_paginate activities, :previous_label => t('muck.activities.paging_newer'), :next_label => t('muck.activities.paging_older') -%>
+<% content_for :head do -%>
+  <%= javascript_tag %[var COMMENT_PROMPT = '#{t('muck.activities.write_prompt')}';] %>
+<% end -%>
 <% content_for :javascript do -%>
   jQuery(document).ready(function(){
     setup_submit_delete();
@@ -11,15 +14,5 @@
     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(){
-    var activities = jQuery('#activity-feed-content').children('.activity-status-update')
-    if(activities.length > 0){
-      return activities[0].id.replace('activity_', '');
-    } else {
-      return '';
-    }
-  }
-  function update_feed(request){
-    jQuery('#activity-feed-content').prepend(request);
-  }
-<% end -%>
+<% end -%>
+<%= javascript_include_tag 'muck_activities' %>

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

@@ -1,7 +1,8 @@
 <% if !activities.blank? -%>
   <% activities.each do |activity| -%>
     <% cache ("activities/#{I18n.locale}/#{activity.id}") do -%>
-      <%= render( :partial => "activity_templates/#{activity.partial}", :locals => {:activity => activity}) rescue '' %>
+      <%= render( :partial => "activity_templates/#{activity.partial}", :locals => {:activity => activity}) %>
+      <hr class="space">
     <% end -%>
   <% end -%>
 <% end -%>

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

@@ -0,0 +1,4 @@
+<div class="actor-icon"><%= icon activity.source %></div>
+<p><span class="actor"><%= link_to activity.source.display_name, activity.source %></span>
+   <span class="activity-time"><%= t("muck.activities.time_ago", :time_in_words => time_ago_in_words(activity.created_at)) %></span></p>
+<p><%= h comment.body %></p>

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

@@ -0,0 +1,9 @@
+<% if activity.has_comments? -%>
+  <div class="activity-comment">
+    <%= render( :partial => "activities/comment", :collection => activity.comments, :locals => { :activity => activity } ) %>
+  </div>
+<% end -%>
+<div id="<%=activity.dom_id%>_comment" class="activity-comment <%= has_comments_css(activity) %>">
+  <div class="actor-icon"><%= icon current_user %></div>
+  <%= activity_comment_link(activity) %>
+</div>

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

@@ -12,7 +12,7 @@
       <%= t("muck.activities.status_update_prompt") %>
       <%= f.text_field :content, :id => 'status_update' %>
       <span id="status-update-button">
-        <%= f.submit t('muck.activities.post'), :id => 'submit_status', :class=>"button" %>
+        <%= f.submit t('muck.activities.post'), :id => 'submit_status', :class => "button" %>
       </span>
     </div>
     <%= f.hidden_field :template, :value => 'status_update' %>

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

@@ -3,6 +3,10 @@
   <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>
+    <% if !activity.has_comments? -%>
+      <span><a id="comment_<%=activity.dom_id%>" class="make-comment" href="#"><%=t('muck.activities.make_comment')%></a></span>
+    <% end -%>
     <%= delete_activity(activity, :image) %>
   </div>
+  <%= activity_comments(activity) %>
 </div>

data/locales/en.yml

@@ -20,4 +20,6 @@ en:
       template_or_item_required: "An activity requires a template or an item to display correctly"
       paging_newer: '« Newer'
       paging_older: 'Older »'
-      all_activities: All Activities
+      all_activities: All Activities
+      make_comment: Comment
+      write_prompt: "Write a comment..."

data/muck-activity.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activity}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-06-12}
+  s.date = %q{2009-06-13}
   s.description = %q{Activity engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,10 @@ Gem::Specification.new do |s|
      "app/views/activities/_activity_feed.html.erb",
      "app/views/activities/_cached_activities.html.erb",
      "app/views/activities/_cached_activities.html.erb",
+     "app/views/activities/_comment.html.erb",
+     "app/views/activities/_comment.html.erb",
+     "app/views/activities/_comments.html.erb",
+     "app/views/activities/_comments.html.erb",
      "app/views/activities/_current_status.html.erb",
      "app/views/activities/_current_status.html.erb",
      "app/views/activities/_current_status_wrapper.html.erb",
@@ -117,8 +121,10 @@ 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",
+     "public/images/loading.gif",
+     "public/javascripts/muck_activities.js",
+     "public/javascripts/muck_activities.js",
      "rails/init.rb",
      "rails/init.rb",
      "rdoc/classes/ActionController.html",
@@ -175,12 +181,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
       s.add_runtime_dependency(%q<muck-users>, [">= 0"])
+      s.add_runtime_dependency(%q<muck-comments>, [">= 0"])
     else
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<muck-users>, [">= 0"])
+      s.add_dependency(%q<muck-comments>, [">= 0"])
     end
   else
     s.add_dependency(%q<muck-engine>, [">= 0"])
     s.add_dependency(%q<muck-users>, [">= 0"])
+    s.add_dependency(%q<muck-comments>, [">= 0"])
   end
 end

data/public/javascripts/muck_activities.js

@@ -0,0 +1,44 @@
+jQuery(document).ready(function() {
+	jQuery('.activity-no-comments').hide();
+	hide_comment_boxes();
+	jQuery('.activity-has-comments').find('textarea').click(function(){
+		show_comment_box(this);
+	});
+	jQuery('.activity-has-comments').find('textarea').blur(function(){
+		textarea = jQuery(this);
+		if (textarea.val() == ''){
+			hide_comment_boxes();
+		}
+	});
+});
+
+function hide_comment_boxes(){
+	jQuery('.activity-has-comments').children('.actor-icon').hide();
+	jQuery('.activity-has-comments').find('.button').hide();
+	jQuery('.activity-has-comments').find('textarea').val(COMMENT_PROMPT);
+	jQuery('.activity-has-comments').find('textarea').addClass('min');
+}
+
+function show_comment_box(obj){
+	textarea = jQuery(obj);
+	textarea.addClass('max');
+	textarea.removeClass('min');
+	textarea.siblings('.actor-icon').show();
+	textarea.siblings('.button').show();
+	if (textarea.val() == COMMENT_PROMPT) {
+		textarea.val('');
+	}
+}
+
+function get_latest_activity_id(){
+  var activities = jQuery('#activity-feed-content').children('.activity-status-update');
+  if(activities.length > 0){
+    return activities[0].id.replace('activity_', '');
+  } else {
+    return '';
+  }
+}
+
+function update_feed(request){
+  jQuery('#activity-feed-content').prepend(request);
+}

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require 'ruby-debug'
 require 'mocha'
 require 'authlogic'
 require 'authlogic/test_case'
+require 'active_record'
 require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')
 require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activity
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -06:00
+date: 2009-06-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: muck-comments
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Activity engine for the muck system.
 email: justinball@gmail.com
 executables: []
@@ -51,6 +61,8 @@ files:
 - app/models/activity_feed.rb
 - app/views/activities/_activity_feed.html.erb
 - app/views/activities/_cached_activities.html.erb
+- app/views/activities/_comment.html.erb
+- app/views/activities/_comments.html.erb
 - app/views/activities/_current_status.html.erb
 - app/views/activities/_current_status_wrapper.html.erb
 - app/views/activities/_delete.html.erb
@@ -96,8 +108,8 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-activity.gemspec
-- pkg/muck-activity-0.1.3.gem
 - public/images/loading.gif
+- public/javascripts/muck_activities.js
 - rails/init.rb
 - rdoc/classes/ActionController.html
 - rdoc/classes/ActionController/Routing.html