acts_as_paranoid 0.1.7 → 0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.2.0* (6 Nov 2005)
+
+* Upgrade to Rails 1.0 RC4.  ActiveRecord::Base#constrain has been replaced with scope_with.
+
 *0.1.7* (22 Oct 2005)
 
 * Added :with_deleted as a valid option of ActiveRecord::Base#find

data/lib/acts_as_paranoid.rb

@@ -45,6 +45,7 @@ module ActiveRecord #:nodoc:
             class << self
               alias_method :original_find, :find
               alias_method :count_with_deleted, :count
+              alias_method :clobbering_with_scope, :with_scope
             end
           end
           include ParanoidMethods
@@ -53,9 +54,6 @@ module ActiveRecord #:nodoc:
     
       module ParanoidMethods #:nodoc:
         def self.included(base) # :nodoc:
-          class << base
-            alias_method :clobbering_constrain, :constrain
-          end
           base.extend ClassMethods
         end
       
@@ -65,7 +63,7 @@ module ActiveRecord #:nodoc:
             call_original_find = lambda { original_find(*(args << options)) }
             
             if !options[:with_deleted]
-              constrain(scope_constrains.merge(:conditions => deleted_constrain)) { return call_original_find.call }
+              with_deleted_scope { return call_original_find.call }
             end
             
             call_original_find.call
@@ -76,36 +74,53 @@ module ActiveRecord #:nodoc:
           end
 
           def count(conditions = nil, joins = nil)
-            constrain(scope_constrains.merge(:conditions => deleted_constrain)) { count_with_deleted(conditions, joins) }
+            with_deleted_scope { count_with_deleted(conditions, joins) }
           end
 
-          # Override #constrain so that nested constrains don't clobber each other.
-          #
-          #   Entry.constrain(:conditions => 'published_at IS NOT NULL') do
-          #     Entry.constrain(:conditions => 'deleted_at IS NULL') do
-          #       Entry.find(:all)
-          #     end
-          #   end
-          def constrain(options = {}, &block)
-            begin
-              is_new_scope = scope_constrains.empty?
-              self.scope_constrains = options
-              block.call if block_given?
-            ensure 
-              self.scope_constrains = nil if is_new_scope
+          def with_scope(method_scoping = {}, is_new_scope = true)
+            # Dup first and second level of hash (method and params).
+            method_scoping = method_scoping.inject({}) do |hash, (method, params)|
+              hash[method] = params.dup
+              hash
+            end
+
+            method_scoping.assert_valid_keys [:find, :create]
+            if f = method_scoping[:find]
+              f.assert_valid_keys [:conditions, :joins, :offset, :limit, :readonly]
+              f[:readonly] = true if !f[:joins].blank? && !f.has_key?(:readonly)
             end
+
+            raise ArgumentError, "Nested scopes are not yet supported: #{scoped_methods.inspect}" unless scoped_methods.nil?
+
+            self.scoped_methods = method_scoping
+            yield
+          ensure
+            self.scoped_methods = nil if is_new_scope
           end
 
           protected
-          def deleted_constrain
+          def with_deleted_scope(&block)
             deleted_cond = "#{table_name}.deleted_at IS NULL"
-            case scope_constrains[:conditions]
-              when /#{deleted_cond}/ then scope_constrains[:conditions]
-              when NilClass then deleted_cond
-              else "#{scope_constrains[:conditions]} AND #{deleted_cond}"
+            if scoped_methods.nil?
+              is_new_scope = true
+              current_scope = {}
+            else
+              is_new_scope = false
+              current_scope = scoped_methods.clone
+              self.scoped_methods = nil
             end
+            
+            current_scope ||= {}
+            current_scope[:find] ||= {}
+            if not current_scope[:find][:conditions] =~ /#{deleted_cond}/
+              current_scope[:find][:conditions] = current_scope[:find][:conditions].nil? ?
+                deleted_cond :
+                "(#{current_scope[:find][:conditions]}) AND #{deleted_cond}"
+            end
+            
+            with_scope(current_scope, is_new_scope, &block)
           end
-          
+
           def validate_find_options(options)
             options.assert_valid_keys [:conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :with_deleted]
           end

data/test/database.yml

@@ -0,0 +1,18 @@
+sqlite:
+  :adapter: sqlite
+  :dbfile: acts_as_paranoid_plugin.sqlite.db
+sqlite3:
+  :adapter: sqlite3
+  :dbfile: acts_as_paranoid_plugin.sqlite3.db
+postgresql:
+  :adapter: postgresql
+  :username: postgres
+  :password: postgres
+  :database: acts_as_paranoid_plugin_test
+  :min_messages: ERROR
+mysql:
+  :adapter: mysql
+  :host: localhost
+  :username: rails
+  :password:
+  :database: acts_as_paranoid_plugin_test

data/test/paranoid_test.rb

@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require File.join(File.dirname(__FILE__), 'test_helper')
 
 class Widget < ActiveRecord::Base
   acts_as_paranoid
@@ -78,20 +78,20 @@ class ParanoidTest < Test::Unit::TestCase
     assert Widget.find(1)
   end
 
-  def test_should_not_override_constrains_when_counting
-    assert_equal 1, Widget.constrain(:conditions => "title = 'widget 1'") { Widget.count }
-    assert_equal 0, Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.count }
-    assert_equal 1, Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.count_with_deleted }
+  def test_should_not_override_scopes_when_counting
+    assert_equal 1, Widget.with_scope(:find => { :conditions => "title = 'widget 1'" }) { Widget.count }
+    assert_equal 0, Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.count }
+    assert_equal 1, Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.count_with_deleted }
   end
 
-  def test_should_not_override_constrains_when_finding
-    assert_equal [1], Widget.constrain(:conditions => "title = 'widget 1'") { Widget.find(:all) }.ids
-    assert_equal [],  Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.find(:all) }.ids
-    assert_equal [2], Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.find_with_deleted(:all) }.ids
+  def test_should_not_override_scopes_when_finding
+    assert_equal [1], Widget.with_scope(:find => { :conditions => "title = 'widget 1'" }) { Widget.find(:all) }.ids
+    assert_equal [],  Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find(:all) }.ids
+    assert_equal [2], Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find_with_deleted(:all) }.ids
   end
 
-  def test_should_allow_multiple_constrained_calls_when_finding
-    Widget.constrain(:conditions => "title = 'deleted widget 2'") do
+  def test_should_allow_multiple_scoped_calls_when_finding
+    Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) do
       assert_equal [2], Widget.find_with_deleted(:all).ids
       assert_equal [2], Widget.find_with_deleted(:all).ids, "clobbers the constrain on the unmodified find"
       assert_equal [], Widget.find(:all).ids
@@ -99,8 +99,8 @@ class ParanoidTest < Test::Unit::TestCase
     end
   end
 
-  def test_should_allow_multiple_constrained_calls_when_counting
-    Widget.constrain(:conditions => "title = 'deleted widget 2'") do
+  def test_should_allow_multiple_scoped_calls_when_counting
+    Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) do
       assert_equal 1, Widget.count_with_deleted
       assert_equal 1, Widget.count_with_deleted, "clobbers the constrain on the unmodified find"
       assert_equal 0, Widget.count

data/test/schema.rb

@@ -0,0 +1,19 @@
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table :widgets, :force => true do |t|
+    t.column :title, :string, :limit => 50
+    t.column :deleted_at, :timestamp
+  end
+
+  create_table :categories, :force => true do |t|
+    t.column :widget_id, :integer
+    t.column :title, :string, :limit => 50
+    t.column :deleted_at, :timestamp
+  end
+
+  create_table :categories_widgets, :force => true, :id => false do |t|
+    t.column :category_id, :integer
+    t.column :widget_id, :integer
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,36 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'test/unit'
+#require 'active_record'
+#require 'active_support/binding_of_caller'
+#require 'active_support/breakpoint'
+require "#{File.dirname(__FILE__)}/../../../../config/environment"
+require 'active_record/fixtures'
+require "#{File.dirname(__FILE__)}/../init"
+
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+
+load(File.dirname(__FILE__) + "/schema.rb")
+
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+
+class Test::Unit::TestCase #:nodoc:
+  def create_fixtures(*table_names)
+    if block_given?
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
+    else
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+    end
+  end
+
+  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
+  self.use_transactional_fixtures = true
+  
+  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
+  self.use_instantiated_fixtures  = false
+
+  # Add more helper methods to be used by all tests here...
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
-date: 2005-10-22
+  version: "0.2"
+date: 2005-11-15
 summary: acts_as_paranoid keeps models from actually being deleted by setting a deleted_at field.
 require_paths: 
   - lib
@@ -28,42 +28,20 @@ authors:
   - Rick Olson
 files: 
   - lib/acts_as_paranoid.rb
-  - test/abstract_unit.rb
-  - test/connections
+  - test/database.yml
   - test/fixtures
   - test/paranoid_test.rb
-  - test/tests.rb
-  - test/connections/native_db2
-  - test/connections/native_mysql
-  - test/connections/native_oci
-  - test/connections/native_postgresql
-  - test/connections/native_sqlite
-  - test/connections/native_sqlite3
-  - test/connections/native_sqlserver
-  - test/connections/native_sqlserver_odbc
-  - test/connections/native_db2/connection.rb
-  - test/connections/native_mysql/connection.rb
-  - test/connections/native_oci/connection.rb
-  - test/connections/native_postgresql/connection.rb
-  - test/connections/native_sqlite/connection.rb
-  - test/connections/native_sqlite3/connection.rb
-  - test/connections/native_sqlserver/connection.rb
-  - test/connections/native_sqlserver_odbc/connection.rb
-  - test/fixtures/activerecord_paranoid.sqlite
+  - test/schema.rb
+  - test/test_helper.rb
   - test/fixtures/categories.yml
   - test/fixtures/categories_widgets.yml
-  - test/fixtures/db_definitions
   - test/fixtures/widgets.yml
-  - test/fixtures/db_definitions/postgresql.drop.sql
-  - test/fixtures/db_definitions/postgresql.sql
-  - test/fixtures/db_definitions/sqlite.drop.sql
-  - test/fixtures/db_definitions/sqlite.sql
   - README
   - MIT-LICENSE
   - CHANGELOG
   - RUNNING_UNIT_TESTS
 test_files: 
-  - test/tests.rb
+  - test/paranoid_test.rb
 rdoc_options: []
 extra_rdoc_files: []
 executables: []

data/test/abstract_unit.rb

@@ -1,25 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'test/unit'
-require 'active_record'
-require 'active_record/fixtures'
-require 'active_support/binding_of_caller'
-require 'active_support/breakpoint'
-require 'connection'
-require 'acts_as_paranoid'
-
-class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names) { yield }
-    else
-      Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names)
-    end
-  end
-end
-
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-Test::Unit::TestCase.use_instantiated_fixtures = false
-Test::Unit::TestCase.use_transactional_fixtures = (ENV['AR_TX_FIXTURES'] == "yes")
-

data/test/connections/native_db2/connection.rb

@@ -1,14 +0,0 @@
-print "Using native DB2\n"
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-db1 = 'arparanoid'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => "db2",
-  :host     => "localhost",
-  :username => "arunit",
-  :password => "arunit",
-  :database => db1
-)

data/test/connections/native_mysql/connection.rb

@@ -1,14 +0,0 @@
-print "Using native MySQL\n"
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-db1 = 'activerecord_paranoid'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => "mysql",
-  :host     => "localhost",
-  :username => "rails",
-  :password => "",
-  :database => db1
-)

data/test/connections/native_oci/connection.rb

@@ -1,15 +0,0 @@
-print "Using OCI Oracle\n"
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new STDOUT
-ActiveRecord::Base.logger.level = Logger::WARN
-
-db1 = 'activerecord_paranoid'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => 'oci',
-  :host     => '',          # can use an oracle SID
-  :username => 'arunit',
-  :password => 'arunit',
-  :database => db1
-)

data/test/connections/native_postgresql/connection.rb

@@ -1,14 +0,0 @@
-print "Using native PostgreSQL\n"
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-db1 = 'activerecord_paranoid'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => "postgresql",
-  :host     => nil, 
-  :username => "postgres",
-  :password => "postgres", 
-  :database => db1
-)

data/test/connections/native_sqlite/connection.rb

@@ -1,34 +0,0 @@
-print "Using native SQlite\n"
-require 'logger'
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-class SqliteError < StandardError
-end
-
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
-sqlite_test_db  = "#{BASE_DIR}/activerecord_paranoid.sqlite"
-
-def make_connection(clazz, db_file, db_definitions_file)
-  unless File.exist?(db_file)
-    puts "SQLite database not found at #{db_file}. Rebuilding it."
-    sqlite_command = %Q{sqlite #{db_file} "create table a (a integer); drop table a;"}
-    puts "Executing '#{sqlite_command}'"
-    raise SqliteError.new("Seems that there is no sqlite executable available") unless system(sqlite_command)
-    clazz.establish_connection(
-        :adapter => "sqlite",
-        :dbfile  => db_file)
-    script = File.read("#{BASE_DIR}/db_definitions/#{db_definitions_file}")
-    # SQLite-Ruby has problems with semi-colon separated commands, so split and execute one at a time
-    script.split(';').each do
-      |command|
-      clazz.connection.execute(command) unless command.strip.empty?
-    end
-  else
-    clazz.establish_connection(
-        :adapter => "sqlite",
-        :dbfile  => db_file)
-  end
-end
-
-make_connection(ActiveRecord::Base, sqlite_test_db, 'sqlite.sql')
-

data/test/connections/native_sqlite3/connection.rb

@@ -1,33 +0,0 @@
-print "Using native SQLite3\n"
-require 'logger'
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-class SqliteError < StandardError
-end
-
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
-sqlite_test_db  = "#{BASE_DIR}/activerecord_paranoid.sqlite3"
-
-def make_connection(clazz, db_file, db_definitions_file)
-  unless File.exist?(db_file)
-    puts "SQLite3 database not found at #{db_file}. Rebuilding it."
-    sqlite_command = %Q{sqlite3 #{db_file} "create table a (a integer); drop table a;"}
-    puts "Executing '#{sqlite_command}'"
-    raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command)
-    clazz.establish_connection(
-        :adapter => "sqlite3",
-        :dbfile  => db_file)
-    script = File.read("#{BASE_DIR}/db_definitions/#{db_definitions_file}")
-    # SQLite-Ruby has problems with semi-colon separated commands, so split and execute one at a time
-    script.split(';').each do
-      |command|
-      clazz.connection.execute(command) unless command.strip.empty?
-    end
-  else
-    clazz.establish_connection(
-        :adapter => "sqlite3",
-        :dbfile  => db_file)
-  end
-end
-
-make_connection(ActiveRecord::Base, sqlite_test_db, 'sqlite.sql')

data/test/connections/native_sqlserver/connection.rb

@@ -1,14 +0,0 @@
-print "Using native SQLServer\n"
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-db1 = 'activerecord_paranoid'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => "sqlserver",
-  :host     => "localhost",
-  :username => "sa",
-  :password => "",
-  :database => db1
-)

data/test/connections/native_sqlserver_odbc/connection.rb

@@ -1,15 +0,0 @@
-print "Using native SQLServer via ODBC\n"
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new("debug.log")
-
-dsn1 = 'activerecord_paranoid'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => "sqlserver",
-  :mode     => "ODBC",
-  :host     => "localhost",
-  :username => "sa",
-  :password => "",
-  :dsn => dsn1
-)

data/test/fixtures/db_definitions/postgresql.drop.sql

@@ -1,3 +0,0 @@
-drop table categories_widgets;
-drop table categories;
-drop table widgets;

data/test/fixtures/db_definitions/postgresql.sql

@@ -1,19 +0,0 @@
-CREATE TABLE widgets (
-  id         SERIAL,
-  title      VARCHAR(50),
-  deleted_at TIMESTAMP
-);
-SELECT setval('widgets_id_seq', 100);
-
-CREATE TABLE categories (
-  id         SERIAL,
-  widget_id  INT,
-  title      VARCHAR(50),
-  deleted_at TIMESTAMP
-);
-SELECT setval('categories_id_seq', 100);
-
-CREATE TABLE categories_widgets (
-  category_id INT,
-  widget_id   INT
-);

data/test/fixtures/db_definitions/sqlite.drop.sql

@@ -1,3 +0,0 @@
-DROP TABLE 'categories_widgets';
-DROP TABLE 'categories';
-DROP TABLE 'widgets';

data/test/fixtures/db_definitions/sqlite.sql

@@ -1,17 +0,0 @@
-CREATE TABLE 'widgets' (
-  'id'         INTEGER NOT NULL PRIMARY KEY,
-  'title'      VARCHAR(50),
-  'deleted_at' DATETIME
-);
-
-CREATE TABLE 'categories' (
-  'id'         INTEGER NOT NULL PRIMARY KEY,
-  'widget_id'  INTEGER,
-  'title'      VARCHAR(50),
-  'deleted_at' DATETIME
-);
-
-CREATE TABLE 'categories_widgets' (
-  'category_id' INTEGER,
-  'widget_id' INTEGER
-);

data/test/tests.rb

@@ -1,2 +0,0 @@
-$:.unshift "../lib"
-Dir["**/*_test.rb"].each { |f| load f }