Added support for hash to conversions_v2 option [skip ci]

Author: ankane

lib/searchkick/query.rb

@@ -660,27 +660,34 @@ def set_conversions
     end
 
     def set_conversions_v2
+      conversions_v2 = options[:conversions_v2]
+      return [] if conversions_v2.nil? && !searchkick_options[:conversions_v2]
+      return [] if conversions_v2 == false
+
+      # disable if searchkick_options[:conversions] to make it easy to upgrade without downtime
+      return [] if conversions_v2.nil? && searchkick_options[:conversions]
+
+      unless conversions_v2.is_a?(Hash)
+        conversions_v2 = {field: conversions_v2}
+      end
+
       conversions_fields =
-        case options[:conversions_v2]
+        case conversions_v2[:field]
         when true, nil
-          searchkick_options[:conversions_v2]
+          Array(searchkick_options[:conversions_v2]).map(&:to_s)
         else
-          options[:conversions_v2]
+          [conversions_v2[:field].to_s]
         end
 
-      conversions_fields = Array(conversions_fields).map(&:to_s)
-      # disable if searchkick_options[:conversions] to make it easy to upgrade without downtime
-      if conversions_fields.present? && options[:conversions_v2] != false && !(options[:conversions_v2].nil? && searchkick_options[:conversions])
-        conversions_fields.map do |conversions_field|
-          {
-            rank_feature: {
-              field: "#{conversions_field}.#{(options[:conversions_term] || term).to_s.downcase.gsub(".", "*")}",
-              linear: {}
-            }
+      conversions_term = conversions_v2[:term] || options[:conversions_term] || term
+
+      conversions_fields.map do |conversions_field|
+        {
+          rank_feature: {
+            field: "#{conversions_field}.#{conversions_term.to_s.downcase.gsub(".", "*")}",
+            linear: {}
           }
-        end
-      else
-        []
+        }
       end
     end
 

test/conversions_test.rb

@@ -95,7 +95,7 @@ def test_v2_space
       {name: "Tomato B", conversions_v2: {"tomato juice" => 2}},
       {name: "Tomato C", conversions_v2: {"tomato juice" => 3}}
     ]
-    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], conversions_v2: true, conversions_term: "tomato juice"
+    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], conversions_v2: {term: "tomato juice"}
   end
 
   def test_v2_dot
@@ -104,7 +104,7 @@ def test_v2_dot
       {name: "Tomato B", conversions_v2: {"tomato.juice" => 2}},
       {name: "Tomato C", conversions_v2: {"tomato.juice" => 3}}
     ]
-    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], conversions_v2: true, conversions_term: "tomato.juice"
+    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], conversions_v2: {term: "tomato.juice"}
   end
 
   def test_v2_unicode
@@ -113,7 +113,7 @@ def test_v2_unicode
       {name: "Tomato B", conversions_v2: {"喰らう" => 2}},
       {name: "Tomato C", conversions_v2: {"喰らう" => 3}}
     ]
-    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], conversions_v2: true, conversions_term: "喰らう"
+    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], conversions_v2: {term: "喰らう"}
   end
 
   def test_v2_score