searchkick 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5398d5720ac0d793c3e056ef46c93257da4e79a
-  data.tar.gz: 71d3ca9b8a853231cd5a285bb5b300912a7cbf5c
+  metadata.gz: 2b43a0209f8d9f4e32f3c21c190ea82d5f2a0b4b
+  data.tar.gz: 016d4568bfd949ba047e6ce59024f795861f24d6
 SHA512:
-  metadata.gz: 0ccea382ae95b340d7bb9df48cde62f84dbceca61451cfd5dce6ca0212e73b8da464a1d9342a20be26fe9b3ef24fadf9599fbd4b09715790c9ab37c6fd6d48a8
-  data.tar.gz: 72f1350835f6a260d7fd051e677f24c3cacee5a469035b8fbc5da80c9b55c123b88e36eab0f41ce1955dd08ca55db6e8762ac0e8b9916b7f38d21a9f4424840a
+  metadata.gz: 76307b462984c715a68d9e0e71edd0139811a3274ad9682ad97034ac2ceb9f9b74b5094750a53ac8c449db5f1b4c5d6be6f5cdb22e1aa19a8b21fd7230f31798
+  data.tar.gz: 236fbf2c4e83877a03eed6728263b6af62094ee1139e88fd3ec86a4fd6da8269fcd2972f29f5bf2bafd3e667f7ee5ce40945509ea56c24f4d3746e4fed688be6

data/lib/searchkick/search.rb

@@ -3,7 +3,7 @@ module Searchkick
 
     def search(term, options = {})
       term = term.to_s
-      fields = options[:fields] || ["_all"]
+      fields = options[:fields] ? options[:fields].map{|f| "#{f}.analyzed" } : ["_all"]
       operator = options[:partial] ? "or" : "and"
       load = options[:load].nil? ? true : options[:load]
       load = (options[:include] ? {include: options[:include]} : true) if load

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/boost_test.rb

@@ -38,4 +38,12 @@ class TestBoost < Minitest::Unit::TestCase
     assert_order "zero", ["Zero Boost"], boost: "orders_count"
   end
 
+  def test_conversions_weight
+    store [
+      {name: "Product Boost", orders_count: 20},
+      {name: "Product Conversions", conversions: {"product" => 10}}
+    ]
+    assert_order "product", ["Product Conversions", "Product Boost"], boost: "orders_count"
+  end
+
 end

data/test/facets_test.rb

@@ -2,15 +2,21 @@ require_relative "test_helper"
 
 class TestFacets < Minitest::Unit::TestCase
 
-  def test_facets
+  def setup
+    super
     store [
       {name: "Product Show", store_id: 1, in_stock: true, color: "blue"},
       {name: "Product Hide", store_id: 2, in_stock: false, color: "green"},
       {name: "Product B", store_id: 2, in_stock: false, color: "red"}
     ]
+  end
+
+  def test_basic
     assert_equal 2, Product.search("Product", facets: [:store_id]).facets["store_id"]["terms"].size
+  end
+
+  def test_where
     assert_equal 1, Product.search("Product", facets: {store_id: {where: {in_stock: true}}}).facets["store_id"]["terms"].size
-    assert_equal 1, Product.search("Product", facets: {store_id: {where: {in_stock: true, color: "blue"}}}).facets["store_id"]["terms"].size
   end
 
 end

data/test/sql_test.rb

@@ -4,22 +4,22 @@ class TestSql < Minitest::Unit::TestCase
 
   def test_limit
     store_names ["Product A", "Product B", "Product C", "Product D"]
-    assert_search "product", ["Product A", "Product B"], order: {name: :asc}, limit: 2
+    assert_order "product", ["Product A", "Product B"], order: {name: :asc}, limit: 2
   end
 
   def test_offset
     store_names ["Product A", "Product B", "Product C", "Product D"]
-    assert_search "product", ["Product C", "Product D"], order: {name: :asc}, offset: 2
+    assert_order "product", ["Product C", "Product D"], order: {name: :asc}, offset: 2
   end
 
   def test_pagination
     store_names ["Product A", "Product B", "Product C", "Product D", "Product E"]
-    assert_search "product", ["Product C", "Product D"], order: {name: :asc}, page: 2, per_page: 2
+    assert_order "product", ["Product C", "Product D"], order: {name: :asc}, page: 2, per_page: 2
   end
 
   def test_pagination_nil_page
     store_names ["Product A", "Product B", "Product C", "Product D", "Product E"]
-    assert_search "product", ["Product A", "Product B"], order: {name: :asc}, page: nil, per_page: 2
+    assert_order "product", ["Product A", "Product B"], order: {name: :asc}, page: nil, per_page: 2
   end
 
   def test_where
@@ -59,12 +59,12 @@ class TestSql < Minitest::Unit::TestCase
 
   def test_order_hash
     store_names ["Product A", "Product B", "Product C", "Product D"]
-    assert_search "product", ["Product D", "Product C", "Product B", "Product A"], order: {name: :desc}
+    assert_order "product", ["Product D", "Product C", "Product B", "Product A"], order: {name: :desc}
   end
 
   def test_order_string
     store_names ["Product A", "Product B", "Product C", "Product D"]
-    assert_search "product", ["Product A", "Product B", "Product C", "Product D"], order: "name"
+    assert_order "product", ["Product A", "Product B", "Product C", "Product D"], order: "name"
   end
 
   def test_partial
@@ -75,8 +75,8 @@ class TestSql < Minitest::Unit::TestCase
 
   def test_fields
     store [
-      {name: "red", color: "blue"},
-      {name: "blue", color: "red"}
+      {name: "red", color: "light blue"},
+      {name: "blue", color: "red fish"}
     ]
     assert_search "blue", ["red"], fields: ["color"]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane