dataview 0.1.0 → 0.1.1

data/lib/data_view.rb

@@ -33,7 +33,7 @@ class DataView
 	end
 	public
 		include Enumerable
-		attr_reader :fields, :titles, :delegates
+		attr_reader :fields, :titles, :values, :value_transforms
 		# Initializes the DataView.
 		# ===Model
 		# The DataView supports a model that contains an array of hashes. The keys in these hashes much be symbols of the field names. This is based off of the ActiveRecord interface.
@@ -46,11 +46,12 @@ class DataView
 		# ====:values
 		# A hash of Procs that get nondefault values of a field in a particular row. By default, the value is taken by looking at the field in the model. The Proc must accept a Hash of parameters and return the transformed value. The Hash contains the following keys:
 		# * :sender - The DataView sending the call
+		# * :model - The Model of the DataView
 		# * :row_index - The Index of the current row.
 		# * :column_index - The Index of the current column.
 		# * :field - The field of the current value.
 		# ====:value_transforms
-		# A Hash of the delegates that will process the values. The field symbol is the key, and the Proc or array of Procs to transform the value. The Proc must accept a Hash of parameters and return the transformed value. The Hash contains the following keys:
+		# A Hash of the value_transforms that will process the values. The field symbol is the key, and the Proc or array of Procs to transform the value. The Proc must accept a Hash of parameters and return the transformed value. The Hash contains the following keys:
 		# * :sender - The DataView sending the call
 		# * :row_index - The Index of the current row.
 		# * :column_index - The Index of the current column.
@@ -116,25 +117,37 @@ class DataView
 			view_row_values = []
 			@fields.each_with_index do |field, field_index|
 				if @values.include?(field)
-					actual_value = @values[field].call(@model, row_index, field)
+					actual_value = @values[field].call(
+						{
+							:sender => self,
+							:model => @model,
+							:row_index => row_index,
+							:column_index => field_index,
+							:field => field
+						}
+					)
 				else
 					actual_value = model_row[field]
 				end
 				view_value = actual_value
 				
 				if @value_transforms.include?(field)
-					delegate_value = actual_value
-					@value_transforms[field].each do |delegate|
-						delegate_params = {
+					transform_value = actual_value
+
+					transforms = @value_transforms[field]
+					transforms = [transforms] unless transforms.respond_to?(:each)
+					transforms.each do |transform|
+						next unless transform
+						transform_params = {
 							:sender => self,
 							:row_index => row_index,
 							:column_index => field_index,
-							:value => delegate_value,
+							:value => transform_value,
 							:field => field
 						}
-						delegate_value = delegate.call(delegate_params)
+						transform_value = transform.call(transform_params)
 					end
-					view_value = delegate_value
+					view_value = transform_value
 				end
 				view_row_values << view_value
 			end
@@ -144,14 +157,14 @@ class DataView
 			return nil if param == nil
 			return param[key]
 		end
-		def format_value_transforms(delegates)
-			delegates.each do |k, *items|
-				delegates[k] = items.flatten
-				delegates[k].each do |d|
+		def format_value_transforms(value_transforms)
+			value_transforms.each do |k, *items|
+				value_transforms[k] = items.flatten
+				value_transforms[k].each do |d|
 					raise ":delegate must respond to call" unless d.respond_to?(:call)
 				end
 			end
-			delegates
+			value_transforms
 		end
 end
 

data/test/tc_data_view.rb

@@ -25,6 +25,19 @@ class DataViewTest < Test::Unit::TestCase
 			assert_equal(mock_model.length, get_data_view(mock_model).length)
 			assert_equal(1, get_data_view(singular_mock_model).length)
 		end
+		def test_value_transforms_accessor
+			data_view = get_data_view(mock_model)
+			data_view.value_transforms[:field1] = nil
+			assert_equal(mock_model[0][:field1], data_view[0][:field1])
+
+			test_transform = lambda { |h|
+				'test ' << h[:value].to_s
+			}
+			data_view.value_transforms[:field1] = test_transform
+
+			expected_transform_value = test_transform.call({:value => mock_model[0][:field1]})
+			assert_equal(expected_transform_value, data_view[0][:field1])
+		end
 	private
 		def do_test_brackets(model)
 			data_view = get_data_view(model)
@@ -32,7 +45,11 @@ class DataViewTest < Test::Unit::TestCase
 			test_model = model.respond_to?(:each_index) ? model : [model]
 			test_model.each_with_index do |r, i|
 				fields.each_with_index do |f, j|
-					v = (f == :model_value_field) ? get_model_value(model, i, f) : r[f]
+					if f != :model_value_field
+						v = r[f]
+					else
+						v = get_model_value({:sender => self, :model => model, :row_index => i, :field => f})
+					end
 					assert_equal(expected_altered_value(v), data_view[i][f])
 				end
 			end
@@ -44,7 +61,9 @@ class DataViewTest < Test::Unit::TestCase
 				assert_equal(expected_row.length, row.to_a.length)
 
 				expected_row.each do |k, expected_value|
-					expected_value = get_model_value(model, i, k) if k == :model_value_field
+					if k == :model_value_field
+						expected_value = get_model_value({:sender => self, :model => model, :row_index => i, :field => k})
+					end
 					assert_equal(expected_altered_value(expected_value), row[k])
 				end
 			end
@@ -82,8 +101,24 @@ class DataViewTest < Test::Unit::TestCase
 			return @get_model_value_method if defined?(@get_model_value_method)
 			@get_model_value_method = method(:get_model_value)
 		end
-		def get_model_value(model, row_index, field)
-			row_index.to_s << ' : Custom ' << field.to_s
+		def get_model_value(params)
+			test_sender = params[:sender]
+			test_model = params[:model]
+			test_row_index = params[:row_index]
+			test_column_index = params[:column_index]
+			test_field = params[:field]
+			
+			unless test_sender == self
+				assert_equal(DataView, test_sender.class)
+				unless mock_model == test_model
+					assert_equal(singular_mock_model, test_model[0])
+				end
+				assert((0..2).include?(test_row_index))
+				assert(fields.include?(test_field))
+				fi = fields.index(test_field)
+				assert_equal(fi, test_column_index)
+			end
+			test_row_index.to_s << ' : Custom ' << test_field.to_s
 		end
 		def fields
 			return @fields if defined?(@fields)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: dataview
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 date: 2005-07-25 00:00:00 -07:00
 summary: Data View is a library that creates a view of a data model. The view can transform the data of the data model without changing the data. Supports ActiveRecord models and other data models that have a similar interface.
 require_paths: