datagrid 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a33a74ea728f66eb12ea5cc90b17d9be026ac0c1
+  data.tar.gz: fa60a6ba1ff9812693f313604a6e35a39ad0b84c
+SHA512:
+  metadata.gz: cb4e447b826333a3034cbcf6fc44a95e3ff3fa4266c9868295aa12bc0222391bdb458e8ea45568970b85363fd28944dfe4ed2f3550c60c0faa34c7749aacdd52
+  data.tar.gz: 2f1bcbe542567a33be0583b8f6c285d249e0c3d9fd88d0e9fa9a0ea1e573f51ba2050954d0cd4b8a6e2e334f8c152f0fdefacf205665cf019c7d6134972b288a

data/Gemfile

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

data/Readme.markdown

@@ -38,11 +38,10 @@ class SimpleReport
   end
 
   filter(:category, :enum, :select => ["first", "second"])
-  filter(:disabled, :eboolean)
-  filter(:confirmed, :boolean)
+  filter(:disabled, :xboolean)
   filter(:group_id, :integer, :multiple => true)
-  filter(:logins_count, :integer, :range => true, :before => :group_id)
-  filter(:group_name, :string, :header => "Group", :after => :category_id) do |value|
+  filter(:logins_count, :integer, :range => true)
+  filter(:group_name, :string, :header => "Group") do |value|
     self.joins(:group).where(:groups => {:name => value})
   end
 
@@ -61,13 +60,13 @@ Basic grid api:
 
 ``` ruby
 report = SimpleReport.new(
-        :group_id => [1,2], :from_logins_count => 1, 
+        :group_id => [1,2], :from_logins_count => 1,
         :category => "first",
         :order => :group,
         :descending => true
 )
 
-report.assets # => Array of User instances: 
+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
 
 report.header # => ["Name", "Group", "Activated"]
@@ -118,8 +117,9 @@ Datagrid supports different type of filters including:
 * integer
 * float
 * date
+* datetime
 * boolean
-* eboolean - the select of "yes", "no" and any
+* xboolean - the select of "yes", "no" and any
 * enum
 * string
 * dynamic
@@ -137,10 +137,10 @@ column(:activated, :header => "Active", :order => "activated", :after => :name)
 end
 ```
 
-Some formatting options are also available. 
+Some formatting options are also available.
 Each column is sortable.
 
-[More about columns](https://github.com/bogdan/datagrid/wiki/Columns) 
+[More about columns](https://github.com/bogdan/datagrid/wiki/Columns)
 
 ### Front end
 
@@ -178,8 +178,8 @@ All advanced frontend things are described in:
 
 ## Self-Promotion
 
-Like datagrid? 
+Like datagrid?
 
-Follow the repository on [GitHub](https://github.com/bogdan/datagrid). 
+Follow the repository on [GitHub](https://github.com/bogdan/datagrid).
 
 Read [author blog](http://gusiev.com).

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/app/assets/stylesheets/datagrid.css.sass

@@ -96,6 +96,12 @@ table.datagrid
   .separator
     float: left
     margin: 6px 4px 0
+  .enum_filter.checkboxes 
+    float: none
+    display: block
+    input
+      margin: 7px
+    margin-left: 150px
 
 
 .datagrid-actions

data/datagrid.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: datagrid 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2013-11-27"
+  s.date = "2014-01-15"
   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 = [
@@ -50,9 +51,11 @@ Gem::Specification.new do |s|
     "lib/datagrid/filters/boolean_filter.rb",
     "lib/datagrid/filters/composite_filters.rb",
     "lib/datagrid/filters/date_filter.rb",
+    "lib/datagrid/filters/date_time_filter.rb",
     "lib/datagrid/filters/default_filter.rb",
     "lib/datagrid/filters/dynamic_filter.rb",
     "lib/datagrid/filters/enum_filter.rb",
+    "lib/datagrid/filters/extended_boolean_filter.rb",
     "lib/datagrid/filters/float_filter.rb",
     "lib/datagrid/filters/integer_filter.rb",
     "lib/datagrid/filters/ranged_filter.rb",
@@ -79,8 +82,10 @@ Gem::Specification.new do |s|
     "spec/datagrid/filters/boolean_enum_filter_spec.rb",
     "spec/datagrid/filters/composite_filters_spec.rb",
     "spec/datagrid/filters/date_filter_spec.rb",
+    "spec/datagrid/filters/date_time_filter_spec.rb",
     "spec/datagrid/filters/dynamic_filter_spec.rb",
     "spec/datagrid/filters/enum_filter_spec.rb",
+    "spec/datagrid/filters/extended_boolean_filter_spec.rb",
     "spec/datagrid/filters/float_filter_spec.rb",
     "spec/datagrid/filters/integer_filter_spec.rb",
     "spec/datagrid/filters/string_filter_spec.rb",
@@ -106,17 +111,18 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.1.10"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
+      s.add_development_dependency(%q<byebug>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
@@ -131,6 +137,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
+      s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -146,6 +153,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])
+    s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

data/lib/datagrid/configuration.rb

@@ -8,6 +8,6 @@ module Datagrid
     yield(configuration)
   end
 
-  class Configuration < Struct.new(:date_formats)
+  class Configuration < Struct.new(:date_formats, :datetime_formats)
   end
 end

data/lib/datagrid/drivers/active_record.rb

@@ -18,7 +18,7 @@ module Datagrid
         # We can only reveal it by checking if it respond to some specific
         # to ActiveRecord method like #scoped
         if scope.is_a?(Class) 
-          scope.scoped({})
+          Rails.version >= "4.0" ? scope.all : scope.scoped({})
         elsif scope.respond_to?(:scoped)
           scope.scoped
         else

data/lib/datagrid/filters.rb

@@ -6,8 +6,10 @@ module Datagrid
     require "datagrid/filters/base_filter"
     require "datagrid/filters/enum_filter"
     require "datagrid/filters/boolean_enum_filter"
+    require "datagrid/filters/extended_boolean_filter"
     require "datagrid/filters/boolean_filter"
     require "datagrid/filters/date_filter"
+    require "datagrid/filters/date_time_filter"
     require "datagrid/filters/default_filter"
     require "datagrid/filters/integer_filter"
     require "datagrid/filters/composite_filters"
@@ -17,9 +19,11 @@ module Datagrid
 
     FILTER_TYPES = {
       :date => Filters::DateFilter,
+      :datetime => Filters::DateTimeFilter,
       :string => Filters::StringFilter,
       :default => Filters::DefaultFilter,
       :eboolean => Filters::BooleanEnumFilter ,
+      :xboolean => Filters::ExtendedBooleanFilter ,
       :boolean => Filters::BooleanFilter ,
       :integer => Filters::IntegerFilter,
       :enum => Filters::EnumFilter,
@@ -52,7 +56,7 @@ module Datagrid
       # Defines new datagrid filter.
       # This method automatically generates <tt>attr_accessor</tt> for filter name
       # and adds it to the list of datagrid attributes.
-      # 
+      #
       # Arguments:
       #
       # * <tt>name</tt> - filter name
@@ -61,19 +65,19 @@ module Datagrid
       # * <tt>block</tt> - proc to apply the filter
       #
       # Available options:
-      #   
+      #
       # * <tt>:header</tt> - determines the header of the filter
       # * <tt>:default</tt> - the default filter value. Able to accept a <tt>Proc</tt> in case default should be recalculated
-      # * <tt>:multiple</tt> -  if true multiple values can be assigned to this filter. 
-      #   By default multiple values are parsed from string using `,` separator. 
+      # * <tt>:multiple</tt> -  if true multiple values can be assigned to this filter.
+      #   By default multiple values are parsed from string using `,` separator.
       #   But you can specify a different separator as option value. Default: false.
       # * <tt>:allow_nil</tt> - determines if the value can be nil
       # * <tt>:allow_blank</tt> - determines if the value can be blank
-      # * <tt>:before</tt> - determines the position of this filter, 
+      # * <tt>:before</tt> - determines the position of this filter,
       #   by adding it before the filter passed here (when using datagrid_form_for helper)
-      # * <tt>:after</tt> - determines the position of this filter, 
+      # * <tt>:after</tt> - determines the position of this filter,
       #   by adding it after the filter passed here (when using datagrid_form_for helper)
-      # * <tt>:dummy</tt> - if true, this filter will not be applied automatically 
+      # * <tt>:dummy</tt> - if true, this filter will not be applied automatically
       #   and will be just displayed in form. In case you may want to apply it manually.
       #
       # See: https://github.com/bogdan/datagrid/wiki/Filters for examples

data/lib/datagrid/filters/base_filter.rb

@@ -16,7 +16,6 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     raise NotImplementedError, "#parse(value) suppose to be overwritten"
   end
 
-
   def unapplicable_value?(value)
     value.nil? ? !allow_nil? : value.blank? && !allow_blank?
   end
@@ -87,11 +86,12 @@ class Datagrid::Filters::BaseFilter #:nodoc:
   def default_filter_block
     filter = self
     lambda do |value, scope, grid|
-      filter.dummy? ? nil : filter.default_filter(value, scope, grid)
+      filter.default_filter(value, scope, grid)
     end
   end
 
   def default_filter(value, scope, grid)
+    return nil if dummy?
     driver = grid.driver
     if !driver.has_column?(scope, name) && driver.to_scope(scope).respond_to?(name)
       driver.to_scope(scope).send(name, value)

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -10,12 +10,4 @@ class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter #:nod
     super(report, attribute, options, &block)
   end
 
-  def apply(grid_object, scope, value)
-    super(grid_object, scope, value)
-  end
-
-  def to_boolean(value)
-    #TODO decide what to do with conversion
-  end
-
 end

data/lib/datagrid/filters/date_time_filter.rb

@@ -0,0 +1,25 @@
+require "datagrid/filters/ranged_filter"
+
+class Datagrid::Filters::DateTimeFilter < Datagrid::Filters::BaseFilter
+
+  include RangedFilter
+
+  def parse(value)
+    Datagrid::Utils.parse_datetime(value)
+  end
+
+  def format(value)
+    if formats.any? && value
+      value.strftime(formats.first)
+    else
+      super
+    end
+  end
+
+  protected
+
+  def formats
+    Array(Datagrid.configuration.datetime_formats)
+  end
+end
+

data/lib/datagrid/filters/extended_boolean_filter.rb

@@ -0,0 +1,23 @@
+class Datagrid::Filters::ExtendedBooleanFilter < Datagrid::Filters::EnumFilter #:nodoc: 
+
+  YES = "YES"
+  NO = "NO"
+
+  def initialize(report, attribute, options = {}, &block)
+    options[:select] = [YES, NO].map do |key, value|
+      [I18n.t("datagrid.filters.xboolean.#{key.downcase}"), key]
+    end
+    super(report, attribute, options, &block)
+  end
+
+  def execute(value, scope, grid_object) 
+    value = value.blank? ? nil : ::Datagrid::Utils.booleanize(value)
+    super(value, scope, grid_object)
+  end
+
+  def parse(value)
+    return nil if value.blank?
+    super(value)
+  end
+
+end

data/lib/datagrid/form_builder.rb

@@ -11,15 +11,18 @@ module Datagrid
     end
 
     # Returns a form label html for the corresponding filter name
-    def datagrid_label(filter_or_attribute, options = {})
+    def datagrid_label(filter_or_attribute, options = {}, &block)
       filter = datagrid_get_filter(filter_or_attribute)
-      self.label(filter.name, filter.header, options)
+      label(filter.name, filter.header, options, &block)
     end
 
     protected
     def datagrid_boolean_enum_filter(attribute_or_filter, options = {})
       datagrid_enum_filter(attribute_or_filter, options)
     end
+    def datagrid_extended_boolean_filter(attribute_or_filter, options = {})
+      datagrid_enum_filter(attribute_or_filter, options)
+    end
 
     def datagrid_boolean_filter(attribute_or_filter, options = {})
       check_box(datagrid_get_attribute(attribute_or_filter), options.reverse_merge(datagrid_extra_checkbox_options))
@@ -29,6 +32,10 @@ module Datagrid
       datagrid_range_filter(:date, attribute_or_filter, options)
     end
 
+    def datagrid_date_time_filter(attribute_or_filter, options = {})
+      datagrid_range_filter(:datetime, attribute_or_filter, options)
+    end
+
     def datagrid_default_filter(attribute_or_filter, options = {})
       filter = datagrid_get_filter(attribute_or_filter)
       text_field filter.name, options.reverse_merge(:value => object.filter_value_as_string(filter))
@@ -37,6 +44,7 @@ module Datagrid
     def datagrid_enum_filter(attribute_or_filter, options = {})
       filter = datagrid_get_filter(attribute_or_filter)
       if filter.checkboxes?
+        options = add_html_classes(options, 'checkboxes')
         filter.select(object).map do |element|
           text, value = @template.send(:option_text_and_value, element)
           id = [object_name, filter.name, value].join('_').underscore
@@ -110,15 +118,15 @@ module Datagrid
       options[:value] = filter.format(object[filter.name].try(type_method_map[type]))
       # In case of datagrid ranged filter
       # from and to input will have same id
-      options[:id] = if !options.key?(:id)
-                       # Rails provides it's own default id for all inputs
-                       # In order to prevent that we assign no id by default
-                       options[:id] = nil
-                     elsif options[:id].present?
-                       # If the id was given we prefix it
-                       # with from_ and to_ accordingly
-                       options[:id] = [type, options[:id]].join("_")
-                     end
+      if !options.key?(:id)
+        # Rails provides it's own default id for all inputs
+        # In order to prevent that we assign no id by default
+        options[:id] = nil
+      elsif options[:id].present?
+        # If the id was given we prefix it
+        # with from_ and to_ accordingly
+        options[:id] = [type, options[:id]].join("_")
+      end
       options
     end
 

data/lib/datagrid/locale/en.yml

@@ -16,10 +16,18 @@ en:
       date:
         range_separator:
           "<span class=\"separator date\"> - </span>"
+      datetime:
+        range_separator:
+          "<span class=\"separator datetime\"> - </span>"
 
       eboolean:
         "yes": "Yes"
         "no": "No"
+
+      xboolean:
+        "yes": "Yes"
+        "no": "No"
+
       dynamic:
         operations:
           ">=": "&ge;"

data/lib/datagrid/scaffold.rb

@@ -8,6 +8,9 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
     template "controller.rb.erb", "app/controllers/#{grid_controller_name.underscore}.rb"
     template "index.html.erb", "app/views/#{grid_controller_short_name}/index.html.erb"
     route("resources :#{grid_controller_short_name}")
+    in_root do
+      inject_into_file "app/assets/stylesheets/application.css", " *= require datagrid", {:before => %r{require_self}} # before all
+    end
   end
 
   def grid_class_name

data/lib/datagrid/utils.rb

@@ -1,4 +1,4 @@
-module Datagrid 
+module Datagrid
   module Utils # :nodoc:
     class << self
 
@@ -6,6 +6,9 @@ module Datagrid
       TRUTH = [true, 1, "1", "true", "yes", "on"]
 
       def booleanize(value)
+        if value.respond_to?(:downcase)
+          value = value.downcase
+        end
         TRUTH.include?(value)
       end
 
@@ -73,6 +76,24 @@ module Datagrid
         nil
       end
 
+      def parse_datetime(value)
+        return nil if value.blank?
+        return value if value.is_a?(Range)
+        if value.is_a?(String)
+          Array(Datagrid.configuration.datetime_formats).each do |format|
+            begin
+              return DateTime.strptime(value, format)
+            rescue ::ArgumentError
+            end
+          end
+        end
+        return DateTime.parse(value) if value.is_a?(String)
+        return value.to_datetime if value.respond_to?(:to_datetime)
+        value
+      rescue ::ArgumentError
+        nil
+      end
+
       def format_date_as_timestamp(value)
         if !value
           value

data/spec/datagrid/core_spec.rb

@@ -15,7 +15,7 @@ describe Datagrid::Core do
       context 'in the class' do
         let(:report) { report_class.new }
 
-        it { expect(report.scope).to have(2).item }
+        it { expect(report.scope.to_a).to have(2).item }
       end
 
       context 'changes scope on the fly' do
@@ -25,25 +25,25 @@ describe Datagrid::Core do
           end
         end
 
-        it { expect(report.scope).to have(1).item }
+        it { expect(report.scope.to_a).to have(1).item }
       end
 
       context 'overriding scope by initializer' do
         let(:report) { report_class.new { Entry.limit(1) } }
 
-        it { expect(report.scope).to have(1).item }
+        it { expect(report.scope.to_a).to have(1).item }
 
         context "reset scope to default" do
           before do
             report.reset_scope
           end
-          it { expect(report.scope).to have(2).item }
+          it { expect(report.scope.to_a).to have(2).item }
         end
       end
 
       context "appending scope by initializer " do
         let(:report) { report_class.new {|scope| scope.limit(1)} }
-        it { expect(report.scope).to have(1).item }
+        it { expect(report.scope.to_a).to have(1).item }
         it { expect(report.scope.order_values).to have(1).item }
       end
     end

data/spec/datagrid/filters/date_time_filter_spec.rb

@@ -0,0 +1,150 @@
+require 'spec_helper'
+
+describe Datagrid::Filters::DateTimeFilter do
+  {:active_record => Entry, :mongoid => MongoidEntry}.each do |orm, klass|
+    describe "with orm #{orm}" do
+      describe "timestamp to timestamp conversion" do
+        let(:klass) { klass }
+        subject do
+          test_report(:created_at => _created_at) do
+            scope { klass }
+            filter(:created_at, :datetime, :range => true)
+          end.assets.to_a
+        end
+
+        def entry_dated(date)
+          klass.create(:created_at => date)
+        end
+
+        context "when single datetime paramter given" do
+          let(:_created_at) { DateTime.now }
+          it { should include(entry_dated(_created_at))}
+          it { should_not include(entry_dated(_created_at - 1.second))}
+          it { should_not include(entry_dated(_created_at + 1.second))}
+        end
+
+        context "when range datetime range given" do
+          let(:_created_at) { [DateTime.now.beginning_of_day, DateTime.now.end_of_day] }
+          it { should include(entry_dated(1.second.ago))}
+          it { should include(entry_dated(Date.today.to_datetime))}
+          it { should include(entry_dated(Date.today.end_of_day.to_datetime))}
+          it { should_not include(entry_dated(Date.yesterday.end_of_day))}
+          it { should_not include(entry_dated(Date.tomorrow.beginning_of_day))}
+        end
+      end
+
+    end
+  end
+
+  it "should support datetime range given as array argument" do
+    e1 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => [DateTime.new(2013, 1, 1, 1, 30).to_s, DateTime.new(2013, 1, 1, 2, 30).to_s]) do
+      scope { Entry }
+      filter(:created_at, :datetime, :range => true)
+    end
+    report.assets.should_not include(e1)
+    report.assets.should include(e2)
+    report.assets.should_not include(e3)
+  end
+
+  it "should support minimum datetime argument" do
+    e1 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => [DateTime.new(2013, 1, 1, 1, 30).to_s, nil]) do
+      scope { Entry }
+      filter(:created_at, :datetime, :range => true)
+    end
+    report.assets.should_not include(e1)
+    report.assets.should include(e2)
+    report.assets.should include(e3)
+  end
+
+  it "should support maximum datetime argument" do
+    e1 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => [nil, DateTime.new(2013, 1, 1, 2, 30).to_s]) do
+      scope { Entry }
+      filter(:created_at, :datetime, :range => true)
+    end
+    report.assets.should include(e1)
+    report.assets.should include(e2)
+    report.assets.should_not include(e3)
+  end
+
+  it "should find something in one second interval" do
+
+    e1 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => (DateTime.new(2013, 1, 1, 2, 0)..DateTime.new(2013, 1, 1, 2, 0))) do
+      scope { Entry }
+      filter(:created_at, :datetime, :range => true)
+    end
+    report.assets.should_not include(e1)
+    report.assets.should include(e2)
+    report.assets.should_not include(e3)
+  end
+  it "should support invalid range" do
+
+    e1 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => DateTime.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => (DateTime.new(2013, 1, 1, 3, 0)..DateTime.new(2013, 1, 1, 1, 0))) do
+      scope { Entry }
+      filter(:created_at, :datetime, :range => true)
+    end
+    report.assets.should_not include(e1)
+    report.assets.should_not include(e2)
+    report.assets.should_not include(e3)
+  end
+
+
+  it "should support block" do
+    report = test_report(:created_at => DateTime.now) do
+      scope { Entry }
+      filter(:created_at, :datetime, :range => true) do |value|
+        where("created_at >= ?", value)
+      end
+    end
+    report.assets.should_not include(Entry.create!(:created_at => 1.day.ago))
+    report.assets.should include(Entry.create!(:created_at => DateTime.tomorrow))
+  end
+
+
+  context "when datetime format is configured" do
+    around(:each) do |example|
+      with_datetime_format(format = "%m/%d/%Y %H:%M") do
+        example.run
+      end
+    end
+
+    it "should have configurable datetime format" do
+      report = test_report(:created_at => "10/01/2013 01:00") do
+        scope  {Entry}
+        filter(:created_at, :datetime)
+      end
+      report.created_at.should == DateTime.new(2013,10,01,1,0)
+    end
+
+    it "should support default explicit datetime" do
+      report = test_report(:created_at => DateTime.parse("2013-10-01 01:00")) do
+        scope  {Entry}
+        filter(:created_at, :datetime)
+      end
+      report.created_at.should == DateTime.new(2013,10,01,1,0)
+    end
+  end
+
+
+  it "should automatically reverse Array if first more than last" do
+    report = test_report(:created_at => ["2013-01-01 01:00", "2012-01-01 01:00"]) do
+      scope  {Entry}
+      filter(:created_at, :datetime, :range => true)
+    end
+    report.created_at.should == [DateTime.new(2012, 01, 01, 1, 0), DateTime.new(2013, 01, 01, 1, 0)]
+  end
+end

data/spec/datagrid/filters/extended_boolean_filter_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Datagrid::Filters::ExtendedBooleanFilter do
+
+  it "should support select option" do
+    test_report do
+      scope {Entry}
+      filter(:disabled, :xboolean)
+    end.class.filter_by_name(:disabled).select.should == [["Yes", "YES"], ["No", "NO"]]
+  end
+
+  it "should generate pass boolean value to filter block" do
+    grid = test_report do
+      scope {Entry}
+      filter(:disabled, :xboolean)
+    end
+
+    disabled_entry = Entry.create!(:disabled => true)
+    enabled_entry = Entry.create!(:disabled => false)
+
+    grid.disabled.should be_nil
+    grid.assets.should include(disabled_entry, enabled_entry)
+    grid.disabled = "YES"
+
+    grid.disabled.should == "YES"
+    grid.assets.should include(disabled_entry)
+    grid.assets.should_not include(enabled_entry)
+    grid.disabled = "NO"
+    grid.disabled.should == "NO"
+    grid.assets.should include(enabled_entry)
+    grid.assets.should_not include(disabled_entry)
+
+  end
+
+end

data/spec/datagrid/form_builder_spec.rb

@@ -234,12 +234,23 @@ describe Datagrid::FormBuilder do
           end
         end
         let(:_filter) { :category }
-        it { should equal_to_dom(
-          '
-<label class="category enum_filter" for="report_category_first"><input id="report_category_first" name="report[category][]" type="checkbox" value="first" />first</label>
-<label class="category enum_filter" for="report_category_second"><input id="report_category_second" name="report[category][]" type="checkbox" value="second" />second</label>
-'
-        )}
+        if Rails.version >= "4.0"
+          it { should equal_to_dom(
+            '
+<label class="category enum_filter checkboxes" for="report_category_first"><input id="report_category_first" name="report[category][]" type="checkbox" value="first" />first</label>
+<label class="category enum_filter checkboxes" for="report_category_second"><input id="report_category_second" name="report[category][]" type="checkbox" value="second" />second</label>
+            '
+          )}
+        else
+          it { should equal_to_dom(
+            '
+<label class="category enum_filter checkboxes" for="report_category_first"><input name="report[category][]" type="hidden"><input id="report_category_first" name="report[category][]" type="checkbox" value="first" />first</label>
+<label class="category enum_filter checkboxes" for="report_category_second"><input name="report[category][]" type="hidden"><input id="report_category_second" name="report[category][]" type="checkbox" value="second" />second</label>
+            '
+          )}
+
+
+        end
       end
     end
 
@@ -457,5 +468,10 @@ describe Datagrid::FormBuilder do
         '<label class="foo" for="report_name">Name</label>'
       )
     end
