radiant-forum-extension 3.0.0.rc3 → 3.0.0.rc4

data/app/views/admin/dashboard/_forum_dashboard.html.haml

@@ -1,31 +1,11 @@
 - include_stylesheet 'admin/forum_dashboard'
 
-#recent_comments.dashboard_module
-  .header
-    %h2
-      = t('forum_extension.pages_with_latest_comments')
-  .blockcontent
-    - latest = Page.last_commented(6)
-    - if latest.any?
-      - latest.each do |page|
-        .page
-          %h3
-            = link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.url, :class => 'page')
-            = link_to("→", page.path, :class => 'public')
-          %p.minor
-            =t('forum_extension.comment_count_from', :count => page.posts.count)
-            = link_to topic.replied_by.name, reader_url(topic.replied_by)
-            = friendly_date(topic.replied_at)
-    - else
-      %p.minor
-        =t('dashboard_extension.no_show')
-        
 #recent_topics.dashboard_module
   .header
     %h2
       = t('forum_extension.latest_forum_activity')
   .blockcontent
-    - latest = Topic.latest(4)
+    - latest = Topic.latest(8)
     - if latest.any?
       - latest.each do |topic|
         - post = topic.posts.last
@@ -40,12 +20,34 @@
               = t('forum_extension.started_by')
               = link_to topic.reader.name, reader_url(topic.reader)
               = friendly_date(topic.created_at)
-        %p.excerpt
-          = truncate_words(scrub_html(post.body), 16)
       %p.minor
         =t('forum_extension.administer_by_browsing')
     - else
       %p.minor
         =t('dashboard_extension.no_show')
-        
-      
+      
+
+#recent_comments.dashboard_module
+  .header
+    %h2
+      = t('forum_extension.pages_with_latest_comments')
+  .blockcontent
+    - if Radiant.config['forum.allow_page_comments?']
+      - latest = Page.last_commented(8)
+      - if latest.any?
+        - latest.each do |page|
+          .page
+            %h3
+              = link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.url, :class => 'page')
+              = link_to("→", page.path, :class => 'public')
+            %p.minor
+              =t('forum_extension.comment_count_from', :count => page.posts.count)
+              = link_to topic.replied_by.name, reader_url(topic.replied_by)
+              = friendly_date(topic.replied_at)
+      - else
+        %p.minor
+          =t('dashboard_extension.no_show')
+    - else
+      %p.minor
+        =t('forum_extension.comments_disabled')
+    

data/config/locales/en.yml

@@ -54,6 +54,7 @@ en:
       other: "%{count} comments, most recently from "
     comment_on_page: "a comment added to the page"
     comments_closed: "Comments closed."
+    comments_disabled: "Page comments are disabled"
     comments_on: "Comments on"
     comments: "comments"
     confirm_removal_of_comment: "Are you sure you want to delete this comment from %{author}? There's no way to get it back if you change your mind."

data/forum_extension.rb

@@ -6,6 +6,10 @@ class ForumExtension < Radiant::Extension
   description RadiantForumExtension::DESCRIPTION
   url RadiantForumExtension::URL
 
+  extension_config do |config|
+    config.gem 'acts_as_list', :version => "~> 0.1.2"
+  end
+
   def activate
     ActiveRecord::Base.send :include, CommentableModel                         # provides has_comments class method that is used here by topics and pages but can be called from any model
     Reader.send :include, ForumReader                                          # has topics and posts
@@ -33,7 +37,7 @@ class ForumExtension < Radiant::Extension
     
     if admin.respond_to?(:dashboard)
       Admin::DashboardController.send :helper, ForumHelper
-      admin.dashboard.index.add :main, 'forum_dashboard', :after => 'draft_pages'
+      admin.dashboard.index.add :main, 'forum_dashboard', :before => 'recent_assets'
     end
 
     tab("Forum") do

data/lib/commentable_model.rb

@@ -1,20 +1,6 @@
 module CommentableModel # for inclusion into ActiveRecord::Base
   def self.included(base)
     base.extend ClassMethods
-    base.class_eval do
-      named_scope :last_commented, lambda { |count| {
-        :conditions => "replied_at IS NOT NULL",
-        :order => "replied_at DESC",
-        :limit => count
-      }}
-      named_scope :most_commented, lambda { |count| {
-        :select => "topics.*, count(posts.id) AS post_count", 
-        :joins => "INNER JOIN posts ON posts.topic_id = topics.id",
-        :group => "topics.id",
-        :order => "post_count DESC",
-        :limit => count
-      }}
-    end
   end
 
   module ClassMethods
@@ -30,6 +16,18 @@ module CommentableModel # for inclusion into ActiveRecord::Base
         extend CommentableModel::CommentableClassMethods
         include CommentableModel::CommentableInstanceMethods
       }
+      named_scope :last_commented, lambda { |count| {
+        :conditions => "replied_at IS NOT NULL",
+        :order => "replied_at DESC",
+        :limit => count
+      }}
+      named_scope :most_commented, lambda { |count| {
+        :select => "#{self.table_name}.*, count(posts.id) AS post_count", 
+        :joins => "INNER JOIN posts ON posts.#{self.class.to_s.downcase}_id = #{self.table_name}.id",
+        :group => "#{self.table_name}.id",
+        :order => "post_count DESC",
+        :limit => count
+      }}
     end
   end
   

data/lib/radiant-forum-extension.rb

@@ -1,5 +1,5 @@
 module RadiantForumExtension
-  VERSION = '3.0.0.rc3'
+  VERSION = '3.0.0.rc4'
   SUMMARY = %q{Forum and Comment Extension for Radiant CMS}
   DESCRIPTION = %q{Nice clean forums and page comments for inclusion in your radiant site.}
   URL = "http://radiant.spanner.org/forum"

data/public/stylesheets/sass/admin/forum_dashboard.sass

@@ -0,0 +1,27 @@
+@import admin/grid
+
+#dashboard
+  #recent_topics
+    +grid(4)
+    height: 500px
+  #recent_comments
+    +grid(4)
+    height: 500px
+
+.blockcontent
+  h3
+    margin-top: 0.25em
+    a.topic
+      color: black
+      text-decoration: none
+      &:hover
+        color: #06c
+        text-decoration: underline
+    span.context
+      font-size: 10px
+      font-weight: normal
+      color: #bbb8ac
+      a
+        color: #939187
+  p.excerpt
+    margin-top: 0.25em

data/public/stylesheets/sass/forum.sass

@@ -237,7 +237,11 @@ p.add_comment, p.add_reply
 
 span.formnote
   +small
-  
+
+// dashboard module
+
+
+
 // emoticons in message display are interpolated by our redcloth extension as <img class="emoticon something" />
 
 img.emoticon

data/radiant-forum-extension.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = RadiantForumExtension::DESCRIPTION
 
   s.add_dependency 'radiant-reader-extension', "~> 2.0.0.rc3"
+  s.add_dependency 'acts_as_list', "~> 0.1.2"
 
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 15424115
+  hash: 15424125
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - rc
-  - 3
-  version: 3.0.0.rc3
+  - 4
+  version: 3.0.0.rc4
 platform: ruby
 authors: 
 - William Ross
@@ -37,6 +37,22 @@ dependencies:
         version: 2.0.0.rc3
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: acts_as_list
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :runtime
+  version_requirements: *id002
 description: Nice clean forums and page comments for inclusion in your radiant site.
 email: 
 - radiant@spanner.org
@@ -216,8 +232,10 @@ files:
 - public/images/furniture/wait_16_grey.gif
 - public/javascripts/forum.js
 - public/stylesheets/sass/admin/forum.sass
+- public/stylesheets/sass/admin/forum_dashboard.sass
 - public/stylesheets/sass/forum.sass
 - public/stylesheets/sass/gallery.sass
+- radiant-forum-extension-3.0.0.rc4.gem
 - radiant-forum-extension.gemspec
 - Rakefile
 - README.md
@@ -241,14 +259,10 @@ files:
 - spec/models/topic_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- vendor/plugins/acts_as_list/init.rb
-- vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
-- vendor/plugins/acts_as_list/README
-- vendor/plugins/acts_as_list/test/list_test.rb
 homepage: http://radiant.spanner.org/forum
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-forum-extension', :version => '~> 3.0.0.rc3'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-forum-extension', :version => '~> 3.0.0.rc4'\n\n  "
 rdoc_options: []
 
 require_paths: 

data/vendor/plugins/acts_as_list/README

@@ -1,23 +0,0 @@
-ActsAsList
-==========
-
-This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a +position+ column defined as an integer on the mapped database table.
-
-
-Example
-=======
-
-  class TodoList < ActiveRecord::Base
-    has_many :todo_items, :order => "position"
-  end
-
-  class TodoItem < ActiveRecord::Base
-    belongs_to :todo_list
-    acts_as_list :scope => :todo_list
-  end
-
-  todo_list.first.move_to_bottom
-  todo_list.last.move_higher
-
-
-Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license

data/vendor/plugins/acts_as_list/init.rb

@@ -1,3 +0,0 @@
-$:.unshift "#{File.dirname(__FILE__)}/lib"
-require 'active_record/acts/list'
-ActiveRecord::Base.class_eval { include ActiveRecord::Acts::List }

data/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb

@@ -1,256 +0,0 @@
-module ActiveRecord
-  module Acts #:nodoc:
-    module List #:nodoc:
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
-      # The class that has this specified needs to have a +position+ column defined as an integer on
-      # the mapped database table.
-      #
-      # Todo list example:
-      #
-      #   class TodoList < ActiveRecord::Base
-      #     has_many :todo_items, :order => "position"
-      #   end
-      #
-      #   class TodoItem < ActiveRecord::Base
-      #     belongs_to :todo_list
-      #     acts_as_list :scope => :todo_list
-      #   end
-      #
-      #   todo_list.first.move_to_bottom
-      #   todo_list.last.move_higher
-      module ClassMethods
-        # Configuration options are:
-        #
-        # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
-        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt> 
-        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible 
-        #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
-        #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
-        def acts_as_list(options = {})
-          configuration = { :column => "position", :scope => "1 = 1" }
-          configuration.update(options) if options.is_a?(Hash)
-
-          configuration[:scope] = "#{configuration[:scope]}_id".intern if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
-
-          if configuration[:scope].is_a?(Symbol)
-            scope_condition_method = %(
-              def scope_condition
-                if #{configuration[:scope].to_s}.nil?
-                  "#{configuration[:scope].to_s} IS NULL"
-                else
-                  "#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
-                end
-              end
-            )
-          else
-            scope_condition_method = "def scope_condition() \"#{configuration[:scope]}\" end"
-          end
-
-          class_eval <<-EOV
-            include ActiveRecord::Acts::List::InstanceMethods
-
-            def acts_as_list_class
-              ::#{self.name}
-            end
-
-            def position_column
-              '#{configuration[:column]}'
-            end
-
-            #{scope_condition_method}
-
-            before_destroy :remove_from_list
-            before_create  :add_to_list_bottom
-          EOV
-        end
-      end
-
-      # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
-      # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
-      # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
-      # the first in the list of all chapters.
-      module InstanceMethods
-        # Insert the item at the given position (defaults to the top position of 1).
-        def insert_at(position = 1)
-          insert_at_position(position)
-        end
-
-        # Swap positions with the next lower item, if one exists.
-        def move_lower
-          return unless lower_item
-
-          acts_as_list_class.transaction do
-            lower_item.decrement_position
-            increment_position
-          end
-        end
-
-        # Swap positions with the next higher item, if one exists.
-        def move_higher
-          return unless higher_item
-
-          acts_as_list_class.transaction do
-            higher_item.increment_position
-            decrement_position
-          end
-        end
-
-        # Move to the bottom of the list. If the item is already in the list, the items below it have their
-        # position adjusted accordingly.
-        def move_to_bottom
-          return unless in_list?
-          acts_as_list_class.transaction do
-            decrement_positions_on_lower_items
-            assume_bottom_position
-          end
-        end
-
-        # Move to the top of the list. If the item is already in the list, the items above it have their
-        # position adjusted accordingly.
-        def move_to_top
-          return unless in_list?
-          acts_as_list_class.transaction do
-            increment_positions_on_higher_items
-            assume_top_position
-          end
-        end
-
-        # Removes the item from the list.
-        def remove_from_list
-          if in_list?
-            decrement_positions_on_lower_items
-            update_attribute position_column, nil
-          end
-        end
-
-        # Increase the position of this item without adjusting the rest of the list.
-        def increment_position
-          return unless in_list?
-          update_attribute position_column, self.send(position_column).to_i + 1
-        end
-
-        # Decrease the position of this item without adjusting the rest of the list.
-        def decrement_position
-          return unless in_list?
-          update_attribute position_column, self.send(position_column).to_i - 1
-        end
-
-        # Return +true+ if this object is the first in the list.
-        def first?
-          return false unless in_list?
-          self.send(position_column) == 1
-        end
-
-        # Return +true+ if this object is the last in the list.
-        def last?
-          return false unless in_list?
-          self.send(position_column) == bottom_position_in_list
-        end
-
-        # Return the next higher item in the list.
-        def higher_item
-          return nil unless in_list?
-          acts_as_list_class.find(:first, :conditions =>
-            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
-          )
-        end
-
-        # Return the next lower item in the list.
-        def lower_item
-          return nil unless in_list?
-          acts_as_list_class.find(:first, :conditions =>
-            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
-          )
-        end
-
-        # Test if this record is in a list
-        def in_list?
-          !send(position_column).nil?
-        end
-
-        private
-          def add_to_list_top
-            increment_positions_on_all_items
-          end
-
-          def add_to_list_bottom
-            self[position_column] = bottom_position_in_list.to_i + 1
-          end
-
-          # Overwrite this method to define the scope of the list changes
-          def scope_condition() "1" end
-
-          # Returns the bottom position number in the list.
-          #   bottom_position_in_list    # => 2
-          def bottom_position_in_list(except = nil)
-            item = bottom_item(except)
-            item ? item.send(position_column) : 0
-          end
-
-          # Returns the bottom item
-          def bottom_item(except = nil)
-            conditions = scope_condition
-            conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
-            acts_as_list_class.find(:first, :conditions => conditions, :order => "#{position_column} DESC")
-          end
-
-          # Forces item to assume the bottom position in the list.
-          def assume_bottom_position
-            update_attribute(position_column, bottom_position_in_list(self).to_i + 1)
-          end
-
-          # Forces item to assume the top position in the list.
-          def assume_top_position
-            update_attribute(position_column, 1)
-          end
-
-          # This has the effect of moving all the higher items up one.
-          def decrement_positions_on_higher_items(position)
-            acts_as_list_class.update_all(
-              "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} <= #{position}"
-            )
-          end
-
-          # This has the effect of moving all the lower items up one.
-          def decrement_positions_on_lower_items
-            return unless in_list?
-            acts_as_list_class.update_all(
-              "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} > #{send(position_column).to_i}"
-            )
-          end
-
-          # This has the effect of moving all the higher items down one.
-          def increment_positions_on_higher_items
-            return unless in_list?
-            acts_as_list_class.update_all(
-              "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
-            )
-          end
-
-          # This has the effect of moving all the lower items down one.
-          def increment_positions_on_lower_items(position)
-            acts_as_list_class.update_all(
-              "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} >= #{position}"
-           )
-          end
-
-          # Increments position (<tt>position_column</tt>) of all items in the list.
-          def increment_positions_on_all_items
-            acts_as_list_class.update_all(
-              "#{position_column} = (#{position_column} + 1)",  "#{scope_condition}"
-            )
-          end
-
-          def insert_at_position(position)
-            remove_from_list
-            increment_positions_on_lower_items(position)
-            self.update_attribute(position_column, position)
-          end
-      end 
-    end
-  end
-end

data/vendor/plugins/acts_as_list/test/list_test.rb

@@ -1,332 +0,0 @@
-require 'test/unit'
-
-require 'rubygems'
-gem 'activerecord', '>= 1.15.4.7794'
-require 'active_record'
-
-require "#{File.dirname(__FILE__)}/../init"
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
-
-def setup_db
-  ActiveRecord::Schema.define(:version => 1) do
-    create_table :mixins do |t|
-      t.column :pos, :integer
-      t.column :parent_id, :integer
-      t.column :created_at, :datetime      
-      t.column :updated_at, :datetime
-    end
-  end
-end
-
-def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
-  end
-end
-
-class Mixin < ActiveRecord::Base
-end
-
-class ListMixin < Mixin
-  acts_as_list :column => "pos", :scope => :parent
-
-  def self.table_name() "mixins" end
-end
-
-class ListMixinSub1 < ListMixin
-end
-
-class ListMixinSub2 < ListMixin
-end
-
-class ListWithStringScopeMixin < ActiveRecord::Base
-  acts_as_list :column => "pos", :scope => 'parent_id = #{parent_id}'
-
-  def self.table_name() "mixins" end
-end
-
-
-class ListTest < Test::Unit::TestCase
-
-  def setup
-    setup_db
-    (1..4).each { |counter| ListMixin.create! :pos => counter, :parent_id => 5 }
-  end
-
-  def teardown
-    teardown_db
-  end
-
-  def test_reordering
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).move_lower
-    assert_equal [1, 3, 2, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).move_higher
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(1).move_to_bottom
-    assert_equal [2, 3, 4, 1], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(1).move_to_top
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).move_to_bottom
-    assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(4).move_to_top
-    assert_equal [4, 1, 3, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  end
-
-  def test_move_to_bottom_with_next_to_last_item
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-    ListMixin.find(3).move_to_bottom
-    assert_equal [1, 2, 4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  end
-
-  def test_next_prev
-    assert_equal ListMixin.find(2), ListMixin.find(1).lower_item
-    assert_nil ListMixin.find(1).higher_item
-    assert_equal ListMixin.find(3), ListMixin.find(4).higher_item
-    assert_nil ListMixin.find(4).lower_item
-  end
-
-  def test_injection
-    item = ListMixin.new(:parent_id => 1)
-    assert_equal "parent_id = 1", item.scope_condition
-    assert_equal "pos", item.position_column
-  end
-
-  def test_insert
-    new = ListMixin.create(:parent_id => 20)
-    assert_equal 1, new.pos
-    assert new.first?
-    assert new.last?
-
-    new = ListMixin.create(:parent_id => 20)
-    assert_equal 2, new.pos
-    assert !new.first?
-    assert new.last?
-
-    new = ListMixin.create(:parent_id => 20)
-    assert_equal 3, new.pos
-    assert !new.first?
-    assert new.last?
-
-    new = ListMixin.create(:parent_id => 0)
-    assert_equal 1, new.pos
-    assert new.first?
-    assert new.last?
-  end
-
-  def test_insert_at
-    new = ListMixin.create(:parent_id => 20)
-    assert_equal 1, new.pos
-
-    new = ListMixin.create(:parent_id => 20)
-    assert_equal 2, new.pos
-
-    new = ListMixin.create(:parent_id => 20)
-    assert_equal 3, new.pos
-
-    new4 = ListMixin.create(:parent_id => 20)
-    assert_equal 4, new4.pos
-
-    new4.insert_at(3)
-    assert_equal 3, new4.pos
-
-    new.reload
-    assert_equal 4, new.pos
-
-    new.insert_at(2)
-    assert_equal 2, new.pos
-
-    new4.reload
-    assert_equal 4, new4.pos
-
-    new5 = ListMixin.create(:parent_id => 20)
-    assert_equal 5, new5.pos
-
-    new5.insert_at(1)
-    assert_equal 1, new5.pos
-
-    new4.reload
-    assert_equal 5, new4.pos
-  end
-
-  def test_delete_middle
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).destroy
-
-    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    assert_equal 1, ListMixin.find(1).pos
-    assert_equal 2, ListMixin.find(3).pos
-    assert_equal 3, ListMixin.find(4).pos
-
-    ListMixin.find(1).destroy
-
-    assert_equal [3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-    assert_equal 1, ListMixin.find(3).pos
-    assert_equal 2, ListMixin.find(4).pos
-  end
-
-  def test_with_string_based_scope
-    new = ListWithStringScopeMixin.create(:parent_id => 500)
-    assert_equal 1, new.pos
-    assert new.first?
-    assert new.last?
-  end
-
-  def test_nil_scope
-    new1, new2, new3 = ListMixin.create, ListMixin.create, ListMixin.create
-    new2.move_higher
-    assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos')
-  end
-  
-  
-  def test_remove_from_list_should_then_fail_in_list? 
-    assert_equal true, ListMixin.find(1).in_list?
-    ListMixin.find(1).remove_from_list
-    assert_equal false, ListMixin.find(1).in_list?
-  end 
-  
-  def test_remove_from_list_should_set_position_to_nil 
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
-    ListMixin.find(2).remove_from_list 
-  
-    assert_equal [2, 1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
-    assert_equal 1,   ListMixin.find(1).pos
-    assert_equal nil, ListMixin.find(2).pos
-    assert_equal 2,   ListMixin.find(3).pos
-    assert_equal 3,   ListMixin.find(4).pos
-  end 
-  
-  def test_remove_before_destroy_does_not_shift_lower_items_twice 
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
-    ListMixin.find(2).remove_from_list 
-    ListMixin.find(2).destroy 
-  
-    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-  
-    assert_equal 1, ListMixin.find(1).pos
-    assert_equal 2, ListMixin.find(3).pos
-    assert_equal 3, ListMixin.find(4).pos
-  end 
-  
-end
-
-class ListSubTest < Test::Unit::TestCase
-
-  def setup
-    setup_db
-    (1..4).each { |i| ((i % 2 == 1) ? ListMixinSub1 : ListMixinSub2).create! :pos => i, :parent_id => 5000 }
-  end
-
-  def teardown
-    teardown_db
-  end
-
-  def test_reordering
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).move_lower
-    assert_equal [1, 3, 2, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).move_higher
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(1).move_to_bottom
-    assert_equal [2, 3, 4, 1], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(1).move_to_top
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).move_to_bottom
-    assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(4).move_to_top
-    assert_equal [4, 1, 3, 2], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-  end
-
-  def test_move_to_bottom_with_next_to_last_item
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-    ListMixin.find(3).move_to_bottom
-    assert_equal [1, 2, 4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-  end
-
-  def test_next_prev
-    assert_equal ListMixin.find(2), ListMixin.find(1).lower_item
-    assert_nil ListMixin.find(1).higher_item
-    assert_equal ListMixin.find(3), ListMixin.find(4).higher_item
-    assert_nil ListMixin.find(4).lower_item
-  end
-
-  def test_injection
-    item = ListMixin.new("parent_id"=>1)
-    assert_equal "parent_id = 1", item.scope_condition
-    assert_equal "pos", item.position_column
-  end
-
-  def test_insert_at
-    new = ListMixin.create("parent_id" => 20)
-    assert_equal 1, new.pos
-
-    new = ListMixinSub1.create("parent_id" => 20)
-    assert_equal 2, new.pos
-
-    new = ListMixinSub2.create("parent_id" => 20)
-    assert_equal 3, new.pos
-
-    new4 = ListMixin.create("parent_id" => 20)
-    assert_equal 4, new4.pos
-
-    new4.insert_at(3)
-    assert_equal 3, new4.pos
-
-    new.reload
-    assert_equal 4, new.pos
-
-    new.insert_at(2)
-    assert_equal 2, new.pos
-
-    new4.reload
-    assert_equal 4, new4.pos
-
-    new5 = ListMixinSub1.create("parent_id" => 20)
-    assert_equal 5, new5.pos
-
-    new5.insert_at(1)
-    assert_equal 1, new5.pos
-
-    new4.reload
-    assert_equal 5, new4.pos
-  end
-
-  def test_delete_middle
-    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    ListMixin.find(2).destroy
-
-    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    assert_equal 1, ListMixin.find(1).pos
-    assert_equal 2, ListMixin.find(3).pos
-    assert_equal 3, ListMixin.find(4).pos
-
-    ListMixin.find(1).destroy
-
-    assert_equal [3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
-
-    assert_equal 1, ListMixin.find(3).pos
-    assert_equal 2, ListMixin.find(4).pos
-  end
-
-end