more porting work for activerecord 3. convert special finders to scopes. add specs for them.

Author: mpd

Gemfile.lock

@@ -3,11 +3,25 @@ PATH
   specs:
     acts_as_commentable_with_threading (0.1.1)
       activerecord (~> 3.0)
-      awesome_nested_set
+      moretea-awesome_nested_set
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
     activemodel (3.0.0)
       activesupport (= 3.0.0)
       builder (~> 2.1.2)
@@ -17,13 +31,48 @@ GEM
       activesupport (= 3.0.0)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
     activesupport (3.0.0)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    awesome_nested_set (1.4.3)
-      activerecord (>= 1.1)
     builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     i18n (0.4.1)
+    mail (2.2.6.1)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    moretea-awesome_nested_set (1.4.3.1)
+      activerecord (~> 3.0.0)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.5)
+      rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (1.3.0)
+    sqlite3-ruby (1.3.1)
+    thor (0.14.2)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -32,4 +81,9 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.0)
   acts_as_commentable_with_threading!
-  awesome_nested_set
+  bundler (~> 1.0)
+  moretea-awesome_nested_set
+  rails (~> 3.0)
+  rake
+  rspec (~> 1.3)
+  sqlite3-ruby

acts_as_commentable_with_threading.gemspec

@@ -21,6 +21,12 @@ ACTS_AS_COMMENTABLE_WITH_THREADING = Gem::Specification.new do |s|
   s.test_files = ["spec/commentable_spec.rb", "spec/comment_spec.rb", "spec/spec_helper.rb", "spec/db/database.yml", "spec/db/schema.rb"]
   s.rdoc_options = ["--main", "README"]
 
-  s.add_dependency 'awesome_nested_set'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 1.3'
+  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'rails', '~> 3.0'
+
   s.add_dependency 'activerecord', '~> 3.0'
+  s.add_dependency 'moretea-awesome_nested_set'
 end

init.rb

@@ -1,3 +1 @@
-# Include hook code here
-require 'acts_as_commentable_with_threading'
-
+require File.expand_path('./rails/init', File.dirname(__FILE__))

lib/comment.rb

@@ -1,3 +1,6 @@
+# WHY IS THIS REQUIRED? 
+ActiveRecord::Base.send(:include, CollectiveIdea::Acts::NestedSet::Base) unless ActiveRecord::Base.respond_to?(:acts_as_nested_set)
+
 class Comment < ActiveRecord::Base
   acts_as_nested_set :scope => [:commentable_id, :commentable_type]
 
@@ -30,25 +33,19 @@ def has_children?
 
   # Helper class method to lookup all comments assigned
   # to all commentable types for a given user.
-  def self.find_comments_by_user(user)
-    find(:all,
-      :conditions => ["user_id = ?", user.id],
-      :order => "created_at DESC"
-    )
-  end
-  
+  scope :find_comments_by_user, lambda { |user|
+    where(:user_id => user.id).order('created_at DESC')
+  }
+
   # Helper class method to look up all comments for 
   # commentable class name and commentable id.
-  def self.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
+  scope :find_comments_for_commentable, lambda { |commentable_str, commentable_id|
+    where(:commentable_type => commentable_str.to_s, :commentable_id => commentable_id).order('created_at DESC')
+  }
 
   # Helper class method to look up a commentable object
   # given the commentable class name and id 
   def self.find_commentable(commentable_str, commentable_id)
     commentable_str.constantize.find(commentable_id)
   end
-end
+end

rails/init.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require 'acts_as_commentable_with_threading'
+
+# Why isn't this being done in the railtie require?
+ActiveRecord::Base.send(:include, CollectiveIdea::Acts::NestedSet::Base)
+

spec/comment_spec.rb

@@ -46,4 +46,42 @@
       @comment.children.first.should == @child
     end
   end
-end
+
+  describe "finders" do
+    describe "#find_comments_by_user" do
+      before :each do
+        @other_user = User.create!
+        @user_comment = Comment.create!(:body => "Child comment", :user => @user)
+        @non_user_comment = Comment.create!(:body => "Child comment", :user => @other_user)
+        @comments = Comment.find_comments_by_user(@user)
+      end
+
+      it "should return all the comments created by the passed user" do
+        @comments.should include(@user_comment)
+      end
+      
+      it "should not return comments created by non-passed users" do
+        @comments.should_not include(@non_user_comment)
+      end
+    end
+
+    describe "#find_comments_for_commentable" do
+      before :each do
+        @other_user = User.create!
+        @user_comment = Comment.create!(:body => 'from user', :commentable_type => @other_user.class.to_s, :commentable_id => @other_user.id, :user => @user)
+
+        @other_comment = Comment.create!(:body => 'from other user', :commentable_type => @user.class.to_s, :commentable_id => @user.id, :user => @other_user)
+
+        @comments = Comment.find_comments_for_commentable(@other_user.class, @other_user.id)
+      end
+
+      it "should return the comments for the passed commentable" do
+        @comments.should include(@user_comment)
+      end
+
+      it "should not return the comments for non-passed commentables" do
+        @comments.should_not include(@other_comment)
+      end
+    end
+  end
+end

spec/spec_helper.rb

@@ -1,7 +1,7 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'bundler/setup'
+
+require 'active_record'
 
-require 'rubygems'
-require 'active_record' 
 require 'logger'
 
 plugin_test_dir = File.dirname(__FILE__)