muck-comments 0.1.20 → 0.1.21

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/lib/active_record/acts/muck_comment.rb

@@ -17,12 +17,13 @@ module ActiveRecord
           acts_as_nested_set :scope => [:commentable_id, :commentable_type]
           validates_presence_of :body
           belongs_to :user
-          belongs_to :commentable, :counter_cache => 'comment_count', :polymorphic => true, :touch => true
+          belongs_to :commentable, :polymorphic => true, :counter_cache => 'comment_count', :touch => true
 
           named_scope :limit, lambda { |num| { :limit => num } }
-          named_scope :by_newest, :order => "created_at DESC"
-          named_scope :by_oldest, :order => "created_at ASC"
-          named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
+          named_scope :by_newest, :order => "comments.created_at DESC"
+          named_scope :by_oldest, :order => "comments.created_at ASC"
+          named_scope :recent, lambda { { :conditions => ['comments.created_at > ?', 1.week.ago] } }
+          named_scope :by_user, lambda { { :conditions => ['comments.user_id  ?', user.id] } }
           
           if options[:sanitize_content]
             before_save :sanitize_attributes
@@ -41,30 +42,6 @@ module ActiveRecord
 
       # class methods
       module SingletonMethods
-        
-        # Helper class method to lookup all comments assigned
-        # to all commentable types for a given user.
-        def find_comments_by_user(user)
-          find(:all,
-            :conditions => ["user_id = ?", user.id],
-            :order => "created_at DESC"
-          )
-        end
-
-        # Helper class method to look up all comments for 
-        # commentable class name and commentable id.
-        def find_comments_for_commentable(commentable_str, commentable_id)
-          find(:all,
-            :conditions => ["commentable_type = ? and commentable_id = ?", commentable_str, commentable_id],
-            :order => "created_at DESC"
-          )
-        end
-
-        # Helper class method to look up a commentable object
-        # given the commentable class name and id 
-        def find_commentable(commentable_str, commentable_id)
-          commentable_str.constantize.find(commentable_id)
-        end
 
       end
       

data/lib/acts_as_commentable_with_threading.rb

@@ -8,7 +8,7 @@ module Acts #:nodoc:
 
     module ClassMethods
       def acts_as_commentable
-        has_many :comments, :as => :commentable, :dependent => :destroy, :order => 'created_at ASC'
+        has_many :comments, :as => :commentable, :dependent => :destroy
         include Acts::CommentableWithThreading::InstanceMethods
         extend Acts::CommentableWithThreading::SingletonMethods
       end
@@ -16,28 +16,7 @@ module Acts #:nodoc:
     
     # This module contains class methods
     module SingletonMethods
-      # Helper method to lookup for comments for a given object.
-      # This method is equivalent to obj.comments.
-      def find_comments_for(obj)
-        commentable = ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s
-       
-        self.find(:all,
-          :conditions => ["commentable_id = ? and commentable_type = ?", obj.id, commentable],
-          :order => "created_at DESC"
-        )
-      end
       
-      # Helper class method to lookup comments for
-      # the mixin commentable type written by a given user.  
-      # This method is NOT equivalent to Comment.find_comments_for_user
-      def find_comments_by_user(user) 
-        commentable = ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s
-        
-        self.find(:all,
-          :conditions => ["user_id = ? and commentable_type = ?", user.id, commentable],
-          :order => "created_at DESC"
-        )
-      end
     end
     
     # This module contains instance methods
@@ -48,17 +27,9 @@ module Acts #:nodoc:
         self.comments.find(:all, :conditions => {:parent_id => nil})
       end
       
-      # Helper method to sort comments by date
-      def comments_ordered_by_submitted
-        self.class.find(:all,
-          :conditions => ["commentable_id = ? and commentable_type = ?", id, self.class.name],
-          :order => "created_at DESC"
-        )
-      end
-      
       # Helper method that defaults the submitted time.
       def add_comment(comment)
-        comments << comment
+        self.comments << comment
       end
       
       # Determines whether or not the give user can comment on the parent object

data/muck-comments.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-comments}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-07-23}
   s.description = %q{The comment engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -143,6 +143,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20091124205819_add_fields_to_profiles.rb",
      "test/rails_root/db/migrate/20100123035450_create_access_codes.rb",
      "test/rails_root/db/migrate/20100123233654_create_access_code_requests.rb",
+     "test/rails_root/db/migrate/20100206000906_remove_name_fields.rb",
      "test/rails_root/features/comments.feature",
      "test/rails_root/features/step_definitions/comment_steps.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
@@ -166,8 +167,13 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/arrow_left.gif",
      "test/rails_root/public/images/arrow_right.gif",
      "test/rails_root/public/images/arrow_up.gif",
+     "test/rails_root/public/images/fancybox/blank.gif",
+     "test/rails_root/public/images/fancybox/fancy_close.png",
      "test/rails_root/public/images/fancybox/fancy_closebox.png",
      "test/rails_root/public/images/fancybox/fancy_left.png",
+     "test/rails_root/public/images/fancybox/fancy_loading.png",
+     "test/rails_root/public/images/fancybox/fancy_nav_left.png",
+     "test/rails_root/public/images/fancybox/fancy_nav_right.png",
      "test/rails_root/public/images/fancybox/fancy_progress.png",
      "test/rails_root/public/images/fancybox/fancy_right.png",
      "test/rails_root/public/images/fancybox/fancy_shadow_e.png",
@@ -180,7 +186,13 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/fancybox/fancy_shadow_w.png",
      "test/rails_root/public/images/fancybox/fancy_title_left.png",
      "test/rails_root/public/images/fancybox/fancy_title_main.png",
+     "test/rails_root/public/images/fancybox/fancy_title_over.png",
      "test/rails_root/public/images/fancybox/fancy_title_right.png",
+     "test/rails_root/public/images/fancybox/fancybox-x.png",
+     "test/rails_root/public/images/fancybox/fancybox-y.png",
+     "test/rails_root/public/images/fancybox/fancybox.png",
+     "test/rails_root/public/images/icon_no.gif",
+     "test/rails_root/public/images/icon_success.gif",
      "test/rails_root/public/images/icons/accept.png",
      "test/rails_root/public/images/icons/add.png",
      "test/rails_root/public/images/icons/blue_guy.png",
@@ -563,6 +575,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/effects.js",
      "test/rails_root/public/javascripts/fancyzoom.min.js",
      "test/rails_root/public/javascripts/jquery/colorpicker.js",
+     "test/rails_root/public/javascripts/jquery/fg.menu.js",
      "test/rails_root/public/javascripts/jquery/jquery-ui.js",
      "test/rails_root/public/javascripts/jquery/jquery.autocomplete.js.readme",
      "test/rails_root/public/javascripts/jquery/jquery.autocomplete.min.js",
@@ -573,15 +586,19 @@ 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.metadata.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.mousewheel.js",
      "test/rails_root/public/javascripts/jquery/jquery.queryString.js",
      "test/rails_root/public/javascripts/jquery/jquery.swapimage.js",
      "test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.timers.js",
      "test/rails_root/public/javascripts/jquery/jquery.tips.js",
      "test/rails_root/public/javascripts/jquery/jrails.js",
      "test/rails_root/public/javascripts/muck-countries.js",
+     "test/rails_root/public/javascripts/muck-src.js",
      "test/rails_root/public/javascripts/muck-users.js",
      "test/rails_root/public/javascripts/muck.js",
      "test/rails_root/public/javascripts/muck_activities.js",
+     "test/rails_root/public/javascripts/muck_admin.js",
      "test/rails_root/public/javascripts/muck_time/en.js",
      "test/rails_root/public/javascripts/prototype.js",
      "test/rails_root/public/javascripts/scriptaculous.js",
@@ -624,6 +641,21 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/blueprint/src/print.css",
      "test/rails_root/public/stylesheets/blueprint/src/reset.css",
      "test/rails_root/public/stylesheets/blueprint/src/typography.css",
+     "test/rails_root/public/stylesheets/fgmenu/fg.menu.css",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_flat_0_aaaaaa_40x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_flat_0_eeeeee_40x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_flat_55_ffffff_40x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_flat_75_ffffff_40x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_glass_65_ffffff_1x400.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-icons_0073ea_256x240.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-icons_454545_256x240.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-icons_666666_256x240.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-icons_ff0084_256x240.png",
+     "test/rails_root/public/stylesheets/flick/images/ui-icons_ffffff_256x240.png",
+     "test/rails_root/public/stylesheets/flick/jquery-ui-1.8.1.custom.css",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_diagonals-thick_15_444444_40x40.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-bg_glass_100_f0f0f0_1x400.png",
@@ -772,7 +804,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-comments}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{The comment engine for the muck system}
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",
@@ -815,6 +847,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20091124205819_add_fields_to_profiles.rb",
      "test/rails_root/db/migrate/20100123035450_create_access_codes.rb",
      "test/rails_root/db/migrate/20100123233654_create_access_code_requests.rb",
+     "test/rails_root/db/migrate/20100206000906_remove_name_fields.rb",
      "test/rails_root/features/step_definitions/comment_steps.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
@@ -860,7 +893,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sanitize>, [">= 0"])
       s.add_runtime_dependency(%q<awesome_nested_set>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])

data/test/rails_root/config/database.yml

@@ -1,23 +1,20 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
+  adapter: mysql
+  database: muck_comments_development
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 
-test: &TEST
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
+test:
+  adapter: mysql
+  database: muck_comments_test
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
-
-cucumber:
-  <<: *TEST
 cucumber:
   <<: *TEST
-cucumber:
-  <<: *TEST
-cucumber:
-  <<: *TEST
+  
+  

data/test/rails_root/db/migrate/20100206000906_remove_name_fields.rb

@@ -0,0 +1,15 @@
+class RemoveNameFields < ActiveRecord::Migration
+  def self.up
+    remove_column :profiles, :first_name
+    remove_column :profiles, :last_name
+    add_column :profiles, :profile_views, :integer
+    add_column :profiles, :policy, :text
+  end
+
+  def self.down
+    add_column :profiles, :first_name, :string
+    add_column :profiles, :last_name, :string
+    remove_column :profiles, :profile_views
+    remove_column :profiles, :policy
+  end
+end