activerecord 1.15.6 → 2.0.0

data/test/xml_serialization_test.rb

@@ -1,20 +1,9 @@
 require 'abstract_unit'
+require 'fixtures/contact'
 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
+require 'fixtures/tagging'
+require 'fixtures/comment'
 
 class XmlSerializationTest < Test::Unit::TestCase
   def test_should_serialize_default_root
@@ -22,19 +11,19 @@ class XmlSerializationTest < Test::Unit::TestCase
     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
@@ -42,45 +31,45 @@ class XmlSerializationTest < Test::Unit::TestCase
     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
+  def test_should_include_yielded_additions
+    @xml = Contact.new.to_xml do |xml|
+      xml.creator "David"
+    end
+
+    assert_match %r{<creator>David</creator>}, @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
+    @xml = Contact.new(:name => 'aaron stack', :age => 25, :avatar => 'binarydata', :created_at => Time.utc(2006, 8, 1), :awesome => false, :preferences => { :gem => 'ruby' }).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
+
+  def test_should_serialize_yaml
+    assert_match %r{<preferences type=\"yaml\">--- \n:gem: ruby\n</preferences>}, @xml
+  end
 end
 
 class NilXmlSerializationTest < Test::Unit::TestCase
@@ -89,32 +78,51 @@ class NilXmlSerializationTest < Test::Unit::TestCase
   end
 
   def test_should_serialize_string
-    assert_match %r{<name></name>},     @xml
+    assert_match %r{<name nil="true"></name>},     @xml
   end
-  
+
   def test_should_serialize_integer
-    assert_match %r{<age type="integer"></age>}, @xml
+    assert %r{<age (.*)></age>}.match(@xml)
+    attributes = $1
+    assert_match %r{nil="true"}, attributes
+    assert_match %r{type="integer"}, attributes
   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
+    assert %r{<avatar (.*)></avatar>}.match(@xml)
+    attributes = $1
+    assert_match %r{type="binary"}, attributes
+    assert_match %r{encoding="base64"}, attributes
+    assert_match %r{nil="true"}, attributes
   end
-  
+
   def test_should_serialize_datetime
-    assert_match %r{<created-at type=\"datetime\"></created-at>}, @xml
+    assert %r{<created-at (.*)></created-at>}.match(@xml)
+    attributes = $1
+    assert_match %r{nil="true"}, attributes
+    assert_match %r{type="datetime"}, attributes
   end
-  
+
   def test_should_serialize_boolean
-    assert_match %r{<awesome type=\"boolean\"></awesome>}, @xml
+    assert %r{<awesome (.*)></awesome>}.match(@xml)
+    attributes = $1
+    assert_match %r{type="boolean"}, attributes
+    assert_match %r{nil="true"}, attributes
+  end
+
+  def test_should_serialize_yaml
+    assert %r{<preferences(.*)></preferences>}.match(@xml)
+    attributes = $1
+    assert_match %r{type="yaml"}, attributes
+    assert_match %r{nil="true"}, attributes
   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
+  # caused the builder to be reused.  This meant the document kept
+  # getting appended to.
   def test_passing_hash_shouldnt_reuse_builder
     options = {:include=>:posts}
     david = authors(:david)
@@ -122,4 +130,73 @@ class DatabaseConnectedXmlSerializationTest < Test::Unit::TestCase
     second_xml_size = david.to_xml(options).size
     assert_equal first_xml_size, second_xml_size
   end
+
+  def test_include_uses_association_name
+    xml = authors(:david).to_xml :include=>:hello_posts, :indent => 0
+    assert_match %r{<hello-posts type="array">}, xml
+    assert_match %r{<hello-post type="Post">}, xml
+    assert_match %r{<hello-post type="StiPost">}, xml
+  end
+
+  def test_methods_are_called_on_object
+    xml = authors(:david).to_xml :methods => :label, :indent => 0
+    assert_match %r{<label>.*</label>}, xml
+  end
+
+  def test_should_not_call_methods_on_associations_that_dont_respond
+    xml = authors(:david).to_xml :include=>:hello_posts, :methods => :label, :indent => 2
+    assert !authors(:david).hello_posts.first.respond_to?(:label)
+    assert_match %r{^  <label>.*</label>}, xml
+    assert_no_match %r{^      <label>}, xml
+  end
+
+  def test_procs_are_called_on_object
+    proc = Proc.new { |options| options[:builder].tag!('nationality', 'Danish') }
+    xml = authors(:david).to_xml(:procs => [ proc ])
+    assert_match %r{<nationality>Danish</nationality>}, xml
+  end
+
+  def test_top_level_procs_arent_applied_to_associations
+    author_proc = Proc.new { |options| options[:builder].tag!('nationality', 'Danish') }
+    xml = authors(:david).to_xml(:procs => [ author_proc ], :include => :posts, :indent => 2)
+
+    assert_match %r{^  <nationality>Danish</nationality>}, xml
+    assert_no_match %r{^ {6}<nationality>Danish</nationality>}, xml
+  end
+
+  def test_procs_on_included_associations_are_called
+    posts_proc = Proc.new { |options| options[:builder].tag!('copyright', 'DHH') }
+    xml = authors(:david).to_xml(
+      :indent => 2,
+      :include => {
+        :posts => { :procs => [ posts_proc ] }
+      }
+    )
+
+    assert_no_match %r{^  <copyright>DHH</copyright>}, xml
+    assert_match %r{^ {6}<copyright>DHH</copyright>}, xml
+  end
+
+  def test_should_include_empty_has_many_as_empty_array
+    authors(:david).posts.delete_all
+    xml = authors(:david).to_xml :include=>:posts, :indent => 2
+
+    assert_equal [], Hash.from_xml(xml)['author']['posts']
+    assert_match %r{^  <posts type="array"/>}, xml
+  end
+
+  def test_should_has_many_array_elements_should_include_type_when_different_from_guessed_value
+    xml = authors(:david).to_xml :include=>:posts_with_comments, :indent => 2
+
+    assert Hash.from_xml(xml)
+    assert_match %r{^  <posts-with-comments type="array">}, xml
+    assert_match %r{^    <posts-with-comment type="Post">}, xml
+    assert_match %r{^    <posts-with-comment type="StiPost">}, xml
+
+    types = Hash.from_xml(xml)['author']['posts_with_comments'].collect {|t| t['type'] }
+    assert types.include?('SpecialPost')
+    assert types.include?('Post')
+    assert types.include?('StiPost')
+  end
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.15.6
-date: 2007-11-24 00:00:00 +13:00
+  version: 2.0.0
+date: 2007-12-06 00:00:00 -06:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
 - lib
@@ -35,10 +35,6 @@ files:
 - RUNNING_UNIT_TESTS
 - CHANGELOG
 - lib/active_record
-- lib/active_record/acts
-- lib/active_record/acts/list.rb
-- lib/active_record/acts/nested_set.rb
-- lib/active_record/acts/tree.rb
 - lib/active_record/aggregations.rb
 - lib/active_record/associations
 - lib/active_record/associations/association_collection.rb
@@ -58,22 +54,15 @@ files:
 - lib/active_record/connection_adapters/abstract
 - lib/active_record/connection_adapters/abstract/connection_specification.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
+- lib/active_record/connection_adapters/abstract/query_cache.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/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
 - lib/active_record/connection_adapters/postgresql_adapter.rb
+- lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/sqlite_adapter.rb
-- lib/active_record/connection_adapters/sqlserver_adapter.rb
-- lib/active_record/connection_adapters/sybase_adapter.rb
-- lib/active_record/deprecated_associations.rb
-- lib/active_record/deprecated_finders.rb
 - lib/active_record/fixtures.rb
 - lib/active_record/locking
 - lib/active_record/locking/optimistic.rb
@@ -84,19 +73,19 @@ files:
 - lib/active_record/reflection.rb
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
+- lib/active_record/serialization.rb
+- lib/active_record/serializers
+- lib/active_record/serializers/json_serializer.rb
+- lib/active_record/serializers/xml_serializer.rb
 - lib/active_record/timestamp.rb
 - lib/active_record/transactions.rb
 - lib/active_record/validations.rb
 - lib/active_record/vendor
 - lib/active_record/vendor/db2.rb
 - lib/active_record/vendor/mysql.rb
-- lib/active_record/vendor/simple.rb
 - lib/active_record/version.rb
-- lib/active_record/wrappers
-- lib/active_record/wrappers/yaml_wrapper.rb
-- lib/active_record/wrappings.rb
-- lib/active_record/xml_serialization.rb
 - lib/active_record.rb
+- lib/activerecord.rb
 - test/aaa_create_tables_test.rb
 - test/abstract_unit.rb
 - test/active_schema_test_mysql.rb
@@ -107,10 +96,13 @@ files:
 - test/ar_schema_test.rb
 - test/association_inheritance_reload.rb
 - test/associations
+- test/associations/ar_joins_test.rb
 - test/associations/callbacks_test.rb
 - test/associations/cascaded_eager_loading_test.rb
+- test/associations/eager_singularization_test.rb
 - test/associations/eager_test.rb
 - test/associations/extension_test.rb
+- test/associations/inner_join_association_test.rb
 - test/associations/join_model_test.rb
 - test/associations_test.rb
 - test/attribute_methods_test.rb
@@ -121,6 +113,7 @@ files:
 - test/class_inheritable_attributes_test.rb
 - test/column_alias_test.rb
 - test/connection_test_firebird.rb
+- test/connection_test_mysql.rb
 - test/connections
 - test/connections/native_db2
 - test/connections/native_db2/connection.rb
@@ -141,22 +134,21 @@ files:
 - test/connections/native_sqlite3
 - test/connections/native_sqlite3/connection.rb
 - test/connections/native_sqlite3/in_memory_connection.rb
-- test/connections/native_sqlserver
-- test/connections/native_sqlserver/connection.rb
-- test/connections/native_sqlserver_odbc
-- test/connections/native_sqlserver_odbc/connection.rb
 - test/connections/native_sybase
 - test/connections/native_sybase/connection.rb
-- test/copy_table_sqlite.rb
+- test/copy_table_test_sqlite.rb
 - test/datatype_test_postgresql.rb
+- test/date_time_test.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/accounts.yml
+- test/fixtures/all
+- test/fixtures/all/developers.yml
+- test/fixtures/all/people.csv
+- test/fixtures/all/tasks.yml
 - test/fixtures/author.rb
 - test/fixtures/author_favorites.yml
 - test/fixtures/authors.yml
@@ -190,6 +182,7 @@ files:
 - test/fixtures/company_in_module.rb
 - test/fixtures/computer.rb
 - test/fixtures/computers.yml
+- test/fixtures/contact.rb
 - test/fixtures/course.rb
 - test/fixtures/courses.yml
 - test/fixtures/customer.rb
@@ -207,10 +200,6 @@ files:
 - 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
-- test/fixtures/db_definitions/mysql2.sql
 - test/fixtures/db_definitions/openbase.drop.sql
 - test/fixtures/db_definitions/openbase.sql
 - test/fixtures/db_definitions/openbase2.drop.sql
@@ -224,14 +213,11 @@ files:
 - test/fixtures/db_definitions/postgresql2.drop.sql
 - test/fixtures/db_definitions/postgresql2.sql
 - test/fixtures/db_definitions/schema.rb
+- test/fixtures/db_definitions/schema2.rb
 - test/fixtures/db_definitions/sqlite.drop.sql
 - test/fixtures/db_definitions/sqlite.sql
 - test/fixtures/db_definitions/sqlite2.drop.sql
 - test/fixtures/db_definitions/sqlite2.sql
-- test/fixtures/db_definitions/sqlserver.drop.sql
-- test/fixtures/db_definitions/sqlserver.sql
-- test/fixtures/db_definitions/sqlserver2.drop.sql
-- test/fixtures/db_definitions/sqlserver2.sql
 - test/fixtures/db_definitions/sybase.drop.sql
 - test/fixtures/db_definitions/sybase.sql
 - test/fixtures/db_definitions/sybase2.drop.sql
@@ -248,14 +234,19 @@ files:
 - test/fixtures/edges.yml
 - test/fixtures/entrant.rb
 - test/fixtures/entrants.yml
+- test/fixtures/example.log
 - test/fixtures/fk_test_has_fk.yml
 - test/fixtures/fk_test_has_pk.yml
 - test/fixtures/flowers.jpg
 - test/fixtures/funny_jokes.yml
+- test/fixtures/item.rb
+- test/fixtures/items.yml
 - test/fixtures/joke.rb
 - test/fixtures/keyboard.rb
 - test/fixtures/legacy_thing.rb
 - test/fixtures/legacy_things.yml
+- test/fixtures/matey.rb
+- test/fixtures/mateys.yml
 - test/fixtures/migrations
 - test/fixtures/migrations/1_people_have_last_names.rb
 - test/fixtures/migrations/2_we_need_reminders.rb
@@ -272,9 +263,10 @@ files:
 - 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/minimalistic.rb
+- test/fixtures/minimalistics.yml
 - test/fixtures/mixed_case_monkey.rb
 - test/fixtures/mixed_case_monkeys.yml
-- test/fixtures/mixin.rb
 - test/fixtures/mixins.yml
 - test/fixtures/movie.rb
 - test/fixtures/movies.yml
@@ -286,8 +278,13 @@ files:
 - test/fixtures/naked/yml/companies.yml
 - test/fixtures/naked/yml/courses.yml
 - test/fixtures/order.rb
+- test/fixtures/parrot.rb
+- test/fixtures/parrots.yml
+- test/fixtures/parrots_pirates.yml
 - test/fixtures/people.yml
 - test/fixtures/person.rb
+- test/fixtures/pirate.rb
+- test/fixtures/pirates.yml
 - test/fixtures/post.rb
 - test/fixtures/posts.yml
 - test/fixtures/project.rb
@@ -295,6 +292,14 @@ files:
 - test/fixtures/reader.rb
 - test/fixtures/readers.yml
 - test/fixtures/reply.rb
+- test/fixtures/reserved_words
+- test/fixtures/reserved_words/distinct.yml
+- test/fixtures/reserved_words/distincts_selects.yml
+- test/fixtures/reserved_words/group.yml
+- test/fixtures/reserved_words/select.yml
+- test/fixtures/reserved_words/values.yml
+- test/fixtures/ship.rb
+- test/fixtures/ships.yml
 - test/fixtures/subject.rb
 - test/fixtures/subscriber.rb
 - test/fixtures/subscribers
@@ -308,25 +313,30 @@ files:
 - test/fixtures/tasks.yml
 - test/fixtures/topic.rb
 - test/fixtures/topics.yml
+- test/fixtures/treasure.rb
+- test/fixtures/treasures.yml
 - test/fixtures/vertex.rb
 - test/fixtures/vertices.yml
 - test/fixtures_test.rb
 - test/inheritance_test.rb
+- test/json_serialization_test.rb
 - test/lifecycle_test.rb
 - 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
 - test/multiple_db_test.rb
 - test/pk_test.rb
+- test/query_cache_test.rb
 - test/readonly_test.rb
 - test/reflection_test.rb
+- test/reserved_word_test_mysql.rb
 - test/schema_authorization_test_postgresql.rb
 - test/schema_dumper_test.rb
 - test/schema_test_postgresql.rb
+- test/serialization_test.rb
 - test/synonym_test_oracle.rb
 - test/table_name_test_sqlserver.rb
 - test/threaded_connections_test.rb
@@ -335,9 +345,6 @@ files:
 - test/validations_test.rb
 - test/xml_serialization_test.rb
 - examples/associations.png
-- examples/associations.rb
-- examples/shared_setup.rb
-- examples/validation.rb
 test_files: []
 
 rdoc_options: 
@@ -359,5 +366,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.4
+        version: 2.0.0
     version: