searchkick 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cffd1af1407a4da1aedcc1a7af63202939586c5
-  data.tar.gz: 3fa1d499bb7f1fd4ff7a71a92fc2237931cc04fd
+  metadata.gz: 174eaff2241d0285d027261332c228bae2cf9215
+  data.tar.gz: db755391a04705242e8d21a54c8374518a1b7344
 SHA512:
-  metadata.gz: 0c98bdf5690ec1bb4b837033f9e08c80cd6aacaa2d811c651108fedcee940df68168ec015c4207b210c3003315a9910517d7fd8210e7b3b2daec1d50c280cf15
-  data.tar.gz: a101b6f2ccd2d7c65d8290b9da7bdc5da8da1efceef7cd51371c743e7bef5cb988b9a6193ef50bf2d5f206c019712090b30f573046bed2058bc3eeef611ab9f1
+  metadata.gz: 587dc4255bb875770e109c1c120fac8775a83f818d009d42bdea27d664af88c93ac3b4bc4e37d7bce033e60f54213fbb41eb5f873bfaffcdb9b6ab0d4605a1ec
+  data.tar.gz: a2da459414ad0a95efbe58c313593367f1e1d7dd3d61d6539c404c813ac204e0b37cae0144ea8366ee0af73fff9a9aeff9d24057b00d001fe00eee5e92caff4a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.3
+
+- Fixed multi-index searches
+- Fixed suggestions for partial matches
+- Added `offset` and `length` for improved pagination
+
 ## 0.7.2
 
 - Added smart facets

data/README.md

@@ -331,6 +331,8 @@ Autocomplete predicts what a user will type, making the search experience faster
 
 ![Autocomplete](http://ankane.github.io/searchkick/autocomplete.png)
 
+**Note:** If you only have a few thousand records, don’t use Searchkick for autocomplete. It’s *much* faster to load all records into JavaScript and autocomplete there (eliminates network requests).
+
 First, specify which fields use this feature.  This is necessary since autocomplete can increase the index size significantly, but don’t worry - this gives you blazing faster queries.
 
 ```ruby
@@ -345,7 +347,7 @@ Reindex and search with:
 City.search "san fr", fields: [{name: :text_start}]
 ```
 
-Typically, you want to use a Javascript library like [typeahead.js](http://twitter.github.io/typeahead.js/) or [jQuery UI](http://jqueryui.com/autocomplete/).
+Typically, you want to use a JavaScript library like [typeahead.js](http://twitter.github.io/typeahead.js/) or [jQuery UI](http://jqueryui.com/autocomplete/).
 
 #### Here’s how to make it work with Rails
 
@@ -362,7 +364,7 @@ class CitiesController < ApplicationController
 end
 ```
 
-Then add the search box and Javascript code to a view.
+Then add the search box and JavaScript code to a view.
 
 ```html
 <input type="text" id="query" name="query" />

data/lib/searchkick/query.rb

@@ -254,8 +254,12 @@ module Searchkick
       # suggestions
       if options[:suggest]
         suggest_fields = (searchkick_options[:suggest] || []).map(&:to_s)
+
         # intersection
-        suggest_fields = suggest_fields & options[:fields].map(&:to_s) if options[:fields]
+        if options[:fields]
+          suggest_fields = suggest_fields & options[:fields].map{|v| (v.is_a?(Hash) ? v.keys.first : v).to_s }
+        end
+
         if suggest_fields.any?
           payload[:suggest] = {text: term}
           suggest_fields.each do |field|

data/lib/searchkick/results.rb

@@ -5,7 +5,7 @@ module Searchkick
 
     attr_reader :klass, :response, :options
 
-    def_delegators :results, :each, :empty?, :size, :slice, :[], :to_ary
+    def_delegators :results, :each, :any?, :empty?, :size, :length, :slice, :[], :to_ary
 
     def initialize(klass, response, options = {})
       @klass = klass
@@ -16,14 +16,21 @@ module Searchkick
     def results
       @results ||= begin
         if options[:load]
-          hit_ids = hits.map{|hit| hit["_id"] }
-          records = klass
-          if options[:includes]
-            records = records.includes(options[:includes])
+          # results can have different types
+          results = {}
+
+          hits.group_by{|hit, i| hit["_type"] }.each do |type, grouped_hits|
+            records = type.camelize.constantize
+            if options[:includes]
+              records = records.includes(options[:includes])
+            end
+            results[type] = records.find(grouped_hits.map{|hit| hit["_id"] })
+          end
+
+          # sort
+          hits.map do |hit|
+            results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
           end
-          records = records.find(hit_ids)
-          hit_ids = hit_ids.map(&:to_s)
-          records.sort_by{|r| hit_ids.index(r.id.to_s)  }
         else
           hits.map do |hit|
             result = hit.except("_source").merge(hit["_source"])
@@ -85,6 +92,7 @@ module Searchkick
     def offset_value
       current_page * per_page
     end
+    alias_method :offset, :offset_value
 
     def previous_page
       current_page > 1 ? (current_page - 1) : nil

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/test/inheritance_test.rb

@@ -62,4 +62,12 @@ class TestInheritance < Minitest::Unit::TestCase
     assert_equal ["tiger"], Animal.search("tige", fields: [:name], suggest: true).suggestions.sort
   end
 
+  # TODO move somewhere better
+
+  def test_multiple_indices
+    store_names ["Product A"]
+    store_names ["Product B"], Animal
+    assert_search "product", ["Product A", "Product B"], index_name: [Product.searchkick_index.name, Animal.searchkick_index.name], conversions: false
+  end
+
 end

data/test/sql_test.rb

@@ -24,13 +24,18 @@ class TestSql < Minitest::Unit::TestCase
     assert_equal ["Product C", "Product D"], products.map(&:name)
     assert_equal 2, products.current_page
     assert_equal 2, products.per_page
+    assert_equal 2, products.size
+    assert_equal 2, products.length
     assert_equal 3, products.total_pages
     assert_equal 5, products.total_count
     assert_equal 5, products.total_entries
     assert_equal 2, products.limit_value
     assert_equal 4, products.offset_value
+    assert_equal 4, products.offset
     assert !products.first_page?
     assert !products.last_page?
+    assert !products.empty?
+    assert products.any?
   end
 
   def test_pagination_nil_page

data/test/suggest_test.rb

@@ -56,6 +56,11 @@ class TestSuggest < Minitest::Unit::TestCase
     assert_suggest "shar", "shark", fields: [:name, :unknown]
   end
 
+  def test_fields_word_start
+    store_names ["Great White Shark", "Hammerhead Shark", "Tiger Shark"]
+    assert_suggest "How Big is a Tigre Shar", "how big is a tiger shark", fields: [{name: :word_start}]
+  end
+
   protected
 
   def assert_suggest(term, expected, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel