activerecord 1.2.0 → 1.3.0

data/lib/active_record/timestamp.rb

@@ -7,19 +7,31 @@ module ActiveRecord
   module Timestamp 
     def self.append_features(base) # :nodoc:
       super
-      base.before_create :timestamp_before_create
-      base.before_update :timestamp_before_update
+
+      base.class_eval do
+        alias_method :create_without_timestamps, :create
+        alias_method :create, :create_with_timestamps
+
+        alias_method :update_without_timestamps, :update
+        alias_method :update, :update_with_timestamps
+      end
     end    
       
-    def timestamp_before_create
+    def create_with_timestamps
       write_attribute("created_at", Time.now) if record_timestamps && respond_to?(:created_at) && created_at.nil?
       write_attribute("created_on", Time.now) if record_timestamps && respond_to?(:created_on) && created_on.nil?
-      timestamp_before_update
+
+      write_attribute("updated_at", Time.now) if record_timestamps && respond_to?(:updated_at)
+      write_attribute("updated_on", Time.now) if record_timestamps && respond_to?(:updated_on)
+      
+      create_without_timestamps
     end
 
-    def timestamp_before_update
+    def update_with_timestamps
       write_attribute("updated_at", Time.now) if record_timestamps && respond_to?(:updated_at)
       write_attribute("updated_on", Time.now) if record_timestamps && respond_to?(:updated_on)
+
+      update_without_timestamps
     end
   end 
 

data/lib/active_record/transactions.rb

@@ -77,13 +77,17 @@ module ActiveRecord
     # Tribute: Object-level transactions are implemented by Transaction::Simple by Austin Ziegler.
     module ClassMethods      
       def transaction(*objects, &block)
-        TRANSACTION_MUTEX.lock
+        TRANSACTION_MUTEX.synchronize do
+          Thread.current['open_transactions'] ||= 0
+          Thread.current['start_db_transaction'] = (Thread.current['open_transactions'] == 0)
+          Thread.current['open_transactions'] += 1
+        end
 
         begin
           objects.each { |o| o.extend(Transaction::Simple) }
           objects.each { |o| o.start_transaction }
 
-          result = connection.transaction(&block)
+          result = connection.transaction(Thread.current['start_db_transaction'], &block)
 
           objects.each { |o| o.commit_transaction }
           return result
@@ -91,7 +95,9 @@ module ActiveRecord
           objects.each { |o| o.abort_transaction }
           raise
         ensure
-          TRANSACTION_MUTEX.unlock
+          TRANSACTION_MUTEX.synchronize do
+            Thread.current['open_transactions'] -= 1
+          end
         end
       end
     end
@@ -101,19 +107,11 @@ module ActiveRecord
     end
 
     def destroy_with_transactions #:nodoc:
-      if TRANSACTION_MUTEX.locked?
-        destroy_without_transactions
-      else
-        transaction { destroy_without_transactions }
-      end
+      transaction { destroy_without_transactions }
     end
     
     def save_with_transactions(perform_validation = true) #:nodoc:
-      if TRANSACTION_MUTEX.locked?
-        save_without_transactions(perform_validation)
-      else
-        transaction { save_without_transactions(perform_validation) }
-      end
+      transaction { save_without_transactions(perform_validation) }
     end
   end
 end

data/lib/active_record/validations.rb

@@ -74,7 +74,8 @@ module ActiveRecord
       #     <%= password_field "person", "password_confirmation" %>
       #
       # The person has to already have a password attribute (a column in the people table), but the password_confirmation is virtual.
-      # It exists only as an in-memory variable for validating the password. This check is performed both on create and update.
+      # It exists only as an in-memory variable for validating the password. This check is performed only if password_confirmation
+      # is not nil and by default on save.
       #
       # Configuration options:
       # * <tt>message</tt> - A custom error message (default is: "doesn't match confirmation")
@@ -85,7 +86,7 @@ module ActiveRecord
 
         for attr_name in attr_names
           attr_accessor "#{attr_name}_confirmation"
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', "#{configuration[:message]}") unless #{attr_name} == #{attr_name}_confirmation}))
+          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', "#{configuration[:message]}") unless #{attr_name}_confirmation.nil? or #{attr_name} == #{attr_name}_confirmation}))
         end
       end
 
@@ -96,10 +97,11 @@ module ActiveRecord
       #     validates_acceptance_of :eula, :message => "must be abided"
       #   end
       #
-      # The terms_of_service attribute is entirely virtual. No database column is needed. This check is performed both on create and update.
+      # The terms_of_service attribute is entirely virtual. No database column is needed. This check is performed only if
+      # terms_of_service is not nil and by default on save.
       #
       # Configuration options:
-      # * <tt>message</tt> - A custom error message (default is: "must be accepted")
+      # * <tt>message</tt> - A custom error message (default is: "can't be empty")
       # * <tt>on</tt> - Specifies when this validation is active (default is :save, other options :create, :update)
       #
       # NOTE: The agreement is considered valid if it's set to the string "1". This makes it easy to relate it to an HTML checkbox.
@@ -109,11 +111,11 @@ module ActiveRecord
 
         for attr_name in attr_names
           attr_accessor(attr_name)
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', '#{configuration[:message]}') unless #{attr_name} == "1"}))
+          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', '#{configuration[:message]}') unless #{attr_name}.nil? or #{attr_name} == "1"}))
         end
       end
 
-      # Validates that the specified attributes are neither nil nor empty. Happens by default on both create and update.
+      # Validates that the specified attributes are neither nil nor empty. Happens by default on save.
       #
       # Configuration options:
       # * <tt>message</tt> - A custom error message (default is: "has already been taken")
@@ -196,7 +198,7 @@ module ActiveRecord
       # can be named "davidhh".
       #
       #   class Person < ActiveRecord::Base
-      #     validates_uniqueness_of :user_name
+      #     validates_uniqueness_of :user_name, :scope => "account_id"
       #   end
       #
       # When the record is created, a check is performed to make sure that no record exist in the database with the given value for the specified
@@ -204,12 +206,17 @@ module ActiveRecord
       #
       # Configuration options:
       # * <tt>message</tt> - Specifies a custom error message (default is: "has already been taken")
+      # * <tt>scope</tt> - Ensures that the uniqueness is restricted to a condition of "scope = record.scope"
       def validates_uniqueness_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
 
         for attr_name in attr_names
-          class_eval(%(validate %{errors.add("#{attr_name}", "#{configuration[:message]}") if self.class.find_first(new_record? ? ["#{attr_name} = ?", #{attr_name}] : ["#{attr_name} = ? AND id <> ?", #{attr_name}, id])}))
+          if scope = configuration[:scope]
+            class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND id <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
+          else
+            class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND id <> ?", #{attr_name}, id])}))
+          end
         end
       end
       
@@ -247,15 +254,21 @@ module ActiveRecord
       # Configuration options:
       # * <tt>in</tt> - An enumerable object of available items
       # * <tt>message</tt> - Specifieds a customer error message (default is: "is not included in the list")
+      # * <tt>allows_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
       def validates_inclusion_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
         enum = configuration[:in] || configuration[:within]
+        allow_nil = configuration[:allow_nil]
 
         raise(ArgumentError, "An object with the method include? is required must be supplied as the :in option of the configuration hash") unless enum.respond_to?("include?")
 
         for attr_name in attr_names
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless (#{enum.inspect}).include?(#{attr_name}) }))
+          if allow_nil
+            class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless #{attr_name}.nil? or (#{enum.inspect}).include?(#{attr_name}) }))
+          else
+            class_eval(%(#{validation_method(configuration[:on])} %{errors.add("#{attr_name}", "#{configuration[:message]}") unless (#{enum.inspect}).include?(#{attr_name}) }))
+          end
         end
       end
       
@@ -393,19 +406,24 @@ module ActiveRecord
 
     # Will add an error message to each of the attributes in +attributes+ that is empty (defined by <tt>attribute_present?</tt>).
     def add_on_empty(attributes, msg = @@default_error_messages[:empty])
-      [attributes].flatten.each { |attr| add(attr, msg) unless @base.attribute_present?(attr.to_s) }
+      for attr in [attributes].flatten
+        value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
+        is_empty = value.respond_to?("empty?") ? value.empty? : false
+        add(attr, msg) unless !value.nil? && !is_empty
+      end
     end
 
     # Will add an error message to each of the attributes in +attributes+ that has a length outside of the passed boundary +range+. 
     # If the length is above the boundary, the too_long_msg message will be used. If below, the too_short_msg.
     def add_on_boundary_breaking(attributes, range, too_long_msg = @@default_error_messages[:too_long], too_short_msg = @@default_error_messages[:too_short])
       for attr in [attributes].flatten
-        add(attr, too_short_msg % range.begin) if @base[attr.to_s] && @base.send(attr.to_s).length < range.begin
-        add(attr, too_long_msg % range.end) if @base[attr.to_s] && @base.send(attr.to_s).length > range.end
+        value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
+        add(attr, too_short_msg % range.begin) if value && value.length < range.begin
+        add(attr, too_long_msg % range.end) if value && value.length > range.end
       end
     end
 
-    alias :add_on_boundary_breaking :add_on_boundary_breaking
+    alias :add_on_boundry_breaking :add_on_boundary_breaking
 
     # Returns true if the specified +attribute+ has errors associated with it.
     def invalid?(attribute)

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activerecord'
-PKG_VERSION   = '1.2.0' + PKG_BUILD
+PKG_VERSION   = '1.3.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[

data/test/abstract_unit.rb

@@ -4,6 +4,8 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
+require 'active_record/support/binding_of_caller'
+require 'active_record/support/breakpoint'
 require 'connection'
 
 class Test::Unit::TestCase #:nodoc:

data/test/base_test.rb

@@ -26,9 +26,7 @@ end
 class Booleantest < ActiveRecord::Base; end
 
 class BasicsTest < Test::Unit::TestCase
-  def setup
-    @topic_fixtures, @companies = create_fixtures "topics", "companies"
-  end
+  fixtures :topics, :companies
 
   def test_set_attributes
     topic = Topic.find(1)
@@ -36,7 +34,7 @@ class BasicsTest < Test::Unit::TestCase
     topic.save
     assert_equal("Budget", topic.title)
     assert_equal("Jason", topic.author_name)
-    assert_equal(@topic_fixtures["first"]["author_email_address"], Topic.find(1).author_email_address)
+    assert_equal(@topics["first"]["author_email_address"], Topic.find(1).author_email_address)
   end
   
   def test_integers_as_nil
@@ -187,14 +185,14 @@ class BasicsTest < Test::Unit::TestCase
   def test_load
     topics = Topic.find_all nil, "id"    
     assert_equal(2, topics.size)
-    assert_equal(@topic_fixtures["first"]["title"], topics.first.title)
+    assert_equal(@topics["first"]["title"], topics.first.title)
   end
   
   def test_load_with_condition
     topics = Topic.find_all "author_name = 'Mary'"
     
     assert_equal(1, topics.size)
-    assert_equal(@topic_fixtures["second"]["title"], topics.first.title)
+    assert_equal(@topics["second"]["title"], topics.first.title)
   end
 
   def test_table_name_guesses
@@ -262,11 +260,15 @@ class BasicsTest < Test::Unit::TestCase
   end
   
   def test_update_all
-    Topic.update_all "content = 'bulk updated!'"
+    assert_equal 2, Topic.update_all("content = 'bulk updated!'")
     assert_equal "bulk updated!", Topic.find(1).content
     assert_equal "bulk updated!", Topic.find(2).content
   end
-  
+
+  def test_delete_all
+    assert_equal 2, Topic.delete_all
+  end
+
   def test_update_by_condition
     Topic.update_all "content = 'bulk updated!'", "approved = 1"
     assert_equal "Have a nice day", Topic.find(1).content
@@ -556,4 +558,22 @@ class BasicsTest < Test::Unit::TestCase
     topic = Topic.create('content' => content)
     assert_equal content, Topic.find(topic.id).content
   end
-end
+  
+  def test_class_level_destroy
+    should_be_destroyed_reply = Reply.create("title" => "hello", "content" => "world")
+    @first.replies << should_be_destroyed_reply
+
+    Topic.destroy(1)
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1) }
+    assert_raises(ActiveRecord::RecordNotFound) { Reply.find(should_be_destroyed_reply.id) }
+  end
+
+  def test_class_level_delete
+    should_be_destroyed_reply = Reply.create("title" => "hello", "content" => "world")
+    @first.replies << should_be_destroyed_reply
+
+    Topic.delete(1)
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1) }
+    assert_nothing_raised { Reply.find(should_be_destroyed_reply.id) }
+  end
+end

data/test/fixtures/db_definitions/mysql.sql

@@ -36,6 +36,7 @@ CREATE TABLE `topics` (
 CREATE TABLE `developers` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) default NULL,
+  `salary` int(11) default 70000,
   PRIMARY KEY  (`id`)
 );
 
@@ -101,10 +102,11 @@ CREATE TABLE `mixins` (
   `id` int(11) NOT NULL auto_increment,
   `parent_id` int(11) default NULL,
   `pos` int(11) default NULL,
-  `lft` int(11) default NULL,
-  `rgt` int(11) default NULL,
-  `root_id` int(11) default NULL,  
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `lft` int(11) default NULL,
+  `rgt` int(11) default NULL,
+  `root_id` int(11) default NULL,
+  `type` varchar(40) default NULL,
   PRIMARY KEY  (`id`)
 );

data/test/fixtures/db_definitions/postgresql.sql

@@ -29,6 +29,7 @@ CREATE TABLE developers_projects (
 CREATE TABLE developers (
     id serial,
     name character varying(100),
+    salary integer DEFAULT 70000,
     PRIMARY KEY (id)
 );
 SELECT setval('developers_id_seq', 100);
@@ -117,6 +118,7 @@ CREATE TABLE colnametests (
 CREATE TABLE mixins (
   id serial,
   parent_id integer,
+  type character varying,  
   pos integer,
   lft integer,
   rgt integer,

data/test/fixtures/db_definitions/sqlite.sql

@@ -32,7 +32,8 @@ CREATE TABLE 'topics' (
 
 CREATE TABLE 'developers' (
   'id' INTEGER PRIMARY KEY NOT NULL,
-  'name' TEXT DEFAULT NULL
+  'name' TEXT DEFAULT NULL,
+  'salary' INTEGER DEFAULT 70000
 );
 
 CREATE TABLE 'projects' (
@@ -89,6 +90,7 @@ CREATE TABLE 'colnametests' (
 CREATE TABLE 'mixins' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'parent_id' INTEGER DEFAULT NULL,
+  'type' VARCHAR(40) DEFAULT NULL,  
   'pos' INTEGER DEFAULT NULL,
   'lft' INTEGER DEFAULT NULL,
   'rgt' INTEGER DEFAULT NULL,

data/test/fixtures/db_definitions/sqlserver.sql

@@ -41,6 +41,7 @@ CREATE TABLE developers (
 CREATE TABLE projects (
   id int NOT NULL IDENTITY(1, 1),
   name varchar(100) default NULL,
+  salary int default 70000,
   PRIMARY KEY  (id)
 );
 
@@ -98,6 +99,7 @@ CREATE TABLE colnametests (
 CREATE TABLE mixins (
   id int NOT NULL IDENTITY(1, 1),
   parent_id int default NULL,
+  type varchar(40) default NULL,  
   pos int default NULL,
   lft int default NULL,
   rgt int default NULL,

data/test/fixtures/developer.rb

@@ -1,8 +1,6 @@
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects
 
-  protected
-    def validate
-      errors.add_on_boundary_breaking("name", 3..20)
-    end
+  validates_inclusion_of :salary, :in => 50000..200000
+  validates_length_of    :name, :within => 3..20
 end

data/test/fixtures/developers.yml

@@ -1,13 +1,16 @@
 david:
   id: 1
   name: David
+  salary: 80000
 
 jamis:
   id: 2
   name: Jamis
+  salary: 150000
 
 <% for digit in 3..10 %>
 dev_<%= digit %>:
   id: <%= digit %>
   name: fixture_<%= digit %>
+  salary: 100000
 <% end %>

data/test/fixtures/mixin.rb

@@ -1,9 +1,12 @@
 class Mixin < ActiveRecord::Base
-  acts_as_tree :foreign_key => "parent_id", :order => "id"
 
 end
 
-class ListMixin < ActiveRecord::Base
+class TreeMixin < Mixin 
+    acts_as_tree :foreign_key => "parent_id", :order => "id"
+end
+
+class ListMixin < Mixin
   acts_as_list :column => "pos", :scope => :parent
 
   def self.table_name() "mixins" end

data/test/fixtures/mixins.yml

@@ -1,14 +1,30 @@
-first:
-  id: 1
-  pos: 1
+# tree mixins
+tree_1:
+  id: 1001
+  type: TreeMixin
   parent_id: 0 
   
-second:
-  id: 2
-  pos: 1
-  parent_id: 1
+tree_2:
+  id: 1002
+  type: TreeMixin
+  parent_id: 1001
 
-third:
-  id: 3
-  pos: 2
-  parent_id: 1
+tree_3:
+  id: 1003
+  type: TreeMixin  
+  parent_id: 1002
+
+tree_4:
+  id: 1004
+  type: TreeMixin  
+  parent_id: 1001
+  
+# List mixins
+
+<% (1..4).each do |counter| %>  
+list_<%= counter %>:
+  id: <%= counter+1006 %>
+  pos: <%= counter  %>
+  type: ListMixin
+  parent_id: 5
+<% end %>