searchkick 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27fb3f9f9fd1773e06eec376ec0677ef60aca65
-  data.tar.gz: 03c0d4c6dabe39b5e9e7beda4f0365e0a3f71472
+  metadata.gz: a492bb88396370b25f7bd69d7c5cebad46fde482
+  data.tar.gz: d958c3ee3261ddf1cf7aed5f1ef1b6e50348194c
 SHA512:
-  metadata.gz: 722dce0a1e9366ed296a9003b435deddc6f6f4c43a90771644bd0f6558d969c348b42279e4c6d04e5ef3cfa188abc75b26a483c6d3d022bd175453135e78f8d6
-  data.tar.gz: e59ff3b1b239b5a9d6d96f3c8482bfece495d936caef69397958292be7069c6e130c6c1bb7aec8b4fb5c0b412914eca4ad9d3af80dca5bf4b9976f9e76496de9
+  metadata.gz: c510e1a08aa01f34f23220a6af5676520be76ab1920843acb3d8ca205fb621de39ee9de3607f6363c49bda2bd416f9bfa1cad9666c42c7e3c4be81bbe678c59a
+  data.tar.gz: 5f51db56e29051fc7fe37242e9b94a09e1a4d05883709b8fe102a750db8197f642753c89a5a186233fe310c5de75a00ee6da1e8cd967061e891ba335097d314f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.2
+
+- Throw `Searchkick::ImportError` for errors when importing records
+- Errors now inherit from `Searchkick::Error`
+- Added `order` option to aggregations
+- Added `mapping` method
+
 ## 1.0.1
 
 - Added aggregations method to get raw response

data/README.md

@@ -260,7 +260,7 @@ Searchkick defaults to English for stemming.  To change this, use:
 
 ```ruby
 class Product < ActiveRecord::Base
-  searchkick stemmer: "german"
+  searchkick language: "german"
 end
 ```
 
@@ -317,7 +317,7 @@ Product.search "zuchini", misspellings: false # no zucchini
 
 ### Emoji
 
-Make :ice_cream::cake: match `ice cream cake`!
+Search :ice_cream::cake: and get `ice cream cake`!
 
 Add this line to your application’s Gemfile:
 
@@ -594,6 +594,14 @@ Limit
 Product.search "apples", aggs: {store_id: {limit: 10}}
 ```
 
+Order
+
+```ruby
+Product.search "wingtips", aggs: {color: {order: {"_term" => "asc"}}} # alphabetically
+```
+
+[All of these options are supported](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html#search-aggregations-bucket-terms-aggregation-order)
+
 Ranges
 
 ```ruby

data/lib/searchkick.rb

@@ -19,10 +19,12 @@ end
 require "searchkick/reindex_v2_job" if defined?(ActiveJob)
 
 module Searchkick
-  class MissingIndexError < StandardError; end
-  class UnsupportedVersionError < StandardError; end
+  class Error < StandardError; end
+  class MissingIndexError < Error; end
+  class UnsupportedVersionError < Error; end
   class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
-  class DangerousOperation < StandardError; end
+  class DangerousOperation < Error; end
+  class ImportError < Error; end
 
   class << self
     attr_accessor :search_method_name

data/lib/searchkick/index.rb

@@ -27,6 +27,10 @@ module Searchkick
       client.indices.exists_alias name: name
     end
 
+    def mapping
+      client.indices.get_mapping index: name
+    end
+
     def swap(new_name)
       old_indices =
         begin
@@ -62,11 +66,15 @@ module Searchkick
 
     def import(records)
       records.group_by { |r| document_type(r) }.each do |type, batch|
-        client.bulk(
-          index: name,
-          type: type,
-          body: batch.map { |r| {index: {_id: search_id(r), data: search_data(r)}} }
-        )
+        response =
+          client.bulk(
+            index: name,
+            type: type,
+            body: batch.map { |r| {index: {_id: search_id(r), data: search_data(r)}} }
+          )
+        if response["errors"]
+          raise Searchkick::ImportError, response["items"].first["index"]["error"]
+        end
       end
     end
 
@@ -201,6 +209,8 @@ module Searchkick
 
     def index_options
       options = @options
+      language = options[:language]
+      language = language.call if language.respond_to?(:call)
 
       if options[:mappings] && !options[:merge_mappings]
         settings = options[:settings] || {}
@@ -317,8 +327,8 @@ module Searchkick
               searchkick_stemmer: {
                 # use stemmer if language is lowercase, snowball otherwise
                 # TODO deprecate language option in favor of stemmer
-                type: options[:language] == options[:language].to_s.downcase ? "stemmer" : "snowball",
-                language: options[:language] || "English"
+                type: language == language.to_s.downcase ? "stemmer" : "snowball",
+                language: language || "English"
               }
             },
             char_filter: {

data/lib/searchkick/query.rb

@@ -351,27 +351,28 @@ module Searchkick
 
           aggs.each do |field, agg_options|
             size = agg_options[:limit] ? agg_options[:limit] : 100_000
+            shared_agg_options = agg_options.slice(:order)
 
             if agg_options[:ranges]
               payload[:aggs][field] = {
                 range: {
                   field: agg_options[:field] || field,
                   ranges: agg_options[:ranges]
-                }
+                }.merge(shared_agg_options)
               }
             elsif agg_options[:date_ranges]
               payload[:aggs][field] = {
                 date_range: {
                   field: agg_options[:field] || field,
                   ranges: agg_options[:date_ranges]
-                }
+                }.merge(shared_agg_options)
               }
             else
               payload[:aggs][field] = {
                 terms: {
                   field: agg_options[:field] || field,
                   size: size
-                }
+                }.merge(shared_agg_options)
               }
             end
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/aggs_test.rb

@@ -19,6 +19,11 @@ class AggsTest < Minitest::Test
     assert_equal ({1 => 1}), store_agg(aggs: {store_id: {where: {in_stock: true}}})
   end
 
+  def test_order
+    agg = Product.search("Product", aggs: {color: {order: {"_term" => "desc"}}}).aggs["color"]
+    assert_equal %w[red green blue], agg["buckets"].map { |b| b["key"] }
+  end
+
   def test_field
     assert_equal ({1 => 1, 2 => 2}), store_agg(aggs: {store_id: {}})
     assert_equal ({1 => 1, 2 => 2}), store_agg(aggs: {store_id: {field: "store_id"}})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel