paranoid_fu 0.4.0 → 0.4.1

data/test/paranoid_test.rb

@@ -1,51 +1,7 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class Tagging < ActiveRecord::Base
-  belongs_to :tag
-  belongs_to :widget
-  paranoid_fu
-end
-
-class Widget < ActiveRecord::Base
-  paranoid_fu
-  has_many :categories, :dependent => :destroy
-  has_and_belongs_to_many :habtm_categories, :class_name => 'Category'
-  has_one :category
-  belongs_to :parent_category, :class_name => 'Category'
-  has_many :taggings
-  has_many :tags, :through => :taggings, :without_deleted => true
-  has_many :any_tags, :through => :taggings, :class_name => 'Tag', :source => :tag
-end
-
-class Category < ActiveRecord::Base
-  paranoid_fu
-  belongs_to :widget, :without_deleted => true
-  belongs_to :any_widget, :class_name => 'Widget', :foreign_key => 'widget_id'
-
-  def self.search(name, options = {})
-    without_deleted.all options.merge(:conditions => ['LOWER(title) LIKE ?', "%#{name.to_s.downcase}%"])
-  end
-
-  def self.search_with_deleted(name, options = {})
-    all options.merge(:conditions => ['LOWER(title) LIKE ?', "%#{name.to_s.downcase}%"])
-  end
-end
-
-class Tag < ActiveRecord::Base
-  has_many :taggings
-  has_many :widgets, :through => :taggings
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :item, :polymorphic => true, :without_deleted => true
-  belongs_to :any_item, :polymorphic => true, :foreign_key => 'item_id', :foreign_type => 'item_type'
-end
-
-class NonParanoidAndroid < ActiveRecord::Base
-end
-
 class ParanoidTest < ActiveSupport::TestCase
-  fixtures :widgets, :categories, :categories_widgets, :tags, :taggings, :orders
+  fixtures :categories, :widgets, :categories_widgets, :tags, :taggings, :orders
   
   def test_without_deleted_scope
     assert_equal [1, 2], Widget.all.ids
@@ -313,6 +269,14 @@ class ParanoidTest < ActiveSupport::TestCase
     o = Order.find(:first, :include => :any_item)
     assert_equal orders(:order_1), o
     assert_equal widgets(:widget_2), o.instance_variable_get(:@any_item)
+
+    assert_equal 1, widgets(:widget_1).non_deleted_habtm_categories.size
+    assert_equal [categories(:category_1)], widgets(:widget_1).non_deleted_habtm_categories
+    w = Widget.find(1, :include => :non_deleted_habtm_categories, :conditions => {'categories.title' => 'category 1'})
+    assert_equal [categories(:category_1)], w.non_deleted_habtm_categories
+    assert_raises(ActiveRecord::RecordNotFound) do
+      Widget.find(1, :include => :non_deleted_habtm_categories, :conditions => {'categories.title' => 'category 2'})
+    end
   end
 end
 

data/test/test_helper.rb

@@ -9,9 +9,10 @@ else
   # load activerecord and plugin manually
   gem 'activerecord', "=#{ENV['RAILS']}"
   require 'active_record'
-  $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-  Dir["#{$LOAD_PATH.last}/**/*.rb"].each do |path| 
-    require path[$LOAD_PATH.last.size + 1..-1]
+  ActiveRecord.load_all!
+  require 'active_record/associations'
+  Dir["#{File.join(File.dirname(__FILE__), '..', 'lib')}/**/*.rb"].each do |path|
+    require path
   end
   require File.join(File.dirname(__FILE__), '..', 'init.rb')
 end
@@ -23,6 +24,11 @@ ActiveRecord::Base.configurations.update config
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite3'])
 
+models_dir = File.join(File.dirname(__FILE__), 'app/models')
+Dir["#{models_dir}/**/*.rb"].each do |path|
+  model = path[models_dir.size+1..-4]
+  autoload model.classify.to_sym, "#{models_dir}/#{model}"
+end
 load(File.dirname(__FILE__) + "/schema.rb")
 
 class ActiveSupport::TestCase #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paranoid_fu
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -38,6 +38,13 @@ files:
 - test/paranoid_test.rb
 - test/schema.rb
 - test/test_helper.rb
+- test/debug.log
+- test/app/models/category.rb
+- test/app/models/non_paranoid_android.rb
+- test/app/models/order.rb
+- test/app/models/tagging.rb
+- test/app/models/tag.rb
+- test/app/models/widget.rb
 - README
 - MIT-LICENSE
 - CHANGELOG