muck-activities 0.1.16 → 0.1.17

data/.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 coverage
 rdoc
-pkg
+pkg
+log/*

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/app/controllers/muck/activities_controller.rb

@@ -4,18 +4,18 @@ class Muck::ActivitiesController < ApplicationController
   include ApplicationHelper
   include MuckActivityHelper
   
-  before_filter :login_required
+  before_filter :login_required, :except => :index
   before_filter :find_parent, :only => [:index, :create]
   before_filter :get_activity, :only => [:destroy, :comment_html]
 
   def index
     if @parent.can_view?(current_user)
       @activities = get_activities(@parent)
-      respond_to do |format|
-        format.js do
-          render :partial => "activities/cached_activities", :locals => {:activities => @activities}
-        end
-      end
+    else
+      @activities = get_profile_activities(@parent) # only items for the profile
+    end
+    respond_to do |format|
+      format.js { render :text => get_activities_html(@activities) }
     end
   end
   
@@ -128,6 +128,12 @@ class Muck::ActivitiesController < ApplicationController
 
   protected
   
+  def get_activities_html(activities)
+    render_as_html do
+      render_to_string(:partial => "activities/cached_activities", :locals => {:activities => @activities})
+    end
+  end
+  
   def get_status_html(activity)
     render_as_html do
       render_to_string(:partial => 'activities/current_status', :locals => {:activities_object => activity})

data/app/helpers/muck_activity_helper.rb

@@ -6,7 +6,7 @@ module MuckActivityHelper
   
   def activity_comment_link(activity, comment = nil)
     if GlobalConfig.enable_activity_comments
-      comment_form(activity, comment = nil)
+      comment_form(activity, comment)
     end
   end
   
@@ -20,7 +20,7 @@ module MuckActivityHelper
   
   # 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)
+    activities = activities_object.activities.created_by(activities_object).only_public.find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
   end
   
@@ -42,7 +42,7 @@ module MuckActivityHelper
   
   # 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, 
+    render :partial => 'shared/delete', :locals => { :delete_object => activity, 
                                                          :button_type => button_type,
                                                          :button_text => button_text,
                                                          :form_class => 'activity-delete',
@@ -50,8 +50,8 @@ module MuckActivityHelper
   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, 
+  def delete_activity_comment(comment, button_type = :button, button_text = t("muck.activities.delete"))
+    render :partial => 'shared/delete', :locals => { :delete_object => comment, 
                                                          :button_type => button_type,
                                                          :button_text => button_text, 
                                                          :form_class => 'comment-delete',
@@ -83,6 +83,14 @@ module MuckActivityHelper
     request.url.gsub(request.query_string, '')
   end
   
+  def get_profile_activities(activities_object)
+    if !params[:latest_activity_id].blank?
+      activities_object.activities.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    else
+      activities_object.activities.filter_by_template(params[:activity_filter]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    end
+  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)
@@ -90,5 +98,12 @@ module MuckActivityHelper
       activities_object.activities.filter_by_template(params[:activity_filter]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     end
   end
-  
+
+  # Render an activity using a block and the given activity.
+  # options:
+  # activity_css_class - css class to attach to the given activity
+  def activity_for(activity, options = {}, &block)
+    block_to_partial('activity_templates/generic', options.merge(:activity => activity), &block)
+  end
+    
 end

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

@@ -1,7 +1,7 @@
 <div id="<%= comment.dom_id %>" class="activity-comment delete-container">
-  <div class="actor-icon"><%= icon comment_owner.source %></div>
-  <%= delete_comment(comment, :image) if comment.can_edit?(current_user) %>
-  <p><span class="actor"><%= link_to comment_owner.source.display_name, comment_owner.source %></span>
-     <span class="activity-time"><%= t("muck.activities.time_ago", :time_in_words => time_ago_in_words(comment_owner.created_at)) %></span></p>
+  <div class="actor-icon"><%= icon(comment.user) %></div>
+  <%= delete_activity_comment(comment, :image) if comment.can_edit?(current_user) %>
+  <p><span class="actor"><%= link_to comment.user.display_name, comment.user %></span>
+     <span class="activity-time"><%= t("muck.general.time_ago", :time_in_words => time_ago_in_words(comment_owner.created_at)) %></span></p>
   <p><%= h comment.body %></p>
 </div>

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

@@ -6,7 +6,7 @@ else
   time = false
 end -%>
 <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-time" class="status-time"><%= t('muck.general.time_ago', :time_in_words => time_ago_in_words(time)) if time %></span>
 <span id="status-clear">
   <% if activities_object.status -%>
     - <%= delete_activity(activities_object.status, :text,  t("muck.activities.clear")) %>

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

@@ -1,9 +1,11 @@
 <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>
+    <p><span class="actor"><%= link_to activity.source.display_name, activity.source %></span>
+      <%= body %>
+    </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>
+    <span class="activity-time"><%= t("muck.general.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 -%>

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

@@ -1 +1,3 @@
-<%= render :partial => 'activity_templates/generic', :locals => { :activity => activity, :activity_css_class => 'activity-status-update' } %>
+<% activity_for(activity, :activity_css_class => 'activity-status-update') do %>
+  <%= activity.content %>
+<% end -%>

data/db/migrate/20090730044139_add_comment_cache.rb

@@ -0,0 +1,9 @@
+class AddCommentCache < ActiveRecord::Migration
+  def self.up
+    add_column :activities, :comment_count, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :activities, :comment_count
+  end
+end

data/lib/active_record/acts/muck_activity.rb

@@ -11,7 +11,7 @@ module ActiveRecord
 
           belongs_to :item, :polymorphic => true
           belongs_to :source, :polymorphic => true
-          has_many :activity_feeds
+          has_many :activity_feeds, :dependent => :destroy
           
           acts_as_commentable
 
@@ -21,7 +21,7 @@ module ActiveRecord
           named_scope :before, lambda { |time| {:conditions => ["activities.created_at < ?", time || DateTime.now] } }
           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 :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]

data/lib/muck_activities/muck_activity_sources.rb

@@ -26,6 +26,21 @@ module MuckActivitySources # :nodoc:
       end
     end
 
+    # +acts_as_activity_item+ gives the class it is called on a method called
+    # +add_activity+ that can add activities into a feed.
+    # It also setups up the object to be an 'item' in the activity feed.
+    # For example if you have a model called 'friend' which serves as an object
+    # that will be used as an 'item' in an activity feed, calling acts_as_activity_item
+    # will add 'activities' to the friend object so that you can call @friend.activities to
+    # retrieve all the activities for which the @friend object is an item.  Deleting the @friend
+    # object will destroy all related activites.
+    def acts_as_activity_item
+      has_many :activities, :as => :item, :dependent => :destroy
+      unless included_modules.include? InstanceMethods
+        include InstanceMethods
+      end
+    end
+    
   end
 
   module InstanceMethods

data/locales/en.yml

@@ -18,7 +18,6 @@ en:
       problem_with_status: "There was a problem changing your status"
       update_error: "Oops... There was a problem.  {{errors}}"
       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 »"

data/muck-activities.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activities}
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-07-24}
+  s.date = %q{2009-08-08}
   s.description = %q{Activity engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -27,13 +27,13 @@ Gem::Specification.new do |s|
      "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",
      "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",
+     "db/migrate/20090730044139_add_comment_cache.rb",
      "install.rb",
      "lib/active_record/acts/muck_activity.rb",
      "lib/muck_activities.rb",
@@ -101,6 +101,7 @@ Gem::Specification.new do |s|
      "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/share.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",
@@ -109,6 +110,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/boot.rb",
      "test/rails_root/config/database.yml",
      "test/rails_root/config/environment.rb",
+     "test/rails_root/config/environments/cucumber.rb",
      "test/rails_root/config/environments/development.rb",
      "test/rails_root/config/environments/production.rb",
      "test/rails_root/config/environments/test.rb",
@@ -127,8 +129,12 @@ Gem::Specification.new do |s|
      "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/migrate/20090730044139_add_comment_cache.rb",
+     "test/rails_root/db/migrate/20090803185323_create_shares.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
+     "test/rails_root/features/support/paths.rb",
+     "test/rails_root/lib/tasks/cucumber.rake",
      "test/rails_root/public/.htaccess",
      "test/rails_root/public/404.html",
      "test/rails_root/public/422.html",
@@ -296,6 +302,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/share_test.rb",
      "test/rails_root/test/unit/user_test.rb",
      "uninstall.rb"
   ]
@@ -313,10 +320,12 @@ Gem::Specification.new do |s|
      "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/share.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/config/boot.rb",
      "test/rails_root/config/environment.rb",
+     "test/rails_root/config/environments/cucumber.rb",
      "test/rails_root/config/environments/development.rb",
      "test/rails_root/config/environments/production.rb",
      "test/rails_root/config/environments/test.rb",
@@ -333,9 +342,12 @@ Gem::Specification.new do |s|
      "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/migrate/20090730044139_add_comment_cache.rb",
+     "test/rails_root/db/migrate/20090803185323_create_shares.rb",
      "test/rails_root/db/schema.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
+     "test/rails_root/features/support/paths.rb",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/script/create_project.rb",
      "test/rails_root/test/factories.rb",
@@ -345,6 +357,7 @@ Gem::Specification.new do |s|
      "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/share_test.rb",
      "test/rails_root/test/unit/user_test.rb"
   ]
 

data/test/rails_root/Rakefile

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

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

@@ -0,0 +1,3 @@
+class Share < ActiveRecord::Base
+  acts_as_muck_share
+end

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

@@ -5,6 +5,7 @@ class User < ActiveRecord::Base
   acts_as_muck_user
   has_muck_profile
   has_activities
+  acts_as_muck_sharer
   
   def feed_to
     [self]

data/test/rails_root/config/database.yml

@@ -3,7 +3,7 @@ development:
   database: db/development.sqlite3
   timeout: 5000
 
-test:
+test: &TEST
   adapter: sqlite3
   database: db/test.sqlite3
   timeout: 5000
@@ -12,3 +12,6 @@ production:
   adapter: sqlite3
   database: db/production.sqlite3
   timeout: 5000
+
+cucumber:
+  <<: *TEST

data/test/rails_root/config/environment.rb

@@ -25,5 +25,6 @@ Rails::Initializer.run do |config|
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-comments', :lib => 'muck_comments'
   config.gem 'muck-profiles', :lib => 'muck_profiles'
+  config.gem 'muck-shares', :lib => 'muck_shares'
   config.plugin_locators << TestGemLocator
 end

data/test/rails_root/config/environments/cucumber.rb

@@ -0,0 +1,21 @@
+config.cache_classes = true # This must be true for Cucumber to operate correctly!
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+config.gem "cucumber",    :lib => false,        :version => ">=0.3.92" unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
+config.gem "webrat",      :lib => false,        :version => ">=0.4.4" unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem "rspec",       :lib => false,        :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))

data/test/rails_root/db/migrate/20090730044139_add_comment_cache.rb

@@ -0,0 +1,9 @@
+class AddCommentCache < ActiveRecord::Migration
+  def self.up
+    add_column :activities, :comment_count, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :activities, :comment_count
+  end
+end

data/test/rails_root/db/migrate/20090803185323_create_shares.rb

@@ -0,0 +1,16 @@
+class CreateShares < ActiveRecord::Migration
+  def self.up
+    create_table :shares, :force => true do |t|
+      t.string  :uri,               :limit => 2083, :default => "", :null => false
+      t.string  :title
+      t.text    :message
+      t.integer :shared_by_id,                                      :null => false
+      t.timestamps
+    end
+    add_index :shares, :shared_by_id
+  end
+
+  def self.down
+    drop_table :shares
+  end
+end

data/test/rails_root/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090613173314) do
+ActiveRecord::Schema.define(:version => 20090803185323) do
 
   create_table "activities", :force => true do |t|
     t.integer  "item_id"
@@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20090613173314) do
     t.boolean  "is_public",        :default => true
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "comment_count",    :default => 0
   end
 
   add_index "activities", ["item_id", "item_type"], :name => "index_activities_on_item_id_and_item_type"
@@ -97,6 +98,17 @@ ActiveRecord::Schema.define(:version => 20090613173314) do
     t.datetime "updated_at"
   end
 
+  create_table "shares", :force => true do |t|
+    t.string   "uri",          :limit => 2083, :default => "", :null => false
+    t.string   "title"
+    t.text     "message"
+    t.integer  "shared_by_id",                                 :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "shares", ["shared_by_id"], :name => "index_shares_on_shared_by_id"
+
   create_table "states", :force => true do |t|
     t.string  "name",         :limit => 128, :default => "", :null => false
     t.string  "abbreviation", :limit => 3,   :default => "", :null => false

data/test/rails_root/features/step_definitions/webrat_steps.rb

@@ -3,29 +3,33 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "pat
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
 
+Given /^I am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
 When /^I go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^I press "(.*)"$/ do |button|
+When /^I press "([^\"]*)"$/ do |button|
   click_button(button)
 end
 
-When /^I follow "(.*)"$/ do |link|
+When /^I follow "([^\"]*)"$/ do |link|
   click_link(link)
 end
 
-When /^I fill in "(.*)" with "(.*)"$/ do |field, value|
+When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
   fill_in(field, :with => value) 
 end
 
-When /^I select "(.*)" from "(.*)"$/ do |value, field|
+When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
   select(value, :from => field) 
 end
 
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time 
-When /^I select "(.*)" as the date and time$/ do |time|
+When /^I select "([^\"]*)" as the date and time$/ do |time|
   select_datetime(time)
 end
 
@@ -36,64 +40,90 @@ end
 #   <%= f.label :alternative %><br />
 #   <%= f.datetime_select :alternative %>
 # The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" data and time
-# And I select "November 25, 2004 10:30" as the "Alternative" data and time
-When /^I select "(.*)" as the "(.*)" date and time$/ do |datetime, datetime_label|
+# When I select "November 23, 2004 11:20" as the "Preferred" date and time
+# And I select "November 25, 2004 10:30" as the "Alternative" date and time
+When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
   select_datetime(datetime, :from => datetime_label)
 end
 
-# Use this step in conjuction with Rail's time_select helper. For example:
+# Use this step in conjunction with Rail's time_select helper. For example:
 # When I select "2:20PM" as the time
 # Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
 # will convert the 2:20PM to 14:20 and then select it. 
-When /^I select "(.*)" as the time$/ do |time|
+When /^I select "([^\"]*)" as the time$/ do |time|
   select_time(time)
 end
 
 # Use this step when using multiple time_select helpers on a page or you want to
 # specify the name of the time on the form.  For example:
 # When I select "7:30AM" as the "Gym" time
-When /^I select "(.*)" as the "(.*)" time$/ do |time, time_label|
+When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
   select_time(time, :from => time_label)
 end
 
-# Use this step in conjuction with Rail's date_select helper.  For example:
+# Use this step in conjunction with Rail's date_select helper.  For example:
 # When I select "February 20, 1981" as the date
-When /^I select "(.*)" as the date$/ do |date|
+When /^I select "([^\"]*)" as the date$/ do |date|
   select_date(date)
 end
 
 # Use this step when using multiple date_select helpers on one page or
 # you want to specify the name of the date on the form. For example:
 # When I select "April 26, 1982" as the "Date of Birth" date
-When /^I select "(.*)" as the "(.*)" date$/ do |date, date_label|
+When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
   select_date(date, :from => date_label)
 end
 
-When /^I check "(.*)"$/ do |field|
+When /^I check "([^\"]*)"$/ do |field|
   check(field) 
 end
 
-When /^I uncheck "(.*)"$/ do |field|
+When /^I uncheck "([^\"]*)"$/ do |field|
   uncheck(field) 
 end
 
-When /^I choose "(.*)"$/ do |field|
+When /^I choose "([^\"]*)"$/ do |field|
   choose(field)
 end
 
-When /^I attach the file at "(.*)" to "(.*)" $/ do |path, field|
+When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
   attach_file(field, path)
 end
 
-Then /^I should see "(.*)"$/ do |text|
-  assert_match /#{text}/m, response.body
+Then /^I should see "([^\"]*)"$/ do |text|
+  response.should contain(text)
+end
+
+Then /^I should see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+  response.should contain(regexp)
+end
+
+Then /^I should not see "([^\"]*)"$/ do |text|
+  response.should_not contain(text)
 end
 
-Then /^I should not see "(.*)"$/ do |text|
-  assert_match /#{text}/m, response.body
+Then /^I should not see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+  response.should_not contain(regexp)
 end
 
-Then /^the "(.*)" checkbox should be checked$/ do |label|
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should =~ /#{value}/
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should_not =~ /#{value}/
+end
+    
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
   field_labeled(label).should be_checked
 end
+
+Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
+  field_labeled(label).should_not be_checked
+end
+
+Then /^I should be on (.+)$/ do |page_name|
+  URI.parse(current_url).path.should == path_to(page_name)
+end

data/test/rails_root/features/support/env.rb

@@ -1,14 +1,25 @@
 # Sets up the Rails environment for Cucumber
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-require 'factory_girl'
 require 'cucumber/rails/world'
-require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
+
+# Comment out the next line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode'
+
+# Comment out the next line if you don't want transactions to
+# open/roll back around each scenario
 Cucumber::Rails.use_transactional_fixtures
+
+# Comment out the next line if you want Rails' own error handling
+# (e.g. rescue_action_in_public / rescue_responses / rescue_from)
 Cucumber::Rails.bypass_rescue
 
 require 'webrat'
+require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
 
 Webrat.configure do |config|
   config.mode = :rails
 end
+
+require 'cucumber/rails/rspec'
+require 'webrat/core/matchers'

data/test/rails_root/features/support/paths.rb

@@ -0,0 +1,27 @@
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in webrat_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+    
+    when /the homepage/
+      '/'
+    
+    # Add more mappings here.
+    # Here is a more fancy example:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(NavigationHelpers)

data/test/rails_root/lib/tasks/cucumber.rake

@@ -0,0 +1,20 @@
+$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+
+unless ARGV.any? {|a| a =~ /^gems/}
+
+begin
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+  end
+  task :features => 'db:test:prepare'
+rescue LoadError
+  desc 'Cucumber rake task not available'
+  task :features do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
+end

data/test/rails_root/script/cucumber

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
   load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber")
-rescue LoadError
+rescue LoadError => e
+  raise unless e.to_s =~ /cucumber/  
   require "rubygems"
   load File.join(Gem.bindir, "cucumber")
 end

data/test/rails_root/test/factories.rb

@@ -10,6 +10,10 @@ Factory.sequence :name do |n|
   "a_name#{n}"
 end
 
+Factory.sequence :title do |n|
+  "a_title#{n}"
+end
+
 Factory.sequence :abbr do |n|
   "abbr#{n}"
 end
@@ -43,4 +47,14 @@ end
 Factory.define :comment do |f|
   f.body 'test comment'
   f.user {|a| a.association(:user)}
-end
+end
+
+Factory.define :share do |f|
+  f.uri { Factory.next(:uri) }
+  f.title { Factory.next(:title) }
+  f.shared_by {|a| a.association(:user)}
+end
+
+Factory.sequence :uri do |n|
+  "n#{n}.example.com"
+end

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

@@ -4,7 +4,23 @@ class Muck::ActivitiesControllerTest < ActionController::TestCase
 
   tests Muck::ActivitiesController
 
-  context "activities controller" do
+  context "activities controller - anonymous" do
+    context "on GET to index" do
+      setup do
+        @user = Factory(:user)
+        @activity = Factory(:activity, :template => 'status_update')
+        @user.activities << @activity
+      end
+      context 'on GET to index (js)' do
+        setup do
+          get :index, :parent_type => @user.class, :parent_id => @user, :format => 'js', :latest_activity_id => @activity.to_param
+        end
+        should_respond_with :success
+      end
+    end
+  end
+  
+  context "activities controller - logged in" do
     setup do
       activate_authlogic
       @user = Factory(:user)

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

@@ -23,6 +23,8 @@ class ActivityTest < ActiveSupport::TestCase
       @new_activity = Factory(:activity)
       @status_activity = Factory(:activity, :template => 'status')
       @other_activity = Factory(:activity, :template => 'other')
+      @private_activity = Factory(:activity, :is_public => false)
+      @public_activity = Factory(:activity, :is_public => true)
     end
     context "before" do
       should "only find old activity" do
@@ -45,6 +47,13 @@ class ActivityTest < ActiveSupport::TestCase
         assert !activities.include?(@other_activity), "since found other activity"
       end
     end
+    context "public" do
+      should "only find public activities" do
+        activities = Activity.only_public
+        assert activities.include?(@public_activity), "only_public didn't find public activity"
+        assert !activities.include?(@private_activity), "only_public found private activity"
+      end
+    end
   end
 
   should "require template or item" do
@@ -98,4 +107,21 @@ class ActivityTest < ActiveSupport::TestCase
     
   end
   
+  context "comments" do
+    setup do
+      @user = Factory(:user)
+      @activity = Factory(:activity)
+      @comment = @activity.comments.build(:body => 'a test comment')
+      @comment.user = @user
+      @comment.save!
+    end
+    should "have comments" do
+      assert_equal 1, @activity.comments.length
+    end
+    should "have comment cache" do
+      @activity.reload
+      assert_equal 1, @activity.comment_count
+    end
+  end
+  
 end 

data/test/rails_root/test/unit/share_test.rb

@@ -0,0 +1,19 @@
+# using muck shares to test acts_as_activity_item
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ShareTest < ActiveSupport::TestCase
+  context "share" do
+    setup do
+      @user = Factory(:user)
+      @share = Factory(:share)
+      @share.add_share_activities([@user])
+    end
+    should_have_many :activities
+    should "delete activities if share is deleted" do
+      assert_difference "Activity.count", -1 do
+        @share.destroy
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activities
 version: !ruby/object:Gem::Version 
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -06:00
+date: 2009-08-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,13 +65,13 @@ files:
 - 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
 - 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
+- db/migrate/20090730044139_add_comment_cache.rb
 - install.rb
 - lib/active_record/acts/muck_activity.rb
 - lib/muck_activities.rb
@@ -139,6 +139,7 @@ files:
 - 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/share.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
@@ -147,6 +148,7 @@ files:
 - test/rails_root/config/boot.rb
 - test/rails_root/config/database.yml
 - test/rails_root/config/environment.rb
+- test/rails_root/config/environments/cucumber.rb
 - test/rails_root/config/environments/development.rb
 - test/rails_root/config/environments/production.rb
 - test/rails_root/config/environments/test.rb
@@ -165,8 +167,12 @@ files:
 - 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/migrate/20090730044139_add_comment_cache.rb
+- test/rails_root/db/migrate/20090803185323_create_shares.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
 - test/rails_root/features/support/env.rb
+- test/rails_root/features/support/paths.rb
+- test/rails_root/lib/tasks/cucumber.rake
 - test/rails_root/public/.htaccess
 - test/rails_root/public/404.html
 - test/rails_root/public/422.html
@@ -334,6 +340,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/share_test.rb
 - test/rails_root/test/unit/user_test.rb
 - uninstall.rb
 has_rdoc: true
@@ -369,10 +376,12 @@ test_files:
 - 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/share.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/models/user_session.rb
 - test/rails_root/config/boot.rb
 - test/rails_root/config/environment.rb
+- test/rails_root/config/environments/cucumber.rb
 - test/rails_root/config/environments/development.rb
 - test/rails_root/config/environments/production.rb
 - test/rails_root/config/environments/test.rb
@@ -389,9 +398,12 @@ test_files:
 - 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/migrate/20090730044139_add_comment_cache.rb
+- test/rails_root/db/migrate/20090803185323_create_shares.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
 - test/rails_root/features/support/env.rb
+- test/rails_root/features/support/paths.rb
 - test/rails_root/public/dispatch.rb
 - test/rails_root/script/create_project.rb
 - test/rails_root/test/factories.rb
@@ -401,4 +413,5 @@ 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/share_test.rb
 - test/rails_root/test/unit/user_test.rb

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

@@ -1,11 +0,0 @@
-<% if button_type == :text -%>
-  <%= link_to_remote( button_text, :url => delete_path, :method => :delete) %>
-<% else -%>
-  <% remote_form_for(delete_object, :url => delete_path, :html => { :class => "delete-form #{form_class}", :method => :delete } ) do |f| -%>
-    <% if button_type == :image -%>
-      <%= image_submit_tag '/images/icons/delete.png', {:title => button_text, :width => '15', :height => '15', :alt => button_text } %>
-    <% else -%>
-      <%= submit_tag button_text, { :title => button_text } %>
-    <% end -%>
-  <% end -%>
-<% end -%>