datagrid 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a9a3ff232cd83f323e280e35a805ebd4ec725b74b531c18328c4de27952f2f
-  data.tar.gz: c91f39764fa86f0d8b016de33eeabfd37b47d16411f3f52ec796f2bf1d14d534
+  metadata.gz: bd828dc639436b3eedd26fad706bb0ba844b62229209dc941019a09e63301d77
+  data.tar.gz: 05c04ebc0ecd2f7b780964ea08677c451ac5c00353dda901af57cc8a447b18ec
 SHA512:
-  metadata.gz: b999afc64d7094dfd47a2e4f393824df58edf15769c445a9d16712dc6f531f3b30f872046cd657bc9323df6a460b4d1a74334fc4b498de141a9998d3aa6c34bc
-  data.tar.gz: 89d0e83bd75e28ee33dc890d2f5f82de6391a9d32b0723e77afa8dfc0856d126c1fe0ee4c8ab5b0b2f5491e5908b45e14de0bd18669c2786764faeac8c6fc0c2
+  metadata.gz: a7f7d6ab72a350bf5f88b5e41707204fa0d1791cc1b382b66d704b2380bffb96280e508b68896ac4e8bf158d7e36bf030c3aa4744134b07c3c0f41651c7fe256
+  data.tar.gz: b07edf4527a83375d94b5cb9d1730c855e595f029bcdd77e9a311e0745a14acc3797b2e9af2d0335977f2718a7e9756bf753a468280511920d2908a385283878

data/Gemfile

@@ -6,17 +6,21 @@ group :development do
 
   gem "bundler"
   if RUBY_VERSION >= "2.3"
-    gem "jeweler", ">= 2.1.2", platform: [:ruby_23, :ruby_24, :ruby_25]
+    gem "jeweler", ">= 2.1.2", platform: [:ruby_23, :ruby_24, :ruby_25, :ruby_26], git: 'git@github.com:technicalpickles/jeweler.git'
   end
 
 
   #gem "json", ">= 1.9"
-  gem "pry-byebug", :platform => [:ruby_24, :ruby_25, :ruby_22, :ruby_23] & Bundler::Dsl::VALID_PLATFORMS
+  gem "pry-byebug"
 
   gem "rspec", ">= 3"
   gem "nokogiri" # used to test html output
 
-  gem "sqlite3", "~> 1.3.6"
+  if RUBY_VERSION >= "2.5"
+    gem "sqlite3", "~> 1.4", platform: [:ruby_25, :ruby_26]
+  else
+    gem "sqlite3", "~> 1.3.6"
+  end
   gem "sequel"
 
   group :mongo do

data/Readme.markdown

@@ -1,6 +1,7 @@
 # Datagrid
 
 [![Build Status](https://travis-ci.org/bogdan/datagrid.svg?branch=master)](https://travis-ci.org/bogdan/datagrid)
+
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid?ref=badge_shield)
 
 Ruby library that helps you to build and represent table-like data with:
@@ -201,4 +202,4 @@ Read [author blog](http://gusiev.com).
 
 
 ## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid?ref=badge_large)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid?ref=badge_large)

data/VERSION

@@ -1 +1 @@
-1.5.9
+1.6.0

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.5.9 ruby lib
+# stub: datagrid 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid".freeze
-  s.version = "1.5.9"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Bogdan Gusiev".freeze]
-  s.date = "2019-05-10"
+  s.date = "2020-03-31"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters".freeze
   s.email = "agresso@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -130,7 +130,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bogdan/datagrid".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "2.7.8".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "Ruby gem to create datagrids".freeze
 
   if s.respond_to? :specification_version then
@@ -143,7 +143,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry-byebug>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 3"])
       s.add_development_dependency(%q<nokogiri>.freeze, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>.freeze, ["~> 1.3.6"])
+      s.add_development_dependency(%q<sqlite3>.freeze, ["~> 1.4"])
       s.add_development_dependency(%q<sequel>.freeze, [">= 0"])
       s.add_development_dependency(%q<mongoid>.freeze, [">= 0"])
       s.add_development_dependency(%q<bson>.freeze, [">= 0"])
@@ -155,7 +155,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
       s.add_dependency(%q<rspec>.freeze, [">= 3"])
       s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
-      s.add_dependency(%q<sqlite3>.freeze, ["~> 1.3.6"])
+      s.add_dependency(%q<sqlite3>.freeze, ["~> 1.4"])
       s.add_dependency(%q<sequel>.freeze, [">= 0"])
       s.add_dependency(%q<mongoid>.freeze, [">= 0"])
       s.add_dependency(%q<bson>.freeze, [">= 0"])
@@ -168,7 +168,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 3"])
     s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
-    s.add_dependency(%q<sqlite3>.freeze, ["~> 1.3.6"])
+    s.add_dependency(%q<sqlite3>.freeze, ["~> 1.4"])
     s.add_dependency(%q<sequel>.freeze, [">= 0"])
     s.add_dependency(%q<mongoid>.freeze, [">= 0"])
     s.add_dependency(%q<bson>.freeze, [">= 0"])

data/lib/datagrid/columns.rb

@@ -16,6 +16,7 @@ module Datagrid
         self.default_column_options = {}
 
         class_attribute :batch_size
+        self.batch_size = 1000
 
         class_attribute :columns_array
         self.columns_array = []

data/lib/datagrid/drivers/mongoid.rb

@@ -12,7 +12,11 @@ module Datagrid
       end
 
       def to_scope(scope)
-        scope.where(nil)
+        if scope.respond_to?(:all)
+          scope.all
+        else
+          scope.where(nil)
+        end
       end
 
       def where(scope, attribute, value)

data/spec/datagrid/filters/date_filter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require "active_support/testing/time_helpers"
 
 describe Datagrid::Filters::DateFilter do
 
@@ -122,14 +123,16 @@ describe Datagrid::Filters::DateFilter do
 
 
   it "should support block" do
-    report = test_report(:created_at => Date.today) do
+    date = Date.new(2018, 01, 07)
+    time = date.to_time + 2.hours + 2.minutes
+    report = test_report(:created_at => date) do
       scope { Entry }
       filter(:created_at, :date, :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 => Time.now))
+    expect(report.assets).not_to include(Entry.create!(:created_at => time - 1.day))
+    expect(report.assets).to include(Entry.create!(:created_at => time))
   end
 
 

data/spec/datagrid/form_builder_spec.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'spec_helper'
+require "action_controller"
 
 class MyFormBuilder
   include Datagrid::FormBuilder
@@ -11,19 +12,15 @@ end
 
 
 describe Datagrid::FormBuilder do
-
   let(:template) do
-    ActionView::Base.new.tap do |v|
-      v.view_paths << File.expand_path("../../../app/views", __FILE__)
-      v.view_paths << File.expand_path("../../support/test_partials", __FILE__)
-    end
+    action_view_template
   end
+
   let(:view) { ActionView::Helpers::FormBuilder.new(:report, _grid, template, view_options)}
   let(:view_options) { {} }
 
 
   describe ".datagrid_filter" do
-
     it "should work for every filter type" do
       Datagrid::Filters::FILTER_TYPES.each do |type, klass|
         expect(Datagrid::FormBuilder.instance_methods.map(&:to_sym)).to include(klass.form_builder_helper_name)

data/spec/datagrid/helper_spec.rb

@@ -1,16 +1,13 @@
 require 'spec_helper'
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
+require "action_controller"
 
 require 'datagrid/renderer'
 
 describe Datagrid::Helper do
   subject do
-    template = ActionView::Base.new
-    allow(template).to receive(:protect_against_forgery?).and_return(false)
-    template.view_paths << File.expand_path("../../../app/views", __FILE__)
-    template.view_paths << File.expand_path("../../support/test_partials", __FILE__)
-    template
+    action_view_template
   end
 
   before(:each) do
@@ -389,14 +386,14 @@ describe Datagrid::Helper do
     end
 
     it "should escape html" do
-      entry.update_attributes!(:name => "<div>hello</div>")
+      entry.update!(:name => "<div>hello</div>")
       expect(subject.datagrid_rows(grid, [entry], :columns => [:name])).to equal_to_dom(<<-HTML)
        <tr><td class="name">&lt;div&gt;hello&lt;/div&gt;</td></tr>
         HTML
     end
 
     it "should not escape safe html" do
-      entry.update_attributes!(:name => "<div>hello</div>")
+      entry.update!(:name => "<div>hello</div>")
       grid.column(:safe_name) do |model|
         model.name.html_safe
       end

data/spec/datagrid_spec.rb

@@ -60,8 +60,8 @@ describe Datagrid do
 
   describe ".batch_size" do
     context "when not defined on class level" do
-      it "returns nil" do
-        expect(subject.batch_size).to eq(nil)
+      it "returns 1000" do
+        expect(subject.batch_size).to eq(1000)
       end
     end
 
@@ -77,6 +77,17 @@ describe Datagrid do
       end
     end
 
+    context "when set to nil in the grid class" do
+      subject do
+        test_report do
+          self.batch_size = nil
+        end
+      end
+
+      it "returns nil" do
+        expect(subject.batch_size).to eq(nil)
+      end
+    end
   end
 
 

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'action_view'
 require "rails"
 require "mongoid"
 begin
-require 'mongo_mapper'
+  require 'mongo_mapper'
 rescue LoadError
 end
 
@@ -55,9 +55,11 @@ begin
         "database" =>"datagrid_mongoid",
         "autocreate_indexes" => true,
         "logger" => nil,
-        "options" => {
-          "connect_timeout" => 2,
-          wait_queue_timeout: 2
+        options: {
+          connect_timeout: 2,
+          wait_queue_timeout: 2,
+          server_selection_timeout: 2,
+          socket_timeout: 1
         }
       }
     }
@@ -80,8 +82,6 @@ rescue Mongo::Error::NoServerAvailable
 end
 
 RSpec.configure do |config|
-
-
   config.after(:each) do
     #TODO better database truncation
     Group.delete_all
@@ -103,12 +103,21 @@ RSpec.configure do |config|
     #c.syntax = :expect
     c.syntax = [:should, :expect]
   end
+end
 
+def action_view_template
+  context = ActionView::LookupContext.new([
+    File.expand_path("../../app/views", __FILE__),
+    File.expand_path("../support/test_partials", __FILE__),
+  ], {})
+  klass = ActionView::Base.respond_to?(:with_empty_template_cache) ? ActionView::Base.with_empty_template_cache : ActionView::Base
+  template = klass.new(context, {}, ::ActionController::Base.new)
+  allow(template).to receive(:protect_against_forgery?).and_return(false)
+  template
 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/**/*.rb"].each {|f| require f}

data/spec/support/simple_report.rb

@@ -45,7 +45,7 @@ class SimpleReport
   end
 
   column(:actions, :html => true) do |model|
-    render :partial => "actions", :locals => {:model => model}
+    render :partial => "/actions", :locals => {:model => model}
   end
 
   column(:pet, :html => lambda {|data| content_tag :em, data}) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -299,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids