@@ -1,7 +1,30 @@ module Clipper module Accessors + + class StringSerializer + def self.load(value) + value.to_s + end + end + + class IntegerSerializer + def self.load(value) + Integer(value) + end + end + class TypedAccessor + ## + # Defines mappings from native types to Clipper Serializers. + # + # @api private + ## + @@native_serializers = { + String => Clipper::Accessors::StringSerializer, + Integer => Clipper::Accessors::IntegerSerializer + }.freeze + attr_reader :target, :name, :type def initialize(target, name, type) @@ -18,17 +41,12 @@ module Clipper end def typecast(value) + return value if value.is_a?(@type) + case - when @type == String then typecast_to_string(value) - when @type == Integer then typecast_to_integer(value) - when Serializable > @type then - case value - when @type then value - when nil then @type.load(Serializable::EmptyReader.new) - when Hash then @type.load(Serializable::HashReader.new(value)) - else - raise SerializationError.new("Don't know how to load value #{value.inspect}") - end + when @type === value then value + when serializer = @@native_serializers[@type] then serializer.load(value) + when Serializable > @type then @type.load(value) else raise SerializationError.new("Don't know how to serialize #{@type.inspect}") end @@ -61,16 +79,10 @@ module Clipper alias == eql? private - class SerializationError < StandardError - end - def typecast_to_string(value) - value.to_s + class SerializationError < StandardError end - def typecast_to_integer(value) - Integer(value) - end end end end \ No newline at end of file lib/clipper/accessors/typed_accessor.rb @@ -1,14 +1,11 @@ module Clipper - @validation_context_map = {} - - def self.constrain(target, context_name, &block) - @validation_context_map[context_name] ||= {} - @validation_context_map[context_name][target] = Clipper::Validations::Context.new(target, context_name, &block) + def self.validation_context_map + @validation_context_map ||= {} end def self.validate(instance, context_name = 'default') - if context_map = @validation_context_map[context_name] + if context_map = validation_context_map[context_name] if context = context_map[instance.class] return context.validate(instance) else @@ -19,4 +16,19 @@ module Clipper end end + module Validations + + def self.included(target) + target.extend(ClassMethods) + end + + module ClassMethods + def constrain(context_name, &block) + Clipper::validation_context_map[context_name] ||= {} + Clipper::validation_context_map[context_name][self] = Clipper::Validations::Context.new(self, context_name, &block) + end + + end + + end # module Validations end # module Clipper \ No newline at end of file lib/clipper/validations.rb @@ -5,6 +5,7 @@ class Integration::ValidationsTest < Test::Unit::TestCase def setup @user = Class.new do + include Clipper::Validations attr_accessor :id, :name, :email, :password, :password_confirmation, :age, :gender, :title end @@ -12,7 +13,7 @@ class Integration::ValidationsTest < Test::Unit::TestCase def test_constraint_declarations assert_nothing_raised do - Clipper::constrain(@user, "test_constraint_declarations") do |check| + @user.constrain("test_constraint_declarations") do |check| check.size("name", 50) { |instance| instance.active? } check.required("name") @@ -31,7 +32,7 @@ class Integration::ValidationsTest < Test::Unit::TestCase end def test_default_validation_returns_invalid_result - Clipper::constrain(@user, 'default') do |check| + @user.constrain('default') do |check| check.required('name') end @@ -42,7 +43,7 @@ class Integration::ValidationsTest < Test::Unit::TestCase end def test_default_validation_returns_valid_result - Clipper::constrain(@user, 'default') do |check| + @user.constrain('default') do |check| check.required('name') end @@ -54,11 +55,11 @@ class Integration::ValidationsTest < Test::Unit::TestCase end def test_multiple_context_validation - Clipper::constrain(@user, 'default') do |check| + @user.constrain('default') do |check| check.required('name') end - Clipper::constrain(@user, 'email_marketing') do |check| + @user.constrain('email_marketing') do |check| check.required('name') check.required('email') end tests/integration/validations_test.rb @@ -10,8 +10,12 @@ class SerializableTest < Test::Unit::TestCase def self.load(reader) city = new - city.name = reader[:name].value - city.state_abbreviation = reader[:state_abbreviation].value + + if reader + city.name = reader[:name] + city.state_abbreviation = reader[:state_abbreviation] + end + city end tests/unit/accessors/serializable_test.rb 9b53372c608352c64ff1f88458afbefefca7f315 182ff96100a46daafed202ad12d107e7413542de Sam Smoot ssmoot@gmail.com http://github.com/wiecklabs/clipper/commit/9c884236f2e974d5d2b592765f6f552f6fe41a5e 9c884236f2e974d5d2b592765f6f552f6fe41a5e 2009-06-22T14:16:44-07:00 2009-06-22T14:16:44-07:00 Merge branch 'master' of git@github.com:wiecklabs/clipper fce6d5148a1ff92fec3ee33d0a7da23f344ba8c9 Sam Smoot ssmoot@gmail.com