github / searchkick

Download as
Browse Code ยป

Commit 9ddaf36992088373374f995e2eda32e8625028a6

Authored by Andrew
1 parent e129fe14
Exists in master and in 18 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Simplify version check

Showing 4 changed files with 5 additions and 5 deletions   Show diff stats
lib/searchkick.rb
  Diff comments   View file @9ddaf36
... ... @@ -95,7 +95,7 @@ module Searchkick
95 95 end
96 96  
97 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 99 end
100 100  
101 101 def self.search(term = "*", model: nil, **options, &block)
... ...
lib/searchkick/index.rb
  Diff comments   View file @9ddaf36
... ... @@ -17,7 +17,7 @@ module Searchkick
17 17 end
18 18  
19 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 21 # can't call delete directly on aliases in ES 6
22 22 indices = client.indices.get_alias(name: name).keys
23 23 client.indices.delete index: indices
... ...
lib/searchkick/index_options.rb
  Diff comments   View file @9ddaf36
... ... @@ -11,7 +11,7 @@ module Searchkick
11 11 settings = options[:settings] || {}
12 12 mappings = options[:mappings]
13 13 else
14   - below60 = Searchkick.server_below?("6.0.0-alpha1")
  14 + below60 = Searchkick.server_below?("6.0.0")
15 15 below62 = Searchkick.server_below?("6.2.0")
16 16  
17 17 default_type = "text"
... ...
lib/searchkick/query.rb
  Diff comments   View file @9ddaf36
... ... @@ -963,11 +963,11 @@ module Searchkick
963 963 end
964 964  
965 965 def below60?
966   - Searchkick.server_below?("6.0.0-alpha1")
  966 + Searchkick.server_below?("6.0.0")
967 967 end
968 968  
969 969 def below61?
970   - Searchkick.server_below?("6.1.0-alpha1")
  970 + Searchkick.server_below?("6.1.0")
971 971 end
972 972 end
973 973 end
... ...