datagrid 0.2.0 → 0.3.0

data/Gemfile

@@ -17,7 +17,8 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
   gem "rcov", ">= 0"
-  gem "ruby-debug"
+  gem "ruby-debug", :platform => "mri_18"
+  #gem "ruby-debug19", :platform => "mri_19"
   gem "sqlite3-ruby"
   gem "fastercsv"
   gem "nokogiri"

data/Readme.markdown

@@ -41,9 +41,9 @@ class SimpleReport
   filter(:category, :enum, :select => ["first", "second"])
   filter(:disabled, :eboolean)
   filter(:confirmed, :boolean)
-  filter(:group_id, :multiple => true)
+  filter(:group_id, :integer, :multiple => true)
   integer_range_filter(:logins_count, :integer)
-  filter(:group_name, :header => "Group") do |value|
+  filter(:group_name, :string, :header => "Group") do |value|
     self.joins(:group).where(:groups => {:name => value})
   end
 
@@ -66,7 +66,14 @@ end
 Basic grid api:
 
 ``` ruby
-report = SimpleReport.new(:order => "group", :descending => true, :group_id => [1,2], :from_logins_count => 1, :category => "first")
+report = SimpleReport.new(
+        :order => "group", 
+        :descending => true, 
+        :group_id => [1,2], :from_logins_count => 1, 
+        :category => "first",
+        :order => :group,
+        :descending => true
+)
 
 report.assets # => Array of User instances: 
               # SELECT * FROM users WHERE users.group_id in (1,2) AND users.logins_count >= 1 AND users.category = 'first' ORDER BY groups.name DESC
@@ -85,7 +92,13 @@ report.to_csv # => Yes, it is
 ### Scope
 
 Default scope of objects to filter and display.
-In common case it is `ActiveRecord::Base` subclass with some generic scopes like in example above.
+In common case it is `ActiveRecord::Base` subclass with some generic scopes like in example above:
+
+``` ruby
+  scope do
+    User.includes(:group)
+  end
+```
 
 ### Filters
 
@@ -104,16 +117,18 @@ Datagrid supports different type of filters including:
 * boolean
 * eboolean - the select of "yes", "no" and any
 * enum
+* string
 
-Read more about filters here:
+[More about filters](https://github.com/bogdan/datagrid/wiki/Filters)
 
 
 ### Columns
 
 Each column is represented by name and code block to calculate the value.
-Grids are sortable by it's columns. Ordering is controller by `#order` and `#descending` attributes.
+Some formatting options are also available. 
+Each column is sortable.
 
-More information about columns here:
+[More about columns](https://github.com/bogdan/datagrid/wiki/Columns) 
 
 
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datagrid}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-06-22}
+  s.date = %q{2011-07-01}
   s.description = %q{This allows you to easily build datagrid aka data tables with sortable columns and filters}
   s.email = %q{agresso@gmail.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/filters/enum_filter.rb",
     "lib/datagrid/filters/filter_eval.rb",
     "lib/datagrid/filters/integer_filter.rb",
+    "lib/datagrid/filters/string_filter.rb",
     "lib/datagrid/form_builder.rb",
     "lib/datagrid/helper.rb",
     "lib/datagrid/rspec.rb",
@@ -56,11 +57,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bogdan/datagrid}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ruby gem to create datagrids}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/datagrid.rb

@@ -29,6 +29,7 @@ module Datagrid
   end # InstanceMethods
 
   class ConfigurationError < StandardError; end
+  class ArgumentError < StandardError; end
 
 
 end

data/lib/datagrid/columns.rb

@@ -14,7 +14,24 @@ module Datagrid
 
         include Datagrid::Core
 
-        datagrid_attribute :order
+        datagrid_attribute :order do |value|
+          unless value.blank?
+            value = value.to_sym
+            column = column_by_name(value)
+            unless column 
+              order_unsupported(value, "no column #{value} in #{self.class}")
+            end
+            unless column.order
+              order_unsupported(
+                name, "#{self.class}##{name} don't support order" 
+              ) 
+            end
+            value
+          else
+            nil
+          end
+
+        end
         datagrid_attribute :descending do |value|
           Datagrid::Utils.booleanize(value)
         end
@@ -30,69 +47,6 @@ module Datagrid
         @columns ||= []
       end
 
-      # Defines column that will be used to display data.
-      # 
-      # Example:
-      #     
-      #   class UserGrid 
-      #     include Datagrid
-      #
-      #     scope do
-      #       User.order("users.created_at desc").includes(:group)
-      #     end
-      #
-      #     column(:name)
-      #     column(:group, :order => "groups.name")
-      #       self.group.name
-      #     end
-      #     column(:active, :header => "Activated") do |user|
-      #       !user.disabled
-      #     end
-      #
-      #   end
-      #
-      # Each column will be used to generate data.
-      # In order to create grid that display all users:
-      #
-      #   grid = UserGrid.new
-      #   grid.rows 
-      #   grid.header # => ["Group", "Name", "Disabled"]
-      #   grid.rows   # => [
-      #               #      ["Steve", "Spammers", true],
-      #               #      [ "John", "Spoilers", true],
-      #               #      ["Berry", "Good people", false]
-      #               #    ]
-      #   grid.data   # => Header & Rows
-      #
-      # = Column value
-      #
-      # Column value can be defined by passing a block to <tt>#column</tt> method.
-      # If no block given column it is generated automatically by sending column name method to model.
-      # The block could have zero arguments(<tt>instance_eval</tt>) or one argument that is model object.
-      #
-      # = Column options
-      #
-      # The following options can be passed to column definition:
-      #
-      # * <tt>:order</tt> - an order SQL that should be used to sort by this column. 
-      # Default: report column name if there is database column with this name.
-      # * <tt>:order_desc</tt> - descending order expression from this column. Default: "#{order} desc".
-      #
-      # TODO: frontend options description
-      #
-      # = Columns order
-      #
-      # Each column supports <tt>:order</tt> option that is used to specify SQL to sort data by the given column.
-      # In order to specify order the following attributes are used:
-      #
-      # * <tt>:order</tt> - column name to sort with as <tt>Symbol</tt>. Default: nil.
-      # * <tt>:descending</tt> - if true descending suffix is added to specified order. Default: false.
-      #
-      # Example:
-      #
-      #   grid = UserGrid.new(:order => :group, :descending => true)
-      #   grid.assets # => Return assets ordered by :group column descending
-      #
       def column(name, options = {}, &block)
         check_scope_defined!("Scope should be defined before columns")
         block ||= lambda do |model|
@@ -101,25 +55,36 @@ module Datagrid
         self.columns << Datagrid::Columns::Column.new(self, name, options, &block)
       end
 
+      def order_unsupported(name, reason)
+        raise Datagrid::OrderUnsupported, "Can not sort #{self.inspect} by ##{name}: #{reason}"
+      end
 
+      def column_by_name(name)
+        self.columns.find do |col|
+          col.name.to_sym == name.to_sym
+        end
+      end
     end # ClassMethods
 
     module InstanceMethods
 
+      # Returns <tt>Array</tt> of human readable column names. See also "Localization" section
       def header
         self.class.columns.map(&:header)
       end
 
+      # Returns <tt>Array</tt> column values for given asset
       def row_for(asset)
         self.class.columns.map do |column|
-          column.value(asset)
+          column.value(asset, self)
         end
       end
 
+      # Returns <tt>Hash</tt> where keys are column names and values are column values for the given asset
       def hash_for(asset)
         result = {}
         self.class.columns.each do |column|
-          result[column.name] = column.value(asset)
+          result[column.name] = column.value(asset, self)
         end
         result
       end
@@ -144,15 +109,20 @@ module Datagrid
         result = super
         if self.order
           column = column_by_name(self.order)
-          raise Datagrid::OrderUnsupported, "Can not sort #{self.inspect} by #{name.inspect}" unless column
           result = result.order(self.descending ? column.desc_order : column.order)
         end
         result
       end
 
       def to_csv(options = {})
-        require "fastercsv"
-        FasterCSV.generate(
+        klass = if RUBY_VERSION >= "1.9"
+                  require 'csv'
+                  CSV
+                else
+                  require "fastercsv"
+                  FasterCSV
+                end
+        klass.generate(
           {:headers => self.header, :write_headers => true}.merge(options)
         ) do |csv|
           self.rows.each do |row|
@@ -166,9 +136,7 @@ module Datagrid
       end
 
       def column_by_name(name)
-        self.columns.find do |col|
-          col.name.to_sym == name.to_sym
-        end
+        self.class.column_by_name(name)
       end
 
     end # InstanceMethods

data/lib/datagrid/columns/column.rb

@@ -10,15 +10,17 @@ class Datagrid::Columns::Column
     self.block = block
   end
 
-  def value(object)
-    value_for(object)
+  def value(model, report)
+    value_for(model, report)
   end
 
-  def value_for(object)
+  def value_for(model, report)
     if self.block.arity == 1
-      self.block.call(object)
+      self.block.call(model)
+    elsif self.block.arity == 2
+      self.block.call(model, report)
     else
-      object.instance_eval(&self.block)
+      model.instance_eval(&self.block)
     end
   end
 
@@ -32,7 +34,7 @@ class Datagrid::Columns::Column
 
   def header
     self.options[:header] || 
-      I18n.translate(self.name, :scope => "reports.#{self.grid}.columns", :default => self.name.to_s.humanize )
+      I18n.translate(self.name, :scope => "reports.#{self.grid.param_name}.columns", :default => self.name.to_s.humanize )
   end
 
   def order

data/lib/datagrid/filters.rb

@@ -10,10 +10,11 @@ module Datagrid
     require "datagrid/filters/filter_eval"
     require "datagrid/filters/integer_filter"
     require "datagrid/filters/composite_filters"
+    require "datagrid/filters/string_filter"
 
     FILTER_TYPES = {
       :date => Filters::DateFilter,
-      :string => Filters::DefaultFilter,
+      :string => Filters::StringFilter,
       :default => Filters::DefaultFilter,
       :eboolean => Filters::BooleanEnumFilter ,
       :boolean => Filters::BooleanFilter ,
@@ -45,62 +46,9 @@ module Datagrid
       end
 
 
-      # Defines the accessible attribute that is used to filter
-      # scope by the specified value with specified code.
-      # 
-      # Example:
-      #     
-      #   class UserGrid 
-      #     include Datagrid
-      #
-      #     scope do
-      #       User.order("users.created_at desc")
-      #     end
-      #
-      #     filter(:name)
-      #     filter(:posts_count, :integer) do |value|
-      #       self.where(["posts_count >= ?", value])
-      #     end
-      #
-      #   end
-      #
-      # Each filter becomes grid attribute.
-      # In order to create grid that display all users with name 'John' that have more than zero posts:
-      #
-      #   grid = UserGrid.new(:posts_count => 1, :name => "John")
-      #   grid.assets # SELECT * FROM users WHERE users.posts_count > 1 AND name = 'John'
-      #
-      # Important! Take care about non-breaking the filter chain and force objects loading in filter.
-      # The filter block should always return a <tt>ActiveRecord::Scope</tt> rather than <tt>Array</tt>
-      #
-      # = Default filter block
-      #
-      # If no block given filter is generated automatically as simple select by filter name from scope.
-      #
-      # = Filter types
-      #
-      # Filter does types conversion automatically.
-      # The following filter types are supported:
-      #
-      # * <tt>:default</tt> (default) - leave value as is
-      # * <tt>:date</tt> - converts value to date using date parser
-      # * <tt>:enum</tt> - designed to be collection select. Additional options for easy form generation:
-      #   * <tt>:select</tt> (required) - collection of values to match against.
-      # * <tt>:boolean</tt> - converts value to true or false depending on whether it looks truly or not
-      # * <tt>:integer</tt> - converts given value to integer.
-      # * <tt>:eboolean</tt> - subtype of enum filter that provides select of "Yes", "No" and "Any". Could be useful.
-      #   
-      # = Default filter options
-      #
-      # Options that could be passed to any filter type:
-      #
-      # * <tt>:header</tt> - human readable name of the filter. Default: generated from the filter name.
-      # * <tt>:default</tt> - default value of the filter. Default: nil.
-      # * <tt>:multiple</tt> - if true multiple values can be assigned to this filter. Default: false.
-      # * <tt>:allow_nil</tt> - determines if filter should be called if filter value is nil. Default: false.
-      # * <tt>:allow_blank</tt> - determines if filter should be called if filter value is #blank?. Default: false.
-      #
-      def filter(attribute, type = :string, options = {}, &block)
+      def filter(attribute, *args, &block)
+        options = args.extract_options!
+        type = args.shift || :default
 
         klass = type.is_a?(Class) ? type : FILTER_TYPES[type]
         raise ConfigurationError, "filter class #{type.inspect} not found" unless klass
@@ -119,12 +67,8 @@ module Datagrid
       protected
       def default_filter(attribute)
         check_scope_defined!("Scope should be defined before filters")
-        if self.scope.column_names.include?(attribute.to_s)
-          lambda do |value|
-            self.scoped(:conditions => {attribute => value})
-          end
-        else
-          raise ConfigurationError, "Not able to generate default filter. No column '#{attribute}' in #{self.scope.table_name}."
+        lambda do |value|
+          self.scoped(:conditions => {attribute => value})
         end
       end
 

data/lib/datagrid/filters/base_filter.rb

@@ -22,6 +22,9 @@ class Datagrid::Filters::BaseFilter
   end
 
   def format_values(value)
+    if !self.multiple && value.is_a?(Array) 
+      raise Datagrid::ArgumentError, "#{grid.class}.#{name} filter can not accept Array argument. Use :multiple option." 
+    end
     values = Array(value)
     values.map! do |value|
       self.format(value)
@@ -31,7 +34,7 @@ class Datagrid::Filters::BaseFilter
 
   def header
     options[:header] || 
-      I18n.translate(self.name, :scope => "datagrid.#{grid.class.to_s.underscore.split("/").last}.filters", :default => self.name.to_s.humanize)
+      I18n.translate(self.name, :scope => "datagrid.#{grid.param_name}.filters", :default => self.name.to_s.humanize)
   end
 
   def default

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -5,7 +5,6 @@ class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter
   VALUES = {YES => true, NO => false}
 
   def initialize(report, attribute, options = {}, &block)
-    options[:allow_blank] = true unless options.has_key?(:allow_blank)
     options[:select] = VALUES.keys
     super(report, attribute, options, &block)
   end

data/lib/datagrid/filters/string_filter.rb

@@ -0,0 +1,5 @@
+class Datagrid::Filters::StringFilter < Datagrid::Filters::BaseFilter
+  def format(value)
+    value.to_s
+  end
+end

data/lib/datagrid/form_builder.rb

@@ -36,11 +36,22 @@ module Datagrid
 
     def datagrid_enum_filter(attribute_or_filter, options = {})
       filter = get_filter(attribute_or_filter)
-      select filter.name, filter.select || [], {:include_blank => filter.include_blank}, {:multiple => filter.multiple}.merge(options)
+      if !options.has_key?(:multiple) && filter.multiple
+        options[:multiple] = true
+      end
+      select filter.name, filter.select || [], {:include_blank => filter.include_blank}, options
     end
 
     def datagrid_integer_filter(attribute_or_filter, options = {})
-      text_field get_attribute(attribute_or_filter), options
+      filter = get_filter(attribute_or_filter)
+      if filter.multiple && self.object[filter.name].blank?
+        options[:value] = "" 
+      end
+      text_field filter.name, options
+    end
+
+    def datagrid_string_filter(attribute_or_filter, options = {})
+      datagrid_default_filter(attribute_or_filter, options)
     end
 
     def get_attribute(attribute_or_filter)

data/lib/datagrid/helper.rb

@@ -3,8 +3,8 @@ require "action_view"
 module Datagrid
   module Helper
 
-    def datagrid_format_value(column, asset)
-      value = column.value(asset)
+    def datagrid_format_value(report, column, asset)
+      value = column.value(asset, report)
       if column.options[:url]
         link_to(value, column.options[:url].call(asset))
       else
@@ -24,11 +24,10 @@ module Datagrid
       assets = report.assets
       paginate = options[:paginate]
       assets = assets.paginate(paginate) if paginate 
-      content = content_tag(:tr, datagrid_header(report, options)) + datagrid_rows(report.columns, assets, options)
+      content = content_tag(:tr, datagrid_header(report, options)) + datagrid_rows(report, assets, options)
       content_tag(:table, content, html)
     end
 
-    protected
 
     def datagrid_header(grid, options = {})
       header = empty_string
@@ -43,12 +42,13 @@ module Datagrid
       header
     end
 
-    def datagrid_rows(columns, assets, options)
+    def datagrid_rows(report, assets, options)
+      columns = report.columns
       result = assets.map do |asset|
         content = columns.map do |column|
-          content_tag(:td, datagrid_format_value(column, asset))
+          content_tag(:td, datagrid_format_value(report, column, asset))
         end.join(empty_string)
-        content_tag(:tr, _safe(content), :class => cycle("odd", "even"))
+        content_tag(:tr, _safe(content), :class => options[:cycle] && cycle(*options[:cycle]))
       end.join(empty_string)
       _safe(result)
     end

data/spec/datagrid/columns_spec.rb

@@ -27,4 +27,39 @@ describe Datagrid::Columns do
   it "should support csv export" do
     subject.to_csv.should == "Group,Name\nPop,Star\n"
   end
+
+  it "should support columns with model and report arguments" do
+    report = test_report(:category => "foo") do
+      scope {Entry.order(:category)}
+      filter(:category) do |value|
+        where("category LIKE '%#{value}%'")
+      end
+
+      column(:exact_category) do |entry, report|
+        entry.category == report.category
+      end
+    end
+    Entry.create!(:category => "foo")
+    Entry.create!(:category => "foobar")
+    report.rows.first.first.should be_true
+    report.rows.last.first.should be_false
+  end
+
+
+  it "should raise error if ordered by not existing column" do
+    lambda {
+      test_report(:order => :hello)
+    }.should raise_error(Datagrid::OrderUnsupported)
+  end
+
+  it "should raise error if ordered by column without order" do
+    lambda {
+      test_report(:order => :category) do
+        filter(:category, :default, :order => false) do |value|
+          self
+        end
+      end
+    }.should raise_error(Datagrid::OrderUnsupported)
+  end
+
 end

data/spec/datagrid/filters_spec.rb

@@ -8,5 +8,28 @@ describe Datagrid::Filters do
       filter(:created_at, :date, :default => proc { Date.today } )
     end.created_at.should == Date.today
   end
+
+  it "should not support array argument for not multiple filter" do
+    report = test_report do
+      scope {Entry}
+      filter(:group_id, :integer)
+    end
+    lambda {
+      report.group_id = [1,2]
+    }.should raise_error(Datagrid::ArgumentError)
+  end
+  
+
+  it "should initialize report Scope table not exists" do
+    class ModelWithoutTable < ActiveRecord::Base; end
+    class TheReport
+      include Datagrid
+
+      scope {ModelWithoutTable}
+
+      filter(:name)
+    end
+
+  end
   
 end

data/spec/datagrid/form_builder_spec.rb

@@ -36,7 +36,7 @@ describe Datagrid::FormBuilder do
     context "with enum filter type" do
       let(:_filter) { :category }
       it { should equal_to_dom(
-        '<select class="category enum_filter" id="report_category" name="report[category][]"><option value=""></option>
+        '<select class="category enum_filter" id="report_category" name="report[category]"><option value=""></option>
        <option value="first">first</option>
        <option value="second">second</option></select>'
       )}
@@ -45,7 +45,7 @@ describe Datagrid::FormBuilder do
           grid.category = "first"
         end
         it { should equal_to_dom(
-          '<select class="category enum_filter" id="report_category" name="report[category][]"><option value=""></option>
+          '<select class="category enum_filter" id="report_category" name="report[category]"><option value=""></option>
        <option value="first" selected="true">first</option>
        <option value="second">second</option></select>'
         )}
@@ -55,11 +55,39 @@ describe Datagrid::FormBuilder do
     context "with eboolean filter type" do
       let(:_filter) { :disabled }
       it { should equal_to_dom(
-        '<select class="disabled boolean_enum_filter" id="report_disabled" name="report[disabled][]"><option value=""></option>
-       <option value="NO">NO</option>
-       <option value="YES">YES</option></select>'
+        '<select class="disabled boolean_enum_filter" id="report_disabled" name="report[disabled]"><option value=""></option>
+       <option value="YES">YES</option>
+       <option value="NO">NO</option></select>'
       )}
     end
+    context "with string filter" do
+      let(:grid) do
+        test_report do
+          scope {Entry}
+          filter(:name, :string)
+        end
+      end
+
+      let(:_filter) { :name }
+
+      it {should equal_to_dom('<input class="name string_filter" id="report_name" name="report[name]" size="30" type="text">')}
+    end
+
+    context "with non multiple filter" do
+      let(:grid) do
+        test_report do
+          scope {Entry}
+          filter(
+            :name, :enum, 
+            :include_blank => false, 
+            :multiple => false, 
+            :select => []
+          )
+        end
+      end
+      let(:_filter) { :name }
+      it {should equal_to_dom('<select class="name enum_filter" id="report_name" name="report[name]"></select>')}
+    end
   end
 
   describe ".datagrid_label" do
@@ -69,6 +97,9 @@ describe Datagrid::FormBuilder do
       )
     end
   end
+
+  
+
 end
 
 

data/spec/datagrid/helper_spec.rb

@@ -34,12 +34,21 @@ describe Datagrid::Helper do
 </th>
 </tr>
 
-<tr class="odd">
+<tr>
 <td>Pop</td>
 <td>Star</td>
 </tr>
 </table>')
     end
+
+    it "should support cycle option" do
+      subject.datagrid_rows(grid, [entry], :cycle => ["odd", "even"]).should equal_to_dom(
+'<tr class="odd">
+<td>Pop</td>
+<td>Star</td>
+</tr>'
+      )
+    end
   end
   
 

data/spec/datagrid_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 require "datagrid/rspec"
 
 
-describe Datagrid do
+describe SimpleReport do
   
-  #it_should_behave_like 'Datagrid'
+  it_should_behave_like 'Datagrid'
   
   let(:group) { Group.create!(:name => "Pop") }
   

data/spec/spec_helper.rb

@@ -10,11 +10,14 @@ end
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'rspec'
 require "active_record"
 require "will_paginate"
 require 'datagrid'
-require 'ruby-debug'
+begin
+  #require 'ruby-debug'
+rescue
+end
+require 'rspec'
 
 
 RSpec.configure do |config|

data/spec/support/equal_to_dom.rb

@@ -16,7 +16,7 @@ class IncludeDom
 
   def matches?(text)
     @matcher = Nokogiri::HTML::DocumentFragment.parse(text).to_s
-    @matcher.include?(@expectation)
+    @matcher == @expectation
   end
 
   def failure_message

data/spec/support/schema.rb

@@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :group_id
     t.string :name
     t.string :category
-    t.boolean :disabled, :null => false, :default => nil
-    t.boolean :confirmed, :null => false, :default => nil
+    t.boolean :disabled, :null => false, :default => false
+    t.boolean :confirmed, :null => false, :default => false
     t.timestamps
   end
 

data/spec/support/simple_report.rb

@@ -1,12 +1,14 @@
 
 
-def test_report(&block)
+def test_report(attributes = {}, &block)
   klass = Class.new
   klass.class_eval do
     include Datagrid
   end
-  klass.class_eval(&block)
-  klass.new
+  if block
+    klass.class_eval(&block)
+  end
+  klass.new(attributes)
 end
 
 class SimpleReport

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,187 +10,141 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 +03:00
+date: 2011-07-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rails
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id001
   type: :runtime
-  name: rails
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
-  requirement: *id002
   type: :development
-  name: rake
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: mocha
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id003
   type: :development
-  name: mocha
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
-  requirement: *id004
   type: :development
-  name: rspec
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: bundler
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id005
   type: :development
-  name: bundler
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
         version: 1.6.0
-  requirement: *id006
   type: :development
-  name: jeweler
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: rcov
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id007
   type: :development
-  name: rcov
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: ruby-debug
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id008
   type: :development
-  name: ruby-debug
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: sqlite3-ruby
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id009
   type: :development
-  name: sqlite3-ruby
   prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: fastercsv
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id010
   type: :development
-  name: fastercsv
   prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id011
   type: :development
-  name: nokogiri
   prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: will_paginate
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 3
-        - 15
         version: 2.3.15
-  requirement: *id012
   type: :development
-  name: will_paginate
   prerelease: false
+  version_requirements: *id012
 description: This allows you to easily build datagrid aka data tables with sortable columns and filters
 email: agresso@gmail.com
 executables: []
@@ -228,6 +177,7 @@ files:
 - lib/datagrid/filters/enum_filter.rb
 - lib/datagrid/filters/filter_eval.rb
 - lib/datagrid/filters/integer_filter.rb
+- lib/datagrid/filters/string_filter.rb
 - lib/datagrid/form_builder.rb
 - lib/datagrid/helper.rb
 - lib/datagrid/rspec.rb
@@ -255,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -315143401371934304
       segments: 
       - 0
       version: "0"
@@ -264,14 +214,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby gem to create datagrids