muck-activities 0.1.11 → 0.1.12

data/README.rdoc

@@ -30,6 +30,12 @@ Adding an item to the activity feed requires 'acts_as_activity_source' which the
   Example:
     add_activity(user.feed_to, user, comment, 'comment')
 
+Create an activity model that 'acts_as_muck_activity':
+
+  class Activity < ActiveRecord::Base
+    acts_as_muck_activity
+  end
+
 === Authorization
 By default 'has_activities' will add a simple 'can_view?' method:
 

data/VERSION

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

data/app/controllers/muck/activities_controller.rb

@@ -24,7 +24,6 @@ class Muck::ActivitiesController < ApplicationController
     @activity.source = @parent
     @activity.content.gsub!(@parent.display_name, '')
     @parent.save!
-
     @activity_html = get_activity_html(@activity)
     if @activity.template == 'status_update'
       @status_html = get_status_html(@parent)
@@ -77,6 +76,11 @@ class Muck::ActivitiesController < ApplicationController
           page_alert(page, message)
         end
       end
+      format.json do
+        render :json => { :success => false,
+                          :exception => ex,
+                          :message => t("muck.activities.create_error", :error => errors) }
+      end
     end
 
   end
@@ -96,10 +100,14 @@ class Muck::ActivitiesController < ApplicationController
             page << "jQuery('##{@activity.dom_id}').fadeOut();"
             page.replace_html 'current-status', @new_status if @new_status
           end
+        else
+          render(:update) do |page|
+            page << "jQuery('##{@activity.dom_id}').fadeOut();"
+          end
         end
       end
       format.json do
-        @new_status = get_status_html(@activities_object)
+        @new_status = get_status_html(@activities_object) if @activity.is_status_update
         render :json => { :success => true,
                           :is_status_update => @activity.is_status_update,
                           :html => @new_status,
@@ -123,14 +131,25 @@ class Muck::ActivitiesController < ApplicationController
   protected
   
   def get_status_html(activity)
-    @template.template_format = :html
-    render_to_string(:partial => 'activities/current_status', :locals => {:activities_object => activity})
+    render_as_html do
+      render_to_string(:partial => 'activities/current_status', :locals => {:activities_object => activity})
+    end
   end
   
   def get_activity_html(activity)
-    render_to_string(:partial => "activity_templates/#{activity.template}", :locals => { :activity => activity })
+    render_as_html do
+      render_to_string(:partial => "activity_templates/#{activity.template}", :locals => { :activity => activity })
+    end
   end
 
+  def render_as_html
+    last_template_format = @template.template_format
+    @template.template_format = :html
+    result = yield
+    @template.template_format = last_template_format
+    result
+  end
+  
   def find_parent
     @klass = params[:parent_type].to_s.capitalize.constantize
     @parent = @klass.find(params[:parent_id])

data/app/helpers/muck_activity_helper.rb

@@ -18,19 +18,29 @@ module MuckActivityHelper
     end
   end
   
+  # Renders an activity with only activities created by activities_object
+  def limited_activity_feed_for(activities_object)
+    activities = activities_object.activities.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
+  end
+  
+  # Renders a full activity feed for activities_object
   def activity_feed_for(activities_object)
     activities = get_activities(activities_object)
     render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
   end
 
+  # Renders a status update form for activities_object
   def status_update(activities_object)
     render :partial => 'activities/status_update', :locals => { :activities_object => activities_object }
   end
 
+  # Renders the last status update made by activities_object
   def current_status(activities_object)
     render :partial => 'activities/current_status_wrapper', :locals => { :activities_object => activities_object }
   end
   
+  # Renders a delete button for an activity
   def delete_activity(activity, button_type = :button, button_text = t("muck.activities.clear"))
     render :partial => 'activities/delete', :locals => { :delete_object => activity, 
                                                          :button_type => button_type,
@@ -39,6 +49,7 @@ module MuckActivityHelper
                                                          :delete_path => activity_path(activity, :format => 'js') }
   end
 
+  # Renders a delete button for a comment inside an activity feed
   def delete_comment(comment, button_type = :button, button_text = t("muck.activities.delete"))
     render :partial => 'activities/delete', :locals => { :delete_object => comment, 
                                                          :button_type => button_type,
@@ -47,6 +58,7 @@ module MuckActivityHelper
                                                          :delete_path => comment_path(comment, :format => 'js') }
   end
   
+  # Renders an activity feed filter.  Filter items come from the name of the templates used to render the activities.
   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 }

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

