Commit 9ddaf36992088373374f995e2eda32e8625028a6
1 parent
e129fe14
Exists in
master
and in
18 other branches
Simplify version check
Showing
4 changed files
with
5 additions
and
5 deletions
Show diff stats
lib/searchkick.rb
| @@ -95,7 +95,7 @@ module Searchkick | @@ -95,7 +95,7 @@ module Searchkick | ||
| 95 | end | 95 | end |
| 96 | 96 | ||
| 97 | def self.server_below?(version) | 97 | def self.server_below?(version) |
| 98 | - Gem::Version.new(server_version.sub("-", ".")) < Gem::Version.new(version.sub("-", ".")) | 98 | + Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0]) |
| 99 | end | 99 | end |
| 100 | 100 | ||
| 101 | def self.search(term = "*", model: nil, **options, &block) | 101 | def self.search(term = "*", model: nil, **options, &block) |
lib/searchkick/index.rb
| @@ -17,7 +17,7 @@ module Searchkick | @@ -17,7 +17,7 @@ module Searchkick | ||
| 17 | end | 17 | end |
| 18 | 18 | ||
| 19 | def delete | 19 | def delete |
| 20 | - if !Searchkick.server_below?("6.0.0-alpha1") && alias_exists? | 20 | + if !Searchkick.server_below?("6.0.0") && alias_exists? |
| 21 | # can't call delete directly on aliases in ES 6 | 21 | # can't call delete directly on aliases in ES 6 |
| 22 | indices = client.indices.get_alias(name: name).keys | 22 | indices = client.indices.get_alias(name: name).keys |
| 23 | client.indices.delete index: indices | 23 | client.indices.delete index: indices |
lib/searchkick/index_options.rb
| @@ -11,7 +11,7 @@ module Searchkick | @@ -11,7 +11,7 @@ module Searchkick | ||
| 11 | settings = options[:settings] || {} | 11 | settings = options[:settings] || {} |
| 12 | mappings = options[:mappings] | 12 | mappings = options[:mappings] |
| 13 | else | 13 | else |
| 14 | - below60 = Searchkick.server_below?("6.0.0-alpha1") | 14 | + below60 = Searchkick.server_below?("6.0.0") |
| 15 | below62 = Searchkick.server_below?("6.2.0") | 15 | below62 = Searchkick.server_below?("6.2.0") |
| 16 | 16 | ||
| 17 | default_type = "text" | 17 | default_type = "text" |
lib/searchkick/query.rb
| @@ -963,11 +963,11 @@ module Searchkick | @@ -963,11 +963,11 @@ module Searchkick | ||
| 963 | end | 963 | end |
| 964 | 964 | ||
| 965 | def below60? | 965 | def below60? |
| 966 | - Searchkick.server_below?("6.0.0-alpha1") | 966 | + Searchkick.server_below?("6.0.0") |
| 967 | end | 967 | end |
| 968 | 968 | ||
| 969 | def below61? | 969 | def below61? |
| 970 | - Searchkick.server_below?("6.1.0-alpha1") | 970 | + Searchkick.server_below?("6.1.0") |
| 971 | end | 971 | end |
| 972 | end | 972 | end |
| 973 | end | 973 | end |