activerecord 1.14.4 → 1.15.0

data/test/xml_serialization_test.rb

@@ -0,0 +1,125 @@
+require 'abstract_unit'
+require 'fixtures/post'
+require 'fixtures/author'
+
+class Contact < ActiveRecord::Base
+  # mock out self.columns so no pesky db is needed for these tests
+  def self.columns() @columns ||= []; end
+  def self.column(name, sql_type = nil, default = nil, null = true)
+    columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+  end
+
+  column :name,       :string
+  column :age,        :integer
+  column :avatar,     :binary
+  column :created_at, :datetime
+  column :awesome,    :boolean
+end
+
+class XmlSerializationTest < Test::Unit::TestCase
+  def test_should_serialize_default_root
+    @xml = Contact.new.to_xml
+    assert_match %r{^<contact>},  @xml
+    assert_match %r{</contact>$}, @xml
+  end
+  
+  def test_should_serialize_default_root_with_namespace
+    @xml = Contact.new.to_xml :namespace=>"http://xml.rubyonrails.org/contact"
+    assert_match %r{^<contact xmlns="http://xml.rubyonrails.org/contact">},  @xml
+    assert_match %r{</contact>$}, @xml
+  end
+  
+  def test_should_serialize_custom_root
+    @xml = Contact.new.to_xml :root => 'xml_contact'
+    assert_match %r{^<xml-contact>},  @xml
+    assert_match %r{</xml-contact>$}, @xml
+  end
+  
+  def test_should_allow_undasherized_tags
+    @xml = Contact.new.to_xml :root => 'xml_contact', :dasherize => false
+    assert_match %r{^<xml_contact>},  @xml
+    assert_match %r{</xml_contact>$}, @xml
+    assert_match %r{<created_at},     @xml
+  end
+
+  def test_should_allow_attribute_filtering
+    @xml = Contact.new.to_xml :only => [:age, :name]
+    assert_match %r{<name},          @xml
+    assert_match %r{<age},           @xml
+    assert_no_match %r{<created-at}, @xml
+    
+    @xml = Contact.new.to_xml :except => [:age, :name]
+    assert_no_match %r{<name},    @xml
+    assert_no_match %r{<age},     @xml
+    assert_match %r{<created-at}, @xml
+  end
+end
+
+class DefaultXmlSerializationTest < Test::Unit::TestCase
+  def setup
+    @xml = Contact.new(:name => 'aaron stack', :age => 25, :avatar => 'binarydata', :created_at => Time.utc(2006, 8, 1), :awesome => false).to_xml
+  end
+
+  def test_should_serialize_string
+    assert_match %r{<name>aaron stack</name>},     @xml
+  end
+  
+  def test_should_serialize_integer
+    assert_match %r{<age type="integer">25</age>}, @xml
+  end
+  
+  def test_should_serialize_binary
+    assert_match %r{YmluYXJ5ZGF0YQ==\n</avatar>},    @xml
+    assert_match %r{<avatar(.*)(type="binary")},     @xml
+    assert_match %r{<avatar(.*)(encoding="base64")}, @xml
+  end
+  
+  def test_should_serialize_datetime
+    assert_match %r{<created-at type=\"datetime\">2006-08-01T00:00:00Z</created-at>}, @xml
+  end
+  
+  def test_should_serialize_boolean
+    assert_match %r{<awesome type=\"boolean\">false</awesome>}, @xml
+  end
+end
+
+class NilXmlSerializationTest < Test::Unit::TestCase
+  def setup
+    @xml = Contact.new.to_xml(:root => 'xml_contact')
+  end
+
+  def test_should_serialize_string
+    assert_match %r{<name></name>},     @xml
+  end
+  
+  def test_should_serialize_integer
+    assert_match %r{<age type="integer"></age>}, @xml
+  end
+  
+  def test_should_serialize_binary
+    assert_match %r{></avatar>},                     @xml
+    assert_match %r{<avatar(.*)(type="binary")},     @xml
+    assert_match %r{<avatar(.*)(encoding="base64")}, @xml
+  end
+  
+  def test_should_serialize_datetime
+    assert_match %r{<created-at type=\"datetime\"></created-at>}, @xml
+  end
+  
+  def test_should_serialize_boolean
+    assert_match %r{<awesome type=\"boolean\"></awesome>}, @xml
+  end
+end
+
+class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
+  fixtures :authors, :posts
+  # to_xml used to mess with the hash the user provided which
+  # caused the builder to be reused
+  def test_passing_hash_shouldnt_reuse_builder
+    options = {:include=>:posts}
+    david = authors(:david)
+    first_xml_size = david.to_xml(options).size
+    second_xml_size = david.to_xml(options).size
+    assert_equal first_xml_size, second_xml_size
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.14.4
-date: 2006-08-09 00:00:00 -05:00
+  version: 1.15.0
+date: 2007-01-18 00:00:00 -06:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - David Heinemeier Hansson
 files: 
@@ -39,6 +40,7 @@ files:
 - lib/active_record/aggregations.rb
 - lib/active_record/associations
 - lib/active_record/associations.rb
+- lib/active_record/attribute_methods.rb
 - lib/active_record/base.rb
 - lib/active_record/calculations.rb
 - lib/active_record/callbacks.rb
@@ -46,7 +48,7 @@ files:
 - lib/active_record/deprecated_associations.rb
 - lib/active_record/deprecated_finders.rb
 - lib/active_record/fixtures.rb
-- lib/active_record/locking.rb
+- lib/active_record/locking
 - lib/active_record/migration.rb
 - lib/active_record/observer.rb
 - lib/active_record/query_cache.rb
@@ -60,6 +62,7 @@ files:
 - lib/active_record/version.rb
 - lib/active_record/wrappers
 - lib/active_record/wrappings.rb
+- lib/active_record/xml_serialization.rb
 - lib/active_record/acts/list.rb
 - lib/active_record/acts/nested_set.rb
 - lib/active_record/acts/tree.rb
@@ -75,6 +78,7 @@ files:
 - lib/active_record/connection_adapters/abstract_adapter.rb
 - lib/active_record/connection_adapters/db2_adapter.rb
 - lib/active_record/connection_adapters/firebird_adapter.rb
+- lib/active_record/connection_adapters/frontbase_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
 - lib/active_record/connection_adapters/openbase_adapter.rb
 - lib/active_record/connection_adapters/oracle_adapter.rb
@@ -83,40 +87,44 @@ files:
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
 - lib/active_record/connection_adapters/sybase_adapter.rb
 - lib/active_record/connection_adapters/abstract/connection_specification.rb
+- lib/active_record/connection_adapters/abstract/connection_specification.rb.rej
 - lib/active_record/connection_adapters/abstract/database_statements.rb
 - lib/active_record/connection_adapters/abstract/quoting.rb
 - lib/active_record/connection_adapters/abstract/schema_definitions.rb
 - lib/active_record/connection_adapters/abstract/schema_statements.rb
+- lib/active_record/locking/optimistic.rb
+- lib/active_record/locking/pessimistic.rb
 - lib/active_record/vendor/db2.rb
 - lib/active_record/vendor/mysql.rb
 - lib/active_record/vendor/simple.rb
 - lib/active_record/wrappers/yaml_wrapper.rb
 - test/aaa_create_tables_test.rb
 - test/abstract_unit.rb
-- test/active_schema_mysql.rb
+- test/active_schema_test_mysql.rb
 - test/adapter_test.rb
+- test/adapter_test_sqlserver.rb
 - test/aggregations_test.rb
 - test/all.sh
 - test/ar_schema_test.rb
-- test/association_callbacks_test.rb
 - test/association_inheritance_reload.rb
-- test/associations_cascaded_eager_loading_test.rb
-- test/associations_extensions_test.rb
-- test/associations_go_eager_test.rb
-- test/associations_join_model_test.rb
+- test/associations
 - test/associations_test.rb
+- test/attribute_methods_test.rb
 - test/base_test.rb
 - test/binary_test.rb
 - test/calculations_test.rb
 - test/callbacks_test.rb
 - test/class_inheritable_attributes_test.rb
 - test/column_alias_test.rb
+- test/connection_test_firebird.rb
 - test/connections
 - test/copy_table_sqlite.rb
+- test/datatype_test_postgresql.rb
 - test/default_test_firebird.rb
 - test/defaults_test.rb
 - test/deprecated_associations_test.rb
 - test/deprecated_finder_test.rb
+- test/empty_date_time_test.rb
 - test/finder_test.rb
 - test/fixtures
 - test/fixtures_test.rb
@@ -125,6 +133,7 @@ files:
 - test/locking_test.rb
 - test/method_scoping_test.rb
 - test/migration_test.rb
+- test/migration_test_firebird.rb
 - test/mixin_nested_set_test.rb
 - test/mixin_test.rb
 - test/modules_test.rb
@@ -132,15 +141,24 @@ files:
 - test/pk_test.rb
 - test/readonly_test.rb
 - test/reflection_test.rb
+- test/schema_authorization_test_postgresql.rb
 - test/schema_dumper_test.rb
 - test/schema_test_postgresql.rb
 - test/synonym_test_oracle.rb
+- test/table_name_test_sqlserver.rb
 - test/threaded_connections_test.rb
 - test/transactions_test.rb
 - test/unconnected_test.rb
 - test/validations_test.rb
+- test/xml_serialization_test.rb
+- test/associations/callbacks_test.rb
+- test/associations/cascaded_eager_loading_test.rb
+- test/associations/eager_test.rb
+- test/associations/extension_test.rb
+- test/associations/join_model_test.rb
 - test/connections/native_db2
 - test/connections/native_firebird
+- test/connections/native_frontbase
 - test/connections/native_mysql
 - test/connections/native_openbase
 - test/connections/native_oracle
@@ -152,6 +170,7 @@ files:
 - test/connections/native_sybase
 - test/connections/native_db2/connection.rb
 - test/connections/native_firebird/connection.rb
+- test/connections/native_frontbase/connection.rb
 - test/connections/native_mysql/connection.rb
 - test/connections/native_openbase/connection.rb
 - test/connections/native_oracle/connection.rb
@@ -194,6 +213,8 @@ files:
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects
 - test/fixtures/developers_projects.yml
+- test/fixtures/edge.rb
+- test/fixtures/edges.yml
 - test/fixtures/entrant.rb
 - test/fixtures/entrants.yml
 - test/fixtures/fk_test_has_fk.yml
@@ -205,7 +226,9 @@ files:
 - test/fixtures/legacy_thing.rb
 - test/fixtures/legacy_things.yml
 - test/fixtures/migrations
+- test/fixtures/migrations_with_decimal
 - test/fixtures/migrations_with_duplicate
+- test/fixtures/migrations_with_missing_versions
 - test/fixtures/mixin.rb
 - test/fixtures/mixins.yml
 - test/fixtures/movie.rb
@@ -232,6 +255,8 @@ files:
 - test/fixtures/tasks.yml
 - test/fixtures/topic.rb
 - test/fixtures/topics.yml
+- test/fixtures/vertex.rb
+- test/fixtures/vertices.yml
 - test/fixtures/bad_fixtures/attr_with_numeric_first_char
 - test/fixtures/bad_fixtures/attr_with_spaces
 - test/fixtures/bad_fixtures/blank_line
@@ -248,6 +273,10 @@ files:
 - test/fixtures/db_definitions/firebird.sql
 - test/fixtures/db_definitions/firebird2.drop.sql
 - test/fixtures/db_definitions/firebird2.sql
+- test/fixtures/db_definitions/frontbase.drop.sql
+- test/fixtures/db_definitions/frontbase.sql
+- test/fixtures/db_definitions/frontbase2.drop.sql
+- test/fixtures/db_definitions/frontbase2.sql
 - test/fixtures/db_definitions/mysql.drop.sql
 - test/fixtures/db_definitions/mysql.sql
 - test/fixtures/db_definitions/mysql2.drop.sql
@@ -283,10 +312,15 @@ files:
 - test/fixtures/migrations/1_people_have_last_names.rb
 - test/fixtures/migrations/2_we_need_reminders.rb
 - test/fixtures/migrations/3_innocent_jointable.rb
+- test/fixtures/migrations_with_decimal/1_give_me_big_numbers.rb
 - test/fixtures/migrations_with_duplicate/1_people_have_last_names.rb
 - test/fixtures/migrations_with_duplicate/2_we_need_reminders.rb
 - test/fixtures/migrations_with_duplicate/3_foo.rb
 - test/fixtures/migrations_with_duplicate/3_innocent_jointable.rb
+- test/fixtures/migrations_with_missing_versions/1000_people_have_middle_names.rb
+- test/fixtures/migrations_with_missing_versions/1_people_have_last_names.rb
+- test/fixtures/migrations_with_missing_versions/3_we_need_reminders.rb
+- test/fixtures/migrations_with_missing_versions/4_innocent_jointable.rb
 - test/fixtures/naked/csv
 - test/fixtures/naked/yml
 - test/fixtures/naked/csv/accounts.csv
@@ -320,5 +354,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: 1.4.0
     version: 

data/lib/active_record/locking.rb

@@ -1,79 +0,0 @@
-module ActiveRecord
-  # Active Records support optimistic locking if the field <tt>lock_version</tt> is present.  Each update to the
-  # record increments the lock_version column and the locking facilities ensure that records instantiated twice
-  # will let the last one saved raise a StaleObjectError if the first was also updated. Example:
-  #
-  #   p1 = Person.find(1)
-  #   p2 = Person.find(1)
-  #   
-  #   p1.first_name = "Michael"
-  #   p1.save
-  #   
-  #   p2.first_name = "should fail"
-  #   p2.save # Raises a ActiveRecord::StaleObjectError
-  #
-  # You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging,
-  # or otherwise apply the business logic needed to resolve the conflict.
-  #
-  # You must ensure that your database schema defaults the lock_version column to 0.
-  #
-  # This behavior can be turned off by setting <tt>ActiveRecord::Base.lock_optimistically = false</tt>.
-  # To override the name of the lock_version column, invoke the <tt>set_locking_column</tt> method.
-  # This method uses the same syntax as <tt>set_table_name</tt>
-  module Locking
-    def self.append_features(base) #:nodoc:
-      super
-      base.class_eval do
-        alias_method :update_without_lock, :update
-        alias_method :update, :update_with_lock
-      end
-    end
-
-    def update_with_lock #:nodoc:
-      return update_without_lock unless locking_enabled?
-
-      lock_col = self.class.locking_column
-      previous_value = send(lock_col)
-      send(lock_col + '=', previous_value + 1)
-
-      affected_rows = connection.update(<<-end_sql, "#{self.class.name} Update with optimistic locking")
-        UPDATE #{self.class.table_name}
-        SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))}
-        WHERE #{self.class.primary_key} = #{quote(id)} 
-        AND #{lock_col} = #{quote(previous_value)}
-      end_sql
-
-      unless affected_rows == 1
-        raise ActiveRecord::StaleObjectError, "Attempted to update a stale object"
-      end
-
-      return true
-    end
-  end
-
-  class Base
-    @@lock_optimistically = true
-    cattr_accessor :lock_optimistically
-
-    def locking_enabled? #:nodoc:
-      lock_optimistically && respond_to?(self.class.locking_column)
-    end
-    
-    class << self
-      def set_locking_column(value = nil, &block)
-        define_attr_method :locking_column, value, &block
-      end
-  
-      def locking_column #:nodoc:
-        reset_locking_column
-      end
-  
-      def reset_locking_column #:nodoc:
-        default = 'lock_version'
-        set_locking_column(default)
-        default
-      end
-    end
-    
-  end
-end