+    it "should support block" do
+      view.datagrid_label(:name, :class => 'foo') { 'The Name' }.should equal_to_dom(
+        '<label class="foo" for="report_name">The Name</label>'
+      )
+    end
   end
 end

data/spec/spec_helper.rb

@@ -25,6 +25,14 @@ end
 require 'rspec'
 require "logger"
 
+class DatagridTest < Rails::Application
+
+end
+
+if I18n.respond_to?(:enforce_available_locales)
+  I18n.enforce_available_locales = true
+end
+
 File.open('spec.log', "w").close
 TEST_LOGGER = Logger.new('spec.log')
 

data/spec/support/configuration.rb

@@ -11,3 +11,18 @@ def with_date_format(format = "%m/%d/%Y")
     end
   end
 end
+
+def with_datetime_format(format = "%m/%d/%Y")
+  begin
+    old_format = Datagrid.configuration.datetime_formats
+    Datagrid.configure do |config|
+      config.datetime_formats = format
+    end
+    yield
+  ensure
+    Datagrid.configure do |config|
+      config.datetime_formats = old_format
+    end
+  end
+end
+

metadata

@@ -1,148 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,23 +153,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -182,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -190,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -198,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -206,17 +195,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
@@ -261,9 +248,11 @@ files:
 - lib/datagrid/filters/boolean_filter.rb
 - lib/datagrid/filters/composite_filters.rb
 - lib/datagrid/filters/date_filter.rb
+- lib/datagrid/filters/date_time_filter.rb
 - lib/datagrid/filters/default_filter.rb
 - lib/datagrid/filters/dynamic_filter.rb
 - lib/datagrid/filters/enum_filter.rb
+- lib/datagrid/filters/extended_boolean_filter.rb
 - lib/datagrid/filters/float_filter.rb
 - lib/datagrid/filters/integer_filter.rb
 - lib/datagrid/filters/ranged_filter.rb
@@ -290,8 +279,10 @@ files:
 - spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
 - spec/datagrid/filters/date_filter_spec.rb
+- spec/datagrid/filters/date_time_filter_spec.rb
 - spec/datagrid/filters/dynamic_filter_spec.rb
 - spec/datagrid/filters/enum_filter_spec.rb
+- spec/datagrid/filters/extended_boolean_filter_spec.rb
 - spec/datagrid/filters/float_filter_spec.rb
 - spec/datagrid/filters/integer_filter_spec.rb
 - spec/datagrid/filters/string_filter_spec.rb
@@ -316,29 +307,25 @@ files:
 homepage: http://github.com/bogdan/datagrid
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 356271283638718851
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem to create datagrids
 test_files: []