muck-comments 0.1.14 → 0.1.15

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-comments"
     gemspec.summary = "The comment engine for the muck system"
-    gemspec.email = "justinball@gmail.com"
-    gemspec.homepage = "http://github.com/jbasdf/muck_comments"
+    gemspec.email = "justin@tatemae.com"
+    gemspec.homepage = "http://github.com/tatemae/muck_comments"
     gemspec.description = "The comment engine for the muck system."
-    gemspec.authors = ["Justin Ball"]
+    gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-comments'
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"
@@ -62,5 +62,5 @@ begin
   end
   Jeweler::GemcutterTasks.new
 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.14
+0.1.15

data/app/controllers/muck/comments_controller.rb

@@ -104,12 +104,15 @@ class Muck::CommentsController < ApplicationController
   end
 
   def get_parent_comment_html(parent, comment)
+    truncate_comment = false
+    length = 30
+    omission = '...'
     render_as_html do
-      render_to_string(:partial => "#{parent.class.to_s.tableize}/comment", :object => comment, :locals => {:comment_owner => parent})
+      render_to_string(:partial => "#{parent.class.to_s.tableize}/comment", :object => comment, :locals => {:comment_owner => parent, :truncate_comment => truncate_comment, :length => length, :omission => omission})
     end
   rescue ActionView::MissingTemplate
     render_as_html do
-      render_to_string(:partial => "comments/comment", :object => comment, :locals => {:comment_owner => parent})
+      render_to_string(:partial => "comments/comment", :object => comment, :locals => {:comment_owner => parent, :truncate_comment => truncate_comment, :length => length, :omission => omission})
     end
     #I18n.t('muck.comments.missing_comment_template_error', :partial => "#{parent.class.to_s.tableize}/comment")
   end

data/app/helpers/muck_comments_helper.rb

@@ -1,15 +1,15 @@
 module MuckCommentsHelper
   
-  def latest_simple_comments(limit = 5, truncate = true, length = 30, omission = '...')
-    render :partial => 'comments/simple_comment', :collection => Comment.by_newest.limit(limit), :locals => { :truncate => truncate, :length => length, :omission => omission }
+  def latest_simple_comments(limit = 5, truncate_comment = true, length = 30, omission = '...')
+    render :partial => 'comments/simple_comment', :collection => Comment.by_newest.limit(limit), :locals => { :truncate_comment => truncate_comment, :length => length, :omission => omission }
   end
   
-  def latest_comments(limit = 5, truncate = true, length = 30, omission = '...')
-    render :partial => 'comments/comment', :collection => Comment.by_newest.limit(limit), :locals => { :truncate => truncate, :length => length, :omission => omission }
+  def latest_comments(limit = 5, truncate_comment = true, length = 30, omission = '...')
+    render :partial => 'comments/comment', :collection => Comment.by_newest.limit(limit), :locals => { :truncate_comment => truncate_comment, :length => length, :omission => omission }
   end
   
-  def show_comments(comments)
-    render :partial => 'comments/comment', :collection => comments
+  def show_comments(comments, truncate_comment = false, length = 30, omission = '...')
+    render :partial => 'comments/comment', :collection => comments, :locals => { :truncate_comment => truncate_comment, :length => length, :omission => omission }
   end
   
   # parent is the object to which the comments will be attached
@@ -41,8 +41,8 @@ module MuckCommentsHelper
                                                          :delete_path => comment_path(comment, :format => 'js') }
   end
   
-  def limit_comment(text, truncate = false, length = 30, omission = '...')
-    if truncate
+  def limit_comment(text, truncate_comment = false, length = 30, omission = '...')
+    if truncate_comment
       html_summarize(text, length, omission)
     else
       text

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

@@ -1,7 +1,7 @@
 <div id="<%= comment.dom_id %>" class="comment_holder delete-container">
   <div class="commentor-icon"><%= icon comment.user %></div>
   <p><span class="commentor"><%= link_to comment.user.try(:display_name), comment.user %></span>
-    <%= h limit_comment(comment.body, truncate, length, omission) %></p>
+    <%= h limit_comment(comment.body, truncate_comment, length, omission) %></p>
   <%= delete_comment(comment, :image) if comment.can_edit?(current_user) %>
   <span class="comment-time"><%= t("muck.general.time_ago", :time_in_words => time_ago_in_words(comment.created_at)) %></span></p>
 </div>

data/app/views/comments/_simple_comment.html.erb

@@ -1,4 +1,4 @@
 <div id="<%= simple_comment.dom_id %>" class="simple-comment">
   <div class="commentor-icon"><%= icon simple_comment.user %></div>
-  <div class="comment-body"><%= h limit_comment(simple_comment.body, truncate, length, omission) %></div>
+  <div class="comment-body"><%= h limit_comment(simple_comment.body, truncate_comment, length, omission) %></div>
 </div>

data/muck-comments.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-comments}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Ball"]
-  s.date = %q{2009-11-07}
+  s.authors = ["Justin Ball", "Joel Duffin"]
+  s.date = %q{2009-11-13}
   s.description = %q{The comment engine for the muck system.}
-  s.email = %q{justinball@gmail.com}
+  s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -93,13 +93,13 @@ Gem::Specification.new do |s|
      "tasks/muck_comments_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",
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/.keep",
      "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",
@@ -125,7 +125,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/20090602041838_create_users.rb",
+     "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
      "test/rails_root/db/migrate/20090608073052_create_friends.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/migrate/20090703055724_add_contents.rb",
@@ -177,10 +177,13 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/icons/comment.png",
      "test/rails_root/public/images/icons/delete.png",
      "test/rails_root/public/images/icons/exclaim.png",
+     "test/rails_root/public/images/icons/external.png",
+     "test/rails_root/public/images/icons/feed.png",
      "test/rails_root/public/images/icons/grey_guy.png",
      "test/rails_root/public/images/icons/hide.png",
      "test/rails_root/public/images/icons/information.png",
      "test/rails_root/public/images/icons/minus.png",
+     "test/rails_root/public/images/icons/pending.png",
      "test/rails_root/public/images/icons/question.png",
      "test/rails_root/public/images/icons/search_box.png",
      "test/rails_root/public/images/icons/star.png",
@@ -207,6 +210,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/jquery/jquery.jgrowl.js",
      "test/rails_root/public/javascripts/jquery/jquery.js",
      "test/rails_root/public/javascripts/jquery/jquery.tips.js",
+     "test/rails_root/public/javascripts/jquery/jrails.js",
      "test/rails_root/public/javascripts/muck.js",
      "test/rails_root/public/javascripts/muck_activities.js",
      "test/rails_root/public/javascripts/muck_time/en.js",
@@ -313,6 +317,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png",
      "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png",
      "test/rails_root/public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css",
+     "test/rails_root/public/stylesheets/muck-activities.css",
      "test/rails_root/public/stylesheets/reset.css",
      "test/rails_root/public/stylesheets/styles.css",
      "test/rails_root/public/stylesheets/themes/blue/styles.css",
@@ -334,16 +339,8 @@ 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/comments_controller_test.rb",
-     "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/shoulda_macros/forms.rb",
-     "test/rails_root/test/shoulda_macros/models.rb",
-     "test/rails_root/test/shoulda_macros/pagination.rb",
-     "test/rails_root/test/shoulda_macros/plugins.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/comment_mailer_test.rb",
@@ -354,7 +351,7 @@ Gem::Specification.new do |s|
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb",
      "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/jbasdf/muck_comments}
+  s.homepage = %q{http://github.com/tatemae/muck_comments}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-comments}
@@ -365,6 +362,7 @@ 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/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",
@@ -384,7 +382,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/20090602041838_create_users.rb",
+     "test/rails_root/db/migrate/20090512013727_create_profiles.rb",
      "test/rails_root/db/migrate/20090608073052_create_friends.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/migrate/20090703055724_add_contents.rb",
@@ -402,13 +400,7 @@ 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/comments_controller_test.rb",
-     "test/rails_root/test/shoulda_macros/controller.rb",
-     "test/rails_root/test/shoulda_macros/forms.rb",
-     "test/rails_root/test/shoulda_macros/models.rb",
-     "test/rails_root/test/shoulda_macros/pagination.rb",
-     "test/rails_root/test/shoulda_macros/plugins.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/comment_mailer_test.rb",
      "test/rails_root/test/unit/comment_test.rb",

data/test/rails_root/Rakefile

@@ -13,11 +13,12 @@ require 'muck_comments/tasks'
 require 'muck_engine/tasks'
 require 'muck_users/tasks'
 require 'muck_activities/tasks'
+require 'muck_profiles/tasks'
 
 namespace :muck do
   
   def muck_gems
-    ['../../muck-engine', '../../muck-users', '../../muck-activities', '../../muck-comments']
+    ['muck-engine', 'muck-users', 'muck-activities', 'muck-comments', 'muck-profiles']
   end
   
 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

@@ -3,6 +3,7 @@ class User < ActiveRecord::Base
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
   acts_as_muck_user
+  has_muck_profile
   has_many :comments
   acts_as_commentable
 end

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,16 +15,18 @@ 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 "binarylogic-authlogic", :lib => 'authlogic', :source  => 'http://gems.github.com', :version => ">=2.1.0"
-  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com', :version => '~> 2.1.1'
+  config.gem "will_paginate"
+  config.gem "authlogic"
+  config.gem "searchlogic"
   config.gem "bcrypt-ruby", :lib => "bcrypt", :version => ">=2.0.5"
-  config.gem 'mbleigh-acts-as-taggable-on', :lib => "acts-as-taggable-on", :source => "http://gems.github.com"
-  config.gem "collectiveidea-awesome_nested_set", :lib => 'awesome_nested_set', :source => "http://gems.github.com"
-  config.gem "friendly_id", :version => '>=2.1.3'
+  config.gem "acts-as-taggable-on"
+  config.gem "awesome_nested_set"
+  config.gem "friendly_id"
+  config.gem "paperclip"
   config.gem "babelphish"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
+  config.gem 'muck-profiles', :lib => 'muck_profiles'
   config.gem 'muck-activities', :lib => 'muck_activities'
   config.plugin_locators << TestGemLocator
 end

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

@@ -26,17 +26,3 @@ HOST = "localhost"
 # This is necessary if your schema can't be completely dumped by the schema dumper,
 # like if you have constraints or database-specific column types
 # config.active_record.schema_format = :sql
-
-config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => 'http://gems.github.com'
-config.gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => 'http://gems.github.com'
-config.gem 'treetop', :version => '>=1.2.4'
-config.gem 'term-ansicolor', :version => '>=1.0.3', :lib => 'term/ansicolor'
-config.gem 'polyglot', :version => '>=0.2.4'
-config.gem "rcov", :version => '>=0.8.1.2.0'
-
-# only required if you want to use selenium for testing
-config.gem 'selenium-client', :lib => 'selenium/client'
-config.gem 'bmabey-database_cleaner', :lib => 'database_cleaner', :source => 'http://gems.github.com'
-
-require 'factory_girl'
-begin require 'redgreen'; rescue LoadError; end

data/test/rails_root/db/migrate/20090402234137_create_languages.rb

@@ -5,7 +5,7 @@ class CreateLanguages < ActiveRecord::Migration
       t.string :english_name
       t.string :locale
       t.boolean :supported, :default => true
-      t.integer :is_default, :default => false
+      t.boolean :is_default, :default => false
     end
     add_index :languages, :name
     add_index :languages, :locale

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/public/javascripts/jquery/jrails.js

@@ -0,0 +1 @@
+(function($){$().ajaxSend(function(a,xhr,s){xhr.setRequestHeader("Accept","text/javascript, text/html, application/xml, text/xml, */*")})})(jQuery);(function($){$.fn.reset=function(){return this.each(function(){if(typeof this.reset=="function"||(typeof this.reset=="object"&&!this.reset.nodeType)){this.reset()}})};$.fn.enable=function(){return this.each(function(){this.disabled=false})};$.fn.disable=function(){return this.each(function(){this.disabled=true})}})(jQuery);(function($){$.extend({fieldEvent:function(el,obs){var field=el[0]||el,e="change";if(field.type=="radio"||field.type=="checkbox"){e="click"}else{if(obs&&field.type=="text"||field.type=="textarea"){e="keyup"}}return e}});$.fn.extend({delayedObserver:function(delay,callback){var el=$(this);if(typeof window.delayedObserverStack=="undefined"){window.delayedObserverStack=[]}if(typeof window.delayedObserverCallback=="undefined"){window.delayedObserverCallback=function(stackPos){observed=window.delayedObserverStack[stackPos];if(observed.timer){clearTimeout(observed.timer)}observed.timer=setTimeout(function(){observed.timer=null;observed.callback(observed.obj,observed.obj.formVal())},observed.delay*1000);observed.oldVal=observed.obj.formVal()}}window.delayedObserverStack.push({obj:el,timer:null,delay:delay,oldVal:el.formVal(),callback:callback});var stackPos=window.delayedObserverStack.length-1;if(el[0].tagName=="FORM"){$(":input",el).each(function(){var field=$(this);field.bind($.fieldEvent(field,delay),function(){observed=window.delayedObserverStack[stackPos];if(observed.obj.formVal()==observed.obj.oldVal){return}else{window.delayedObserverCallback(stackPos)}})})}else{el.bind($.fieldEvent(el,delay),function(){observed=window.delayedObserverStack[stackPos];if(observed.obj.formVal()==observed.obj.oldVal){return}else{window.delayedObserverCallback(stackPos)}})}},formVal:function(){var el=this[0];if(el.tagName=="FORM"){return this.serialize()}if(el.type=="checkbox"||self.type=="radio"){return this.filter("input:checked").val()||""}else{return this.val()}}})})(jQuery);(function($){$.fn.extend({visualEffect:function(o){e=o.replace(/\_(.)/g,function(m,l){return l.toUpperCase()});return eval("$(this)."+e+"()")},appear:function(speed,callback){return this.fadeIn(speed,callback)},blindDown:function(speed,callback){return this.show("blind",{direction:"vertical"},speed,callback)},blindUp:function(speed,callback){return this.hide("blind",{direction:"vertical"},speed,callback)},blindRight:function(speed,callback){return this.show("blind",{direction:"horizontal"},speed,callback)},blindLeft:function(speed,callback){this.hide("blind",{direction:"horizontal"},speed,callback);return this},dropOut:function(speed,callback){return this.hide("drop",{direction:"down"},speed,callback)},dropIn:function(speed,callback){return this.show("drop",{direction:"up"},speed,callback)},fade:function(speed,callback){return this.fadeOut(speed,callback)},fadeToggle:function(speed,callback){return this.animate({opacity:"toggle"},speed,callback)},fold:function(speed,callback){return this.hide("fold",{},speed,callback)},foldOut:function(speed,callback){return this.show("fold",{},speed,callback)},grow:function(speed,callback){return this.show("scale",{},speed,callback)},highlight:function(speed,callback){return this.show("highlight",{},speed,callback)},puff:function(speed,callback){return this.hide("puff",{},speed,callback)},pulsate:function(speed,callback){return this.show("pulsate",{},speed,callback)},shake:function(speed,callback){return this.show("shake",{},speed,callback)},shrink:function(speed,callback){return this.hide("scale",{},speed,callback)},squish:function(speed,callback){return this.hide("scale",{origin:["top","left"]},speed,callback)},slideUp:function(speed,callback){return this.hide("slide",{direction:"up"},speed,callback)},slideDown:function(speed,callback){return this.show("slide",{direction:"up"},speed,callback)},switchOff:function(speed,callback){return this.hide("clip",{},speed,callback)},switchOn:function(speed,callback){return this.show("clip",{},speed,callback)}})})(jQuery);

data/test/rails_root/public/stylesheets/muck-activities.css

@@ -0,0 +1,39 @@
+/* activity feed */
+#activity-status-control{border:solid 1px #ccc;padding:10px 7px;background-color:#eee;}
+#status-update-field{}
+ul#status-menu{list-style:none;}
+ul#status-menu li{float:left;display:inline;margin:0 5px;}
+#status-update-button input{padding:0;}
+.status-update-dim{}
+.status-update-lit{}
+ul#activity-filter{list-style:none;}
+ul#activity-filter li{border-bottom:solid 1px #ccc;}
+ul#activity-filter li a{text-decoration:none;}
+ul#activity-filter li a:hover;{text-decoration:underline;}
+ul#activity-filter li.current a{color:#5EAC18;}
+.activity{clear:both;display:block;}
+#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-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;}
+form.activity-delete {position:relative;display:inline;float:right;display:none;}
+form.activity-delete input{padding:0;margin:0;width:15px;height:15px;position:absolute;right:0px;bottom:0px;}
+.activity .activity-hover form.activity-delete{display:block;}
+.welcome_activity{font-size:14px;}
+a.upload-button{background:transparent url('/images/icons/button_background.png') no-repeat scroll left top;text-decoration:none;padding:0px 23px 1px 6px;color:#fff;font-weight:bold;}
+a.upload-button:hover{background:transparent url('/images/icons/button_background.png') no-repeat scroll left bottom;}
+/* comments under activity feed */
+.activity-comment{border:1px solid #ccc;margin:2px 50px 2px 60px;padding:.5em;background-color:#eee;}
+.activity-comment .actor-icon{width:40px;}
+.activity-comment .actor-icon img{width:40px;height:40px;}
+.activity-comment textarea.max{width:80%;height:30px;}
+.activity-comment textarea.min{height:15px;width:50%;}
+.activity-comment p{margin:0;}
+.activity-comment .actor a{font-size:.8em;}
+.activity form.comment-delete {position:relative;display:inline;float:right;}
+.activity form.comment-delete input{padding:0;margin:0;width:15px;height:15px;position:absolute;right:0px;top:0px;}
+.activity form.comment-delete{display:none;}
+.activity .comment-hover form.comment-delete{display:block;}

data/test/rails_root/test/test_helper.rb

@@ -1,48 +1,11 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-require 'ruby-debug'
-gem 'thoughtbot-factory_girl' # from github
-require 'factory_girl'
+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')
-require File.join(File.dirname(__FILE__), 'shoulda_macros', 'models')
-
-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
-  
-  # For Selenium
-  # setup do |session|
-  #   session.host! "localhost:3001"
-  # end
-  
-  def make_parent_params(parent)
-    { :parent_id => parent.id, :parent_type => parent.class.to_s }
-  end
-    
-end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: muck-comments
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Justin Ball
+- Joel Duffin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 -07:00
+date: 2009-11-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +34,7 @@ dependencies:
         version: "0"
     version: 
 description: The comment engine for the muck system.
-email: justinball@gmail.com
+email: justin@tatemae.com
 executables: []
 
 extensions: []
@@ -118,13 +119,13 @@ files:
 - tasks/muck_comments_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
 - test/rails_root/app/helpers/application_helper.rb
 - test/rails_root/app/models/.keep
 - 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
@@ -150,7 +151,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/20090602041838_create_users.rb
+- test/rails_root/db/migrate/20090512013727_create_profiles.rb
 - test/rails_root/db/migrate/20090608073052_create_friends.rb
 - test/rails_root/db/migrate/20090613173314_create_comments.rb
 - test/rails_root/db/migrate/20090703055724_add_contents.rb
@@ -202,10 +203,13 @@ files:
 - test/rails_root/public/images/icons/comment.png
 - test/rails_root/public/images/icons/delete.png
 - test/rails_root/public/images/icons/exclaim.png
+- test/rails_root/public/images/icons/external.png
+- test/rails_root/public/images/icons/feed.png
 - test/rails_root/public/images/icons/grey_guy.png
 - test/rails_root/public/images/icons/hide.png
 - test/rails_root/public/images/icons/information.png
 - test/rails_root/public/images/icons/minus.png
+- test/rails_root/public/images/icons/pending.png
 - test/rails_root/public/images/icons/question.png
 - test/rails_root/public/images/icons/search_box.png
 - test/rails_root/public/images/icons/star.png
@@ -232,6 +236,7 @@ files:
 - test/rails_root/public/javascripts/jquery/jquery.jgrowl.js
 - test/rails_root/public/javascripts/jquery/jquery.js
 - test/rails_root/public/javascripts/jquery/jquery.tips.js
+- test/rails_root/public/javascripts/jquery/jrails.js
 - test/rails_root/public/javascripts/muck.js
 - test/rails_root/public/javascripts/muck_activities.js
 - test/rails_root/public/javascripts/muck_time/en.js
@@ -338,6 +343,7 @@ files:
 - test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png
 - test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png
 - test/rails_root/public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css
+- test/rails_root/public/stylesheets/muck-activities.css
 - test/rails_root/public/stylesheets/reset.css
 - test/rails_root/public/stylesheets/styles.css
 - test/rails_root/public/stylesheets/themes/blue/styles.css
@@ -359,16 +365,8 @@ 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/comments_controller_test.rb
-- 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/shoulda_macros/forms.rb
-- test/rails_root/test/shoulda_macros/models.rb
-- test/rails_root/test/shoulda_macros/pagination.rb
-- test/rails_root/test/shoulda_macros/plugins.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/comment_mailer_test.rb
@@ -379,7 +377,7 @@ files:
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/jbasdf/muck_comments
+homepage: http://github.com/tatemae/muck_comments
 licenses: []
 
 post_install_message: 
@@ -411,6 +409,7 @@ test_files:
 - test/rails_root/app/controllers/default_controller.rb
 - test/rails_root/app/helpers/application_helper.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
@@ -430,7 +429,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/20090602041838_create_users.rb
+- test/rails_root/db/migrate/20090512013727_create_profiles.rb
 - test/rails_root/db/migrate/20090608073052_create_friends.rb
 - test/rails_root/db/migrate/20090613173314_create_comments.rb
 - test/rails_root/db/migrate/20090703055724_add_contents.rb
@@ -448,13 +447,7 @@ 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/comments_controller_test.rb
-- test/rails_root/test/shoulda_macros/controller.rb
-- test/rails_root/test/shoulda_macros/forms.rb
-- test/rails_root/test/shoulda_macros/models.rb
-- test/rails_root/test/shoulda_macros/pagination.rb
-- test/rails_root/test/shoulda_macros/plugins.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/comment_mailer_test.rb
 - test/rails_root/test/unit/comment_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/db/migrate/20090602041838_create_users.rb

@@ -1,39 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-
-  def self.up
-    create_table :users, :force => true do |t|
-      t.string   :login
-      t.string   :email
-      t.string   :first_name
-      t.string   :last_name
-      t.string   :crypted_password
-      t.string   :password_salt
-      t.string   :persistence_token
-      t.string   :single_access_token
-      t.string   :perishable_token
-      t.integer  :login_count,         :null => false, :default => 0
-      t.integer  :failed_login_count,  :null => false, :default => 0
-      t.datetime :last_request_at                                   
-      t.datetime :last_login_at 
-      t.datetime :current_login_at                                  
-      t.string   :current_login_ip                                  
-      t.string   :last_login_ip
-      t.boolean  :terms_of_service,   :default => false, :null => false
-      t.string   :time_zone,          :default => "UTC"
-      t.datetime :disabled_at
-      t.datetime :activated_at
-      t.timestamps
-    end
-
-    add_index :users, :login
-    add_index :users, :email
-    add_index :users, :persistence_token
-    add_index :users, :perishable_token
-    add_index :users, :single_access_token
-    add_index :users, :last_request_at
-  end
-
-  def self.down
-    drop_table :users
-  end
-end

data/test/rails_root/test/factories.rb

@@ -1,75 +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.sequence :uri do |n|
-  "n#{n}.example.com"
-end
-
-Factory.define :state do |f|
-  f.name { Factory.next(:name) }
-  f.abbreviation { Factory.next(:abbr) }
-  f.country {|a| a.association(:country) }
-end
-
-Factory.define :country do |f|
-  f.name { Factory.next(:name) }
-  f.abbreviation { Factory.next(:abbr) }
-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 :permission do |f|
-  f.role {|a| a.association(:role)}
-  f.user {|a| a.association(:user)}
-end
-
-Factory.define :role do |f|
-  f.rolename 'administrator'
-end
-
-Factory.define :comment do |f|
-  f.body { Factory.next(:description) }
-  f.user {|a| a.association(:user)}
-  f.commentable {|a| a.association(:user)}
-end
-
-Factory.define :domain_theme do |f|
-  f.name { Factory.next(:name) }
-  f.uri { Factory.next(:uri) }
-end
-
-Factory.define :theme do |f|
-  f.name { Factory.next(:name) }
-end
-
-

data/test/rails_root/test/shoulda_macros/controller.rb

@@ -1,49 +0,0 @@
-module MuckControllerMacros
-
-  def 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
-        if [:put, :delete].include?(verb) # put and delete require an id even if it is a bogus one
-          send(verb, action, :id => 1)
-        else
-          send(verb, action)
-        end
-        assert_redirected_to(login_url)
-      end
-    end
-  end
-
-  def 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 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 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
-
-ActionController::TestCase.extend(MuckControllerMacros)

data/test/rails_root/test/shoulda_macros/forms.rb

@@ -1,32 +0,0 @@
-module ShouldaFormMacros
-  def self.should_have_form(opts)
-    model = self.name.gsub(/ControllerTest$/, '').singularize.downcase
-    model = model[model.rindex('::')+2..model.size] if model.include?('::')
-    http_method, hidden_http_method = form_http_method opts[:method]
-    should "have a #{model} form" do
-      assert_select "form[action=?][method=#{http_method}]", eval(opts[:action]) do
-        if hidden_http_method
-          assert_select "input[type=hidden][name=_method][value=#{hidden_http_method}]"
-        end
-        opts[:fields].each do |attribute, type|
-          attribute = attribute.is_a?(Symbol) ? "#{model}[#{attribute.to_s}]" : attribute
-          assert_select "input[type=#{type.to_s}][name=?]", attribute
-        end
-        assert_select "input[type=submit]"
-      end
-    end
-  end
-
-  def self.form_http_method(http_method)
-    http_method = http_method.nil? ? 'post' : http_method.to_s
-    if http_method == "post" || http_method == "get"
-      return http_method, nil
-    else
-      return "post", http_method
-    end
-  end  
-end
-
-class ActiveSupport::TestCase
-  extend ShouldaFormMacros
-end

data/test/rails_root/test/shoulda_macros/models.rb

@@ -1,50 +0,0 @@
-module ShouldaModelMacros
-
-  def should_sanitize(*attributes)
-    bad_scripts = [
-      %|';alert(String.fromCharCode(88,83,83))//';alert(String.fromCharCode(88,83,83))//";alert(String.fromCharCode(88,83,83))//";alert(String.fromCharCode(88,83,83))//--></SCRIPT>">'><SCRIPT>alert(String.fromCharCode(88,83,83))</SCRIPT>|,
-      %|'';!--"<XSS>=&{()}|,
-      %|<SCRIPT SRC=http://ha.ckers.org/xss.js></SCRIPT>|,
-      %|<IMG SRC="javascript:alert('XSS');">|,
-      %|<IMG SRC=javascript:alert('XSS')>|,
-      %|<IMG SRC=JaVaScRiPt:alert('XSS')>|,
-      %|<IMG SRC=JaVaScRiPt:alert('XSS')>|,
-      %|<IMG SRC=`javascript:alert("RSnake says, 'XSS'")`>|,
-      %|<IMG """><SCRIPT>alert("XSS")</SCRIPT>">|,
-      %|<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>|,
-      %|<A HREF="h
-      tt	p://6&#9;6.000146.0x7.147/">XSS</A>|,
-      %|<script>alert('message');</script>| ]
-      
-    klass = model_class
-    attributes.each do |attribute|
-      attribute = attribute.to_sym
-      should "white list #{attribute}" do
-        assert object = klass.find(:first), "Can't find first #{klass}"
-        bad_scripts.each do |bad_value|
-          object.send("#{attribute}=", bad_value)
-          object.save
-          clean_value = object.send("#{attribute}")
-          assert !clean_value.include?(bad_value), "#{attribute} is not white listed. #{bad_value} made it through"
-        end
-      end
-    end
-  end
-
-  def should_accept_nested_attributes_for(*attr_names)
-    klass = self.name.gsub(/Test$/, '').constantize
- 
-    context "#{klass}" do
-      attr_names.each do |association_name|
-        should "accept nested attrs for #{association_name}" do
-          assert  klass.instance_methods.include?("#{association_name}_attributes="),
-                  "#{klass} does not accept nested attributes for #{association_name}"
-        end
-      end
-    end
-  end
-end
-
-class ActiveSupport::TestCase
-  extend ShouldaModelMacros
-end

data/test/rails_root/test/shoulda_macros/pagination.rb

@@ -1,53 +0,0 @@
-module ShouldaPaginationMacros
-  # Example:
-  #  context "a GET to index logged in as admin" do
-  #    setup do
-  #      login_as_admin 
-  #      get :index
-  #    end
-  #    should_paginate_collection :users
-  #    should_display_pagination
-  #  end
-  def self.should_paginate_collection(collection_name)
-    should "paginate #{collection_name}" do
-      assert collection = assigns(collection_name), 
-        "Controller isn't assigning to @#{collection_name.to_s}."
-      assert_kind_of WillPaginate::Collection, collection, 
-        "@#{collection_name.to_s} isn't a WillPaginate collection."
-    end
-  end
-  
-  def self.should_display_pagination
-    should "display pagination" do
-      assert_select "div.pagination", { :minimum => 1 }, 
-        "View isn't displaying pagination. Add <%= will_paginate @collection %>."
-    end
-  end
-  
-  # Example:
-  #  context "a GET to index not logged in as admin" do
-  #    setup { get :index }
-  #    should_not_paginate_collection :users
-  #    should_not_display_pagination
-  #  end
-  def self.should_not_paginate_collection(collection_name)
-    should "not paginate #{collection_name}" do
-      assert collection = assigns(collection_name), 
-        "Controller isn't assigning to @#{collection_name.to_s}."
-      assert_not_equal WillPaginate::Collection, collection.class, 
-        "@#{collection_name.to_s} is a WillPaginate collection."
-    end
-  end
-  
-  def self.should_not_display_pagination
-    should "not display pagination" do
-      assert_select "div.pagination", { :count => 0 }, 
-        "View is displaying pagination. Check your logic."
-    end
-  end
-end
-
-
-class ActiveSupport::TestCase
-  extend ShouldaPaginationMacros
-end

data/test/rails_root/test/shoulda_macros/plugins.rb

@@ -1,34 +0,0 @@
-module ShouldaPluginMacros
-
-  def self.should_act_as_taggable_on_steroids
-    klass = self.name.gsub(/Test$/, '').constantize
-
-    should "include ActsAsTaggableOnSteroids methods" do
-      assert klass.extended_by.include?(ActiveRecord::Acts::Taggable::ClassMethods)
-      assert klass.extended_by.include?(ActiveRecord::Acts::Taggable::SingletonMethods)
-      assert klass.include?(ActiveRecord::Acts::Taggable::InstanceMethods)
-    end
-
-    should_have_many :taggings, :tags
-  end
-
-
-  def self.should_act_as_list
-    klass = self.name.gsub(/Test$/, '').constantize
-
-    context "To support acts_as_list" do
-      should_have_db_column('position', :type => :integer)
-    end
-
-    should "include ActsAsList methods" do
-      assert klass.include?(ActiveRecord::Acts::List::InstanceMethods)
-    end
-
-    should_have_instance_methods :acts_as_list_class, :position_column, :scope_condition
-  end
-
-end
-
-ActiveSupport::TestCase.extend(ShouldaPluginMacros)
-Test::Unit::TestCase.extend(ShouldaPluginMacros)
-ActionController::TestCase.extend(ShouldaPluginMacros)