activerecord 1.7.0 → 1.8.0

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activerecord'
-PKG_VERSION   = '1.7.0' + PKG_BUILD
+PKG_VERSION   = '1.8.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[
@@ -117,7 +117,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 1.0.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.0.1' + PKG_BUILD)
 
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"

data/test/aaa_create_tables_test.rb

@@ -45,13 +45,13 @@ class CreateTablesTest < Test::Unit::TestCase
 
   def test_table_creation
     adapter_name = ActiveRecord::Base.connection.adapter_name.downcase
-    run_sql_file ActiveRecord::Base.connection, "test/fixtures/db_definitions/" + adapter_name + ".drop.sql"
-    run_sql_file ActiveRecord::Base.connection, "test/fixtures/db_definitions/" + adapter_name + ".sql"
+    run_sql_file ActiveRecord::Base.connection, "#{File.dirname(__FILE__)}/fixtures/db_definitions/" + adapter_name + ".drop.sql"
+    run_sql_file ActiveRecord::Base.connection, "#{File.dirname(__FILE__)}/fixtures/db_definitions/" + adapter_name + ".sql"
 
     # Now do the same thing with the connection used by multiple_db_test.rb
     adapter_name = Course.retrieve_connection.adapter_name.downcase
-    run_sql_file Course.retrieve_connection, "test/fixtures/db_definitions/" + adapter_name + "2.drop.sql"
-    run_sql_file Course.retrieve_connection, "test/fixtures/db_definitions/" + adapter_name + "2.sql"
+    run_sql_file Course.retrieve_connection, "#{File.dirname(__FILE__)}/fixtures/db_definitions/" + adapter_name + "2.drop.sql"
+    run_sql_file Course.retrieve_connection, "#{File.dirname(__FILE__)}/fixtures/db_definitions/" + adapter_name + "2.sql"
     
     assert_equal 1,1
   end

data/test/aggregations_test.rb

@@ -2,10 +2,7 @@ require 'abstract_unit'
 require 'fixtures/customer'
 
 class AggregationsTest < Test::Unit::TestCase
-  def setup
-    @customers = create_fixtures "customers"
-    @david = Customer.find(1)
-  end
+  fixtures :customers
 
   def test_find_single_value_object
     assert_equal 50, @david.balance.amount
@@ -30,4 +27,21 @@ class AggregationsTest < Test::Unit::TestCase
     @david.balance = Money.new(100)
     assert_raises(TypeError) {  @david.balance.instance_eval { @amount = 20 } }
   end  
+  
+  def test_inferred_mapping
+    assert_equal "35.544623640962634", @david.gps_location.latitude
+    assert_equal "-105.9309951055148", @david.gps_location.longitude
+    
+    @david.gps_location = GpsLocation.new("39x-110")
+
+    assert_equal "39", @david.gps_location.latitude
+    assert_equal "-110", @david.gps_location.longitude
+    
+    @david.save
+    
+    @david.reload
+
+    assert_equal "39", @david.gps_location.latitude
+    assert_equal "-110", @david.gps_location.longitude
+  end
 end

data/test/associations_test.rb

@@ -94,7 +94,8 @@ class HasOneAssociationsTest < Test::Unit::TestCase
     @signals37.account = nil
     @signals37.save
     assert_nil @signals37.account
-    assert_nil Account.find(old_account_id).firm_id
+    # account is dependent, therefore is destroyed when reference to owner is lost
+    assert_raises(ActiveRecord::RecordNotFound) { Account.find(old_account_id) } 
   end
 
   def test_dependence

data/test/base_test.rb

@@ -216,6 +216,16 @@ class BasicsTest < Test::Unit::TestCase
     assert_equal("initialized from attributes", topic.title)
   end
   
+  def test_initialize_with_invalid_attribute
+    begin
+      topic = Topic.new({ "title" => "test", 
+        "last_read(1i)" => "2005", "last_read(2i)" => "2", "last_read(3i)" => "31"})
+    rescue ActiveRecord::MultiparameterAssignmentErrors => ex
+      assert_equal(1, ex.errors.size)
+      assert_equal("last_read", ex.errors[0].attribute)
+    end
+  end
+  
   def test_load
     topics = Topic.find_all nil, "id"    
     assert_equal(2, topics.size)

data/test/fixtures/company.rb

@@ -6,7 +6,7 @@ end
 
 
 class Firm < Company
-  has_many :clients, :order => "id", :dependent => true
+  has_many :clients, :order => "id", :dependent => true, :counter_sql => "SELECT COUNT(*) FROM companies WHERE firm_id = 1 AND (type = 'Client' OR type = 'SpecialClient' OR type = 'VerySpecialClient' )"
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
   has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"

data/test/fixtures/customer.rb

@@ -1,6 +1,7 @@
 class Customer < ActiveRecord::Base
   composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ]
   composed_of :balance, :class_name => "Money", :mapping => %w(balance amount)
+  composed_of :gps_location
 end
 
 class Address
@@ -27,4 +28,20 @@ class Money
   def exchange_to(other_currency)
     Money.new((amount * EXCHANGE_RATES["#{currency}_TO_#{other_currency}"]).floor, other_currency)
   end
+end
+
+class GpsLocation
+  attr_reader :gps_location
+  
+  def initialize(gps_location)
+    @gps_location = gps_location
+  end
+  
+  def latitude
+    gps_location.split("x").first
+  end
+  
+  def longitude
+    gps_location.split("x").last
+  end
 end

data/test/fixtures/customers.yml

@@ -5,3 +5,4 @@ david:
   address_street: Funny Street
   address_city: Scary Town
   address_country: Loony Land
+  gps_location: 35.544623640962634x-105.9309951055148

data/test/fixtures/db_definitions/db2.sql

@@ -58,6 +58,7 @@ CREATE TABLE customers (
   address_street varchar(100) default NULL,
   address_city varchar(100) default NULL,
   address_country varchar(100) default NULL,
+  gps_location varchar(100) default NULL,
   PRIMARY KEY (id)
 );
 

data/test/fixtures/db_definitions/mysql.sql

@@ -59,6 +59,7 @@ CREATE TABLE `customers` (
   `address_street` varchar(100) default NULL,
   `address_city` varchar(100) default NULL,
   `address_country` varchar(100) default NULL,
+  `gps_location` varchar(100) default NULL,
   PRIMARY KEY  (`id`)
 );
 

data/test/fixtures/db_definitions/oci.sql

@@ -83,6 +83,7 @@ create table customers (
     address_street varchar(100) default null,
     address_city varchar(100) default null,
     address_country varchar(100) default null,
+    gps_location varchar(100) default null,
     primary key (id)
 );
 

data/test/fixtures/db_definitions/postgresql.sql

@@ -65,6 +65,7 @@ CREATE TABLE customers (
     address_street character varying,
     address_city character varying,
     address_country character varying,
+    gps_location character varying,
     PRIMARY KEY (id)
 );
 SELECT setval('customers_id_seq', 100);

data/test/fixtures/db_definitions/sqlite.sql

