muck-activities 0.1.23 → 0.1.24

data/.gitignore

@@ -1,6 +1,29 @@
+**/*.pid
+log/*.log
+log/*.pid
+tmp
+.DS_Store
+public/cache/**/*
+public/system/**/*
+doc/**/*
+db/*.sqlite3
+.project
+.loadpath
+nbproject/
+.idea
+testjour.log
+*.so
+*.o
+Makefile
+mkmf.log
+*.bundle
+conftest
+content/
+.idea
 *.sw?
 .DS_Store
 coverage
 rdoc
 pkg
+pkg/*
 log/*

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Justin Ball
+Copyright (c) 2009 Tatemae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -49,10 +49,10 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "muck-activities"
     gemspec.summary = "Activity engine for the muck system"
-    gemspec.email = "justinball@gmail.com"
-    gemspec.homepage = "http://github.com/jbasdf/muck_activities"
+    gemspec.email = "justin@tatemae.com"
+    gemspec.homepage = "http://github.com/tatemae/muck_activities"
     gemspec.description = "Activity engine for the muck system."
-    gemspec.authors = ["Justin Ball"]
+    gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-activities'
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"
@@ -63,5 +63,5 @@ begin
     rubyforge.doc_task = "rdoc"
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/muck-activities.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activities}
-  s.version = "0.1.23"
+  s.version = "0.1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Ball"]
-  s.date = %q{2009-10-27}
+  s.authors = ["Justin Ball", "Joel Duffin"]
+  s.date = %q{2009-11-13}
   s.description = %q{Activity engine for the muck system.}
-  s.email = %q{justinball@gmail.com}
+  s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -100,7 +100,6 @@ Gem::Specification.new do |s|
      "tasks/muck_activity_tasks.rake",
      "test/rails_root/.gitignore",
      "test/rails_root/.rake_tasks",
-     "test/rails_root/Capfile",
      "test/rails_root/Rakefile",
      "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
@@ -300,14 +299,10 @@ Gem::Specification.new do |s|
      "test/rails_root/script/process/spawner",
      "test/rails_root/script/runner",
      "test/rails_root/script/server",
-     "test/rails_root/test/factories.rb",
      "test/rails_root/test/functional/.keep",
      "test/rails_root/test/functional/activities_controller_test.rb",
      "test/rails_root/test/functional/default_controller_test.rb",
      "test/rails_root/test/integration/.keep",
-     "test/rails_root/test/mocks/development/.keep",
-     "test/rails_root/test/mocks/test/.keep",
-     "test/rails_root/test/shoulda_macros/controller.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/activity_feed_test.rb",
@@ -316,7 +311,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/user_test.rb",
      "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/jbasdf/muck_activities}
+  s.homepage = %q{http://github.com/tatemae/muck_activities}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-activities}
@@ -360,10 +355,8 @@ Gem::Specification.new do |s|
      "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",
      "test/rails_root/test/functional/activities_controller_test.rb",
      "test/rails_root/test/functional/default_controller_test.rb",
-     "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",

data/public/stylesheets/muck-activities.css

@@ -15,7 +15,7 @@ ul#activity-filter li.current a{color:#5EAC18;}
 #activity-feed{margin:15px 0 0 0;}
 #activity-feed-content .activity{margin:8px 0 4px 0;}
 #activity-feed-content .activity-time{font-size:1em;font-color:#eee;clear:left;}
-#activity-icon, .actor-icon{width:50px;float:left;margin:0 10px 10px 0;}
+#activity-icon, .actor-icon{width:50px;float:left;margin:0 10px 10px 0;overflow:hidden;}
 #activity-feed-content .actor, #current-status-name{font-weight:bolder;font-size:1.3em;}
 .activity-time, .status-time{color:#777777;font-size:.9em;}
 p#current-status-text, .activity-content p{margin:0;}

data/test/rails_root/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 
@@ -15,11 +15,11 @@ end
 
 Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
-  config.gem 'mislav-will_paginate', :lib => 'will_paginate', :source => 'http://gems.github.com'
+  config.gem "will_paginate"
   config.gem "authlogic"
   config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com'
   config.gem "bcrypt-ruby", :lib => "bcrypt"
-  config.gem "collectiveidea-awesome_nested_set", :lib => 'awesome_nested_set', :source => "http://gems.github.com"
+  config.gem "awesome_nested_set"
   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'

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

@@ -21,13 +21,4 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-HOST = "localhost"
-
-config.gem 'thoughtbot-shoulda',
-  :lib     => 'shoulda',
-  :source  => "http://gems.github.com",
-  :version => '>= 2.9.1'
-config.gem 'thoughtbot-factory_girl',
-  :lib     => 'factory_girl',
-  :source  => "http://gems.github.com",
-  :version => '>= 1.2.0'
+HOST = "localhost"

data/test/rails_root/config/routes.rb

@@ -1,5 +1,8 @@
 ActionController::Routing::Routes.draw do |map|
   
+  map.home '', :controller => 'default', :action => 'index'
+  map.root :controller => 'default', :action => 'index'
+  
   # Install the default routes as the lowest priority.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'

data/test/rails_root/test/test_helper.rb

@@ -1,37 +1,11 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-gem 'thoughtbot-factory_girl' # from github
-require 'factory_girl'
-require 'mocha'
+gem 'muck-engine'
+require 'muck_test_helper'
 require 'authlogic/test_case'
-require 'redgreen' rescue LoadError
-require File.expand_path(File.dirname(__FILE__) + '/factories')
-require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')
-
-class ActiveSupport::TestCase 
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
 
+class ActiveSupport::TestCase
+  include MuckTestMethods
   include Authlogic::TestCase
-  
-  def login_as(user)
-    success = UserSession.create(user)
-    if !success
-      errors = user.errors.full_messages.to_sentence
-      message = 'User has not been activated' if !user.active?
-      raise "could not login as #{user.to_param}.  Please make sure the user is valid. #{message} #{errors}"
-    end
-    UserSession.find
-  end
-  
-  def assure_logout
-    user_session = UserSession.find
-    user_session.destroy if user_session
-  end
-  
-  def ensure_flash(val)
-    assert_contains flash.values, val, ", Flash: #{flash.inspect}"
-  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activities
 version: !ruby/object:Gem::Version 
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors: 
 - Justin Ball
+- Joel Duffin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -06:00
+date: 2009-11-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +44,7 @@ dependencies:
         version: "0"
     version: 
 description: Activity engine for the muck system.
-email: justinball@gmail.com
+email: justin@tatemae.com
 executables: []
 
 extensions: []
@@ -135,7 +136,6 @@ files:
 - tasks/muck_activity_tasks.rake
 - test/rails_root/.gitignore
 - test/rails_root/.rake_tasks
-- test/rails_root/Capfile
 - test/rails_root/Rakefile
 - test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/default_controller.rb
@@ -335,14 +335,10 @@ files:
 - test/rails_root/script/process/spawner
 - test/rails_root/script/runner
 - test/rails_root/script/server
-- test/rails_root/test/factories.rb
 - test/rails_root/test/functional/.keep
 - test/rails_root/test/functional/activities_controller_test.rb
 - test/rails_root/test/functional/default_controller_test.rb
 - test/rails_root/test/integration/.keep
-- test/rails_root/test/mocks/development/.keep
-- test/rails_root/test/mocks/test/.keep
-- test/rails_root/test/shoulda_macros/controller.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/activity_feed_test.rb
@@ -351,7 +347,7 @@ files:
 - test/rails_root/test/unit/user_test.rb
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/jbasdf/muck_activities
+homepage: http://github.com/tatemae/muck_activities
 licenses: []
 
 post_install_message: 
@@ -416,10 +412,8 @@ test_files:
 - 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
 - test/rails_root/test/functional/activities_controller_test.rb
 - test/rails_root/test/functional/default_controller_test.rb
-- 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

data/test/rails_root/Capfile

@@ -1,3 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy'

data/test/rails_root/test/factories.rb

@@ -1,60 +0,0 @@
-Factory.sequence :email do |n|
-  "somebody#{n}@example.com"
-end
-
-Factory.sequence :login do |n|
-  "inquire#{n}"
-end
-
-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
-
-Factory.sequence :description do |n|
-  "This is the description: #{n}"
-end
-
-Factory.define :user do |f|
-  f.login { Factory.next(:login) }
-  f.email { Factory.next(:email) }
-  f.password 'inquire_pass'
-  f.password_confirmation 'inquire_pass'
-  f.first_name 'test'
-  f.last_name 'guy'
-  f.terms_of_service true
-  f.activated_at DateTime.now
-end
-
-Factory.define :activity do |f|
-  f.item {|a| a.association(:user)}
-  f.template ''
-  f.source {|a| a.association(:user)}
-  f.content ''
-  f.title ''
-  f.is_status_update false
-  f.is_public true
-  f.created_at DateTime.now
-end
-
-Factory.define :comment do |f|
-  f.body 'test comment'
-  f.user {|a| a.association(:user)}
-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/shoulda_macros/controller.rb

@@ -1,43 +0,0 @@
-ActiveSupport::TestCase.class_eval do
-
-  def self.should_require_login(*args)
-    args = Hash[*args]
-    login_url = args.delete :login_url
-    args.each do |action, verb|
-      should "Require login for '#{action}' action" do
-        send(verb, action)
-        assert_redirected_to(login_url)
-      end
-    end
-  end
-
-  def self.should_require_role(role, redirect_url, *actions)
-    actions.each do |action|
-      should "require role for '#{action}' action" do
-        get(action)
-        ensure_flash(/permission/i)
-        assert_response :redirect
-      end
-    end
-  end
-  
-  #from: http://blog.internautdesign.com/2008/9/11/more-on-custom-shoulda-macros-scoping-of-instance-variables
-  def self.should_not_allow action, object, url= "/login", msg=nil
-    msg ||= "a #{object.class.to_s.downcase}" 
-    should "not be able to #{action} #{msg}" do
-      object = eval(object, self.send(:binding), __FILE__, __LINE__)
-      get action, :id => object.id
-      assert_redirected_to url
-    end
-  end
-
-  def self.should_allow action, object, msg=nil
-    msg ||= "a #{object.class.to_s.downcase}" 
-    should "be able to #{action} #{msg}" do
-      object = eval(object, self.send(:binding), __FILE__, __LINE__)
-      get action, :id => object.id
-      assert_response :success
-    end
-  end
-
-end