From 9ddaf36992088373374f995e2eda32e8625028a6 Mon Sep 17 00:00:00 2001
From: Andrew <acekane1@gmail.com>
Date: Wed, 18 Apr 2018 01:42:21 -0700
Subject: [PATCH] Simplify version check

---
 lib/searchkick.rb               | 2 +-
 lib/searchkick/index.rb         | 2 +-
 lib/searchkick/index_options.rb | 2 +-
 lib/searchkick/query.rb         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index 5e6e516..3833481 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -95,7 +95,7 @@ module Searchkick
   end
 
   def self.server_below?(version)
-    Gem::Version.new(server_version.sub("-", ".")) < Gem::Version.new(version.sub("-", "."))
+    Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0])
   end
 
   def self.search(term = "*", model: nil, **options, &block)
diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb
index 639ff28..4e47c92 100644
--- a/lib/searchkick/index.rb
+++ b/lib/searchkick/index.rb
@@ -17,7 +17,7 @@ module Searchkick
     end
 
     def delete
-      if !Searchkick.server_below?("6.0.0-alpha1") && alias_exists?
+      if !Searchkick.server_below?("6.0.0") && alias_exists?
         # can't call delete directly on aliases in ES 6
         indices = client.indices.get_alias(name: name).keys
         client.indices.delete index: indices
diff --git a/lib/searchkick/index_options.rb b/lib/searchkick/index_options.rb
index 0f755ec..be32f8c 100644
--- a/lib/searchkick/index_options.rb
+++ b/lib/searchkick/index_options.rb
@@ -11,7 +11,7 @@ module Searchkick
         settings = options[:settings] || {}
         mappings = options[:mappings]
       else
-        below60 = Searchkick.server_below?("6.0.0-alpha1")
+        below60 = Searchkick.server_below?("6.0.0")
         below62 = Searchkick.server_below?("6.2.0")
 
         default_type = "text"
diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
index a1bf6fc..8f5174b 100644
--- a/lib/searchkick/query.rb
+++ b/lib/searchkick/query.rb
@@ -963,11 +963,11 @@ module Searchkick
     end
 
     def below60?
-      Searchkick.server_below?("6.0.0-alpha1")
+      Searchkick.server_below?("6.0.0")
     end
 
     def below61?
-      Searchkick.server_below?("6.1.0-alpha1")
+      Searchkick.server_below?("6.1.0")
     end
   end
 end
--
libgit2 0.21.0