@@ -310,7 +310,7 @@ module DataMapper @loaded_set.reload!(:fields => self.class.properties(self.class.repository.name).lazy_load_context(#{name.inspect})) end end - #{custom? ? "#{@type.inspect}.load(#{@instance_variable_name})" : @instance_variable_name} + #{custom? ? "#{@type.inspect}.load(#{@instance_variable_name}, self.class.properties(self.class.repository.name)[#{name.inspect}])" : @instance_variable_name} end EOS rescue SyntaxError @@ -324,7 +324,7 @@ module DataMapper def #{name}=(value) #{lock? ? "@shadow_#{name} = #{@instance_variable_name}" : ''} dirty_attributes << self.class.properties(repository.name)[#{name.inspect}] - #{@instance_variable_name} = #{custom? ? "#{@type.inspect}.dump(value)" : 'value'} + #{@instance_variable_name} = #{custom? ? "#{@type.inspect}.dump(value, self.class.properties(self.class.repository.name)[#{name.inspect}])" : 'value'} end EOS rescue SyntaxError lib/data_mapper/property.rb @@ -50,7 +50,7 @@ module DataMapper end value = instance_variable_get(ivar_name) - property.custom? ? property.type.load(value) : value + property.custom? ? property.type.load(value, property) : value end def []=(name, value) @@ -62,7 +62,7 @@ module DataMapper end dirty_attributes << property - instance_variable_set(ivar_name, property.custom? ? property.type.dump(value) : value) + instance_variable_set(ivar_name, property.custom? ? property.type.dump(value, property) : value) end def repository lib/data_mapper/resource.rb @@ -27,7 +27,7 @@ module DataMapper # primitive String # size 10 # - # def self.dump(value) + # def self.dump(value, property) # <work some magic> # end # @@ -129,7 +129,7 @@ module DataMapper # # # @public - def self.dump(value) + def self.dump(value, property) value end @@ -144,7 +144,7 @@ module DataMapper # # # @public - def self.load(value) + def self.load(value, property) value end lib/data_mapper/type.rb @@ -5,7 +5,7 @@ module DataMapper size 65535 lazy true - def self.load(value) + def self.load(value, property) case value when String then FasterCSV.parse(value) when Array then value @@ -13,7 +13,7 @@ module DataMapper end end - def self.dump(value) + def self.dump(value, property) case value when Array then FasterCSV.generate do |csv| lib/data_mapper/types/csv.rb @@ -7,7 +7,7 @@ module DataMapper size 65535 lazy true - def self.load(value) + def self.load(value, property) if value.nil? nil elsif value.is_a?(String) @@ -17,7 +17,7 @@ module DataMapper end end - def self.dump(value) + def self.dump(value, property) if value.nil? nil elsif value.is_a?(String) && value =~ /^---/ lib/data_mapper/types/yaml.rb @@ -15,14 +15,35 @@ describe DataMapper::Type do primitive String size 10 - def self.load(value) + def self.load(value, property) value.reverse end - def self.dump(value) + def self.dump(value, property) value.reverse end end + + class TestResource + include DataMapper::Resource + end + + class TestType3 < DataMapper::Type + primitive String + size 10 + attr_accessor :property, :value + + def self.load(value, property) + type = self.new + type.property = property + type.value = value + type + end + + def self.dump(value, property) + value.value + end + end end it "should have the same PROPERTY_OPTIONS aray as DataMapper::Property" do @@ -48,19 +69,42 @@ describe DataMapper::Type do end it "should pass through the value if load wasn't overriden" do - TestType.load("test").should == "test" + TestType.load("test", nil).should == "test" end it "should pass through the value if dump wasn't overriden" do - TestType.dump("test").should == "test" + TestType.dump("test", nil).should == "test" end it "should not raise NotImplmenetedException if load was overriden" do - TestType2.dump("helo").should == "oleh" + TestType2.dump("helo", nil).should == "oleh" end it "should not raise NotImplmenetedException if dump was overriden" do - TestType2.load("oleh").should == "helo" + TestType2.load("oleh", nil).should == "helo" + end + + describe "using a custom type" do + before do + @property = DataMapper::Property.new TestResource, :name, TestType3, {} + end + + it "should return a object of the same type" do + TestType3.load("helo", @property).class.should == TestType3 + end + + it "should contain the property" do + TestType3.load("helo", @property).property.should == @property + end + + it "should contain the value" do + TestType3.load("helo", @property).value.should == "helo" + end + + it "should return the value" do + obj = TestType3.load("helo", @property) + TestType3.dump(obj, @property).should == "helo" + end end describe "using def Type" do spec/unit/type_spec.rb 0f38788ebd9dfa4395b021255b13ee7b55a58cb5 Ken Robertson ken@explosivethoughts.com http://github.com/sam/dm-core/commit/0e283f878c5bd0a3cb241a553ba2c967e17b3e91 0e283f878c5bd0a3cb241a553ba2c967e17b3e91 2008-04-10T12:59:01-07:00 2008-04-10T12:59:01-07:00 Added support to pass property information own to custom types in the dump/load e564126ab9eb0e762353cc92333cb00e87a9ccfe Ken Robertson ken@explosivethoughts.com