Navigation

Changeset 3108

Timestamp:

11/20/05 08:15:51 (3 years ago)

Author:

bitsweat

Message:

Make data writer private. Marshal/unmarshal handle nil.

Files:

r3107	r3108
81	81	end
82	82
83		def marshal(data) ~~Base64.encode64(Marshal.dump(data))~~ end
84		def unmarshal(data) ~~Marshal.load(Base64.decode64(data))~~ end
	83	def marshal(data) Base64.encode64(Marshal.dump(data)) if data end
	84	def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
85	85
86	86	def create_table!
…	…
118	118	end
119	119
120		~~attr_writer :data~~
121
122	120	# Lazy-unmarshal session state.
123	121	def data
124		@data \|\|= self.class.unmarshal(read_attribute(@@data_column_name))
	122	@data \|\|= self.class.unmarshal(read_attribute(@@data_column_name)) \|\| {}
125	123	end
126	124
127	125	private
	126	attr_writer :data
	127
128	128	def marshal_data!
129	129	write_attribute(@@data_column_name, self.class.marshal(self.data))
…	…
188	188	end
189	189
190		def marshal(data) ~~Base64.encode64(Marshal.dump(data))~~ end
191		def unmarshal(data) ~~Marshal.load(Base64.decode64(data))~~ end
	190	def marshal(data) Base64.encode64(Marshal.dump(data)) if data end
	191	def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
192	192
193	193	def create_table!
…	…
225	225	unless @data
226	226	if @marshaled_data
227		@data, @marshaled_data = self.class.unmarshal(@marshaled_data), nil
	227	@data, @marshaled_data = self.class.unmarshal(@marshaled_data) \|\| {}, nil
228	228	else
229	229	@data = {}