searchkick 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74cd357aadff8dc7f80b5db94f74dde7940abcd8
-  data.tar.gz: ae9c5f086a639fbb18e0848a862231f188ee7624
+  metadata.gz: 6b20e3f5f346c6ef75c257cf2b2aafa23884ee2b
+  data.tar.gz: f8c6e426340f0602037a3204e8d38a40d28cf430
 SHA512:
-  metadata.gz: 22c8007b1672a5ca1d6def91d812509f50fc795b0744817f8af52feaa024c569b6f993f41b138f47c2aa5d42a7709faa2e6a51f1ff3a5005ff0c8e084ae1a4e9
-  data.tar.gz: ce18c6e5766bfc8a203c1a6ebe77f9d717b7a88c6ce361858ad15fa3049a4722cb5dcc23bc41f0e3d3be9e12f34a47d70a6783b458b2fe9701cb5d673376711f
+  metadata.gz: 210eecb919e7491f84acdc1f4f69f2c1bf898b808033ed31f8adc63cc4ac636d0e242cd9136cf1467842aafcd0e358b570b02e9eb0f2e1a7d158807c096e6b3d
+  data.tar.gz: b4907fb7bde4d2a7c13a68b26b84527f8deb00bd41da7216a0637f15f62923f39d0589151edbcd44b1bc0f1eec61e3ae8e5e0be1cc95e440f09b6a694d10f007

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.3
+
+- Fixed bug w/ word_* queries
+
 ## 0.5.2
 
 - Use after_commit hook for ActiveRecord to prevent data inconsistencies

data/README.md

@@ -494,8 +494,9 @@ Dog.reindex # equivalent
 And to search, use:
 
 ```ruby
-Animal.search "*" # all animals
-Dog.search "*"    # just dogs
+Animal.search "*"                   # all animals
+Dog.search "*"                      # just dogs
+Animal.search "*", type: [Dog, Cat] # just cats and dogs [master]
 ```
 
 **Note:** The `suggest` option retrieves suggestions from the parent at the moment.
@@ -747,11 +748,14 @@ For convenience, this is set by default in the test environment.
 
 Thanks to Karel Minarik for [Tire](https://github.com/karmi/tire), Jaroslav Kalistsuk for [zero downtime reindexing](https://gist.github.com/jarosan/3124884), and Alex Leschenko for [Elasticsearch autocomplete](https://github.com/leschenko/elasticsearch_autocomplete).
 
-## TODO
+## Roadmap
 
-- Generate autocomplete predictions from past search queries
-- Automatic failover
-- Make Searchkick work with any language
+- Search multiple fields for different terms
+- Search across models
+- Search nested objects
+- Add section on testing
+- Much finer customization
+- More transparency into generated queries (for advanced use)
 
 ## History
 
@@ -765,3 +769,11 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Fix bugs and [submit pull requests](https://github.com/ankane/searchkick/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
+
+To get started with development and testing:
+
+1. Clone the repo
+2. Install PostgreSQL and create a database called `searchkick_test` (`psql -d postgres -c "create database searchkick_test"`)
+3. Install Elasticsearch
+4. `bundle`
+5. `rake test`

data/lib/searchkick/reindex.rb

@@ -51,7 +51,8 @@ module Searchkick
     end
 
     def self.extended(klass)
-      (@descendents ||= []) << klass
+      @descendents ||= []
+      @descendents << klass unless @descendents.include?(klass)
     end
 
     private
@@ -124,6 +125,11 @@ module Searchkick
                 tokenizer: "keyword",
                 filter: ["lowercase", "asciifolding"]
               },
+              searchkick_word_search: {
+                type: "custom",
+                tokenizer: "standard",
+                filter: ["lowercase", "asciifolding"]
+              },
               searchkick_suggest_index: {
                 type: "custom",
                 tokenizer: "standard",

data/lib/searchkick/search.rb

@@ -92,11 +92,12 @@ module Searchkick
                 ]
               end
             else
+              analyzer = field.match(/\.word_(start|middle|end)\z/) ? "searchkick_word_search" : "searchkick_autocomplete_search"
               queries << {
                 multi_match: {
                   fields: [field],
                   query: term,
-                  analyzer: "searchkick_autocomplete_search"
+                  analyzer: analyzer
                 }
               }
             end
@@ -159,6 +160,15 @@ module Searchkick
         }
       end
 
+      if options[:personalize]
+        custom_filters << {
+          filter: {
+            term: options[:personalize]
+          },
+          boost: 100
+        }
+      end
+
       if custom_filters.any?
         payload = {
           custom_filters_score: {
@@ -215,30 +225,29 @@ module Searchkick
               end
 
               if value.is_a?(Hash)
-                if value[:near]
-                  filters << {
-                    geo_distance: {
-                      field => value.delete(:near).map(&:to_f).reverse,
-                      distance: value.delete(:within) || "50mi"
+                value.each do |op, op_value|
+                  case op
+                  when :within, :bottom_right
+                    # do nothing
+                  when :near
+                    filters << {
+                      geo_distance: {
+                        field => op_value.map(&:to_f).reverse,
+                        distance: value[:within] || "50mi"
+                      }
                     }
-                  }
-                end
-
-                if value[:top_left]
-                  filters << {
-                    geo_bounding_box: {
-                      field => {
-                        top_left: value.delete(:top_left).map(&:to_f).reverse,
-                        bottom_right: value.delete(:bottom_right).map(&:to_f).reverse
+                  when :top_left
+                    filters << {
+                      geo_bounding_box: {
+                        field => {
+                          top_left: op_value.map(&:to_f).reverse,
+                          bottom_right: value[:bottom_right].map(&:to_f).reverse
+                        }
                       }
                     }
-                  }
-                end
-
-                value.each do |op, op_value|
-                  if op == :not # not equal
+                  when :not # not equal
                     filters << {not: term_filters.call(field, op_value)}
-                  elsif op == :all
+                  when :all
                     filters << {terms: {field => op_value, execution: "and"}}
                   else
                     range_query =
@@ -254,7 +263,12 @@ module Searchkick
                       else
                         raise "Unknown where operator"
                       end
-                    filters << {range: {field => range_query}}
+                    # issue 132
+                    if existing = filters.find{ |f| f[:range] && f[:range][field] }
+                      existing[:range][field].merge!(range_query)
+                    else
+                      filters << {range: {field => range_query}}
+                    end
                   end
                 end
               else
@@ -350,7 +364,9 @@ module Searchkick
       payload[:fields] = [] if load
 
       tire_options = {load: load, payload: payload, size: per_page, from: offset}
-      tire_options[:type] = document_type if self != searchkick_klass
+      if options[:type] or self != searchkick_klass
+        tire_options[:type] = [options[:type] || self].flatten.map(&:document_type)
+      end
       search = Tire::Search::Search.new(index_name, tire_options)
       begin
         response = search.json

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/test/autocomplete_test.rb

@@ -18,33 +18,38 @@ class TestAutocomplete < Minitest::Unit::TestCase
   end
 
   def test_text_start
-    store_names ["Where in the World is Carmen San Diego?"]
-    assert_search "whe", ["Where in the World is Carmen San Diego?"], fields: [{name: :text_start}]
+    store_names ["Where in the World is Carmen San Diego"]
+    assert_search "where in the world is", ["Where in the World is Carmen San Diego"], fields: [{name: :text_start}]
+    assert_search "in the world", [], fields: [{name: :text_start}]
   end
 
   def test_text_middle
-    store_names ["Where in the World is Carmen San Diego?"]
-    assert_search "n the wor", ["Where in the World is Carmen San Diego?"], fields: [{name: :text_middle}]
+    store_names ["Where in the World is Carmen San Diego"]
+    assert_search "where in the world is", ["Where in the World is Carmen San Diego"], fields: [{name: :text_middle}]
+    assert_search "n the wor", ["Where in the World is Carmen San Diego"], fields: [{name: :text_middle}]
+    assert_search "men san diego", ["Where in the World is Carmen San Diego"], fields: [{name: :text_middle}]
+    assert_search "world carmen", [], fields: [{name: :text_middle}]
   end
 
   def test_text_end
-    store_names ["Where in the World is Carmen San Diego?"]
-    assert_search "ego?", ["Where in the World is Carmen San Diego?"], fields: [{name: :text_end}]
+    store_names ["Where in the World is Carmen San Diego"]
+    assert_search "men san diego", ["Where in the World is Carmen San Diego"], fields: [{name: :text_end}]
+    assert_search "carmen san", [], fields: [{name: :text_end}]
   end
 
   def test_word_start
-    store_names ["Where in the World is Carmen San Diego?"]
-    assert_search "car", ["Where in the World is Carmen San Diego?"], fields: [{name: :word_start}]
+    store_names ["Where in the World is Carmen San Diego"]
+    assert_search "car san wor", ["Where in the World is Carmen San Diego"], fields: [{name: :word_start}]
   end
 
   def test_word_middle
-    store_names ["Where in the World is Carmen San Diego?"]
-    assert_search "orl", ["Where in the World is Carmen San Diego?"], fields: [{name: :word_middle}]
+    store_names ["Where in the World is Carmen San Diego"]
+    assert_search "orl", ["Where in the World is Carmen San Diego"], fields: [{name: :word_middle}]
   end
 
   def test_word_end
-    store_names ["Where in the World is Carmen San Diego?"]
-    assert_search "men", ["Where in the World is Carmen San Diego?"], fields: [{name: :word_end}]
+    store_names ["Where in the World is Carmen San Diego"]
+    assert_search "rld men ego", ["Where in the World is Carmen San Diego"], fields: [{name: :word_end}]
   end
 
 end

data/test/boost_test.rb

@@ -57,4 +57,14 @@ class TestBoost < Minitest::Unit::TestCase
     assert_first "tomato", "Tomato B", user_id: 2
   end
 
+  def test_personalize
+    store [
+      {name: "Tomato A"},
+      {name: "Tomato B", user_ids: [1, 2, 3]},
+      {name: "Tomato C"},
+      {name: "Tomato D"}
+    ]
+    assert_first "tomato", "Tomato B", personalize: {user_ids: 2}
+  end
+
 end

data/test/inheritance_test.rb

@@ -25,6 +25,19 @@ class TestInheritance < Minitest::Unit::TestCase
     assert_equal 2, Animal.search("bear").size
   end
 
+  def test_force_one_type
+    store_names ["Green Bear"], Dog
+    store_names ["Blue Bear"], Cat
+    assert_equal ["Blue Bear"], Animal.search("bear", type: [Cat]).map(&:name)
+  end
+
+  def test_force_multiple_types
+    store_names ["Green Bear"], Dog
+    store_names ["Blue Bear"], Cat
+    store_names ["Red Bear"], Animal
+    assert_equal ["Green Bear", "Blue Bear"], Animal.search("bear", type: [Dog, Cat]).map(&:name)
+  end
+
   def test_child_autocomplete
     store_names ["Max"], Cat
     store_names ["Mark"], Dog

data/test/sql_test.rb

@@ -60,6 +60,7 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "product", ["Product A", "Product B"], where: {store_id: [1, 2]}
     assert_search "product", ["Product B", "Product C", "Product D"], where: {store_id: {not: 1}}
     assert_search "product", ["Product C", "Product D"], where: {store_id: {not: [1, 2]}}
+    assert_search "product", ["Product A"], where: {user_ids: {lte: 2, gte: 2}}
     # or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{in_stock: true}, {store_id: 3}]]}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{orders_count: [2, 4]}, {store_id: [1, 2]}]]}
@@ -105,6 +106,25 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "product", [], where: {store_id: []}
   end
 
+  # http://elasticsearch-users.115913.n3.nabble.com/Numeric-range-quey-or-filter-in-an-array-field-possible-or-not-td4042967.html
+  # https://gist.github.com/jprante/7099463
+  def test_where_range_array
+    store [
+      {name: "Product A", user_ids: [11, 23, 13, 16, 17, 23.6]},
+      {name: "Product B", user_ids: [1, 2, 3, 4, 5, 6, 7, 8, 8.9, 9.1, 9.4]},
+      {name: "Product C", user_ids: [101, 230, 150, 200]}
+    ]
+    assert_search "product", ["Product A"], where: {user_ids: {gt: 10, lt: 23.9}}
+  end
+
+  def test_where_range_array_again
+    store [
+      {name: "Product A", user_ids: [19, 32, 42]},
+      {name: "Product B", user_ids: [13, 40, 52]}
+    ]
+    assert_search "product", ["Product A"], where: {user_ids: {gt: 26, lt: 36}}
+  end
+
   def test_near
     store [
       {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire