activerecord 1.4.0 → 1.5.0

data/test/base_test.rb

@@ -2,6 +2,7 @@ require 'abstract_unit'
 require 'fixtures/topic'
 require 'fixtures/reply'
 require 'fixtures/company'
+require 'fixtures/project'
 require 'fixtures/default'
 require 'fixtures/auto_id'
 require 'fixtures/column_name'
@@ -26,7 +27,7 @@ end
 class Booleantest < ActiveRecord::Base; end
 
 class BasicsTest < Test::Unit::TestCase
-  fixtures :topics, :companies
+  fixtures :topics, :companies, :projects
 
   def test_set_attributes
     topic = Topic.find(1)
@@ -100,6 +101,10 @@ class BasicsTest < Test::Unit::TestCase
     topic.content << "five"
     assert_equal(%w( one two three four five ), topic.content)
   end
+ 
+  def test_attributes_hash
+    assert_equal @projects["action_controller"].to_hash, @action_controller.attributes
+  end
   
   def test_create
     topic = Topic.new
@@ -367,6 +372,9 @@ class BasicsTest < Test::Unit::TestCase
     assert !Topic.find(1).approved?
     Topic.find(1).update_attribute("approved", true)
     assert Topic.find(1).approved?
+
+    Topic.find(1).update_attribute(:approved, false)
+    assert !Topic.find(1).approved?
   end
   
   def test_mass_assignment_protection
@@ -585,4 +593,45 @@ class BasicsTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1) }
     assert_nothing_raised { Reply.find(should_be_destroyed_reply.id) }
   end
+
+  def test_increment_attribute
+    assert_equal 0, @topics["first"].find.replies_count
+    @topics["first"].find.increment! :replies_count
+    assert_equal 1, @topics["first"].find.replies_count
+    
+    @topics["first"].find.increment(:replies_count).increment!(:replies_count)
+    assert_equal 3, @topics["first"].find.replies_count
+  end
+  
+  def test_increment_nil_attribute
+    assert_nil @topics["first"].find.parent_id
+    @topics["first"].find.increment! :parent_id
+    assert_equal 1, @topics["first"].find.parent_id
+  end
+  
+  def test_decrement_attribute
+    @topics["first"].find.increment(:replies_count).increment!(:replies_count)
+    assert_equal 2, @topics["first"].find.replies_count
+    
+    @topics["first"].find.decrement!(:replies_count)
+    assert_equal 1, @topics["first"].find.replies_count
+
+    @topics["first"].find.decrement(:replies_count).decrement!(:replies_count)
+    assert_equal -1, @topics["first"].find.replies_count
+  end
+  
+  def test_toggle_attribute
+    assert !@topics["first"].find.approved?
+    @topics["first"].find.toggle!(:approved)
+    assert @topics["first"].find.approved?
+  end
+
+  def test_reload
+    t1 = Topic.find(1)
+    t2 = Topic.find(1)
+    t1.title = "something else"
+    t1.save
+    t2.reload
+    assert_equal t1.title, t2.title
+  end
 end

data/test/callbacks_test.rb

@@ -227,4 +227,20 @@ class CallbacksTest < Test::Unit::TestCase
       [ :after_initialize,            :method ]
     ], david.history
   end
+
+  def test_zzz_callback_returning_false # must be run last since we modify CallbackDeveloper
+    david = CallbackDeveloper.find(1)
+    CallbackDeveloper.before_validation proc { |model| model.history << [:before_validation, :returning_false]; return false }
+    CallbackDeveloper.before_validation proc { |model| model.history << [:before_validation, :should_never_get_here] }
+    david.save
+    assert_equal [
+      [ :after_find,                  :method ],
+      [ :after_initialize,            :method ],
+      [ :before_validation,           :string ],
+      [ :before_validation,           :proc   ],
+      [ :before_validation,           :object ],
+      [ :before_validation,           :block  ],
+      [ :before_validation, :returning_false  ]
+    ], david.history
+  end
 end

data/test/connections/native_mysql/connection.rb

@@ -10,7 +10,7 @@ db2 = 'activerecord_unittest2'
 ActiveRecord::Base.establish_connection(
   :adapter  => "mysql",
   :host     => "localhost",
-  :username => "root",
+  :username => "rails",
   :password => "",
   :database => db1
 )
@@ -18,7 +18,7 @@ ActiveRecord::Base.establish_connection(
 Course.establish_connection(
   :adapter  => "mysql",
   :host     => "localhost",
-  :username => "root",
+  :username => "rails",
   :password => "",
   :database => db2
 )

data/test/connections/native_sqlite3/connection.rb

@@ -0,0 +1,34 @@
+print "Using native SQLite3\n"
+require 'fixtures/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+ActiveRecord::Base.logger.level = Logger::DEBUG
+
+BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
+sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
+sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.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 = "sqlite3 #{db_file} 'create table a (a integer); drop table a;'"
+    puts "Executing '#{sqlite_command}'"
+    `#{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')
+make_connection(Course, sqlite_test_db2, 'sqlite2.sql')

data/test/deprecated_associations_test.rb

@@ -138,14 +138,14 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
   end
 
   def test_force_reload
-    firm = Firm.new
+    firm = Firm.new("name" => "A New Firm, Inc")
     firm.save
     firm.clients.each {|c|} # forcing to load all clients
     assert firm.clients.empty?, "New firm shouldn't have client objects"
     assert !firm.has_clients?, "New firm shouldn't have clients"
     assert_equal 0, firm.clients_count, "New firm should have 0 clients"
 
-    client = Client.new("firm_id" => firm.id)
+    client = Client.new("name" => "TheClient.com", "firm_id" => firm.id)
     client.save
 
     assert firm.clients.empty?, "New firm should have cached no client objects"
@@ -340,4 +340,38 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
     assert_equal 2, Firm.find_first.find_all_in_clients("type = 'Client'").length
     assert_equal 1, Firm.find_first.find_all_in_clients("name = 'Summit'").length
   end
+
+  def test_has_one
+    assert @signals37.account?(Account.find(1))
+    assert @signals37.has_account?, "37signals should have an account"
+    assert Account.find(1).firm?(@signals37), "37signals account should be able to backtrack"
+    assert Account.find(1).has_firm?, "37signals account should be able to backtrack"
+
+    assert !Account.find(2).has_firm?, "Unknown isn't linked"
+    assert !Account.find(2).firm?(@signals37), "Unknown isn't linked"
+  end
+
+  def test_has_one_build
+    firm = Firm.new("name" => "GlobalMegaCorp")
+    assert firm.save
+
+    account = firm.build_account("credit_limit" => 1000)
+    assert account.save
+    assert_equal account, firm.account
+  end
+
+  def test_has_one_failing_build_association
+    firm = Firm.new("name" => "GlobalMegaCorp")
+    firm.save
+    
+    account = firm.build_account
+    assert !account.save
+    assert_equal "can't be empty", account.errors.on("credit_limit")
+  end
+
+  def test_has_one_create
+    firm = Firm.new("name" => "GlobalMegaCorp")
+    firm.save
+    assert_equal firm.create_account("credit_limit" => 1000), firm.account
+  end
 end

data/test/fixtures/company.rb

@@ -1,5 +1,7 @@
 class Company < ActiveRecord::Base
   attr_protected :rating
+
+  validates_presence_of :name
 end
 
 

data/test/fixtures/computer.rb

@@ -0,0 +1,3 @@
+class Computer < ActiveRecord::Base
+  belongs_to :developer, :foreign_key=>'developer'
+end

data/test/fixtures/computers.yml

@@ -0,0 +1,3 @@
+workstation:
+  id: 1
+  developer: 1

data/test/fixtures/db_definitions/db2.sql

@@ -122,3 +122,8 @@ CREATE TABLE binaries (
   data blob(50000),
   PRIMARY KEY  (id)
 );
+
+CREATE TABLE computers (
+  id int generated by default as identity (start with +10000),
+  developer int NOT NULL
+);

data/test/fixtures/db_definitions/mysql.sql

@@ -121,4 +121,9 @@ CREATE TABLE `binaries` (
   `id` int(11) NOT NULL auto_increment,
   `data` mediumblob,
   PRIMARY KEY  (`id`)
+);
+
+CREATE TABLE `computers` (
+  `id` INTEGER NOT NULL PRIMARY KEY,
+  `developer` INTEGER NOT NULL
 );

data/test/fixtures/db_definitions/postgresql.sql

@@ -139,4 +139,9 @@ CREATE TABLE binaries (
   id serial , 
   data bytea,
   PRIMARY KEY (id)
+);
+
+CREATE TABLE computers (
+  id serial,
+  developer integer NOT NULL
 );

data/test/fixtures/db_definitions/sqlite.sql

@@ -108,4 +108,9 @@ CREATE TABLE 'people' (
 CREATE TABLE 'binaries' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'data' BLOB DEFAULT NULL
+);
+
+CREATE TABLE 'computers' (
+  'id' INTEGER NOT NULL PRIMARY KEY,
+  'developer' INTEGER NOT NULL
 );

data/test/fixtures/db_definitions/sqlserver.sql

@@ -122,4 +122,8 @@ CREATE TABLE binaries (
   PRIMARY KEY (id)
 );
 
-
+CREATE TABLE computers (
+  id int NOT NULL IDENTITY(1, 1),
+  developer int NOT NULL,
+  PRIMARY KEY (id)
+);

data/test/validations_test.rb

@@ -389,6 +389,27 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "hoo 5", t.errors["title"]
   end
 
+  def test_validates_associated_many
+    Topic.validates_associated( :replies )
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    t.replies << [r = Reply.create("title" => "A reply"), Reply.create("title" => "Another reply", "content" => "with content!")]
+    assert !t.valid?
+    assert t.errors.on(:replies)
+    r.content = "non-empty"
+    assert t.valid?
+  end
+
+  def test_validates_associated_one
+    Reply.validates_associated( :topic )
+    Topic.validates_presence_of( :content )
+    r = Reply.create("title" => "A reply", "content" => "with content!")
+    r.topic = Topic.create("title" => "uhohuhoh")
+    assert !r.valid?
+    assert r.errors.on(:topic)
+    r.topic.content = "non-empty"
+    assert r.valid?
+  end
+
   def test_throw_away_typing
     d = Developer.create "name" => "David", "salary" => "100,000"
     assert !d.valid?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2005-01-04
+  version: 1.5.0
+date: 2005-01-17
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -58,8 +58,11 @@ files:
   - lib/active_record/acts/list.rb
   - lib/active_record/acts/tree.rb
   - lib/active_record/associations/association_collection.rb
+  - lib/active_record/associations/association_proxy.rb
+  - lib/active_record/associations/belongs_to_association.rb
   - lib/active_record/associations/has_and_belongs_to_many_association.rb
   - lib/active_record/associations/has_many_association.rb
+  - lib/active_record/associations/has_one_association.rb
   - lib/active_record/connection_adapters/abstract_adapter.rb
   - lib/active_record/connection_adapters/db2_adapter.rb
   - lib/active_record/connection_adapters/mysql_adapter.rb
@@ -71,12 +74,25 @@ files:
   - lib/active_record/support/class_attribute_accessors.rb
   - lib/active_record/support/class_inheritable_attributes.rb
   - lib/active_record/support/clean_logger.rb
+  - lib/active_record/support/core_ext
+  - lib/active_record/support/core_ext.rb
   - lib/active_record/support/dependencies.rb
   - lib/active_record/support/inflector.rb
   - lib/active_record/support/misc.rb
   - lib/active_record/support/module_attribute_accessors.rb
+  - lib/active_record/support/core_ext/hash
+  - lib/active_record/support/core_ext/hash.rb
+  - lib/active_record/support/core_ext/numeric
+  - lib/active_record/support/core_ext/numeric.rb
+  - lib/active_record/support/core_ext/string
+  - lib/active_record/support/core_ext/string.rb
+  - lib/active_record/support/core_ext/hash/keys.rb
+  - lib/active_record/support/core_ext/numeric/bytes.rb
+  - lib/active_record/support/core_ext/numeric/time.rb
+  - lib/active_record/support/core_ext/string/inflections.rb
   - lib/active_record/vendor/db2.rb
   - lib/active_record/vendor/mysql.rb
+  - lib/active_record/vendor/mysql411.rb
   - lib/active_record/vendor/simple.rb
   - lib/active_record/wrappers/yaml_wrapper.rb
   - test/abstract_unit.rb
@@ -108,11 +124,13 @@ files:
   - test/connections/native_mysql
   - test/connections/native_postgresql
   - test/connections/native_sqlite
+  - test/connections/native_sqlite3
   - test/connections/native_sqlserver
   - test/connections/native_db2/connection.rb
   - test/connections/native_mysql/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/fixtures/accounts.yml
   - test/fixtures/associations.png
@@ -123,6 +141,8 @@ files:
   - test/fixtures/companies.yml
   - test/fixtures/company.rb
   - test/fixtures/company_in_module.rb
+  - test/fixtures/computer.rb
+  - test/fixtures/computers.yml
   - test/fixtures/course.rb
   - test/fixtures/courses.yml
   - test/fixtures/customer.rb