@@ -0,0 +1,12 @@
+<div class="activity <%= activity_css_class %> 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>
+    <%= delete_activity(activity, :image) %>
+    <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="make_comment_<%=activity.dom_id%>" class="make-comment" href="#"><%=t('muck.activities.make_comment')%></a></span>
+    <% end -%>
+  </div>
+  <%= activity_comments(activity) %>
+</div>

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

@@ -1,12 +1 @@
-<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>
-    <%= delete_activity(activity, :image) %>
-    <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="make_comment_<%=activity.dom_id%>" class="make-comment" href="#"><%=t('muck.activities.make_comment')%></a></span>
-    <% end -%>
-  </div>
-  <%= activity_comments(activity) %>
-</div>
+<%= render :partial => 'activity_templates/generic', :locals => { :activity => activity, :activity_css_class => 'activity-status-update' } %>

data/lib/active_record/acts/muck_activity.rb

@@ -0,0 +1,76 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckActivity #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+
+        def acts_as_muck_activity(options = {})
+
+          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] } }
+          named_scope :before, lambda {|time| {:conditions => ["activities.created_at < ?", time] } }
+          named_scope :newest, :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] } unless template.blank? }
+          named_scope :created_by, lambda {|activity_object| {:conditions => ["activities.source_id = ? AND activities.source_type = ?", activity_object.id, activity_object.class.to_s] } }
+          named_scope :status_updates, :conditions => ["activities.is_status_update = ?", true]
+          class_eval <<-EOV
+            attr_protected :created_at, :updated_at
+          EOV
+
+          include ActiveRecord::Acts::MuckActivity::InstanceMethods
+          extend ActiveRecord::Acts::MuckActivity::SingletonMethods
+
+        end
+      end
+
+      # class methods
+      module SingletonMethods
+  
+      end
+
+      # All the methods available to a record that has had <tt>acts_as_muck_activity</tt> specified.
+      module InstanceMethods
+
+        def validate
+          errors.add_to_base(I18n.t('muck.activities.template_or_item_required')) if template.blank? && item.blank?
+        end
+
+        # Provides a template that can be used to render a view of this activity.
+        # If 'template' is not specified when the object created then the item class
+        # name will be used to generated a template
+        def partial
+          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)
+          if check_object.is_a?(User)
+            return true if check(check_object, :source_id)
+          else
+            source == check_object
+          end
+          false
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/muck_activities.rb

@@ -1,9 +1,10 @@
 require 'cgi'
 require 'muck_activities/initialize_routes'
-require 'muck_activities/muck_activity'
+require 'muck_activities/muck_activity_sources'
 
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckActivity }
 ActionController::Base.send :helper, MuckActivityHelper
-ActiveRecord::Base.send(:include, MuckActivity)
-ActionController::Base.send(:include, MuckActivity)
+ActiveRecord::Base.send(:include, MuckActivitySources)
+ActionController::Base.send(:include, MuckActivitySources)
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]

data/lib/muck_activities/{active_record/acts/muck_activity.rb → muck_activity_sources.rb}

@@ -1,4 +1,4 @@
-module MuckActivity # :nodoc:
+module MuckActivitySources # :nodoc:
 
   def self.included(base) # :nodoc:
     base.extend ActMethods
@@ -19,6 +19,7 @@ module MuckActivity # :nodoc:
     
     # +acts_as_activity_source+ gives the class it is called on a method called
     # +add_activity+ that can add activities into a feed.
+    # This can be applied to models or controllers
     def acts_as_activity_source
       unless included_modules.include? InstanceMethods
         include InstanceMethods
@@ -43,7 +44,11 @@ module MuckActivity # :nodoc:
     #   to false the activity won't be added to the object's activity feed.  An example usage would be
     #   letting users configure which items they want to have in their activity feed.
     def add_activity(feed_to, source, item, template, title = '', content = '', check_method = nil)
-      feed_to = [feed_to] unless feed_to.is_a?(Array)
+      if feed_to.is_a?(Array)
+        feed_to = feed_to & feed_to # eliminate duplicates from feed_to array
+      else
+        feed_to = [feed_to]
+      end
       activity = Activity.create(:item => item, :source => source, :template => template, :title => title, :content => content)
       feed_to.each do |ft|
         if check_method
@@ -52,12 +57,13 @@ module MuckActivity # :nodoc:
           ft.activities << activity
         end
       end
+      activity
     end
     
     # +status+ returns the first activity item from the user's activity feed that is a status update.
     # Used for displaying the last status update the user made
     def status
-      self.activities.find(:first, :conditions => ['is_status_update = true'], :order => 'created_at DESC')
+      self.activities.status_updates.newest.first
     end
     
     def can_view?(check_object)

data/locales/en.yml

@@ -1,12 +1,13 @@
 en:
   muck:
     activities:
-      item_removed: 'Item successfully removed from the recent activities list.'
-      item_could_not_be_removed: 'Item could not be removed from the recent activities list.'
-      item_created: 'Added activity'
+      item_removed: "Item successfully removed from the recent activities list."
+      item_could_not_be_removed: "Item could not be removed from the recent activities list."
+      item_created: "Added activity"
+      create_error: "There was a problem adding the requested activity: {{error}}"
       permission_denied: "Sorry, you can't do that."
       status_update_prompt: "What are you doing right now?"
-      activity_feed_title: 'Recent Activity'
+      activity_feed_title: "Recent Activity"
       updating_status_message: "Updating your status.  Please wait."
       status_indicator: is
       invite_friends: Invite Friends
@@ -19,8 +20,8 @@ en:
       update_status_message: "update your status!"
       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_newer: "« Newer"
+      paging_older: "Older »"
       all_activities: All Activities
       make_comment: Comment
       write_prompt: "Write a comment..."

data/muck-activities.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activities}
-  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-06-19}
+  s.date = %q{2009-06-24}
   s.description = %q{Activity engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
      "app/controllers/muck/activities_controller.rb",
      "app/helpers/muck_activity_helper.rb",
      "app/helpers/muck_activity_helper.rb",
-     "app/models/activity.rb",
-     "app/models/activity.rb",
      "app/models/activity_feed.rb",
      "app/models/activity_feed.rb",
      "app/views/activities/_activity_feed.html.erb",
@@ -43,6 +41,8 @@ Gem::Specification.new do |s|
      "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/_generic.html.erb",
+     "app/views/activity_templates/_generic.html.erb",
      "app/views/activity_templates/_status_update.html.erb",
      "app/views/activity_templates/_status_update.html.erb",
      "config/muck_activities_routes.rb",
@@ -50,14 +50,14 @@ Gem::Specification.new do |s|
      "db/migrate/20090402033319_add_muck_activities.rb",
      "db/migrate/20090402033319_add_muck_activities.rb",
      "install.rb",
+     "lib/active_record/acts/muck_activity.rb",
+     "lib/active_record/acts/muck_activity.rb",
      "lib/muck_activities.rb",
      "lib/muck_activities.rb",
-     "lib/muck_activities/active_record/acts/muck_activity.rb",
-     "lib/muck_activities/active_record/acts/muck_activity.rb",
      "lib/muck_activities/initialize_routes.rb",
      "lib/muck_activities/initialize_routes.rb",
-     "lib/muck_activities/muck_activity.rb",
-     "lib/muck_activities/muck_activity.rb",
+     "lib/muck_activities/muck_activity_sources.rb",
+     "lib/muck_activities/muck_activity_sources.rb",
      "lib/muck_activities/tasks.rb",
      "lib/muck_activities/tasks.rb",
      "locales/ar.yml",
@@ -126,6 +126,7 @@ Gem::Specification.new do |s|
      "locales/zh.yml",
      "muck-activities.gemspec",
      "pkg/muck-activities-0.1.10.gem",
+     "pkg/muck-activities-0.1.11.gem",
      "public/images/loading.gif",
      "public/images/loading.gif",
      "public/javascripts/muck_activities.js",
@@ -161,7 +162,9 @@ Gem::Specification.new do |s|
      "test/rails_root/app/controllers/default_controller.rb",
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/.keep",
+     "test/rails_root/app/models/activity.rb",
      "test/rails_root/app/models/comment.rb",
+     "test/rails_root/app/models/profile.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/app/views/default/index.html.erb",
@@ -185,6 +188,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
+     "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
      "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -356,6 +360,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/activity_feed_test.rb",
      "test/rails_root/test/unit/activity_test.rb",
+     "test/rails_root/test/unit/user_test.rb",
      "uninstall.rb"
   ]
   s.has_rdoc = true
@@ -369,7 +374,9 @@ Gem::Specification.new do |s|
     "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
      "test/rails_root/app/helpers/application_helper.rb",
+     "test/rails_root/app/models/activity.rb",
      "test/rails_root/app/models/comment.rb",
+     "test/rails_root/app/models/profile.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/config/boot.rb",
@@ -387,6 +394,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090402234137_create_languages.rb",
      "test/rails_root/db/migrate/20090426041056_create_countries.rb",
      "test/rails_root/db/migrate/20090426041103_create_states.rb",
+     "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
      "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/schema.rb",
@@ -400,7 +408,8 @@ Gem::Specification.new do |s|
      "test/rails_root/test/shoulda_macros/controller.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/activity_feed_test.rb",
-     "test/rails_root/test/unit/activity_test.rb"
+     "test/rails_root/test/unit/activity_test.rb",
+     "test/rails_root/test/unit/user_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/rdoc/created.rid

@@ -1 +1 @@
-Thu, 18 Jun 2009 11:30:28 -0600
+Fri, 19 Jun 2009 02:12:00 -0600

data/test/rails_root/Rakefile

@@ -13,3 +13,4 @@ require 'muck_engine/tasks'
 require 'muck_users/tasks'
 require 'muck_comments/tasks'
 require 'muck_activities/tasks'
+require 'muck_profiles/tasks'

data/test/rails_root/app/models/activity.rb

@@ -0,0 +1,3 @@
+class Activity < ActiveRecord::Base
+  acts_as_muck_activity
+end

data/test/rails_root/app/models/profile.rb

@@ -0,0 +1,3 @@
+class Profile < ActiveRecord::Base
+  acts_as_muck_profile
+end

data/test/rails_root/app/models/user.rb

@@ -2,9 +2,14 @@ class User < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
-  
+  acts_as_muck_user
+  has_muck_profile
   has_activities
   
+  def feed_to
+    [self]
+  end
+  
   def admin?
     false
   end

data/test/rails_root/app/views/default/index.html.erb

@@ -4,3 +4,4 @@
 <%= current_status(@user) %>
 <%= status_update(@user) %>
 <%= activity_feed_for(@user) %>
+<%= limited_activity_feed_for(@user) %>

data/test/rails_root/config/environment.rb

@@ -17,10 +17,13 @@ Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
   config.gem 'mislav-will_paginate', :lib => 'will_paginate', :source => 'http://gems.github.com'
   config.gem "authlogic"
