diff --git a/ajax-datatables-rails.gemspec b/ajax-datatables-rails.gemspec index 26cf8b82..d1cb44d6 100644 --- a/ajax-datatables-rails.gemspec +++ b/ajax-datatables-rails.gemspec @@ -25,9 +25,5 @@ Gem::Specification.new do |gem| gem.add_development_dependency "pry" gem.add_development_dependency "rake" - if RUBY_VERSION == '1.9.2' - gem.add_development_dependency "rails", "3.1.0" - else - gem.add_development_dependency "rails", ">= 3.1.0" - end + gem.add_development_dependency "rails", ">= 4.2.11.3" end diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb index bd476caa..b788fdad 100644 --- a/lib/ajax-datatables-rails/base.rb +++ b/lib/ajax-datatables-rails/base.rb @@ -113,7 +113,7 @@ def build_conditions_for(query) search_for = query.split(' ') criteria = search_for.inject([]) do |criteria, atom| criteria << searchable_columns.map { |col| search_condition(col, atom) }.reduce{|memo, node| Arel::Nodes::Grouping.new Arel::Nodes::Or.new(memo, node)} - end.reduce{|memo, node| Arel::Nodes::Grouping.new Arel::Nodes::And.new(memo, node)} + end.reduce{|memo, node| Arel::Nodes::Grouping.new Arel::Nodes::And.new([memo, node])} criteria end @@ -128,7 +128,7 @@ def aggregate_query value = params[:columns]["#{index}"][:search][:value] if params[:columns] search_condition(column, value) unless value.blank? end - conditions.compact.reduce{|memo, node| Arel::Nodes::Grouping.new Arel::Nodes::And.new(memo, node)} + conditions.compact.reduce{|memo, node| Arel::Nodes::Grouping.new Arel::Nodes::And.new([memo, node])} end def offset diff --git a/lib/ajax-datatables-rails/version.rb b/lib/ajax-datatables-rails/version.rb index 2c2a6dd7..917d3b62 100644 --- a/lib/ajax-datatables-rails/version.rb +++ b/lib/ajax-datatables-rails/version.rb @@ -1,3 +1,3 @@ module AjaxDatatablesRails - VERSION = '0.2.1' + VERSION = '0.2.2' end