File tree Expand file tree Collapse file tree 4 files changed +9
-13
lines changed
lib/ajax-datatables-rails Expand file tree Collapse file tree 4 files changed +9
-13
lines changed Original file line number Diff line number Diff line change 22
33require 'yaml'
44
5- rails_versions = YAML . safe_load ( File . read ( 'appraisal.yml' ) )
5+ rails_versions = YAML . safe_load_file ( 'appraisal.yml' )
66
77rails_versions . each do |version , gems |
88 appraise "rails_#{ version } " do
@@ -16,12 +16,10 @@ rails_versions.each do |version, gems|
1616 gem name , opts [ 'version' ]
1717 end
1818 end
19+ elsif opts [ 'version' ] . empty?
20+ gem name
1921 else
20- if opts [ 'version' ] . empty?
21- gem name
22- else
23- gem name , opts [ 'version' ]
24- end
22+ gem name , opts [ 'version' ]
2523 end
2624 end
2725 end
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ require 'rspec/core/rake_task'
66RSpec ::Core ::RakeTask . new ( :spec )
77task default : :spec
88
9+ desc 'Open a Ruby irb console with the gem loaded'
910task :console do
1011 require 'pry'
1112 require 'rails'
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ def column_data(column)
102102
103103 # helper methods
104104 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 ) }
106106 end
107107
108108 def searchable_columns
Original file line number Diff line number Diff line change @@ -33,20 +33,17 @@ def build_conditions
3333 end
3434 end
3535
36- # rubocop:disable Metrics/AbcSize
3736 def build_conditions_for_datatable
3837 columns = searchable_columns . reject ( &:searched? )
3938 search_for . inject ( [ ] ) do |crit , atom |
40- crit << columns . map do |simple_column |
39+ crit << columns . filter_map do |simple_column |
4140 simple_column . search = Datatable ::SimpleSearch . new ( value : atom , regex : datatable . search . regexp? )
4241 simple_column . search_query
43- end . compact . reduce ( :or )
42+ end . reduce ( :or )
4443 end . compact . reduce ( :and )
4544 end
46- # rubocop:enable Metrics/AbcSize
47-
4845 def build_conditions_for_selected_columns
49- search_columns . map ( &:search_query ) . compact . reduce ( :and )
46+ search_columns . filter_map ( &:search_query ) . reduce ( :and )
5047 end
5148
5249 def search_for
You can’t perform that action at this time.
0 commit comments