+  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com', :version => '~> 2.0.0'
   config.gem "bcrypt-ruby", :lib => "bcrypt"
   config.gem "collectiveidea-awesome_nested_set", :lib => 'awesome_nested_set', :source => "http://gems.github.com"
+  config.gem 'thoughtbot-paperclip', :lib => 'paperclip', :source => "http://gems.github.com"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-comments', :lib => 'muck_comments'
+  config.gem 'muck-profiles', :lib => 'muck_profiles'
   config.plugin_locators << TestGemLocator
 end

data/test/rails_root/db/migrate/20090512013727_create_profiles.rb

@@ -0,0 +1,21 @@
+class CreateProfiles < ActiveRecord::Migration
+  
+  def self.up
+  
+    create_table :profiles, :force => true do |t|
+      t.integer  :user_id
+      t.string :photo_file_name
+      t.string :photo_content_type
+      t.integer :photo_file_size
+      t.timestamps
+    end
+
+    add_index :profiles, ['user_id']
+
+  end
+
+  def self.down
+    drop_table :profiles
+  end
+  
+end

data/test/rails_root/db/migrate/20090613173314_create_comments.rb

@@ -3,7 +3,7 @@ class CreateComments < ActiveRecord::Migration
     create_table :comments, :force => true do |t|
       t.integer   :commentable_id, :default => 0
       t.string    :commentable_type, :limit => 15, :default => ""
-      t.text      :body, :default => ""
+      t.text      :body
       t.integer   :user_id, :default => 0, :null => false
       t.integer   :parent_id
       t.integer   :lft

data/test/rails_root/test/functional/activities_controller_test.rb

@@ -11,30 +11,56 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
       login_as @user
     end
 
-    context 'on GET to index (js)' do
+    context "on GET to index" do
       setup do
-        @activity = Factory(:activity)
-        get :index, :parent_type => @user.type, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
+        @activity = Factory(:activity, :template => 'status_update')
+        @user.activities << @activity
+      end
+    
+      context 'on GET to index (js)' do
+        setup do
+          get :index, :parent_type => @user.type, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
+        end
+        should_respond_with :success
+      end
+
+      context 'on GET to index (js) no latest activity id' do
+        setup do
+          get :index, :parent_type => @user.type, :parent_id => @user, :format => 'js', :latest_activity_id => nil
+        end
+        should_respond_with :success
       end
-      should_respond_with :success
     end
 
-    context 'on GET to index (js) no latest activity id' do
+    context 'fail on POST to create (json)' do
       setup do
-        get :index, :parent_type => @user.type, :parent_id => @user, :format => 'js', :latest_activity_id => nil
-      end
+        post :create, :activity => { :content => 'test activity' }, :parent_type => @user.type, :parent_id => @user, :format => 'json'
+      end      
       should_respond_with :success
+      should_not_set_the_flash
+      should "return create json errors" do
+        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
+        assert !json[:success]
+        assert_equal json[:message], I18n.t("muck.activities.create_error", :error => assigns(:activity).errors.full_messages.to_sentence)
+      end
     end
-    
-    context 'on GET to comment (json)' do
+        
+    context 'on POST to create (json)' do
       setup do
-        @activity = Factory(:activity, :source => @user)
-        @comment = Factory(:comment, :user => @user)
-        get :comment, :id => @activity.id, :comment_id => @comment.id, :format => 'json'
-      end
+        @activity_content = 'test content for my new activity'
+        post :create, :activity => { :content => @activity_content, :template => 'status_update' }, :parent_type => @user.type, :parent_id => @user, :format => 'json'
+      end      
       should_respond_with :success
+      should_not_set_the_flash
+      should "return valid create json" do
+        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
+        assert json[:success]
+        assert !json[:is_status_update]
+        assert json[:html].include?(@activity_content)
+        assert_equal json[:message], I18n.t("muck.activities.created")
+      end
     end
-    
+       
     context 'on POST to create (js)' do
       setup do
         post :create, :activity => { :content => 'test activity' }, :parent_type => @user.type, :parent_id => @user, :format => 'js'
@@ -42,7 +68,7 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
       should_respond_with :success
       should_not_set_the_flash
     end
-        
+     
     context 'on POST to create' do
       setup do
         post :create, :activity => { :content => 'test activity' }, :parent_type => @user.type, :parent_id => @user
@@ -61,13 +87,53 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
   
     context 'on DELETE to destroy (js)' do
       setup do
-        @activity = Factory(:activity, :source => @user)
+        @activity = Factory(:activity, :source => @user, :is_status_update => false)
         delete :destroy, :id => @activity.id, :format => 'js'
       end
       should_respond_with :success
       should_not_set_the_flash
     end
     
+    context 'on DELETE to destroy, status update (js)' do
+      setup do
+        @activity = Factory(:activity, :source => @user, :is_status_update => true)
+        delete :destroy, :id => @activity.id, :format => 'js'
+      end
+      should_respond_with :success
+      should_not_set_the_flash
+    end
+    
+    context 'on DELETE to destroy (json)' do
+      setup do
+        @activity = Factory(:activity, :source => @user, :is_status_update => false)
+        delete :destroy, :id => @activity.id, :format => 'json'
+      end
+      should_respond_with :success
+      should_not_set_the_flash
+      should "return valid delete json" do
+        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
+        assert json[:success]
+        assert !json[:is_status_update]
+        assert json[:html].blank?
+        assert_equal json[:message], I18n.t("muck.activities.item_removed")
+      end
+    end
+    
+    context 'on DELETE to destroy, status update (json)' do
+      setup do
+        @activity = Factory(:activity, :source => @user, :is_status_update => true)
+        delete :destroy, :id => @activity.id, :format => 'json'
+      end
+      should_respond_with :success
+      should_not_set_the_flash
+      should "return valid delete json" do
+        json = ActiveSupport::JSON.decode(@response.body).symbolize_keys!
+        assert json[:success]
+        assert json[:is_status_update]
+        assert json[:html].length > 0
+        assert_equal json[:message], I18n.t("muck.activities.item_removed")
+      end
+    end
   end
   
 end

data/test/rails_root/test/functional/default_controller_test.rb

@@ -15,7 +15,7 @@ class DefaultControllerTest < ActionController::TestCase
       # the default view calls some of the helpers
       # this is a sanity check to make sure they don't blow up
       setup do
-        @user.activities << Factory(:activity)
+        @user.activities << Factory(:activity,  :template => 'status_update')
         get :index
       end
       should_respond_with :success

data/test/rails_root/test/unit/activity_feed_test.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ActivityFeedTest < ActiveSupport::TestCase
-
+  should_belong_to :activity
+  should_belong_to :ownable
 end

data/test/rails_root/test/unit/activity_test.rb

@@ -9,12 +9,15 @@ class ActivityTest < ActiveSupport::TestCase
     should_belong_to :item
     should_belong_to :source
     should_have_many :activity_feeds
+    should_have_many :comments
     
     should_have_named_scope :since
     should_have_named_scope :before
-    should_have_named_scope :recent
+    should_have_named_scope :newest
     should_have_named_scope :only_public
     should_have_named_scope :filter_by_template
+    should_have_named_scope :status_updates
+    
   end
 
   should "require template or item" do
@@ -54,4 +57,18 @@ class ActivityTest < ActiveSupport::TestCase
     assert user.activities.filter_by_template(@template_name).include?(activity)
   end
   
+  should "only find activities created by the source" do
+    user = Factory(:user)
+    activity = Factory(:activity, :source => user, :template => @template_name)
+    user.activities << activity
+    
+    user2 = Factory(:user)
+    activity2 = Factory(:activity, :source => user2, :template => @template_name)
+    user2.activities << activity2
+    
+    assert user.activities.created_by(user).include?(activity)
+    assert !user.activities.created_by(user).include?(activity2)
+    
+  end
+  
 end 

data/test/rails_root/test/unit/user_test.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  context "activities" do
+    setup do
+      @user = Factory(:user)
+    end
+    should_have_many :activity_feeds
+    should_have_many :activities
+    should "create an activity" do
+      assert_difference "Activity.count", 1 do
+        @user.add_activity(@user.feed_to, @user, @user, 'status_update', 'status', 'a status update')
+      end
+    end
+    should "set the user's current status" do
+      activity = @user.add_activity(@user.feed_to, @user, @user, 'status_update', 'status', 'a status update')
+      activity.is_status_update = true
+      activity.save!
+      assert_equal @user.status, activity
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activities
 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-06-19 00:00:00 -06:00
+date: 2009-06-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,6 @@ files:
 - VERSION
 - app/controllers/muck/activities_controller.rb
 - app/helpers/muck_activity_helper.rb
-- app/models/activity.rb
 - app/models/activity_feed.rb
 - app/views/activities/_activity_feed.html.erb
 - app/views/activities/_cached_activities.html.erb
@@ -68,14 +67,15 @@ files:
 - app/views/activities/_delete.html.erb
 - app/views/activities/_status_update.html.erb
 - app/views/activities/_template_filter.html.erb
+- app/views/activity_templates/_generic.html.erb
 - app/views/activity_templates/_status_update.html.erb
 - config/muck_activities_routes.rb
 - db/migrate/20090402033319_add_muck_activities.rb
 - install.rb
+- lib/active_record/acts/muck_activity.rb
 - lib/muck_activities.rb
-- lib/muck_activities/active_record/acts/muck_activity.rb
 - lib/muck_activities/initialize_routes.rb
-- lib/muck_activities/muck_activity.rb
+- lib/muck_activities/muck_activity_sources.rb
 - lib/muck_activities/tasks.rb
 - locales/ar.yml
 - locales/bg.yml
@@ -111,6 +111,7 @@ files:
 - locales/zh.yml
 - muck-activities.gemspec
 - pkg/muck-activities-0.1.10.gem
+- pkg/muck-activities-0.1.11.gem
 - public/images/loading.gif
 - public/javascripts/muck_activities.js
 - rails/init.rb
@@ -142,7 +143,9 @@ files:
 - test/rails_root/app/controllers/default_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/.keep
+- test/rails_root/app/models/activity.rb
 - test/rails_root/app/models/comment.rb
+- test/rails_root/app/models/profile.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/app/views/default/index.html.erb
@@ -166,6 +169,7 @@ files:
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
 - test/rails_root/db/migrate/20090426041056_create_countries.rb
 - test/rails_root/db/migrate/20090426041103_create_states.rb
+- test/rails_root/db/migrate/20090512013727_create_profiles.rb
 - test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/db/migrate/20090613173314_create_comments.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
@@ -337,6 +341,7 @@ files:
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/activity_feed_test.rb
 - test/rails_root/test/unit/activity_test.rb
+- test/rails_root/test/unit/user_test.rb
 - uninstall.rb
 has_rdoc: true
 homepage: http://github.com/jbasdf/muck_activities
@@ -368,7 +373,9 @@ test_files:
 - test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/default_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
+- test/rails_root/app/models/activity.rb
 - test/rails_root/app/models/comment.rb
+- test/rails_root/app/models/profile.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/config/boot.rb
@@ -386,6 +393,7 @@ test_files:
 - test/rails_root/db/migrate/20090402234137_create_languages.rb
 - test/rails_root/db/migrate/20090426041056_create_countries.rb
 - test/rails_root/db/migrate/20090426041103_create_states.rb
+- test/rails_root/db/migrate/20090512013727_create_profiles.rb
 - test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/db/migrate/20090613173314_create_comments.rb
 - test/rails_root/db/schema.rb
@@ -400,3 +408,4 @@ test_files:
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/activity_feed_test.rb
 - test/rails_root/test/unit/activity_test.rb
+- test/rails_root/test/unit/user_test.rb

data/app/models/activity.rb

@@ -1,62 +0,0 @@
-# == Schema Information
-#
-# Table name: activities
-#
-#  id            :integer(4)      not null, primary key
-#  item_id       :integer(4)
-#  item_type     :string(255)
-#  template      :string(255)
-#  source_id     :integer(4)
-#  source_type   :string(255)
-#  content       :text
-#  title         :string(255)
-#  status_update :boolean(1)
-#  created_at    :datetime
-#  updated_at    :datetime
-#
-
-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] } }
-  named_scope :before, lambda {|time| {:conditions => ["activities.created_at < ?", time] } }
-  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] } unless template.blank? }
-  
-  def validate
-    errors.add_to_base(I18n.t('muck.activities.template_or_item_required')) if template.blank? && item.blank?
-  end
-    
-  # Provides a template that can be used to render a view of this activity.
-  # If 'template' is not specified when the object created then the item class
-  # name will be used to generated a template
-  def partial
-    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)
-    if check_object.is_a?(User)
-      return true if check(check_object, :source_id)
-    else
-      source == check_object
-    end
-    false
-  end
-  
-end

data/lib/muck_activities/muck_activity.rb

@@ -1,68 +0,0 @@
-module MuckActivity # :nodoc:
-
-  def self.included(base) # :nodoc:
-    base.extend ActMethods
-  end
-  
-  module ActMethods
-
-    # +has_activities+ gives the class it is called on an activity feed and a method called
-    # +add_activity+ that can add activities into a feed.  Retrieve activity feed items
-    # via object.activities. ie @user.activities.
-    def has_activities
-      unless included_modules.include? InstanceMethods
-        has_many :activity_feeds, :as => :ownable
-        has_many :activities, :through => :activity_feeds, :order => 'created_at desc'
-        include InstanceMethods
-      end
-    end
-    
-    # +acts_as_activity_source+ gives the class it is called on a method called
-    # +add_activity+ that can add activities into a feed.
-    def acts_as_activity_source
-      unless included_modules.include? InstanceMethods
-        include InstanceMethods
-      end
-    end
-
-  end
-
-  module InstanceMethods
-
-    # +add_activity+ adds an activity to all activites feeds that belong to the objects found in feed_to.
-    # * +feed_to+: an array of objects that have +has_activities+ declared on them.  The generated activity
-    #   will be pushed into the feed of each of these objects.
-    # * +source+: the object that peformed the activity ie a user or group
-    # * +item+: an object that will be used to generated the entry in an activity feed
-    # * +template+: name of an partial that will be used to generated the entry in the activity feed.  Place
-    #   templates in /app/views/activity_templates
-    # * +title+: optional title that can be used in the template
-    # * +content+: option content that can be used in the template.  Useful for activities that might not have
-    #    an item but instead might have a message or other text.
-    # * +check_method+: method that will be called on each item in the feed_to array.  If the method evaluates
-    #   to false the activity won't be added to the object's activity feed.  An example usage would be
-    #   letting users configure which items they want to have in their activity feed.
-    def add_activity(feed_to, source, item, template, title = '', content = '', check_method = nil)
-      feed_to = [feed_to] unless feed_to.is_a?(Array)
-      activity = Activity.create(:item => item, :source => source, :template => template, :title => title, :content => content)
-      feed_to.each do |ft|
-        if check_method
-          ft.activities << activity if ft.send(check_method)
-        else
-          ft.activities << activity
-        end
-      end
-    end
-    
-    # +status+ returns the first activity item from the user's activity feed that is a status update.
-    # Used for displaying the last status update the user made
-    def status
-      self.activities.find(:first, :conditions => ['is_status_update = true'], :order => 'created_at DESC')
-    end
-    
-    def can_view?(check_object)
-      self == check_object
-    end
-  end
-
-end