Skip to content

Commit ab40c07

Browse files
committed
Merge branch 'main' into version-2
2 parents 42aabb1 + cfc639a commit ab40c07

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

lib/datagrid.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
require "datagrid/configuration"
55
require "datagrid/engine"
66

7-
# @main README.md
87
module Datagrid
98
# @!visibility private
109
def self.included(base)
@@ -19,15 +18,6 @@ def self.included(base)
1918
end
2019
end
2120

22-
def self.configuration
23-
@configuration ||= Configuration.new
24-
end
25-
26-
# Configure
27-
def self.configure(&block)
28-
block.call(configuration)
29-
end
30-
3121
class ConfigurationError < StandardError; end
3222
class ArgumentError < ::ArgumentError; end
3323
class ColumnUnavailableError < StandardError; end

lib/datagrid/configuration.rb

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
# frozen_string_literal: true
22

33
module Datagrid
4+
# @return [Configuration] current Datagrid configuration
5+
def self.configuration
6+
@configuration ||= Configuration.new
7+
end
8+
9+
# @yield block to configure
10+
# @yieldparam [Configuration] configuration
11+
# @yieldreturn [void]
12+
# @return [void] configure datagrid
13+
# @see Datagrid::Configuration
14+
def self.configure(&block)
15+
block.call(configuration)
16+
end
17+
418
# ## Configuration
519
#
620
# Datagrid provides several configuration options.
@@ -12,7 +26,7 @@ module Datagrid
1226
# # Defines date formats that can be used to parse dates.
1327
# # Note: Multiple formats can be specified. The first format is used to format dates as strings,
1428
# # while other formats are used only for parsing dates from strings (e.g., if your app supports multiple formats).
15-
# config.date_formats = ["%m/%d/%Y", "%Y-%m-%d"]
29+
# config.date_formats = "%m/%d/%Y", "%Y-%m-%d"
1630
#
1731
# # Defines timestamp formats that can be used to parse timestamps.
1832
# # Note: Multiple formats can be specified. The first format is used to format timestamps as strings,

lib/datagrid/filters/base_filter.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class FilteringError < StandardError
77
end
88
end
99

10-
# @!visibility private
1110
module Datagrid
1211
module Filters
1312
class BaseFilter

lib/datagrid/filters/extended_boolean_filter.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
# @!visibility private
43
module Datagrid
54
module Filters
65
class ExtendedBooleanFilter < Datagrid::Filters::EnumFilter

lib/datagrid/generators/scaffold.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
require "rails/generators"
44

5-
# @!visibility private
65
module Datagrid
76
# @!visibility private
87
module Generators

0 commit comments

Comments
 (0)