datagrid 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8edc6a25bb802b852ce81f90623d3fca8b6fc5e4
-  data.tar.gz: 8ee50cd8e1a3f759fc5344262c73fc054a47e4d9
+  metadata.gz: 89f8357208d93d460caef785e2ebaa7ebbb36280
+  data.tar.gz: 32723d7e2ca88ff415c6686d073672e78cb32742
 SHA512:
-  metadata.gz: 294214bffac7241ea3f36a40bdb20df4b9efbd9a80b908e352129faf1ca98721d5b9e32d3c857c2e00538d19efbd0a7ded3a08376587647502faa2244a08731e
-  data.tar.gz: a733509325684ddadd94e9feab83c3e475c8b00a577812da0b7b7d7a394df692f9790b1d87fc713df7b370afcdb7770de955aaa8baa83f47b264bcbf853f3f9c
+  metadata.gz: 111f4e212572c21a899ab428e0a4fea23b7a106bcec089508c36b68349384d76e6bdb94fe9ebf1045791a9b9b9f5f0a2423f328853bff0b5df5b47f0ec6c3626
+  data.tar.gz: d396415dd9f0d3743ed552fddccb1926e3737f7b5a0a7264414fa51a73abe9c8e43520e5e941a201d2093fd7ded8e16e8f67efc814cc2a36d732f736983bc820

data/Gemfile

@@ -9,7 +9,7 @@ group :development do
 
 
   gem "debugger", :platform => "ruby_19"
-  gem "byebug", :platform => "ruby_20"
+  gem "byebug", :platform => ["ruby_20", "ruby_21"]
   gem "ruby-debug", :platform => "ruby_18"
 
   gem "rspec"

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.0

