Version 2

.github/workflows/ci.yml

@@ -8,11 +8,13 @@ jobs:
       fail-fast: false
       matrix:
         # To keep matrix size down, only test highest and lowest rubies.
-        ruby: ["2.7", "3.3"]
-        rails: ["6.1", "7.0", "7.1", "7.2"]
+        ruby: ["3.0", "3.3"]
+        rails: ["7.0", "7.1", "7.2", "8.0"]
         exclude:
-          - ruby: "2.7"
+          - ruby: "3.0"
             rails: "7.2"
+          - ruby: "3.0"
+            rails: "8.0"
     name: Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}
     runs-on: ubuntu-latest
     env:

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.0.0
+
+Version 2 is a major update implementing a lot of major improvements
+at the cost of backward compatibility.
+
+[Changes and migration guide](./version-2)
+
 ## 1.8.3
 
 * Fix rails hooking for version 7.1. [#327](https://github.com/bogdan/datagrid/issues/327)

Gemfile

@@ -12,7 +12,9 @@ group :development do
   gem "debug"
   gem "nokogiri" # used to test html output
   gem "pry-byebug"
+  gem "rails-dom-testing", "~> 2.2"
   gem "rspec"
+  gem "rubocop", "~> 1.68"
   gem "sequel"
   gem "sqlite3", "~> 1.7.0"
 
@@ -21,5 +23,3 @@ group :development do
     gem "mongoid", "~> 9.0"
   end
 end
-
-gem "rubocop", "~> 1.68"

Readme.markdown

@@ -1,11 +1,13 @@
 # Datagrid
 
-[![Build Status](https://github.com/bogdan/datagrid/workflows/CI/badge.svg?branch=master)](https://github.com/bogdan/datagrid/actions)
+Datagrid Version 2.0.0 is here.
+
+[Migration Guide](./version-2).
 
-[![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)
+[![Build Status](https://github.com/bogdan/datagrid/workflows/CI/badge.svg?branch=master)](https://github.com/bogdan/datagrid/actions)
 
 A really mighty and flexible ruby library that generates reports
-including admin panels, analytics and data representation:
+including admin panels, analytics and data browsers:
 
 * Filtering
 * Columns
@@ -31,7 +33,7 @@ including admin panels, analytics and data representation:
 
 ## Documentation
 
-* [Readme](/Readme.markdown) - this read-me for basic information.
+* Readme - this read-me for basic information.
 * [Wiki](https://github.com/bogdan/datagrid/wiki) - general reference on how to use the gem.
 * [Rdoc](https://rubydoc.info/gems/datagrid) - API reference.
 
@@ -47,9 +49,7 @@ including admin panels, analytics and data representation:
 In order to create a grid:
 
 ``` ruby
-class UsersGrid
-
-  include Datagrid
+class UsersGrid < Datagrid::Base
 
   scope do
     User.includes(:group)
@@ -183,12 +183,12 @@ route  resources :skills
 insert  app/assets/stylesheet/application.css
 ```
 
-#### Customize Built-in partials
+#### Customize Built-in views
 
-In order to get a control on datagrid built-in partials run:
+In order to get a control on datagrid built-in views run:
 
 ``` sh
-rake datagrid:copy_partials
+rails g datagrid::views
 ```
 
 #### Advanced frontend

app/assets/stylesheets/datagrid.css

@@ -0,0 +1,145 @@
+/* Table */
+
+table.datagrid-table {
+  background-color: transparent;
+  border-collapse: collapse;
+  max-width: 100%;
+}
+
+table.datagrid-table th {
+  background-color: #eee;
+  text-align: left;
+  vertical-align: top;
+}
+
+table.datagrid-table td,
+table.datagrid-table th {
+  border: 1px solid #d6d6d6;
+  padding: 5px 10px;
+}
+
+.datagrid-order-control-asc,
+.datagrid-order-control-desc {
+  text-decoration: none;
+  font-weight: normal;
+}
+
+.datagrid-order-active-asc,
+.datagrid-order-active-desc {
+  background-color: #fff7d5;
+}
+
+.datagrid-order-active-asc a.datagrid-order-control-asc,
+.datagrid-order-active-desc a.datagrid-order-control-desc {
+  font-weight: bold;
+  color: #d00;
+}
+
+.datagrid-no-results {
+  text-align: center;
+}
+
+/* Form */
+
+.datagrid-form {
+  background-color: #f0f0f0;
+  border-radius: 5px;
+  padding: 20px;
+}
+
+.datagrid-filter {
+  margin: 10px;
+}
+
+.datagrid-filter label {
+  width: 150px;
+  display: inline-block;
+}
+
+.datagrid-filter input, .datagrid-filter select {
+  border: 2px solid #ccc;
+  border-radius: 4px;
+  display: inline-block;
+  padding: 5px 12px;
+  width: 300px;
+}
+
+input.datagrid-range-from, input.datagrid-range-to {
+  width: 138px;
+}
+
+.datagrid-filter select[multiple] {
+  border: 2px solid #ccc;
+  border-radius: 5px;
+  height: 100px;
+}
+
+select.datagrid-dynamic-field {
+  width: 228px
+}
+
+select.datagrid-dynamic-operation {
+  margin-left: 7px;
+  width: 60px;
+}
+
+.datagrid-dynamic-value {
+  margin: 10px 0 0 154px;
+}
+
+.datagrid-range-separator {
+  display: inline-block;
+  margin: 6px 4px 0;
+}
+
+.datagrid-enum-checkboxes {
+  display: inline-block;
+}
+
+.datagrid-enum-checkboxes input {
+  margin: 7px;
+  width: auto;
+}
+
+.datagrid-enum-checkboxes label {
+  display: block;
+  width: 100%;
+}
+
+.datagrid-actions {
+  padding-left: calc(150px + 10px);
+}
+
+.datagrid-submit {
+  background-color: #555;
+  border: none;
+  border-radius: 5px;
+  color: white;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: bold;
+  line-height: normal;
+  padding: 7px 15px;
+  vertical-align: middle;
+  display: inline-block;
+  zoom: 1;
+  *display: inline;
+}
+
+.datagrid-submit:hover,
+.datagrid-submit:focus {
+  background-color: #333;
+}
+
+.datagrid-submit:active {
+  background-color: #000;
+}
+
+.datagrid-reset {
+  font-size: 14px;
+  padding: 7px 15px;
+  vertical-align: middle;
+  display: inline-block;
+  zoom: 1;
+  *display: inline;
+}

app/views/datagrid/_enum_checkboxes.html.erb

@@ -2,10 +2,12 @@
 Indent in this file may cause extra space to appear.
 You can add indent if whitespace doesn't matter for you
 %>
-<%- elements.each do |value, text, checked| -%>
+<div class="datagrid-enum-checkboxes">
+<%- choices.each do |value, text| -%>
 <%- id = [form.object_name, filter.name, value].join('_').underscore -%>
-<%= form.label filter.name, options.merge(for: id) do -%>
-<%= form.check_box(filter.name, {multiple: true, id: id, checked: checked, include_hidden: false}, value.to_s, nil) -%>
+<%= form.datagrid_label(filter.name, for: id, **options) do -%>
+<%= form.datagrid_filter_input(filter.name, id: id, value: value) -%>
 <%= text -%>
 <%- end -%>
 <%- end -%>
+</div>