Skip to content

Commit db76973

Browse files
committed
Fix Rubocop offenses
1 parent f342bab commit db76973

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

.rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ AllCops:
88
- gemfiles/*
99
- spec/**/*
1010

11+
Gemspec/DevelopmentDependencies:
12+
Enabled: false
13+
1114
Style/Documentation:
1215
Enabled: false
1316

lib/ajax-datatables-rails/base.rb

+3-11
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,15 @@ def column_data(column)
101101

102102
# helper methods
103103
def connected_columns
104-
@connected_columns ||= begin
105-
view_columns.keys.map do |field_name|
106-
datatable.column_by(:data, field_name.to_s)
107-
end.compact
108-
end
104+
@connected_columns ||= view_columns.keys.map { |field_name| datatable.column_by(:data, field_name.to_s) }.compact
109105
end
110106

111107
def searchable_columns
112-
@searchable_columns ||= begin
113-
connected_columns.select(&:searchable?)
114-
end
108+
@searchable_columns ||= connected_columns.select(&:searchable?)
115109
end
116110

117111
def search_columns
118-
@search_columns ||= begin
119-
searchable_columns.select(&:searched?)
120-
end
112+
@search_columns ||= searchable_columns.select(&:searched?)
121113
end
122114

123115
def sanitize_data(data)

lib/ajax-datatables-rails/datatable/column.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def casted_column
100100
end
101101

102102
def validate_settings!
103-
raise AjaxDatatablesRails::Error::InvalidSearchColumn, "Unknown column. Check that `data` field is filled on JS side with the column name" if column_name.empty?
103+
raise AjaxDatatablesRails::Error::InvalidSearchColumn, 'Unknown column. Check that `data` field is filled on JS side with the column name' if column_name.empty?
104104
raise AjaxDatatablesRails::Error::InvalidSearchColumn, "Check that column '#{column_name}' exists in view_columns" unless valid_search_column?(column_name)
105105
raise AjaxDatatablesRails::Error::InvalidSearchCondition, cond unless valid_search_condition?(cond)
106106
end

0 commit comments

Comments
 (0)