File tree 4 files changed +9
-13
lines changed
lib/ajax-datatables-rails
4 files changed +9
-13
lines changed Original file line number Diff line number Diff line change 2
2
3
3
require 'yaml'
4
4
5
- rails_versions = YAML . safe_load ( File . read ( 'appraisal.yml' ) )
5
+ rails_versions = YAML . safe_load_file ( 'appraisal.yml' )
6
6
7
7
rails_versions . each do |version , gems |
8
8
appraise "rails_#{ version } " do
@@ -16,12 +16,10 @@ rails_versions.each do |version, gems|
16
16
gem name , opts [ 'version' ]
17
17
end
18
18
end
19
+ elsif opts [ 'version' ] . empty?
20
+ gem name
19
21
else
20
- if opts [ 'version' ] . empty?
21
- gem name
22
- else
23
- gem name , opts [ 'version' ]
24
- end
22
+ gem name , opts [ 'version' ]
25
23
end
26
24
end
27
25
end
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ require 'rspec/core/rake_task'
6
6
RSpec ::Core ::RakeTask . new ( :spec )
7
7
task default : :spec
8
8
9
+ desc 'Open a Ruby irb console with the gem loaded'
9
10
task :console do
10
11
require 'pry'
11
12
require 'rails'
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ def column_data(column)
102
102
103
103
# helper methods
104
104
def connected_columns
105
- @connected_columns ||= view_columns . keys . map { |field_name | datatable . column_by ( :data , field_name . to_s ) } . compact
105
+ @connected_columns ||= view_columns . keys . filter_map { |field_name | datatable . column_by ( :data , field_name . to_s ) }
106
106
end
107
107
108
108
def searchable_columns
Original file line number Diff line number Diff line change @@ -33,20 +33,17 @@ def build_conditions
33
33
end
34
34
end
35
35
36
- # rubocop:disable Metrics/AbcSize
37
36
def build_conditions_for_datatable
38
37
columns = searchable_columns . reject ( &:searched? )
39
38
search_for . inject ( [ ] ) do |crit , atom |
40
- crit << columns . map do |simple_column |
39
+ crit << columns . filter_map do |simple_column |
41
40
simple_column . search = Datatable ::SimpleSearch . new ( value : atom , regex : datatable . search . regexp? )
42
41
simple_column . search_query
43
- end . compact . reduce ( :or )
42
+ end . reduce ( :or )
44
43
end . compact . reduce ( :and )
45
44
end
46
- # rubocop:enable Metrics/AbcSize
47
-
48
45
def build_conditions_for_selected_columns
49
- search_columns . map ( &:search_query ) . compact . reduce ( :and )
46
+ search_columns . filter_map ( &:search_query ) . reduce ( :and )
50
47
end
51
48
52
49
def search_for
You can’t perform that action at this time.
0 commit comments