@@ -53,7 +53,8 @@ CREATE TABLE 'customers' (
   'balance' INTEGER DEFAULT 0,
   'address_street' TEXT DEFAULT NULL,
   'address_city' TEXT DEFAULT NULL,
-  'address_country' TEXT DEFAULT NULL
+  'address_country' TEXT DEFAULT NULL,
+  'gps_location' TEXT DEFAULT NULL
 );
 
 CREATE TABLE 'movies' (

data/test/fixtures/db_definitions/sqlserver.sql

@@ -57,6 +57,7 @@ CREATE TABLE customers (
   address_street varchar(100) default NULL,
   address_city varchar(100) default NULL,
   address_country varchar(100) default NULL,
+  gps_location varchar(100) default NULL,
   PRIMARY KEY  (id)
 );
 

data/test/fixtures/migrations/1_people_have_last_names.rb

@@ -0,0 +1,9 @@
+class PeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "last_name", :string
+  end
+  
+  def self.down
+    remove_column "people", "last_name"
+  end
+end

data/test/fixtures/migrations/2_we_need_reminders.rb

@@ -0,0 +1,12 @@
+class WeNeedReminders < ActiveRecord::Migration
+  def self.up
+    create_table("reminders") do |t|
+      t.column :content, :text
+      t.column :remind_at, :datetime
+    end
+  end
+  
+  def self.down
+    drop_table "reminders"
+  end
+end

data/test/fixtures_test.rb

@@ -105,5 +105,34 @@ class FixturesTest < Test::Unit::TestCase
   def test_empty_csv_fixtures
     assert_not_nil Fixtures.new( Account.connection, "accounts", File.dirname(__FILE__) + "/fixtures/naked/csv/accounts")
   end
-  
+end
+
+
+class FixturesWithoutInstantiationTest < Test::Unit::TestCase
+  self.use_instantiated_fixtures = false
+  fixtures :topics, :developers, :accounts
+
+  def test_without_complete_instantiation
+    assert_nil @topics
+    assert_nil @first
+  end
+
+  def test_fixtures_from_root_yml_without_instantiation
+    assert_nil @unknown
+  end
+end
+
+
+class TransactionalFixturesTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = true
+  fixtures :topics
+
+  def test_destroy
+    assert_not_nil @first
+    @first.destroy
+  end
+
+  def test_destroy_just_kidding
+    assert_not_nil @first
+  end
 end

data/test/migration_mysql.rb

@@ -0,0 +1,104 @@
+require 'abstract_unit'
+require 'fixtures/person'
+require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
+require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
+
+class Reminder < ActiveRecord::Base; end
+
+class MigrationTest < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+    ActiveRecord::Base.connection.initialize_schema_information
+    ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+
+    Reminder.connection.drop_table("reminders") rescue nil
+    Reminder.reset_column_information
+
+    Person.connection.remove_column("people", "last_name") rescue nil
+    Person.reset_column_information
+  end
+
+  def test_add_remove_single_field
+    assert !Person.column_methods_hash.include?(:last_name)
+
+    PeopleHaveLastNames.up
+
+    Person.reset_column_information
+    assert Person.column_methods_hash.include?(:last_name)
+    
+    PeopleHaveLastNames.down
+
+    Person.reset_column_information
+    assert !Person.column_methods_hash.include?(:last_name)
+  end
+
+  def test_add_table
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+    
+    WeNeedReminders.up
+    
+    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
+    assert "hello world", Reminder.find_first
+    
+    WeNeedReminders.down
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.find_first }
+  end
+
+  def test_migrator
+    assert !Person.column_methods_hash.include?(:last_name)
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+
+    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
+
+    assert_equal 2, ActiveRecord::Migrator.current_version
+    Person.reset_column_information
+    assert Person.column_methods_hash.include?(:last_name)
+    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
+    assert "hello world", Reminder.find_first
+
+
+    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')
+
+    assert_equal 0, ActiveRecord::Migrator.current_version
+    Person.reset_column_information
+    assert !Person.column_methods_hash.include?(:last_name)
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.find_first }
+  end
+
+  def test_migrator_one_up
+    assert !Person.column_methods_hash.include?(:last_name)
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+
+    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
+
+    Person.reset_column_information
+    assert Person.column_methods_hash.include?(:last_name)
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+
+
+    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
+
+    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
+    assert "hello world", Reminder.find_first
+  end
+  
+  def test_migrator_one_down
+    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
+    
+    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
+
+    Person.reset_column_information
+    assert Person.column_methods_hash.include?(:last_name)
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+  end
+  
+  def test_migrator_one_up_one_down
+    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
+    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
+
+    assert !Person.column_methods_hash.include?(:last_name)
+    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+  end
+end

data/test/reflection_test.rb

@@ -42,15 +42,19 @@ class ReflectionTest < Test::Unit::TestCase
 
   def test_aggregation_reflection
     reflection_for_address = ActiveRecord::Reflection::AggregateReflection.new(
-      :address, { :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] }, Customer
+      :composed_of, :address, { :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ] }, Customer
     )
 
     reflection_for_balance = ActiveRecord::Reflection::AggregateReflection.new(
-      :balance, { :class_name => "Money", :mapping => %w(balance amount) }, Customer
+      :composed_of, :balance, { :class_name => "Money", :mapping => %w(balance amount) }, Customer
+    )
+
+    reflection_for_gps_location = ActiveRecord::Reflection::AggregateReflection.new(
+      :composed_of, :gps_location, { }, Customer
     )
 
     assert_equal(
-      [ reflection_for_address, reflection_for_balance ],
+      [ reflection_for_address, reflection_for_balance, reflection_for_gps_location ],
       Customer.reflect_on_all_aggregations
     )
     
@@ -61,7 +65,7 @@ class ReflectionTest < Test::Unit::TestCase
   
   def test_association_reflection
     reflection_for_clients = ActiveRecord::Reflection::AssociationReflection.new(
-      :clients, { :order => "id", :dependent => true }, Firm
+      :has_many, :clients, { :order => "id", :dependent => true }, Firm
     )
 
     assert_equal reflection_for_clients, Firm.reflect_on_association(:clients)

data/test/validations_test.rb

@@ -604,4 +604,42 @@ class ValidationsTest < Test::Unit::TestCase
     assert !r.valid?
     assert_equal r.errors.on(:topic).first, "This string contains 'single' and \"double\" quotes"
   end
+
+  def test_validates_numericality_of_with_string
+    Topic.validates_numericality_of( :replies_count )
+    ["not a number","42 not a number","0xdeadbeef","00-1","-+019.0","12.12.13.12",nil].each do |v|
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => "not a number")
+        assert !t.valid?, "#{v} not rejected as a number"
+        assert t.errors.on(:replies_count)
+    end
+  end
+
+  def test_validates_numericality_of
+    Topic.validates_numericality_of( :replies_count )
+    ["10", "10.0", "10.5", "-10.5", "-0.0001","0090","-090","-090.1"].each do |v|
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => v)
+        assert t.valid?, "#{v} not recognized as a number"
+        # we cannot check this as replies_count is actually an integer field
+        #assert_in_delta v.to_f, t.replies_count, 0.0000001
+    end
+  end
+  
+  def test_validates_numericality_of_int_with_string
+    Topic.validates_numericality_of( :replies_count, :only_integer => true )
+    ["not a number","42 not a number","0xdeadbeef","0-1","--3","+-3","+3-1",nil].each do |v|
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => v)
+        assert !t.valid?, "#{v} not rejected as integer"
+        assert t.errors.on(:replies_count)
+    end
+  end
+  
+  def test_validates_numericality_of_int
+    Topic.validates_numericality_of( :replies_count, :only_integer => true )
+    ["42", "+42", "-42", "042", "0042", "-042", 42].each do |v|
+        t = Topic.create("title" => "numeric test", "content" => "whatever", "replies_count" => v)
+        assert t.valid?, "#{v} not recognized as integer"
+        assert_equal v.to_i, t.replies_count
+    end
+  end
+  
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
-date: 2005-02-24
+  version: 1.8.0
+date: 2005-03-07
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -46,6 +46,7 @@ files:
   - lib/active_record/deprecated_associations.rb
   - lib/active_record/fixtures.rb
   - lib/active_record/locking.rb
+  - lib/active_record/migration.rb
   - lib/active_record/observer.rb
   - lib/active_record/reflection.rb
   - lib/active_record/timestamp.rb
@@ -93,6 +94,7 @@ files:
   - test/inheritance_test.rb
   - test/lifecycle_test.rb
   - test/locking_test.rb
+  - test/migration_mysql.rb
   - test/mixin_test.rb
   - test/modules_test.rb
   - test/multiple_db_test.rb
@@ -141,6 +143,7 @@ files:
   - test/fixtures/entrants.yml
   - test/fixtures/fixture_database.sqlite
   - test/fixtures/fixture_database_2.sqlite
+  - test/fixtures/migrations
   - test/fixtures/mixin.rb
   - test/fixtures/mixins.yml
   - test/fixtures/movie.rb
@@ -191,6 +194,8 @@ files:
   - test/fixtures/developers_projects/david_action_controller
   - test/fixtures/developers_projects/david_active_record
   - test/fixtures/developers_projects/jamis_active_record
+  - test/fixtures/migrations/1_people_have_last_names.rb
+  - test/fixtures/migrations/2_we_need_reminders.rb
   - test/fixtures/naked/csv
   - test/fixtures/naked/yml
   - test/fixtures/naked/csv/accounts.csv
@@ -221,5 +226,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
       version: