bellmyer-validates_blacklist 0.1.1 → 0.1.3

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -120,7 +120,7 @@ The only limits are your imagination, and my forethought.  You can even specify
 the error message that is generated:
 
   email:
-   - [greasy_pete@aol.com, cannot be greasy pete from biology]
+   - [stinky_pete@aol.com, cannot be greasy pete from biology]
   
   age:
    - [>25, cannot be a pervert]

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the validates_blacklist plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the validates_blacklist plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ValidatesBlacklist'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/generators/blacklists/blacklists_generator.rb

@@ -0,0 +1,11 @@
+class BlacklistsGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.directory 'config/blacklists'
+      
+      Dir["#{RAILS_ROOT}/app/models/*.rb"].each do |file|
+        m.file 'blacklist.yml', "config/blacklists/#{File.basename(file, '.rb')}_blacklist.yml", :collision => :skip
+      end
+    end
+  end
+end

data/generators/blacklists/templates/blacklist.yml

@@ -0,0 +1,14 @@
+# Example for a User model with name, e-mail and age attributes
+#
+# name:
+#   - Stinky Pete
+#   - Patchy the Pirate
+#
+# email:
+#   - stinky_pete@gmail.com
+#   - /@aol.com$/
+#
+# age:
+#   - < 14
+#   - > 25
+

data/init.rb

@@ -0,0 +1,2 @@
+require 'bellmyer/validates_blacklist'
+ActiveRecord::Base.extend Bellmyer::ValidatesBlacklist

data/lib/bellmyer/validates_blacklist.rb

@@ -0,0 +1,68 @@
+module Bellmyer
+  module ValidatesBlacklist
+    require 'yaml'
+
+    def validates_blacklist(options = {})
+      options.reverse_merge!(
+        :message  => 'is not allowed.',
+        :attributes => {}
+      )
+
+      unless included_modules.include? InstanceMethods
+        class_inheritable_accessor :options
+        class_inheritable_accessor :model
+        
+        extend ClassMethods
+        include InstanceMethods
+
+        validate :model_blacklists
+
+      end
+      
+      self.options = options
+        self.model = self.to_s.underscore
+    end
+    
+    module ClassMethods
+      def blacklist
+        puts "blacklisted!"
+      end
+      
+      def unblacklist
+        puts "Removed from blacklist."
+      end
+    end
+    
+    module InstanceMethods
+      
+      
+      protected
+      
+      def model_blacklists
+        blacklist = "#{RAILS_ROOT}/config/blacklists/#{self.class.to_s.underscore}_blacklist.yml"
+        
+        # Load blacklist #
+        if attributes = File.open(blacklist){|f| YAML::load(f)}
+          # Cycle through attributes #
+          attributes.each do |attribute, stops|
+            attribute = attribute.to_sym
+            
+            stops.each do |stop|
+              stop_name = stop.is_a?(Array) ? stop.first : stop
+              stop_message = stop.is_a?(Array) ? stop.last : self.options[:attributes][attribute] || self.options[:message]
+              
+              # regexp #
+              if !self.send(attribute).nil? && stop_name =~ /^\//
+                errors.add(attribute, stop_message) if eval("self.#{attribute} =~ #{stop_name}")
+              elsif !self.send(attribute).nil? && stop_name =~ /^(\<|\>|!|=)/
+                errors.add(attribute, stop_message) if eval("self.#{attribute} #{stop_name}")
+              else
+                errors.add(attribute, stop_message) if self.send(attribute).to_s == stop_name
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/config/blacklists/friend_with_attribute_message_blacklist.yml

@@ -0,0 +1,11 @@
+name:
+ - Stinky Pete
+ - [Vanessa, is not allowed after ditching my b-day party]
+ 
+email:
+ - stinky_pete@gmail.com
+ - [/@aol\.com$/, is banned until they stop sending me CD\'s]
+ 
+age:
+ - < 14
+ - [\> 25, is too old and pervy!exit]

data/test/config/blacklists/friend_with_blacklist_blacklist.yml

@@ -0,0 +1,20 @@
+name:
+ - Stinky Pete
+ - /Pete/
+ - [Vanessa, is not allowed after ditching my b-day party]
+ - ['=~ /smurf/i', is not allowed to be a smurf!]
+ 
+email:
+ - stinky_pete@gmail.com
+ - [/@aol\.com$/, is banned until they stop sending me CD\'s]
+ 
+age:
+ - [< 14, is too young to party.]
+ - ['> 25', is too old and pervy!]
+
+net_worth:
+ - ['<= 50_000', is too poor.]
+ - ['>= 150_000', is too rich.]
+ 
+school:
+ - ['!~ /Valley/', is not Valley High School!]

data/test/config/blacklists/friend_with_blank_blacklist_blacklist.yml

@@ -0,0 +1 @@
+

data/test/config/blacklists/friend_with_custom_message_blacklist.yml

@@ -0,0 +1,11 @@
+name:
+ - Stinky Pete
+ - [Vanessa, is not allowed after ditching my b-day party]
+ 
+email:
+ - stinky_pete@gmail.com
+ - [/@aol\.com$/, is banned until they stop sending me CD\'s]
+ 
+age:
+ - < 14
+ - [\> 25, is too old and pervy!exit]

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+require 'active_support'
+require 'active_support/test_case'
+
+

data/test/validates_blacklist_test.rb

@@ -0,0 +1,178 @@
+require 'test/unit'
+require 'rubygems'
+require 'active_record'
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require File.dirname(__FILE__) + '/../init'
+ 
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ 
+# AR keeps printing annoying schema statements
+$stdout = StringIO.new
+
+RAILS_ROOT = File.dirname(__FILE__)
+
+def setup_db
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :friends do |t|
+      t.string  :name
+      t.string  :email
+      t.integer :age
+      t.integer :net_worth
+      t.string  :school
+    end
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class Friend < ActiveRecord::Base
+end
+
+class FriendWithBlacklist < Friend
+  validates_blacklist
+end
+
+class FriendWithBlacklistTest < Test::Unit::TestCase
+  def setup
+    setup_db
+  end
+  
+  def teardown
+    teardown_db
+  end
+  
+  def test_should_fail_validation_on_exact_string_match
+    friend = FriendWithBlacklist.new(:name => 'Stinky Pete')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?("is not allowed.")
+  end
+  
+  def test_should_fail_validation_on_regexp_match
+    friend = FriendWithBlacklist.new(:name => 'Handsome Pete')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?("is not allowed.")
+  end
+  
+  def test_should_fail_validation_on_custom_message
+    friend = FriendWithBlacklist.new(:name => 'Vanessa')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?("is not allowed after ditching my b-day party")
+  end
+  
+  def test_should_fail_validation_on_less_than_match
+    friend = FriendWithBlacklist.new(:age => 12)
+    assert !friend.valid?
+    assert friend.errors.invalid?(:age)
+    assert friend.errors.on(:age).include?("is too young to party.")
+  end
+  
+  def test_should_fail_validation_on_greater_than_match
+    friend = FriendWithBlacklist.new(:age => 55)
+    assert !friend.valid?
+    assert friend.errors.invalid?(:age)
+    assert friend.errors.on(:age).include?("is too old and pervy!")
+  end
+  
+  def test_should_fail_validation_on_greater_than_or_equal_match
+    friend = FriendWithBlacklist.new(:net_worth => 150_000)
+    assert !friend.valid?
+    assert friend.errors.invalid?(:net_worth)
+    assert friend.errors.on(:net_worth).include?('is too rich.')
+  end
+  
+  def test_should_fail_validation_on_less_than_or_equal_match
+    friend = FriendWithBlacklist.new(:net_worth => 50_000)
+    assert !friend.valid?
+    assert friend.errors.invalid?(:net_worth)
+    assert friend.errors.on(:net_worth).include?('is too poor.')
+  end
+  
+  def test_should_fail_validation_on_explicit_nonregexp
+    friend = FriendWithBlacklist.new(:school => 'Mouthbreather Academy')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:school)
+    assert friend.errors.on(:school).include?("is not Valley High School!")
+  end
+  
+  def test_should_fail_validation_on_explicit_regexp
+    friend = FriendWithBlacklist.new(:name => 'Papa Smurf')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?("is not allowed to be a smurf!")
+  end
+end
+
+class FriendWithCustomMessage < Friend
+  validates_blacklist :message => "has left the building."
+end
+
+class FriendWithCustomMessageTest < Test::Unit::TestCase
+  def setup
+    setup_db
+  end
+  
+  def teardown
+    teardown_db
+  end
+  
+  def test_global_custom_message_fails_validation_on_exact_string_match
+    friend = FriendWithCustomMessage.new(:name => 'Stinky Pete')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?("has left the building.")
+  end
+end
+
+class FriendWithAttributeMessage < Friend
+  validates_blacklist :message => "has left the building.", :attributes => {:email => 'looks spammy'}
+end
+
+class FriendWithAttributeMessageTest < Test::Unit::TestCase
+  def setup
+    setup_db
+  end
+  
+  def teardown
+    teardown_db
+  end
+  
+  def test_attribute_message_fails_validation_on_exact_string_match_with_global_message
+    friend = FriendWithAttributeMessage.new(:name => 'Stinky Pete')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:name)
+    assert friend.errors.on(:name).include?("has left the building.")
+  end
+  
+  def test_attribute_message_fails_validation_on_exact_string_match_with_attrib_message
+    friend = FriendWithAttributeMessage.new(:email => 'stinky_pete@gmail.com')
+    assert !friend.valid?
+    assert friend.errors.invalid?(:email)
+    assert friend.errors.on(:email).include?('looks spammy')
+  end
+end
+
+class FriendWithBlankBlacklist < Friend
+  validates_blacklist
+end
+
+class FriendWithBlankBlacklistTest < Test::Unit::TestCase
+  def setup
+    setup_db
+  end
+  
+  def teardown
+    teardown_db
+  end
+  
+  def test_should_not_fail
+    friend = FriendWithBlankBlacklist.new(:name => 'Stinky Pete')
+    assert friend.valid?
+  end
+end

data/validates_blacklist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'validates_blacklist'
-  s.version = '0.1.1'
+  s.version = '0.1.3'
   s.date = '2009-08-26'
   
   s.summary = "Allows models to be validated against yaml-based blacklists"
@@ -15,14 +15,24 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README"]
 
   s.add_dependency 'rails', ['>= 2.1']
+  s.add_dependency 'yaml'
   
    s.files = [
+    "init.rb",
+    "MIT-LICENSE",
+    "Rakefile",
     "README",
     "validates_blacklist.gemspec",
-    "lib/bellmyer-validates_blacklist.rb",
-    "lib/active_record/validates/blacklist.rb",
+    "generators/blacklists/templates/blacklist.yml",
+    "generators/blacklists/blacklists_generator.rb",
+    "lib/bellmyer/validates_blacklist.rb",
+    "test/config/blacklists/friend_with_attribute_message_blacklist.yml",
+    "test/config/blacklists/friend_with_blacklist_blacklist.yml",
+    "test/config/blacklists/friend_with_blank_blacklist_blacklist.yml",
+    "test/config/blacklists/friend_with_custom_message_blacklist.yml",
+    "test/test_helper.rb",
+    "test/validates_blacklist_test.rb"
   ]
   
-  s.test_files = ["test/blacklist_test.rb"]
-
+  s.test_files = ["test/validates_blacklist_test.rb"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bellmyer-validates_blacklist
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jaime Bellmyer
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.1"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: yaml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: ""
 email: ruby@bellmyer.com
 executables: []
@@ -31,10 +41,20 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- init.rb
+- MIT-LICENSE
+- Rakefile
 - README
 - validates_blacklist.gemspec
-- lib/bellmyer-validates_blacklist.rb
-- lib/active_record/validates/blacklist.rb
+- generators/blacklists/templates/blacklist.yml
+- generators/blacklists/blacklists_generator.rb
+- lib/bellmyer/validates_blacklist.rb
+- test/config/blacklists/friend_with_attribute_message_blacklist.yml
+- test/config/blacklists/friend_with_blacklist_blacklist.yml
+- test/config/blacklists/friend_with_blank_blacklist_blacklist.yml
+- test/config/blacklists/friend_with_custom_message_blacklist.yml
+- test/test_helper.rb
+- test/validates_blacklist_test.rb
 has_rdoc: true
 homepage: http://github.com/bellmyer/validates_blacklist
 licenses: 
@@ -64,4 +84,4 @@ signing_key:
 specification_version: 2
 summary: Allows models to be validated against yaml-based blacklists
 test_files: 
-- test/blacklist_test.rb
+- test/validates_blacklist_test.rb

data/lib/active_record/validates/blacklist.rb

@@ -1,27 +0,0 @@
-module ActiveRecord
-  module Validates #:nodoc:
-    module Blacklist #:nodoc:
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        validates_blacklist(options = {})
-          options.reverse_merge!(:message => 'is not allowed')
-          
-          include ActiveRecord::Validates::Blacklist::InstanceMethods
-        end
-      end
-
-      module InstanceMethods
-        def blacklist(attribute, value, message = nil)
-          puts "blacklisted!"
-        end
-        
-        def unblacklist(attribute, value)
-          puts "unblacklisted!"
-        end
-      end 
-    end
-  end
-end

data/lib/bellmyer-validates_blacklist.rb

@@ -1,2 +0,0 @@
-require 'active_record/validates/blacklist'
-ActiveRecord::Base.class_eval { include ActiveRecord::Validates::Blacklist }

data/test/blacklist_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