dataview 0.3.0 → 0.3.1

data/lib/data_view.rb

@@ -17,11 +17,8 @@ class << self
     @@Column_Struct_Class.new(field, title, value, value_transforms.flatten)
   end
 end
-   
-  public
   
   include Enumerable
-  attr_reader :columns, :rows
   # Initializes the DataView.
   # ===Model
   # The DataView supports a model that contains an array of structs or hashes.
@@ -29,6 +26,7 @@ end
   # ===Columns
   # An Array of Structs (see :create_column) that contain data
   # about the columns and how the columns will be handled.
+	# The Columns array also has the method find_by_field(field) which will return the column with the passed field.
   # The column order in the each method is the same as the array order.
   # Each Struct contains the following keys:
   # ====:field
@@ -62,12 +60,28 @@ end
   # * :column_index - The Index of the current column.
   # * :column - The column of the current value.
   def initialize(model, *columns)
+		# A new array object is created here.
     columns = columns.flatten
     @model = if model.respond_to?(:each_index) then model else [model] end
 
     # @columns is an ordered array of the columns that will be shown
     @columns = columns
+		class << @columns
+			def find_by_field(field)
+				self.find {|c| c.field == field}
+			end
+		end
   end
+	
+	# An array of the columns in the DataView. columns also has the find_by_field(field) method to quickly find a column by its field.
+	def columns
+		@columns
+	end
+	
+	# An array of the rows in the DataView.
+	def rows
+		@rows
+	end
   
   # Creates a column definition struct.
   def create_column(field=nil, title=nil, value=nil, *value_transforms)
@@ -94,88 +108,87 @@ end
   end
   
   private
-  
-  def create_view_row_struct
-    fields = @columns.collect{|c| c.field}
-    Struct.new(*fields)
-  end
-    
-  def get_view_row(row_index, view_row_struct)
-    model_row = @model[row_index]
-    
-    view_row_values = view_row_struct.new
-    @columns.each_with_index do |column, column_index|
-      value = get_raw_value(model_row, column, row_index, column_index)
-      value = get_transformed_value(value, column, row_index, column_index)
-      view_row_values[column.field] = value
-    end
-    view_row_values
-  end
-    
-  def get_raw_value(model_row, col, row_index, column_index)
-    return model_row[col.field] if col.value.nil?
-    
-    return col.value.call(
-      create_value_proc_struct(row_index, column_index, col)
-    ) if col.value.respond_to?(:call)
-      
-    return col.value
-  end
-  
-  def create_value_proc_struct(row_index, column_index, column)
-    @@Value_Proc_Struct_Class = Struct.new(
-      :model,
-      :row_index,
-      :column_index,
-      :column
-    ) unless defined?(@@Value_Proc_Struct_Class)
-    
-    @@Value_Proc_Struct_Class.new(
-      @model,
-      row_index,
-      column_index,
-      column
-    )
-  end
-  
-  def get_transformed_value(value, column, row_index, column_index)
-    transforms = column.value_transforms
-    return value if transforms.nil?
-
-    DuckType.check(transforms, :each, 'column.value_transforms')
-    
-    transforms.each do |t|
-      next unless t
-      
-      params = create_value_transforms_struct(
-        value,
-        row_index,
-        column_index,
-        column
-      )
-      
-      value = t.call(params)
-    end
-    value
-  end
-  
-  def create_value_transforms_struct(value, row_index, column_index, column)
-    @@Value_Transforms_Struct_Class = Struct.new(
-      :value,
-      :model,
-      :row_index,
-      :column_index,
-      :column
-    ) unless defined?(@@Value_Transforms_Struct_Class)
-    
-    @@Value_Transforms_Struct_Class.new(
-      value,
-      @model,
-      row_index,
-      column_index,
-      column
-    )
-  end
+		def create_view_row_struct
+			fields = @columns.collect{|c| c.field}
+			Struct.new(*fields)
+		end
+			
+		def get_view_row(row_index, view_row_struct)
+			model_row = @model[row_index]
+			
+			view_row_values = view_row_struct.new
+			@columns.each_with_index do |column, column_index|
+				value = get_raw_value(model_row, column, row_index, column_index)
+				value = get_transformed_value(value, column, row_index, column_index)
+				view_row_values[column.field] = value
+			end
+			view_row_values
+		end
+			
+		def get_raw_value(model_row, col, row_index, column_index)
+			return model_row[col.field] if col.value.nil?
+			
+			return col.value.call(
+				create_value_proc_struct(row_index, column_index, col)
+			) if col.value.respond_to?(:call)
+				
+			return col.value
+		end
+		
+		def create_value_proc_struct(row_index, column_index, column)
+			@@Value_Proc_Struct_Class = Struct.new(
+				:model,
+				:row_index,
+				:column_index,
+				:column
+			) unless defined?(@@Value_Proc_Struct_Class)
+			
+			@@Value_Proc_Struct_Class.new(
+				@model,
+				row_index,
+				column_index,
+				column
+			)
+		end
+		
+		def get_transformed_value(value, column, row_index, column_index)
+			transforms = column.value_transforms
+			return value if transforms.nil?
+	
+			DuckType.check(transforms, :each, 'column.value_transforms')
+			
+			transforms.each do |t|
+				next unless t
+				
+				params = create_value_transforms_struct(
+					value,
+					row_index,
+					column_index,
+					column
+				)
+				
+				value = t.call(params)
+			end
+			value
+		end
+		
+		def create_value_transforms_struct(value, row_index, column_index, column)
+			@@Value_Transforms_Struct_Class = Struct.new(
+				:value,
+				:model,
+				:row_index,
+				:column_index,
+				:column
+			) unless defined?(@@Value_Transforms_Struct_Class)
+			
+			@@Value_Transforms_Struct_Class.new(
+				value,
+				@model,
+				row_index,
+				column_index,
+				column
+			)
+		end
 end
 
 end

data/test/tc_data_view.rb

@@ -37,6 +37,15 @@ class DataViewTest < Test::Unit::TestCase
     expected_transform_value = test_transform.call(arg)
     assert_equal(expected_transform_value, data_view[0].field1)
   end
+	
+	def test_find_by_field
+		data_view = get_data_view(mock_model)
+		col = data_view.columns.find_by_field(:field1)
+		assert_not_nil(col)
+		
+		expected_col = data_view.columns.find {|col| col.field == :field1}
+		assert_equal(expected_col, col)
+	end
     
   private
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: dataview
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2005-09-02 00:00:00 -07:00
+  version: 0.3.1
+date: 2005-10-18 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: 
   - lib