datagrid 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d1827360a3a33795e420d9c086607e2934ff3a8
-  data.tar.gz: 34e08edcc7adcb354dfd7d6b24b19c8a34134c19
+  metadata.gz: cb6758027fb0dcc66c2d3a285466b5aed3d4c3f1
+  data.tar.gz: ea86794219dd8af94986c010c976809580680b55
 SHA512:
-  metadata.gz: d1d458c0938739371e2cf3dd5d16e5c9601dea0f9a6c62b439c542aa8a14d6a84e90c76e7447b03306a51eec91eddb05d97fe454c1020dd25748c89b093cc8fa
-  data.tar.gz: bd86f70ec51fcf427b33c1b3380b4c4eaf9d7c8e3070ce74606354dace36e973ca5befe383f3cc7c397ebe4e8418d8e568e2cea1621d9372195321295ed5b7f5
+  metadata.gz: f91876b2190e994ff3259106a296034ff000ea1f3da233af811491d0c881e7a0bb14519b4a419f048b0865d4a9bc02c275a95ea10b648e2184d36f8d0cd4c50c
+  data.tar.gz: a337280ece74f2b3e4b97e2749dde0d6a422405d71b051871222b0c5e2622bc8437e0bbbf40cff5cac04441b456c8640fcda82deb4f0a3399451ae16bb25dd94

data/Gemfile

@@ -15,10 +15,11 @@ group :development do
   gem "nokogiri" # used to test html output
 
   gem "sqlite3"
+  gem "sequel"
 
   group :mongo do
     gem "mongoid", "3.1.6"
-    gem "mongo_mapper", ">=0.11.0"
+    gem "mongo_mapper", "~> 0.11.0"
     gem "bson", "1.4.0"
     gem "bson_ext", "1.4.0"
   end

data/Readme.markdown

@@ -15,6 +15,7 @@ Ruby library that helps you to build and represent table-like data with:
 * ActiveRecord
 * Mongoid
 * MongoMapper
+* Sequel
 * Array (slow but possible)
 
 [Create an issue](https://github.com/bogdan/datagrid/issues/new) if you want more.
@@ -31,7 +32,7 @@ Ruby library that helps you to build and represent table-like data with:
 In order to create a grid:
 
 ``` ruby
-class SimpleReport
+class UsersGrid
 
   include Datagrid
 
@@ -61,11 +62,12 @@ end
 Basic grid api:
 
 ``` ruby
-report = SimpleReport.new(
-        :group_id => [1,2], :from_logins_count => 1,
-        :category => "first",
-        :order => :group,
-        :descending => true
+report = UsersGrid.new(
+  :group_id => [1,2], 
+  :logins_count => [1, nil],
+  :category => "first",
+  :order => :group,
+  :descending => true
 )
 
 report.assets # => Array of User instances:
@@ -122,9 +124,9 @@ Datagrid supports different type of filters including:
 * datetime
 * boolean
 * xboolean - the select of "yes", "no" and any
-* enum
+* enum - selection of the given values
 * string
-* dynamic
+* dynamic - build dynamic SQL condition 
 
 [More about filters](https://github.com/bogdan/datagrid/wiki/Filters)
 

data/VERSION

@@ -1 +1 @@
-1.3.9
+1.4.0

data/app/views/datagrid/_table.html.erb

@@ -4,15 +4,19 @@ Local variables:
 * assets - Array of database Entities
 * options - passed options Hash
 %>
-<%= content_tag :table, options[:html] do %>
-  <thead>
-    <%= datagrid_header(grid, options) %>
-  </thead>
-  <tbody>
-    <% if assets.any? %>
-      <%= datagrid_rows(grid, assets, options) %>
-    <% else %>
-      <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
-    <% end %>
-  </tbody>
+<% if grid.html_columns(*options[:columns]).any? %>
+  <%= content_tag :table, options[:html] do %>
+    <thead>
+      <%= datagrid_header(grid, options) %>
+    </thead>
+    <tbody>
+      <% if assets.any? %>
+        <%= datagrid_rows(grid, assets, options) %>
+      <% else %>
+        <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
+      <% end %>
+    </tbody>
+  <% end %>
+<% else -%>
+  <%= I18n.t("datagrid.table.no_columns").html_safe %>
 <% end %>

data/datagrid.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.3.9 ruby lib
+# stub: datagrid 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.3.9"
+  s.version = "1.4.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 = "2015-05-11"
+  s.date = "2015-11-05"
   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 = [
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/drivers/array.rb",
     "lib/datagrid/drivers/mongo_mapper.rb",
     "lib/datagrid/drivers/mongoid.rb",
+    "lib/datagrid/drivers/sequel.rb",
     "lib/datagrid/engine.rb",
     "lib/datagrid/filters.rb",
     "lib/datagrid/filters/base_filter.rb",
@@ -83,6 +84,7 @@ Gem::Specification.new do |s|
     "spec/datagrid/drivers/array_spec.rb",
     "spec/datagrid/drivers/mongo_mapper_spec.rb",
     "spec/datagrid/drivers/mongoid_spec.rb",
+    "spec/datagrid/drivers/sequel_spec.rb",
     "spec/datagrid/filters/boolean_enum_filter_spec.rb",
     "spec/datagrid/filters/composite_filters_spec.rb",
     "spec/datagrid/filters/date_filter_spec.rb",
@@ -108,6 +110,7 @@ Gem::Specification.new do |s|
     "spec/support/matchers.rb",
     "spec/support/mongo_mapper.rb",
     "spec/support/mongoid.rb",
+    "spec/support/sequel.rb",
     "spec/support/simple_report.rb",
     "spec/support/test_partials/_actions.html.erb",
     "spec/support/test_partials/client/datagrid/_form.html.erb",
@@ -139,8 +142,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 3"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<sequel>, [">= 0"])
       s.add_development_dependency(%q<mongoid>, ["= 3.1.6"])
-      s.add_development_dependency(%q<mongo_mapper>, [">= 0.11.0"])
+      s.add_development_dependency(%q<mongo_mapper>, ["~> 0.11.0"])
       s.add_development_dependency(%q<bson>, ["= 1.4.0"])
       s.add_development_dependency(%q<bson_ext>, ["= 1.4.0"])
     else
@@ -152,8 +156,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 3"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<sequel>, [">= 0"])
       s.add_dependency(%q<mongoid>, ["= 3.1.6"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
+      s.add_dependency(%q<mongo_mapper>, ["~> 0.11.0"])
       s.add_dependency(%q<bson>, ["= 1.4.0"])
       s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
     end
@@ -166,8 +171,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 3"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<sequel>, [">= 0"])
     s.add_dependency(%q<mongoid>, ["= 3.1.6"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
+    s.add_dependency(%q<mongo_mapper>, ["~> 0.11.0"])
     s.add_dependency(%q<bson>, ["= 1.4.0"])
     s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
   end

data/lib/datagrid/columns.rb

@@ -184,10 +184,15 @@ module Datagrid
       #             #    ]
       def dynamic(&block)
         previous_block = dynamic_block
-        self.dynamic_block = proc {
-          instance_eval(&previous_block) if previous_block
-          instance_eval(&block)
-        }
+        self.dynamic_block = 
+          if previous_block
+            proc {
+              instance_eval(&previous_block)
+              instance_eval(&block)
+            }
+          else
+            block
+          end
       end
 
       def inherited(child_class) #:nodoc:
@@ -319,7 +324,7 @@ module Datagrid
       def to_csv(*column_names)
         options = column_names.extract_options!
         csv_class.generate(
-          {:headers => self.header(*column_names), :write_headers => true}.merge(options)
+          {:headers => self.header(*column_names), :write_headers => true}.merge!(options)
         ) do |csv|
           each_with_batches do |asset|
             csv << row_for(asset, *column_names)

data/lib/datagrid/drivers.rb

@@ -3,6 +3,7 @@ require "datagrid/drivers/active_record"
 require "datagrid/drivers/array"
 require "datagrid/drivers/mongoid"
 require "datagrid/drivers/mongo_mapper"
+require "datagrid/drivers/sequel"
 
 
 module Datagrid

data/lib/datagrid/drivers/abstract_driver.rb

@@ -94,6 +94,17 @@ module Datagrid
         raise NotImplementedError
       end
 
+      def where_by_timestamp_gotcha(scope, name, value)
+        value = Datagrid::Utils.format_date_as_timestamp(value)
+        if value.first
+          scope = greater_equal(scope, name, value.first)
+        end
+        if value.last
+          scope = less_equal(scope, name, value.last)
+        end
+        scope
+      end
+
       protected
       def timestamp_class?(klass)
         TIMESTAMP_CLASSES.include?(klass)

data/lib/datagrid/drivers/active_record.rb

@@ -56,7 +56,7 @@ module Datagrid
       end
 
       def default_order(scope, column_name)
-        has_column?(scope, column_name) ? [scope.table_name, column_name].join(".") : nil
+        has_column?(scope, column_name) ? prefix_table_name(scope, column_name) : nil
       end
 
       def greater_equal(scope, field, value)
@@ -127,3 +127,11 @@ module Datagrid
     end
   end
 end
+
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.class_eval do
+    def self.datagrid_where_by_timestamp(column, value)
+      Datagrid::Drivers::ActiveRecord.new.where_by_timestamp_gotcha(self, column, value)
+    end
+  end
+end

data/lib/datagrid/drivers/mongoid.rb

@@ -97,3 +97,4 @@ module Datagrid
     end
   end
 end
+

data/lib/datagrid/drivers/sequel.rb

@@ -0,0 +1,104 @@
+module Datagrid
+  module Drivers
+    class Sequel < AbstractDriver #:nodoc:
+
+      def self.match?(scope)
+        return false unless defined?(::Sequel)
+        if scope.is_a?(Class)
+          scope.ancestors.include?(::Sequel::Model)
+        else
+          scope.is_a?(::Sequel::Dataset)
+        end
+      end
+
+      def to_scope(scope)
+        return scope if scope.is_a?(::Sequel::Dataset)
+        scope.where
+      end
+
+      def append_column_queries(assets, columns)
+        super
+      end
+
+      def where(scope, attribute, value)
+        scope.where(attribute => value)
+      end
+
+      def asc(scope, order)
+        scope.order(::Sequel.lit(order))
+      end
+
+      def desc(scope, order)
+        scope.order(::Sequel.desc(::Sequel.lit(order)))
+      end
+
+      def reverse_order(scope)
+        super
+      end
+
+      def default_order(scope, column_name)
+        has_column?(scope, column_name) ?  ::Sequel.lit(prefix_table_name(scope, column_name)) : nil
+      end
+
+      def greater_equal(scope, field, value)
+        scope.where(["#{prefix_table_name(scope, field)} >= ?", value])
+      end
+
+      def less_equal(scope, field, value)
+        scope.where(["#{prefix_table_name(scope, field)} <= ?", value])
+      end
+
+      def has_column?(scope, column_name)
+        scope.columns.include?(column_name.to_sym)
+      end
+
+      def column_names(scope)
+        scope.columns
+      end
+
+      def is_timestamp?(scope, column_name)
+        column_type(scope, column_name) == :datetime
+      end
+
+      def contains(scope, field, value)
+        field = prefix_table_name(scope, field)
+        scope.where(Sequel.like(field, "%#{value}%"))
+      end
+
+      def normalized_column_type(scope, field)
+        type = column_type(scope, field)
+        return nil unless type
+        {
+          [:string, :blob, :time] => :string,
+          [:integer, :primary_key] => :integer,
+          [:float, :decimal] => :float,
+          [:date] => :date,
+          [:datetime] => :datetime,
+          [:boolean] => :boolean
+        }.each do |keys, value|
+          return value if keys.include?(type)
+        end
+      end
+
+      def default_cache_key(asset)
+        asset.id || raise(NotImplementedError)
+      end
+
+      def batch_each(scope, batch_size, &block)
+        scope.extension(:pagination).each_page(batch_size) do |page|
+          page.each(&block)
+        end
+      end
+
+      protected
+
+      def prefix_table_name(scope, field)
+        has_column?(scope, field) ?  [to_scope(scope).row_proc.table_name, field].join(".") : field
+      end
+
+      def column_type(scope, field)
+        has_column?(scope, field) ? to_scope(scope).row_proc.db_schema[field.to_sym][:type] : nil
+      end
+    end
+  end
+end

data/lib/datagrid/filters/base_filter.rb

@@ -89,16 +89,6 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     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)
-    else
-      default_filter_where(driver, scope, value)
-    end
-  end
-
   def supports_range?
     self.class.ancestors.include?(::Datagrid::Filters::RangedFilter)
   end
@@ -122,7 +112,7 @@ class Datagrid::Filters::BaseFilter #:nodoc:
 
   protected
 
-  def default_filter_where(driver, scope, value)
+  def default_filter_where(scope, value)
     driver.where(scope, name, value)
   end
 
@@ -150,5 +140,18 @@ class Datagrid::Filters::BaseFilter #:nodoc:
     ','
   end
 
+  def driver
+    grid_class.driver
+  end
+
+  def default_filter(value, scope, grid)
+    return nil if dummy?
+    if !driver.has_column?(scope, name) && driver.to_scope(scope).respond_to?(name)
+      driver.to_scope(scope).send(name, value)
+    else
+      default_filter_where(scope, value)
+    end
+  end
+
 end
 

data/lib/datagrid/filters/date_filter.rb

@@ -24,11 +24,11 @@ class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
     end
   end
 
-  def default_filter_where(driver, scope, value)
+  def default_filter_where(scope, value)
     if driver.is_timestamp?(scope, name)
       value = Datagrid::Utils.format_date_as_timestamp(value)
     end
-    super(driver, scope, value)
+    super(scope, value)
   end
 
   protected

data/lib/datagrid/filters/dynamic_filter.rb

@@ -26,7 +26,7 @@ class Datagrid::Filters::DynamicFilter < Datagrid::Filters::BaseFilter
     super(value)
   end
 
-  def default_filter_where(driver, scope, filter)
+  def default_filter_where(scope, filter)
     field, operation, value = filter
     date_conversion = value.is_a?(Date) && driver.is_timestamp?(scope, field)
 

data/lib/datagrid/filters/ranged_filter.rb

@@ -36,7 +36,7 @@ module Datagrid::Filters::RangedFilter
     options[:range]
   end
 
-  def default_filter_where(driver, scope, value)
+  def default_filter_where(scope, value)
     if range? && value.is_a?(Array)
       left, right = value
       if left
@@ -47,7 +47,7 @@ module Datagrid::Filters::RangedFilter
       end
       scope
     else 
-      super(driver, scope, value)
+      super(scope, value)
     end
   end
 

data/lib/datagrid/form_builder.rb

@@ -33,7 +33,7 @@ module Datagrid
     end
 
     def datagrid_boolean_filter(attribute_or_filter, options = {})
-      check_box(datagrid_get_attribute(attribute_or_filter), options.reverse_merge(datagrid_extra_checkbox_options))
+      check_box(datagrid_get_attribute(attribute_or_filter), options)
     end
 
     def datagrid_date_filter(attribute_or_filter, options = {})

data/lib/datagrid/locale/en.yml

@@ -6,23 +6,11 @@ en:
       order:
         asc: "↑"
         desc: "↓"
+      no_columns: "No columns selected"
     form:
       search: "Search"
       reset: "Reset"
     filters:
-      #integer:
-        #range_format:
-          #"%{from_input}<span class=\"separator integer\"> - </span>%{to_input}"
-      #date:
-        #range_format:
-          #"%{from_input}<span class=\"separator date\"> - </span>%{to_input}"
-      #datetime:
-        #range_format:
-          #"%{from_input}<span class=\"separator datetime\"> - </span>%{to_input}"
-      #float:
-        #range_format:
-          #"%{from_input}<span class=\"separator float\"> - </span>%{to_input}"
-
       xboolean:
         "yes": "Yes"
         "no": "No"

data/lib/datagrid/rspec.rb

@@ -38,7 +38,7 @@ shared_examples_for "Datagrid" do
             "text"
           when :date
             1.day.ago
-          when :eboolean
+          when :xboolean, :eboolean
             Datagrid::Filters::BooleanEnumFilter::YES
           when :boolean
             true

data/lib/datagrid/utils.rb

@@ -96,13 +96,13 @@ module Datagrid
         if value.is_a?(String)
           Array(Datagrid.configuration.datetime_formats).each do |format|
             begin
-              return DateTime.strptime(value, format)
+              return Time.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)
+        return Time.parse(value) if value.is_a?(String)
+        return value.to_time if value.respond_to?(:to_time)
         value
       rescue ::ArgumentError
         nil

data/spec/datagrid/column_names_attribute_spec.rb

@@ -39,6 +39,12 @@ describe Datagrid::ColumnNamesAttribute do
     expect(subject.row_for(entry)).to eq(["hello", "greeting"])
   end
 
+  it "should show mandatory columns even if they are unselected" do
+    subject.column_names = ["category"]
+    expect(subject.row_for(entry)).to eq(["hello", "greeting"])
+    expect(subject.data).to eq([["Name", "Category"], ["hello", "greeting"]])
+  end
+
   it "should find any column by name" do
     expect(subject.column_by_name(:id)).not_to be_nil
     expect(subject.column_by_name(:name)).not_to be_nil

data/spec/datagrid/drivers/active_record_spec.rb

@@ -20,4 +20,34 @@ describe Datagrid::Drivers::ActiveRecord do
     scope = subject.append_column_queries(Entry.where({}), [Datagrid::Columns::Column.new(test_report_class, :sum_group_id, 'sum(entries.group_id)')])
     expect(scope.to_sql.strip).to eq('SELECT "entries".*, sum(entries.group_id) AS sum_group_id FROM "entries"')
   end
+
+
+  describe "gotcha #datagrid_where_by_timestamp" do
+
+    subject do
+      test_report(created_at: 10.days.ago..5.days.ago) do
+        scope {Entry}
+
+        filter(:created_at, :date, range: true) do |value, scope, grid|
+          scope.joins(:group).datagrid_where_by_timestamp("groups.created_at", value)
+        end
+      end.assets
+    end
+    it "includes object created in proper range" do
+      expect(subject).to include(
+        Entry.create!(group: Group.create!(created_at: 7.days.ago)),
+      )
+    end
+
+    it "excludes object created before the range" do
+      expect(subject).to_not include(
+        Entry.create!(created_at: 7.days.ago, group: Group.create!(created_at: 11.days.ago)),
+      )
+    end
+    it "excludes object created after the range" do
+      expect(subject).to_not include(
+        Entry.create!(created_at: 7.days.ago, group: Group.create!(created_at: 4.days.ago)),
+      )
+    end
+  end
 end

data/spec/datagrid/drivers/sequel_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Datagrid::Drivers::Sequel do
+
+  describe ".match?" do
+    
+    subject { described_class }
+
+    it {should be_match(SequelEntry)}
+    it {should be_match(SequelEntry.where(:id => 1))}
+    it {should_not be_match(Entry.where(:id => 1))}
+
+  end
+  describe "api" do
+
+    subject do
+      SequelGrid.new(
+        defined?(_attributes) ? _attributes : {}
+      )
+    end
+
+    let!(:first) do
+      SequelEntry.create(
+        :group_id => 2,
+        :name => "Main First",
+        :disabled => false
+      )
+    end
+    let!(:second) do
+      SequelEntry.create(
+        :group_id => 3,
+        :name => "Main Second",
+        :disabled => true
+      )
+    end
+
+
+    describe '#assets' do
+      subject { super().assets }
+      it {should include(first, second)}
+    end
+
+    describe '#assets' do
+      subject { super().assets }
+      describe '#size' do
+        subject { super().count }
+        it {should == 2}
+      end
+    end
+
+    describe '#rows' do
+      subject { super().rows }
+      it {should == [["Main First", 2, false], ["Main Second", 3, true]]}
+    end
+
+    describe '#header' do
+      subject { super().header }
+      it {should ==[ "Name", "Group", "Disabled"]}
+    end
+
+    describe '#data' do
+      subject { super().data }
+      it {should == [[ "Name", "Group", "Disabled"], ["Main First", 2, false], ["Main Second", 3, true]]}
+    end
+
+
+    describe "when some filters specified" do
+      let(:_attributes) { {:from_group_id => 3} }
+
+      describe '#assets' do
+        subject { super().assets.map(&:id) }
+        it {should_not include(first.id)}
+      end
+
+      describe '#assets' do
+        subject { super().assets }
+        it {should include(second)}
+      end
+    end
+
+    describe "when reverse ordering is specified" do
+      let(:_attributes) { {:order => :name, :descending => true} }
+
+      describe '#rows' do
+        subject { super().rows }
+        it {should == [["Main Second", 3, true], ["Main First", 2, false]]}
+      end
+    end
+
+    it "should provide default order for non declared fields" do
+      expect {
+        test_report(:order => :test) do
+          scope { SequelEntry }
+          column(:test) do
+            'test'
+          end
+        end.assets
+      }.to raise_error(Datagrid::OrderUnsupported)
+    end
+
+    it "should support batch_size" do
+      report = test_report do
+        scope { SequelEntry }
+        self.batch_size = 1 
+        column(:name)
+      end
+
+      expect(report.data).to eq([["Name"], ["Main First"], ["Main Second"]])
+    end
+  end
+end

data/spec/datagrid/filters/date_filter_spec.rb

@@ -15,7 +15,7 @@ describe Datagrid::Filters::DateFilter do
     expect(report.assets).not_to include(e3)
   end
 
-  {:active_record => Entry, :mongoid => MongoidEntry}.each do |orm, klass|
+  {:active_record => Entry, :mongoid => MongoidEntry, :sequel => SequelEntry}.each do |orm, klass|
     describe "with orm #{orm}", orm => true do
       describe "date to timestamp conversion" do
         let(:klass) { klass }
@@ -127,7 +127,7 @@ describe Datagrid::Filters::DateFilter do
       end
     end
     expect(report.assets).not_to include(Entry.create!(:created_at => 1.day.ago))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.now))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.now))
   end
 
 

data/spec/datagrid/filters/date_time_filter_spec.rb

@@ -22,17 +22,17 @@ describe Datagrid::Filters::DateTimeFilter do
         end
 
         context "when single datetime paramter given" do
-          let(:_created_at) { DateTime.now }
-          it { should include(entry_dated(_created_at))}
+          let(:_created_at) { Time.now.change(sec: 0) }
+          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] }
+          let(:_created_at) { [Time.now.beginning_of_day, Time.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(DateTime.now.end_of_day.to_datetime))}
+          it { should include(entry_dated(Date.today.to_time))}
+          it { should include(entry_dated(Time.now.end_of_day.to_time))}
           it { should_not include(entry_dated(Date.yesterday.end_of_day))}
           it { should_not include(entry_dated(Date.tomorrow.beginning_of_day))}
         end
@@ -42,10 +42,10 @@ describe Datagrid::Filters::DateTimeFilter do
   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
+    e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => [Time.new(2013, 1, 1, 1, 30).to_s, Time.new(2013, 1, 1, 2, 30).to_s]) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
@@ -55,10 +55,10 @@ describe Datagrid::Filters::DateTimeFilter do
   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
+    e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => [Time.new(2013, 1, 1, 1, 30).to_s, nil]) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
@@ -68,10 +68,10 @@ describe Datagrid::Filters::DateTimeFilter do
   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
+    e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => [nil, Time.new(2013, 1, 1, 2, 30).to_s]) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
@@ -82,10 +82,10 @@ describe Datagrid::Filters::DateTimeFilter do
 
   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
+    e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => (Time.new(2013, 1, 1, 2, 0)..Time.new(2013, 1, 1, 2, 0))) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
@@ -95,10 +95,10 @@ describe Datagrid::Filters::DateTimeFilter do
   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
+    e1 = Entry.create!(:created_at => Time.new(2013, 1, 1, 1, 0))
+    e2 = Entry.create!(:created_at => Time.new(2013, 1, 1, 2, 0))
+    e3 = Entry.create!(:created_at => Time.new(2013, 1, 1, 3, 0))
+    report = test_report(:created_at => (Time.new(2013, 1, 1, 3, 0)..Time.new(2013, 1, 1, 1, 0))) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true)
     end
@@ -109,14 +109,14 @@ describe Datagrid::Filters::DateTimeFilter do
 
 
   it "should support block" do
-    report = test_report(:created_at => DateTime.now) do
+    report = test_report(:created_at => Time.now) do
       scope { Entry }
       filter(:created_at, :datetime, :range => true) do |value|
         where("created_at >= ?", value)
       end
     end
     expect(report.assets).not_to include(Entry.create!(:created_at => 1.day.ago))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.tomorrow))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.now+1.day))
   end
 
 
@@ -132,15 +132,15 @@ describe Datagrid::Filters::DateTimeFilter do
         scope  {Entry}
         filter(:created_at, :datetime)
       end
-      expect(report.created_at).to eq(DateTime.new(2013,10,01,1,0))
+      expect(report.created_at).to eq(Time.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
+      report = test_report(:created_at => Time.parse("2013-10-01 01:00")) do
         scope  {Entry}
         filter(:created_at, :datetime)
       end
-      expect(report.created_at).to eq(DateTime.new(2013,10,01,1,0))
+      expect(report.created_at).to eq(Time.new(2013,10,01,1,0))
     end
   end
 
@@ -150,6 +150,6 @@ describe Datagrid::Filters::DateTimeFilter do
       scope  {Entry}
       filter(:created_at, :datetime, :range => true)
     end
-    expect(report.created_at).to eq([DateTime.new(2012, 01, 01, 1, 0), DateTime.new(2013, 01, 01, 1, 0)])
+    expect(report.created_at).to eq([Time.new(2012, 01, 01, 1, 0), Time.new(2013, 01, 01, 1, 0)])
   end
 end

data/spec/datagrid/filters/dynamic_filter_spec.rb

@@ -77,33 +77,33 @@ describe Datagrid::Filters::DynamicFilter do
   it "should support date comparation operation by timestamp column" do
     report.condition = [:created_at, "<=", '1986-08-05']
     expect(report.condition).to eq([:created_at, "<=", Date.parse('1986-08-05')])
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-04 01:01:01')))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-05 23:59:59')))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-05 00:00:00')))
-    expect(report.assets).not_to include(Entry.create!(:created_at => DateTime.parse('1986-08-06 00:00:00')))
-    expect(report.assets).not_to include(Entry.create!(:created_at => DateTime.parse('1986-08-06 23:59:59')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-04 01:01:01')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-05 23:59:59')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-05 00:00:00')))
+    expect(report.assets).not_to include(Entry.create!(:created_at => Time.parse('1986-08-06 00:00:00')))
+    expect(report.assets).not_to include(Entry.create!(:created_at => Time.parse('1986-08-06 23:59:59')))
   end
 
   it "should support date = operation by timestamp column" do
     report.condition = [:created_at, "=", '1986-08-05']
     expect(report.condition).to eq([:created_at, "=", Date.parse('1986-08-05')])
-    expect(report.assets).not_to include(Entry.create!(:created_at => DateTime.parse('1986-08-04 23:59:59')))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-05 23:59:59')))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-05 00:00:01')))
+    expect(report.assets).not_to include(Entry.create!(:created_at => Time.parse('1986-08-04 23:59:59')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-05 23:59:59')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-05 00:00:01')))
     #TODO: investigate SQLite issue and uncomment this line
-    #report.assets.should include(Entry.create!(:created_at => DateTime.parse('1986-08-05 00:00:00')))
-    expect(report.assets).not_to include(Entry.create!(:created_at => DateTime.parse('1986-08-06 23:59:59')))
+    #report.assets.should include(Entry.create!(:created_at => Time.parse('1986-08-05 00:00:00')))
+    expect(report.assets).not_to include(Entry.create!(:created_at => Time.parse('1986-08-06 23:59:59')))
   end
 
   it "should support date =~ operation by timestamp column" do
     report.condition = [:created_at, "=~", '1986-08-05']
     expect(report.condition).to eq([:created_at, "=~", Date.parse('1986-08-05')])
-    expect(report.assets).not_to include(Entry.create!(:created_at => DateTime.parse('1986-08-04 23:59:59')))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-05 23:59:59')))
-    expect(report.assets).to include(Entry.create!(:created_at => DateTime.parse('1986-08-05 00:00:01')))
+    expect(report.assets).not_to include(Entry.create!(:created_at => Time.parse('1986-08-04 23:59:59')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-05 23:59:59')))
+    expect(report.assets).to include(Entry.create!(:created_at => Time.parse('1986-08-05 00:00:01')))
     #TODO: investigate SQLite issue and uncomment this line
-    #report.assets.should include(Entry.create!(:created_at => DateTime.parse('1986-08-05 00:00:00')))
-    expect(report.assets).not_to include(Entry.create!(:created_at => DateTime.parse('1986-08-06 23:59:59')))
+    #report.assets.should include(Entry.create!(:created_at => Time.parse('1986-08-05 00:00:00')))
+    expect(report.assets).not_to include(Entry.create!(:created_at => Time.parse('1986-08-06 23:59:59')))
   end
 
   it "should support operations for invalid date" do

data/spec/datagrid/form_builder_spec.rb

@@ -346,16 +346,29 @@ describe Datagrid::FormBuilder do
       end
     end
 
-    context "with eboolean filter type" do
+    context "with boolean filter type" do
       let(:_filter) { :disabled }
       let(:_grid) do
         test_report do
           scope {Entry}
-          filter(:disabled, :eboolean)
+          filter(:disabled, :boolean, default: true)
         end
       end
       it { should equal_to_dom(
-        '<select class="disabled boolean_enum_filter" id="report_disabled" name="report[disabled]"><option value=""></option>
+        # hidden is important when default is set to true
+        '<input name="report[disabled]" type="hidden" value="0"><input checked class="disabled boolean_filter" id="report_disabled" name="report[disabled]" type="checkbox" value="1">'
+      )}
+    end
+    context "with xboolean filter type" do
+      let(:_filter) { :disabled }
+      let(:_grid) do
+        test_report do
+          scope {Entry}
+          filter(:disabled, :xboolean)
+        end
+      end
+      it { should equal_to_dom(
+        '<select class="disabled extended_boolean_filter" id="report_disabled" name="report[disabled]"><option value=""></option>
        <option value="YES">Yes</option>
        <option value="NO">No</option></select>'
       )}

data/spec/datagrid/helper_spec.rb

@@ -31,6 +31,7 @@ describe Datagrid::Helper do
     let(:grid) do
       test_report do
         scope { Entry.where("1 != 1") }
+        column(:id)
       end
     end
 
@@ -55,6 +56,7 @@ describe Datagrid::Helper do
         class TestGrid
           include Datagrid
           scope { Entry }
+          column(:id)
         end
       end
       expect(subject.datagrid_table(::Ns23::TestGrid.new)).to match_css_pattern(
@@ -128,6 +130,18 @@ describe Datagrid::Helper do
       end
     end
 
+    context "when grid has no columns" do
+      let(:grid) do
+        test_report do
+          scope {Entry}
+        end
+      end
+
+      it "should render no_columns message" do
+        expect(subject.datagrid_table(grid, [entry])).to equal_to_dom("No columns selected")
+      end
+    end
+
     context 'with partials attribute' do
       let(:grid) do
         test_report do

data/spec/spec_helper.rb

@@ -75,6 +75,7 @@ RSpec.configure do |config|
     #TODO better database truncation
     Group.delete_all
     Entry.delete_all
+    SequelEntry.where.delete
     unless NO_MONGO
       MongoidEntry.delete_all
       MongoMapperEntry.delete_all
@@ -99,6 +100,4 @@ end
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/schema.rb"].each {|f| require f}
-Dir["#{File.dirname(__FILE__)}/support/mongoid.rb"].each {|f| require f}
-Dir["#{File.dirname(__FILE__)}/support/mongo_mapper.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/support/mongo_mapper.rb

@@ -8,7 +8,7 @@ class MongoMapperEntry
   key :category, String
   key :disabled, Boolean, :default => false
   key :confirmed, Boolean, :default => false
-  key :shipping_date, DateTime
+  key :shipping_date, Time
   timestamps!
 
 end
@@ -22,7 +22,7 @@ class MongoMapperGrid
 
   filter :name
   integer_range_filters(:group_id, {:default => 0}, {:default => 100})
-  filter :disabled, :eboolean
+  filter :disabled, :xboolean
 
   column :name
   column :group_id

data/spec/support/mongoid.rb

@@ -13,7 +13,7 @@ class MongoidEntry
   field :category, :type => String
   field :disabled, :default => false, :type => Boolean
   field :confirmed, :default => false, :type => Boolean
-  field :shipping_date, :type => DateTime
+  field :shipping_date, :type => Time
 
 end
 
@@ -26,7 +26,7 @@ class MongoidGrid
 
   filter :name
   integer_range_filters(:group_id, {:default => 0}, {:default => 100})
-  filter :disabled, :eboolean
+  filter :disabled, :xboolean
 
   column :name
   column :group_id

data/spec/support/sequel.rb

@@ -0,0 +1,39 @@
+require "sequel"
+
+
+DB = Sequel.sqlite # memory database
+
+DB.create_table :sequel_entries do
+  primary_key :id
+
+  Integer :group_id
+  String :name
+  String :category
+  Boolean :disabled
+  Boolean :confirmed
+  Time :shipping_date
+  Time :created_at
+end
+
+class SequelEntry < Sequel::Model
+
+end
+
+
+class SequelGrid
+  include ::Datagrid
+
+  scope do
+    SequelEntry
+  end
+
+  filter :name
+  integer_range_filters(:group_id, {:default => 0}, {:default => 100})
+  filter :disabled, :xboolean
+
+  column :name
+  column :group_id
+  column :disabled
+
+end
+

data/spec/support/simple_report.rb

@@ -29,7 +29,7 @@ class SimpleReport
 
   filter(:group_id, :integer, :multiple => true)
   filter(:category, :enum, :select => ["first", "second"])
-  filter(:disabled, :eboolean)
+  filter(:disabled, :xboolean)
   filter(:confirmed, :boolean)
 
   filter(:name) do |value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  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: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +154,14 @@ dependencies:
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
@@ -217,6 +231,7 @@ files:
 - lib/datagrid/drivers/array.rb
 - lib/datagrid/drivers/mongo_mapper.rb
 - lib/datagrid/drivers/mongoid.rb
+- lib/datagrid/drivers/sequel.rb
 - lib/datagrid/engine.rb
 - lib/datagrid/filters.rb
 - lib/datagrid/filters/base_filter.rb
@@ -251,6 +266,7 @@ files:
 - spec/datagrid/drivers/array_spec.rb
 - spec/datagrid/drivers/mongo_mapper_spec.rb
 - spec/datagrid/drivers/mongoid_spec.rb
+- spec/datagrid/drivers/sequel_spec.rb
 - spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
 - spec/datagrid/filters/date_filter_spec.rb
@@ -276,6 +292,7 @@ files:
 - spec/support/matchers.rb
 - spec/support/mongo_mapper.rb
 - spec/support/mongoid.rb
+- spec/support/sequel.rb
 - spec/support/simple_report.rb
 - spec/support/test_partials/_actions.html.erb
 - spec/support/test_partials/client/datagrid/_form.html.erb