data/datagrid.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.0.5 ruby lib
+# stub: datagrid 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.0.5"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2014-01-15"
+  s.date = "2014-03-07"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [
@@ -110,8 +111,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "2.2.2"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid/columns.rb

@@ -88,38 +88,46 @@ module Datagrid
       end
 
       # Defines new datagrid column
-      # 
+      #
       # Arguments:
       #
       #   * <tt>name</tt> - column name
+      #   * <tt>query</tt> - a string representing the query to select this column (supports only ActiveRecord)
       #   * <tt>options</tt> - hash of options
       #   * <tt>block</tt> - proc to calculate a column value
       #
       # Available options:
-      #   
+      #
       #   * <tt>:html</tt> - determines if current column should be present in html table and how is it formatted
-      #   * <tt>:order</tt> - determines if this column could be sortable and how. 
-      #     The value of order is explicitly passed to ORM ordering method. 
+      #   * <tt>:order</tt> - determines if this column could be sortable and how.
+      #     The value of order is explicitly passed to ORM ordering method.
       #     Ex: <tt>"created_at, id"</tt> for ActiveRecord, <tt>[:created_at, :id]</tt> for Mongoid
-      #   * <tt>:order_desc</tt> - determines a descending order for given column 
+      #   * <tt>:order_desc</tt> - determines a descending order for given column
       #     (only in case when <tt>:order</tt> can not be easily reversed by ORM)
-      #   * <tt>:order_by_value</tt> - used in case it is easier to perform ordering at ruby level not on database level. 
-      #     Warning: using ruby to order large datasets is very unrecommended. 
+      #   * <tt>:order_by_value</tt> - used in case it is easier to perform ordering at ruby level not on database level.
+      #     Warning: using ruby to order large datasets is very unrecommended.
       #     If set to true - datagrid will use column value to order by this column
       #     If block is given - datagrid will use value returned from block
       #   * <tt>:mandatory</tt> - if true, column will never be hidden with #column_names selection
       #   * <tt>:url</tt> - a proc with one argument, pass this option to easily convert the value into an URL
       #   * <tt>:before</tt> - determines the position of this column, by adding it before the column passed here
       #   * <tt>:after</tt> - determines the position of this column, by adding it after the column passed here
+      #   * <tt>:if</tt> - the column is shown if the reult of calling this argument is true
+      #   * <tt>:unless</tt> - the column is shown unless the reult of calling this argument is true
       #
       # See: https://github.com/bogdan/datagrid/wiki/Columns for examples
-      def column(name, options = {}, &block)
+      def column(name, options_or_query = {}, options = {}, &block)
+        if options_or_query.is_a?(String)
+          query = options_or_query
+        else
+          options = options_or_query
+        end
         check_scope_defined!("Scope should be defined before columns")
         block ||= lambda do |model|
           model.send(name)
         end
         position = Datagrid::Utils.extract_position_from_options(columns_array, options)
-        column = Datagrid::Columns::Column.new(self, name, default_column_options.merge(options), &block)
+        column = Datagrid::Columns::Column.new(self, name, query, default_column_options.merge(options), &block)
         columns_array.insert(position, column)
       end
 
@@ -148,7 +156,7 @@ module Datagrid
             end
           end
         else
-          # Ruby Object#format exists. 
+          # Ruby Object#format exists.
           # We don't want to change the behaviour and overwrite it.
           super
         end
@@ -163,6 +171,10 @@ module Datagrid
 
     module InstanceMethods
 
+      def assets
+        driver.append_column_queries(super, columns.map(&:query).compact)
+      end
+
       # Returns <tt>Array</tt> of human readable column names. See also "Localization" section
       #
       # Arguments:
@@ -212,7 +224,7 @@ module Datagrid
         self.rows(*column_names).unshift(self.header(*column_names))
       end
 
-      # Return Array of Hashes where keys are column names and values are column values 
+      # Return Array of Hashes where keys are column names and values are column values
       # for each row in filtered datagrid relation.
       #
       # Example:
@@ -267,13 +279,13 @@ module Datagrid
       # Returns all columns selected in grid instance
       #
       # Examples:
-      # 
+      #
       #   MyGrid.new.columns # => all defined columns
       #   grid = MyGrid.new(:column_names => [:id, :name])
       #   grid.columns # => id and name columns
       #   grid.columns(:id, :category) # => id and category column
       def columns(*args)
-        self.class.columns(*args)
+        self.class.columns(*args).select {|column| column.enabled?(self)}
       end
 
       # Returns all columns that can be represented in plain data(non-html) way
@@ -301,7 +313,7 @@ module Datagrid
       # Gives ability to have a different formatting for CSV and HTML column value.
       #
       # Example:
-      #   
+      #
       #   column(:name) do |model|
       #     format(model.name) do |value|
       #       content_tag(:strong, value)
@@ -309,7 +321,7 @@ module Datagrid
       #   end
       #
       #   column(:company) do |model|
-      #     format(model.company.name) do 
+      #     format(model.company.name) do
       #       render :partial => "company_with_logo", :locals => {:company => model.company }
       #     end
       #   end
@@ -317,10 +329,32 @@ module Datagrid
         if block_given?
           self.class.format(value, &block)
         else
+          # don't override Object#format method
           super
         end
       end
 
+      # Returns an object representing a table row.
+      # Allows to access column values
+      #
+      # Example:
+      #
+      #  class MyGrid
+      #    scope { User }
+      #    column(:id)
+      #    column(:name)
+      #    column(:number_of_purchases) do |user|
+      #      user.purchases.count
+      #    end
+      #  end
+      #
+      #  row = MyGrid.new.data_row(User.last)
+      #  row.id # => user.id
+      #  row.number_of_purchases # => user.purchases.count
+      def data_row(asset)
+        ::Datagrid::Columns::DataRow.new(self, asset)
+      end
+
       protected
 
       def map_with_batches(&block)
@@ -333,5 +367,20 @@ module Datagrid
 
     end # InstanceMethods
 
+    class DataRow
+
+      def initialize(grid, model)
+        @grid = grid
+        @model = model
+      end
+
+      def method_missing(meth, *args, &blk)
+        if column = @grid.column_by_name(meth)
+          column.data_value(@model, @grid)
+        else
+          super
+        end
+      end
+    end
   end
 end

data/lib/datagrid/columns/column.rb

@@ -25,9 +25,9 @@ class Datagrid::Columns::Column
     end
   end
 
-  attr_accessor :grid_class, :options, :data_block, :name, :html_block
+  attr_accessor :grid_class, :options, :data_block, :name, :html_block, :query
 
-  def initialize(grid_class, name, options = {}, &block)
+  def initialize(grid_class, name, query, options = {}, &block)
     self.grid_class = grid_class
     self.name = name.to_sym
     self.options = options
@@ -40,9 +40,13 @@ class Datagrid::Columns::Column
         self.html_block = options[:html]
       end
     end
+    self.query = query
+    options[:if] = convert_option_to_proc(options[:if])
+    options[:unless] = convert_option_to_proc(options[:unless])
   end
 
   def data_value(model, grid)
+    raise "no data value for #{name} column" unless data?
     result = generic_value(model,grid)
     result.is_a?(ResponseFormat) ? result.data_value : result
   end
@@ -53,7 +57,7 @@ class Datagrid::Columns::Column
   end
 
   def header
-    self.options[:header] || 
+    self.options[:header] ||
       I18n.translate(self.name, :scope => "datagrid.#{self.grid_class.param_name}.columns", :default => self.name.to_s.humanize )
   end
 
@@ -83,21 +87,25 @@ class Datagrid::Columns::Column
 
   def order_desc
     return nil unless order
-    self.options[:order_desc]  
+    self.options[:order_desc]
   end
 
   def html?
     options[:html] != false
   end
-  
+
   def data?
     self.data_block != nil
   end
-  
+
   def mandatory?
     !! options[:mandatory]
   end
 
+  def enabled?(grid)
+    (!options[:if] || (options[:if] && options[:if].call(grid))) && !options[:unless] || (options[:unless] && !options[:unless].call(grid))
+  end
+
   def inspect
     "#<Datagird::Columns::Column #{grid_class}##{name} #{options.inspect}>"
   end
@@ -137,10 +145,18 @@ class Datagrid::Columns::Column
 
   def generic_value(model, grid)
     if self.data_block.arity >= 1
-      Datagrid::Utils.apply_args(model, grid, &data_block)
+      Datagrid::Utils.apply_args(model, grid, grid.data_row(model), &data_block)
     else
       model.instance_eval(&self.data_block)
     end
   end
 
+  private
+  def convert_option_to_proc(option)
+    if option.is_a?(Proc)
+      option
+    elsif option
+      proc {|object| object.send(option.to_sym) }
+    end
+  end
 end

data/lib/datagrid/core.rb

@@ -73,7 +73,7 @@ module Datagrid
         end
       end
 
-      # Returns a hash of grid attributes including filter values 
+      # Returns a hash of grid attributes including filter values
       # and ordering values
       def attributes
         result = {}
@@ -120,17 +120,17 @@ module Datagrid
       end
 
       # Redefines scope at instance level
-      # 
+      #
       #   class MyGrid
       #     scope { Article.order('created_at desc') }
       #   end
-      # 
+      #
       #   grid = MyGrid.new
       #   grid.scope do |scope|
       #     scope.where(:author_id => current_user.id)
       #   end
-      #   grid.assets 
-      #       # => SELECT * FROM articles WHERE author_id = ? 
+      #   grid.assets
+      #       # => SELECT * FROM articles WHERE author_id = ?
       #       #    ORDER BY created_at desc
       #
       def scope(&block)

data/lib/datagrid/drivers/abstract_driver.rb

@@ -53,7 +53,7 @@ module Datagrid
       def less_equal(scope, field, value)
         raise NotImplementedError
       end
-      
+
       def has_column?(scope, column_name)
         raise NotImplementedError
       end
@@ -82,6 +82,14 @@ module Datagrid
         raise NotImplementedError
       end
 
+      def append_column_queries(assets, columns)
+        if columns.present?
+          raise NotImplementedError
+        else
+          assets
+        end
+      end
+
       protected
       def timestamp_class?(klass)
         TIMESTAMP_CLASSES.include?(klass)

data/lib/datagrid/drivers/active_record.rb

@@ -4,20 +4,20 @@ module Datagrid
 
       def self.match?(scope)
         return false unless defined?(::ActiveRecord)
-        if scope.is_a?(Class) 
+        if scope.is_a?(Class)
           scope.ancestors.include?(::ActiveRecord::Base)
         else
-          scope.is_a?(::ActiveRecord::Relation) 
+          scope.is_a?(::ActiveRecord::Relation)
         end
       end
 
       def to_scope(scope)
         return scope if scope.is_a?(::ActiveRecord::Relation)
         # Model class or Active record association
-        # ActiveRecord association class hides itself under an Array 
+        # ActiveRecord association class hides itself under an Array
         # We can only reveal it by checking if it respond to some specific
         # to ActiveRecord method like #scoped
-        if scope.is_a?(Class) 
+        if scope.is_a?(Class)
           Rails.version >= "4.0" ? scope.all : scope.scoped({})
         elsif scope.respond_to?(:scoped)
           scope.scoped
@@ -26,6 +26,16 @@ module Datagrid
         end
       end
 
+      def append_column_queries(assets, columns)
+        if columns.present?
+          if assets.select_values.empty?
+            assets = assets.select(Arel.respond_to?(:star) ? assets.klass.arel_table[Arel.star] : "#{assets.quoted_table_name}.*")
+          end
+          assets = assets.select(*columns)
+        end
+        assets
+      end
+
       def where(scope, attribute, value)
         scope.where(attribute => value)
       end
@@ -97,7 +107,7 @@ module Datagrid
         end
         result
       end
-      
+
       protected
 
       def prefix_table_name(scope, field)
@@ -105,8 +115,8 @@ module Datagrid
       end
 
       def contains_predicate
-        defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && 
-          ::ActiveRecord::Base.connection.is_a?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) ? 
+        defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
+          ::ActiveRecord::Base.connection.is_a?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) ?
           'ilike' : 'like'
       end
 

data/lib/datagrid/drivers/array.rb

@@ -34,14 +34,14 @@ module Datagrid
 
       def greater_equal(scope, field, value)
         scope.select do |object|
-          compare_value = object.send(field) 
+          compare_value = object.send(field)
           compare_value.respond_to?(:>=) && compare_value >= value
         end
       end
 
       def less_equal(scope, field, value)
         scope.select do |object|
-          compare_value = object.send(field) 
+          compare_value = object.send(field)
           compare_value.respond_to?(:<=) && compare_value <= value
         end
       end
@@ -51,7 +51,7 @@ module Datagrid
       end
 
       def is_timestamp?(scope, column_name)
-        has_column?(scope, column_name) && 
+        has_column?(scope, column_name) &&
           timestamp_class?(scope.first.send(column_name).class)
       end
 

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -4,7 +4,7 @@ module Datagrid
 
       def self.match?(scope)
         return false unless defined?(::MongoMapper)
-        if scope.is_a?(Class) 
+        if scope.is_a?(Class)
           scope.ancestors.include?(::MongoMapper::Document)
         else
           scope.is_a?(::Plucky::Query)

data/lib/datagrid/drivers/mongoid.rb

@@ -4,7 +4,7 @@ module Datagrid
 
       def self.match?(scope)
         return false unless defined?(::Mongoid)
-        if scope.is_a?(Class) 
+        if scope.is_a?(Class)
           scope.ancestors.include?(::Mongoid::Document)
         else
           scope.is_a?(::Mongoid::Criteria)

data/lib/datagrid/filters.rb

@@ -48,6 +48,7 @@ module Datagrid
 
       # Returns filter definition object by name
       def filter_by_name(attribute)
+        return attribute if attribute.is_a?(Datagrid::Filters::BaseFilter)
         self.filters.find do |filter|
           filter.name.to_sym == attribute.to_sym
         end
@@ -133,10 +134,14 @@ module Datagrid
       end
 
       # Returns string representation of filter value
-      def filter_value_as_string(filter)
+      def filter_value_as_string(name)
+        filter = filter_by_name(name)
         value = filter_value(filter)
-        value = value.is_a?(Array) ?  value.join(filter.separator) : value.to_s
-        value.blank? ? nil : value
+        if value.is_a?(Array) 
+          value.map {|v| filter.format(v) }.join(filter.separator)
+        else
+          filter.format(value)
+        end
       end
 
       # Returns filter object with the given name

data/lib/datagrid/filters/base_filter.rb

@@ -103,7 +103,7 @@ class Datagrid::Filters::BaseFilter #:nodoc:
   def format(value)
     value.nil? ? nil : value.to_s
   end
-  
+
   def dummy?
     options[:dummy]
   end

data/spec/datagrid/columns_spec.rb

@@ -31,7 +31,7 @@ describe Datagrid::Columns do
     it  "should generate header" do
       subject.header.should == ["Shipping date", "Group", "Name", "Access level", "Pet"]
     end
-    
+
     it "should return html_columns" do
       report = test_report do
         scope {Entry}
@@ -82,6 +82,29 @@ describe Datagrid::Columns do
     it "should support csv export options" do
       subject.to_csv(:col_sep => ";").should == "Shipping date;Group;Name;Access level;Pet\n#{date};Pop;Star;admin;ROTTWEILER\n"
     end
+
+    it "should support defining a query for a column" do
+      report = test_report do
+        scope {Entry}
+        filter(:name)
+        column(:id)
+        column(:sum_group_id, 'sum(group_id) sum_group_id')
+      end
+      report.assets.first.sum_group_id.should == group.id
+    end
+    it "should support hidding columns through if and unless" do
+      report = test_report do
+        scope {Entry}
+        column(:id, :if => :show?)
+        column(:name, :unless => proc {|grid| !grid.show? })
+
+        def show?
+          false
+        end
+      end
+      report.columns(:id).should == []
+      report.columns(:name).should == []
+    end
   end
 
   it "should support columns with model and report arguments" do
@@ -206,4 +229,45 @@ describe Datagrid::Columns do
       report.rows
     end
   end
+
+  describe ".data_row" do
+    it "should give access to column values via an object" do
+      grid = test_report do
+        scope  { Entry }
+        column(:id)
+        column(:name) do
+          name.capitalize
+        end
+        column(:actions, html: true) do
+          "some link here"
+        end
+      end
+      entry = Entry.create!(name: 'hello')
+      row = grid.data_row(entry)
+      row.id.should == entry.id
+      row.name.should == "Hello"
+      proc {
+        row.actions
+      }.should raise_error
+    end
+  end
+
+  describe "column value" do
+    it "should support conversion" do
+      group = Group.create!
+      Entry.create(:group => group)
+      Entry.create(:group => group)
+      grid = test_report do
+        scope { Group }
+        column(:entries_count) do |g|
+          g.entries.count
+        end
+        column(:odd_entries) do |_, _, row|
+          row.entries_count.odd?
+        end
+      end
+
+      grid.row_for(group).should == [2, false]
+    end
+  end
 end

data/spec/datagrid/drivers/active_record_spec.rb

@@ -15,5 +15,10 @@ describe Datagrid::Drivers::ActiveRecord do
     subject.to_scope(Entry.limit(5)).should be_a(ActiveRecord::Relation)
     subject.to_scope(Group.create!.entries).should be_a(ActiveRecord::Relation)
   end
-  
+
+  it "should support append_column_queries" do
+    scope = subject.append_column_queries(Entry.scoped, ['sum(entries.group_id) sum_group_id'])
+    scope.select_values.length.should == 2
+    scope.select_values.should == ["#{Entry.quoted_table_name}.*", 'sum(entries.group_id) sum_group_id']
+  end
 end

data/spec/datagrid/filters/date_filter_spec.rb

@@ -7,7 +7,7 @@ describe Datagrid::Filters::DateFilter do
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
     report = test_report(:created_at => 5.day.ago..3.days.ago) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date)
     end
     report.assets.should_not include(e1)
@@ -21,7 +21,7 @@ describe Datagrid::Filters::DateFilter do
         let(:klass) { klass }
         subject do
           test_report(:created_at => _created_at) do
-            scope { klass } 
+            scope { klass }
             filter(:created_at, :date, :range => true)
           end.assets.to_a
         end
@@ -57,7 +57,7 @@ describe Datagrid::Filters::DateFilter do
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
     report = test_report(:created_at => [5.day.ago.to_date.to_s, 3.days.ago.to_date.to_s]) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date, :range => true)
     end
     report.assets.should_not include(e1)
@@ -70,7 +70,7 @@ describe Datagrid::Filters::DateFilter do
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
     report = test_report(:created_at => [5.day.ago.to_date.to_s, nil]) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date, :range => true)
     end
     report.assets.should_not include(e1)
@@ -83,7 +83,7 @@ describe Datagrid::Filters::DateFilter do
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
     report = test_report(:created_at => [nil, 3.days.ago.to_date.to_s]) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date, :range => true)
     end
     report.assets.should include(e1)
@@ -97,7 +97,7 @@ describe Datagrid::Filters::DateFilter do
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
     report = test_report(:created_at => (4.days.ago.to_date..4.days.ago.to_date)) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date, :range => true)
     end
     report.assets.should_not include(e1)
@@ -110,7 +110,7 @@ describe Datagrid::Filters::DateFilter do
     e2 = Entry.create!(:created_at => 4.days.ago)
     e3 = Entry.create!(:created_at => 1.day.ago)
     report = test_report(:created_at => (1.days.ago.to_date..7.days.ago.to_date)) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date, :range => true)
     end
     report.assets.should_not include(e1)
@@ -121,7 +121,7 @@ describe Datagrid::Filters::DateFilter do
 
   it "should support block" do
     report = test_report(:created_at => Date.today) do
-      scope { Entry } 
+      scope { Entry }
       filter(:created_at, :date, :range => true) do |value|
         where("created_at >= ?", value)
       end
@@ -129,7 +129,7 @@ describe Datagrid::Filters::DateFilter do
     report.assets.should_not include(Entry.create!(:created_at => 1.day.ago))
     report.assets.should include(Entry.create!(:created_at => DateTime.now))
   end
-  
+
 
   context "when date format is configured" do
     around(:each) do |example|
@@ -170,4 +170,15 @@ describe Datagrid::Filters::DateFilter do
     end
     report.created_at.should == [Date.new(2012, 01, 01), Date.new(2013, 01, 01)]
   end
+
+  it "should properly format date in filter_value_as_string" do
+    with_date_format do
+      report = test_report(:created_at => "2012-01-02") do
+        scope  {Entry}
+        filter(:created_at, :date)
+      end
+      report.filter_value_as_string(:created_at).should == "01/02/2012"
+    end
+  end
+
 end

data/spec/datagrid/form_builder_spec.rb

@@ -63,6 +63,17 @@ describe Datagrid::FormBuilder do
       it { should equal_to_dom(
         '<input class="created_at date_filter" id="report_created_at" name="report[created_at]" size="30" type="text"/>'
       )}
+      context "when special date format specified" do
+        around(:each) do |example|
+          _grid.created_at = Date.parse('2012-01-02')
+          with_date_format do
+            example.run
+          end
+        end
+        it { should equal_to_dom(
+          '<input class="created_at date_filter" id="report_created_at" name="report[created_at]" size="30" type="text" value="01/02/2012"/>'
+        )}
+      end
     end
 
     context "with integer filter type and range option" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids