From ef500c8d0e640c7f88562c9699a1527f3bb9e0fa Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 10 Jul 2016 12:20:16 -0700 Subject: [PATCH] Fix for Ruby 2.0 - fixes #698 --- lib/searchkick.rb | 2 +- test/aggs_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/searchkick.rb b/lib/searchkick.rb index ec38d14..ab04f74 100644 --- a/lib/searchkick.rb +++ b/lib/searchkick.rb @@ -59,7 +59,7 @@ module Searchkick end def self.server_below?(version) - Gem::Version.new(server_version) < Gem::Version.new(version) + Gem::Version.new(server_version.sub("-", ".")) < Gem::Version.new(version.sub("-", ".")) end def self.enable_callbacks diff --git a/test/aggs_test.rb b/test/aggs_test.rb index 64e563f..3042461 100644 --- a/test/aggs_test.rb +++ b/test/aggs_test.rb @@ -42,7 +42,7 @@ class AggsTest < Minitest::Test agg = Product.search("Product", aggs: {store_id: {limit: 1}}).aggs["store_id"] assert_equal 1, agg["buckets"].size # assert_equal 3, agg["doc_count"] - assert_equal(1, agg["sum_other_doc_count"]) if Gem::Version.new(Searchkick.server_version) >= Gem::Version.new("1.4.0") + assert_equal(1, agg["sum_other_doc_count"]) unless Searchkick.server_below?("1.4.0") end def test_ranges -- libgit2 0.21.0