searchkick 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d67265d1ad299d9e79b7f1020197f3b12f551535
-  data.tar.gz: b72d9fb064fad2f904db6d2cf69e9be96fb8c44e
+  metadata.gz: c8a8a68edbdd1ac1b03fc9fa7396391082a13a64
+  data.tar.gz: 9933087ad09633fbb2b9b0607fc2ec591a62e35b
 SHA512:
-  metadata.gz: 7ec7b5537539de163009b0857bd84a78829a0520b55b1f77544d0a65dee789dfce467b7afc63aa4aa54327d87be1dc3954178d3d209a35bb92e47c5179ad53a3
-  data.tar.gz: c9710769dd1045f5e8cfb1cd4cc86242df365289d28409bf8c47fe19e3b829b6d5b7ab6bed8ba890e56189ececacad520280c0940651bb2d8cdb2a0f78ac1356
+  metadata.gz: edbfccd85651bbfb32c13a8c7de4ea15663cc0ff04fcc03969d7268d2c365b59e7272045541b116e9bb0234d8e5976190265d699d6549cc0a6710489927638f6
+  data.tar.gz: eea0fe79ae6396f7c07769a3437640162ded10494600bc69179403e2f11609a9c24609c4eaa08dd287840328417d54323850657fd7791f51212aa287549e6993

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.5
+
+- Added facet ranges
+- Add all operator
+
 ## 0.3.4
 
 - Added highlighting

data/README.md

@@ -87,6 +87,7 @@ where: {
   aisle_id: [25, 30],         # in
   store_id: {not: 2},         # not
   aisle_id: {not: [25, 30]},  # not in
+  user_ids: {all: [1, 3]},    # all elements in array
   or: [
     [{in_stock: true}, {backordered: true}]
   ]
@@ -111,6 +112,14 @@ Boost by a field
 boost: "orders_count" # give popular documents a little boost
 ```
 
+### Get Everything
+
+Use a `*` for the query.
+
+```ruby
+Product.search "*"
+```
+
 ### Pagination
 
 Plays nicely with kaminari and will_paginate.
@@ -348,6 +357,13 @@ Advanced
 Product.search "2% Milk", facets: {store_id: {where: {in_stock: true}, limit: 10}}
 ```
 
+Ranges
+
+```ruby
+price_ranges = [{to: 20}, {from: 20, to: 50}, {from: 50}]
+Product.search "*", facets: {price: {ranges: price_ranges}}
+```
+
 ### Highlight
 
 Highlight the search query in the results.
@@ -407,6 +423,29 @@ Bounded by a box
 City.search "san", where: {location: {top_left: [38, -123], bottom_right: [37, -122]}}
 ```
 
+## Inheritance
+
+Searchkick supports single table inheritance.
+
+```ruby
+class Dog < Animal
+end
+```
+
+The parent and child model can both reindex.
+
+```ruby
+Animal.reindex
+Dog.reindex # equivalent
+```
+
+And to search, use:
+
+```ruby
+Animal.search "*" # all animals
+Dog.search "*"    # just dogs
+```
+
 ## Deployment
 
 Searchkick uses `ENV["ELASTICSEARCH_URL"]` for the Elasticsearch server.  This defaults to `http://localhost:9200`.
@@ -449,29 +488,6 @@ Then deploy and reindex:
 rake searchkick:reindex CLASS=Product
 ```
 
-## Inheritance
-
-Searchkick supports single table inheritance.
-
-```ruby
-class Dog < Animal
-end
-```
-
-The parent and child model can both reindex.
-
-```ruby
-Animal.reindex
-Dog.reindex # equivalent
-```
-
-And to search, use:
-
-```ruby
-Animal.search "*" # all animals
-Dog.search "*"    # just dogs
-```
-
 ## Reference
 
 Searchkick requires Elasticsearch `0.90.0` or higher.

data/lib/searchkick/search.rb

@@ -201,6 +201,8 @@ module Searchkick
                     else
                       filters << {not: {term: {field => op_value}}}
                     end
+                  elsif op == :all
+                    filters << {terms: {field => op_value, execution: "and"}}
                   else
                     range_query =
                       case op
@@ -250,12 +252,22 @@ module Searchkick
         facets.each do |field, facet_options|
           # ask for extra facets due to
           # https://github.com/elasticsearch/elasticsearch/issues/1305
-          payload[:facets][field] = {
-            terms: {
-              field: field,
-              size: facet_options[:limit] ? facet_options[:limit] + 150 : 100000
+
+          if facet_options[:ranges]
+            payload[:facets][field] = {
+              range: {
+                field.to_sym => facet_options[:ranges]
+              }
             }
-          }
+          else
+            payload[:facets][field] = {
+              terms: {
+                field: field,
+                size: facet_options[:limit] ? facet_options[:limit] + 150 : 100000
+              }
+            }
+          end
+
           facet_limits[field] = facet_options[:limit] if facet_options[:limit]
 
           # offset is not possible

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/facets_test.rb

@@ -5,9 +5,9 @@ class TestFacets < Minitest::Unit::TestCase
   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"}
+      {name: "Product Show", store_id: 1, in_stock: true, color: "blue", price: 21},
+      {name: "Product Hide", store_id: 2, in_stock: false, color: "green", price: 25},
+      {name: "Product B", store_id: 2, in_stock: false, color: "red", price: 5}
     ]
   end
 
@@ -26,4 +26,15 @@ class TestFacets < Minitest::Unit::TestCase
     assert_equal 1, facet["other"]
   end
 
+  def test_ranges
+    price_ranges = [{to: 10}, {from: 10, to: 20}, {from: 20}]
+    facet = Product.search("Product", facets: {price: {ranges: price_ranges}}).facets["price"]
+
+    assert_equal 3, facet["ranges"].size
+    assert_equal 10.0, facet["ranges"][0]["to"]
+    assert_equal 20.0, facet["ranges"][2]["from"]
+    assert_equal 1, facet["ranges"][0]["count"]
+    assert_equal 0, facet["ranges"][1]["count"]
+    assert_equal 2, facet["ranges"][2]["count"]
+  end
 end

data/test/sql_test.rb

@@ -39,7 +39,7 @@ class TestSql < Minitest::Unit::TestCase
     now = Time.now
     store [
       {name: "Product A", store_id: 1, in_stock: true, backordered: true, created_at: now, orders_count: 4, user_ids: [1, 2, 3]},
-      {name: "Product B", store_id: 2, in_stock: true, backordered: false, created_at: now - 1, orders_count: 3},
+      {name: "Product B", store_id: 2, in_stock: true, backordered: false, created_at: now - 1, orders_count: 3, user_ids: [1]},
       {name: "Product C", store_id: 3, in_stock: false, backordered: true, created_at: now - 2, orders_count: 2},
       {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1},
     ]
@@ -64,15 +64,16 @@ class TestSql < Minitest::Unit::TestCase
     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]}]]}
     assert_search "product", ["Product A", "Product D"], where: {or: [[{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]]}
-    # array
-    assert_search "product", ["Product A"], where: {user_ids: 2}
+    # all
+    assert_search "product", ["Product A"], where: {user_ids: {all: [1, 3]}}
+    assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
   end
 
   def test_where_string
     store [
       {name: "Product A", color: "RED"}
     ]
-    assert_search "product", ["Product A"], where: {color: ["RED"]}
+    assert_search "product", ["Product A"], where: {color: "RED"}
   end
 
   def test_where_nil
@@ -83,6 +84,12 @@ class TestSql < Minitest::Unit::TestCase
     assert_search "product", ["Product A"], where: {color: nil}
   end
 
+  def test_where_id
+    store_names ["Product A"]
+    product = Product.last
+    assert_search "product", ["Product A"], where: {id: product.id}
+  end
+
   def test_near
     store [
       {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},

data/test/test_helper.rb

@@ -53,6 +53,7 @@ else
     t.boolean :in_stock
     t.boolean :backordered
     t.integer :orders_count
+    t.integer :price
     t.string :color
     t.decimal :latitude, precision: 10, scale: 7
     t.decimal :longitude, precision: 10, scale: 7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire