@@ -2,7 +2,7 @@ TODO: * IdentityMap * ObjectEnumerator -* Load a complex object that spans more than one table +* Save a complex object that spans more than one table * Load an object that uses a Discriminator * Save an Association * Load an Association TODO @@ -4,6 +4,12 @@ module Wheels class UnmappedClassError < StandardError end + class UnsupportedTypeError < StandardError + def initialize(type) + super("#{type.inspect} is not a registered Wheels::Orm::Type (#{Wheels::Orm::Types.inspect})") + end + end + include Enumerable def initialize lib/wheels/orm/mappings.rb @@ -3,22 +3,24 @@ module Wheels class Mappings class Field - include Test::Unit::Assertions - def initialize(mapping, name, type, default = nil) begin - assert_kind_of(Wheels::Orm::Mappings::Mapping, mapping, "Field#mapping must be a Mapping") + raise ArgumentError.new("Field#mapping must be a Mapping") unless mapping.kind_of?(Wheels::Orm::Mappings::Mapping) @mapping = mapping - assert_kind_of(String, name, "Field#name must be a String") - assert_not_blank(name, "Field#name must not be blank") + raise ArgumentError.new("Field#name must be a String") unless name.is_a?(String) + raise ArgumentError.new("Field#name must not be blank") if name.blank? @name = name if type.is_a?(Class) - type = Wheels::Orm::Types[type.to_s].new + if defined_type = Wheels::Orm::Types[type.to_s] + type = defined_type.new + else + raise Wheels::Orm::Mappings::UnsupportedTypeError.new(type) + end end - assert_kind_of(Wheels::Orm::Type, type, "Field#type must be a Wheels::Orm::Type") + raise ArgumentError.new("Field#type must be a Wheels::Orm::Type") unless type.is_a?(Wheels::Orm::Type) @type = type @default = default lib/wheels/orm/mappings/field.rb 86e63577b432466792c6f0f4ac6b7c1490475e05 Sam Smoot ssmoot@gmail.com http://github.com/wiecklabs/clipper/commit/488a6a49b2e9cae7d7940d985dac55e47161dca0 488a6a49b2e9cae7d7940d985dac55e47161dca0 2009-04-10T09:08:26-07:00 2009-04-10T09:08:26-07:00 Removed test-unit-assertions from field.rb. 61059a367b14f04990e0bc4d94a53331b7bff0cd Sam Smoot ssmoot@gmail.com