Style updates

Andrew Kane
1 parent 53e7953f
Showing 16 changed files with 77 additions and 77 deletions Show diff stats
Gemfile
Rakefile
lib/searchkick.rb
lib/searchkick/index.rb
lib/searchkick/logging.rb
lib/searchkick/model.rb
lib/searchkick/query.rb
lib/searchkick/results.rb
lib/searchkick/tasks.rb
searchkick.gemspec
test/facets_test.rb
test/index_test.rb
test/reindex_v2_job_test.rb
test/sql_test.rb
test/suggest_test.rb
test/test_helper.rb
-source 'https://rubygems.org'
+source "https://rubygems.org"
  
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec
 require "bundler/gem_tasks"
 require "rake/testtask"
  
-task :default => :test
+task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
@@ -44,8 +44,8 @@ module Searchkick
       )
   end
  
-  def self.client=(client)
-    @client = client
+  class << self
+    attr_writer :client
   end
  
   def self.server_version
@@ -34,7 +34,7 @@ module Searchkick
         rescue Elasticsearch::Transport::Transport::Errors::NotFound
           []
         end
-      actions = old_indices.map{|old_name| {remove: {index: old_name, alias: name}} } + [{add: {index: new_name, alias: name}}]
+      actions = old_indices.map { |old_name| {remove: {index: old_name, alias: name}} } + [{add: {index: new_name, alias: name}}]
       client.indices.update_aliases body: {actions: actions}
     end
  
@@ -58,11 +58,11 @@ module Searchkick
     end
  
     def import(records)
-      records.group_by{|r| document_type(r) }.each do |type, batch|
+      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)}} }
+          body: batch.map { |r| {index: {_id: search_id(r), data: search_data(r)}} }
         )
       end
     end
@@ -89,7 +89,7 @@ module Searchkick
  
     def reindex_record_async(record)
       if defined?(Searchkick::ReindexV2Job)
-          Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
+        Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
       else
         Delayed::Job.enqueue Searchkick::ReindexJob.new(record.class.name, record.id.to_s)
       end
@@ -97,7 +97,7 @@ module Searchkick
  
     def similar_record(record, options = {})
       like_text = retrieve(record).to_hash
-        .keep_if{|k,v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
+        .keep_if { |k, v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
         .values.compact.join(" ")
  
       # TODO deep merge method
@@ -136,7 +136,7 @@ module Searchkick
     # remove old indices that start w/ index_name
     def clean_indices
       all_indices = client.indices.get_aliases
-      indices = all_indices.select{|k, v| (v.empty? || v["aliases"].empty?) && k =~ /\A#{Regexp.escape(name)}_\d{14,17}\z/ }.keys
+      indices = all_indices.select { |k, v| (v.empty? || v["aliases"].empty?) && k =~ /\A#{Regexp.escape(name)}_\d{14,17}\z/ }.keys
       indices.each do |index|
         Searchkick::Index.new(index).delete
       end
@@ -180,7 +180,7 @@ module Searchkick
       scope = scope.search_import if scope.respond_to?(:search_import)
       if scope.respond_to?(:find_in_batches)
         scope.find_in_batches batch_size: batch_size do |batch|
-          import batch.select{|item| item.should_index? }
+          import batch.select(&:should_index?)
         end
       else
         # https://github.com/karmi/tire/blob/master/lib/tire/model/import.rb
@@ -333,7 +333,7 @@ module Searchkick
         if synonyms.any?
           settings[:analysis][:filter][:searchkick_synonym] = {
             type: "synonym",
-            synonyms: synonyms.select{|s| s.size > 1 }.map{|s| s.join(",") }
+            synonyms: synonyms.select { |s| s.size > 1 }.map { |s| s.join(",") }
           }
           # choosing a place for the synonym filter when stemming is not easy
           # https://groups.google.com/forum/#!topic/elasticsearch/p7qcQlgHdB8
@@ -361,7 +361,7 @@ module Searchkick
  
         if options[:special_characters] == false
           settings[:analysis][:analyzer].each do |analyzer, analyzer_settings|
-            analyzer_settings[:filter].reject!{|f| f == "asciifolding" }
+            analyzer_settings[:filter].reject! { |f| f == "asciifolding" }
           end
         end
  
@@ -380,7 +380,7 @@ module Searchkick
  
         mapping_options = Hash[
           [:autocomplete, :suggest, :text_start, :text_middle, :text_end, :word_start, :word_middle, :word_end, :highlight]
-            .map{|type| [type, (options[type] || []).map(&:to_s)] }
+            .map { |type| [type, (options[type] || []).map(&:to_s)] }
         ]
  
         mapping_options.values.flatten.uniq.each do |field|
@@ -457,7 +457,7 @@ module Searchkick
     # other
  
     def tokens(text, options = {})
-      client.indices.analyze({text: text, index: name}.merge(options))["tokens"].map{|t| t["token"] }
+      client.indices.analyze({text: text, index: name}.merge(options))["tokens"].map { |t| t["token"] }
     end
  
     def klass_document_type(klass)
@@ -488,24 +488,24 @@ module Searchkick
  
       # stringify fields
       # remove _id since search_id is used instead
-      source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("_id")
+      source = source.inject({}) { |memo, (k, v)| memo[k.to_s] = v; memo }.except("_id")
  
       # conversions
       conversions_field = options[:conversions]
       if conversions_field && source[conversions_field]
-        source[conversions_field] = source[conversions_field].map{|k, v| {query: k, count: v} }
+        source[conversions_field] = source[conversions_field].map { |k, v| {query: k, count: v} }
       end
  
       # hack to prevent generator field doesn't exist error
       (options[:suggest] || []).map(&:to_s).each do |field|
-        source[field] = nil if !source[field]
+        source[field] = nil unless source[field]
       end
  
       # locations
       (options[:locations] || []).map(&:to_s).each do |field|
         if source[field]
           if source[field].first.is_a?(Array) # array of arrays
-            source[field] = source[field].map{|a| a.map(&:to_f).reverse }
+            source[field] = source[field].map { |a| a.map(&:to_f).reverse }
           else
             source[field] = source[field].map(&:to_f).reverse
           end
@@ -77,7 +77,7 @@ module Searchkick
  
       # no easy way to tell which host the client will use
       host = Searchkick.client.transport.hosts.first
-      debug "  #{color(name, YELLOW, true)}  curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map{|t| CGI.escape(t) }.join(",")}" : ""}/_search?pretty -d '#{payload[:query][:body].to_json}'"
+      debug "  #{color(name, YELLOW, true)}  curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map { |t| CGI.escape(t) }.join(',')}" : ''}/_search?pretty -d '#{payload[:query][:body].to_json}'"
     end
  
     def request(event)
@@ -11,14 +11,14 @@ module Searchkick
       class_eval do
         cattr_reader :searchkick_options, :searchkick_klass
  
-        callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true
+        callbacks = options.key?(:callbacks) ? options[:callbacks] : true
  
         class_variable_set :@@searchkick_options, options.dup
         class_variable_set :@@searchkick_klass, self
         class_variable_set :@@searchkick_callbacks, callbacks
         class_variable_set :@@searchkick_index, options[:index_name] || [options[:index_prefix], model_name.plural, Searchkick.env].compact.join("_")
  
-        define_singleton_method(Searchkick.search_method_name) do |term = nil, options={}, &block|
+        define_singleton_method(Searchkick.search_method_name) do |term = nil, options = {}, &block|
           searchkick_index.search_model(self, term, options, &block)
         end
         extend Searchkick::Reindex # legacy for Searchjoy
@@ -68,10 +68,10 @@ module Searchkick
         if callbacks
           callback_name = callbacks == :async ? :reindex_async : :reindex
           if respond_to?(:after_commit)
-            after_commit callback_name, if: proc{ self.class.search_callbacks? }
+            after_commit callback_name, if: proc { self.class.search_callbacks? }
           else
-            after_save callback_name, if: proc{ self.class.search_callbacks? }
-            after_destroy callback_name, if: proc{ self.class.search_callbacks? }
+            after_save callback_name, if: proc { self.class.search_callbacks? }
+            after_destroy callback_name, if: proc { self.class.search_callbacks? }
           end
         end
  
@@ -22,19 +22,19 @@ module Searchkick
       fields =
         if options[:fields]
           if options[:autocomplete]
-            options[:fields].map{|f| "#{f}.autocomplete" }
+            options[:fields].map { |f| "#{f}.autocomplete" }
           else
             options[:fields].map do |value|
               k, v = value.is_a?(Hash) ? value.to_a.first : [value, :word]
               k2, boost = k.to_s.split("^", 2)
-              field = "#{k2}.#{v == :word ? "analyzed" : v}"
+              field = "#{k2}.#{v == :word ? 'analyzed' : v}"
               boost_fields[field] = boost.to_f if boost
               field
             end
           end
         else
           if options[:autocomplete]
-            (searchkick_options[:autocomplete] || []).map{|f| "#{f}.autocomplete" }
+            (searchkick_options[:autocomplete] || []).map { |f| "#{f}.autocomplete" }
           else
             ["_all"]
           end
@@ -44,7 +44,7 @@ module Searchkick
  
       # pagination
       page = [options[:page].to_i, 1].max
-      per_page = (options[:limit] || options[:per_page] || 100000).to_i
+      per_page = (options[:limit] || options[:per_page] || 100_000).to_i
       padding = [options[:padding].to_i, 0].max
       offset = options[:offset] || (page - 1) * per_page + padding
  
@@ -104,7 +104,7 @@ module Searchkick
                   shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search"),
                   shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search2")
                 ]
-                misspellings = options.has_key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
+                misspellings = options.key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
                 if misspellings != false
                   edit_distance = (misspellings.is_a?(Hash) && (misspellings[:edit_distance] || misspellings[:distance])) || 1
                   qs.concat [
@@ -120,7 +120,7 @@ module Searchkick
                 qs << shared_options.merge(analyzer: analyzer)
               end
  
-              queries.concat(qs.map{|q| {match: {field => q}} })
+              queries.concat(qs.map { |q| {match: {field => q}} })
             end
  
             payload = {
@@ -167,7 +167,7 @@ module Searchkick
  
         boost_by = options[:boost_by] || {}
         if boost_by.is_a?(Array)
-          boost_by = Hash[ boost_by.map{|f| [f, {factor: 1}] } ]
+          boost_by = Hash[boost_by.map { |f| [f, {factor: 1}] }]
         end
         if options[:boost]
           boost_by[options[:boost]] = {factor: 1}
@@ -218,7 +218,7 @@ module Searchkick
           if !boost_by_distance[:field] || !boost_by_distance[:origin]
             raise ArgumentError, "boost_by_distance requires :field and :origin"
           end
-          function_params = boost_by_distance.select{|k,v| [:origin, :scale, :offset, :decay].include?(k) }
+          function_params = boost_by_distance.select { |k, v| [:origin, :scale, :offset, :decay].include?(k) }
           function_params[:origin] = function_params[:origin].reverse
           custom_filters << {
             boost_by_distance[:function] => {
@@ -248,7 +248,7 @@ module Searchkick
         if options[:order]
           order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
           # TODO id transformation for arrays
-          payload[:sort] = order.is_a?(Array) ? order : Hash[ order.map{|k, v| [k.to_s == "id" ? :_id : k, v] } ]
+          payload[:sort] = order.is_a?(Array) ? order : Hash[order.map { |k, v| [k.to_s == "id" ? :_id : k, v] }]
         end
  
         # filters
@@ -263,14 +263,14 @@ module Searchkick
         if options[:facets]
           facets = options[:facets] || {}
           if facets.is_a?(Array) # convert to more advanced syntax
-            facets = Hash[ facets.map{|f| [f, {}] } ]
+            facets = Hash[facets.map { |f| [f, {}] }]
           end
  
           payload[:facets] = {}
           facets.each do |field, facet_options|
             # ask for extra facets due to
             # https://github.com/elasticsearch/elasticsearch/issues/1305
-            size = facet_options[:limit] ? facet_options[:limit] + 150 : 100000
+            size = facet_options[:limit] ? facet_options[:limit] + 150 : 100_000
  
             if facet_options[:ranges]
               payload[:facets][field] = {
@@ -300,7 +300,7 @@ module Searchkick
             # offset is not possible
             # http://elasticsearch-users.115913.n3.nabble.com/Is-pagination-possible-in-termsStatsFacet-td3422943.html
  
-            facet_options.deep_merge!(where: options[:where].reject{|k| k == field}) if options[:smart_facets] == true
+            facet_options.deep_merge!(where: options[:where].reject { |k| k == field }) if options[:smart_facets] == true
             facet_filters = where_filters(facet_options[:where])
             if facet_filters.any?
               payload[:facets][field][:facet_filter] = {
@@ -318,7 +318,7 @@ module Searchkick
  
           # intersection
           if options[:fields]
-            suggest_fields = suggest_fields & options[:fields].map{|v| (v.is_a?(Hash) ? v.keys.first : v).to_s.split("^", 2).first }
+            suggest_fields &= options[:fields].map { |v| (v.is_a?(Hash) ? v.keys.first : v).to_s.split("^", 2).first }
           end
  
           if suggest_fields.any?
@@ -336,11 +336,11 @@ module Searchkick
         # highlight
         if options[:highlight]
           payload[:highlight] = {
-            fields: Hash[ fields.map{|f| [f, {}] } ]
+            fields: Hash[fields.map { |f| [f, {}] }]
           }
  
           if options[:highlight].is_a?(Hash)
-            if tag = options[:highlight][:tag]
+            if (tag = options[:highlight][:tag])
               payload[:highlight][:pre_tags] = [tag]
               payload[:highlight][:post_tags] = [tag.to_s.gsub(/\A</, "</")]
             end
@@ -365,7 +365,7 @@ module Searchkick
         end
  
         if options[:type] || klass != searchkick_klass
-          @type = [options[:type] || klass].flatten.map{|v| searchkick_index.klass_document_type(v) }
+          @type = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v) }
         end
       end
  
@@ -430,7 +430,7 @@ module Searchkick
         field = field.to_s
         facet = response["facets"][field]
         response["facets"][field]["terms"] = facet["terms"].first(limit)
-        response["facets"][field]["other"] = facet["total"] - facet["terms"].sum{|term| term["count"] }
+        response["facets"][field]["other"] = facet["total"] - facet["terms"].sum { |term| term["count"] }
       end
  
       opts = {
@@ -453,7 +453,7 @@ module Searchkick
  
         if field == :or
           value.each do |or_clause|
-            filters << {or: or_clause.map{|or_statement| {and: where_filters(or_statement)} }}
+            filters << {or: or_clause.map { |or_statement| {and: where_filters(or_statement)} }}
           end
         else
           # expand ranges
@@ -507,7 +507,7 @@ module Searchkick
                     raise "Unknown where operator"
                   end
                 # issue 132
-                if existing = filters.find{ |f| f[:range] && f[:range][field] }
+                if (existing = filters.find { |f| f[:range] && f[:range][field] })
                   existing[:range][field].merge!(range_query)
                 else
                   filters << {range: {field => range_query}}
@@ -21,7 +21,7 @@ module Searchkick
           # results can have different types
           results = {}
  
-          hits.group_by{|hit, i| hit["_type"] }.each do |type, grouped_hits|
+          hits.group_by { |hit, i| hit["_type"] }.each do |type, grouped_hits|
             records = type.camelize.constantize
             if options[:includes]
               if defined?(NoBrainer::Document) && records < NoBrainer::Document
@@ -35,7 +35,7 @@ module Searchkick
  
           # sort
           hits.map do |hit|
-            results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
+            results[hit["_type"]].find { |r| r.id.to_s == hit["_id"].to_s }
           end.compact
         else
           hits.map do |hit|
@@ -54,7 +54,7 @@ module Searchkick
  
     def suggestions
       if response["suggest"]
-        response["suggest"].values.flat_map{|v| v.first["options"] }.sort_by{|o| -o["score"] }.map{|o| o["text"] }.uniq
+        response["suggest"].values.flat_map { |v| v.first["options"] }.sort_by { |o| -o["score"] }.map { |o| o["text"] }.uniq
       else
         raise "Pass `suggest: true` to the search method for suggestions"
       end
@@ -68,7 +68,7 @@ module Searchkick
       each_with_hit.map do |model, hit|
         details = {}
         if hit["highlight"]
-          details[:highlight] = Hash[ hit["highlight"].map{|k, v| [(options[:json] ? k : k.sub(/\.analyzed\z/, "")).to_sym, v.first] } ]
+          details[:highlight] = Hash[hit["highlight"].map { |k, v| [(options[:json] ? k : k.sub(/\.analyzed\z/, "")).to_sym, v.first] }]
         end
         [model, details]
       end
@@ -140,16 +140,16 @@ module Searchkick
     def results_query(records, grouped_hits)
       if records.respond_to?(:primary_key) && records.primary_key
         # ActiveRecord
-        records.where(records.primary_key => grouped_hits.map{|hit| hit["_id"] }).to_a
+        records.where(records.primary_key => grouped_hits.map { |hit| hit["_id"] }).to_a
       elsif records.respond_to?(:all) && records.all.respond_to?(:for_ids)
         # Mongoid 2
-        records.all.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
+        records.all.for_ids(grouped_hits.map { |hit| hit["_id"] }).to_a
       elsif records.respond_to?(:queryable)
         # Mongoid 3+
-        records.queryable.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
+        records.queryable.for_ids(grouped_hits.map { |hit| hit["_id"] }).to_a
       elsif records.respond_to?(:unscoped) && records.all.respond_to?(:preload)
         # Nobrainer
-        records.unscoped.where(:id.in => grouped_hits.map{|hit| hit["_id"] }).to_a
+        records.unscoped.where(:id.in => grouped_hits.map { |hit| hit["_id"] }).to_a
       else
         raise "Not sure how to load records"
       end
@@ -3,13 +3,13 @@ require &quot;rake&quot;
 namespace :searchkick do
  
   desc "reindex model"
-  task :reindex => :environment do
+  task reindex: :environment do
     if ENV["CLASS"]
       klass = ENV["CLASS"].constantize rescue nil
       if klass
         klass.reindex
       else
-        abort "Could not find class: #{ENV["CLASS"]}"
+        abort "Could not find class: #{ENV['CLASS']}"
       end
     else
       abort "USAGE: rake searchkick:reindex CLASS=Product"
@@ -20,7 +20,7 @@ namespace :searchkick do
  
     namespace :reindex do
       desc "reindex all models"
-      task :all => :environment do
+      task all: :environment do
         Rails.application.eager_load!
         Searchkick.models.each do |model|
           puts "Reindexing #{model.name}..."
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'searchkick/version'
+require "searchkick/version"
  
 Gem::Specification.new do |spec|
   spec.name          = "searchkick"
   spec.version       = Searchkick::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.description   = %q{Intelligent search made easy}
-  spec.summary       = %q{Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users.}
+  spec.description   = "Intelligent search made easy"
+  spec.summary       = "Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users."
   spec.homepage      = "https://github.com/ankane/searchkick"
   spec.license       = "MIT"
  
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -79,7 +79,7 @@ class TestFacets &lt; Minitest::Test
   protected
  
   def store_facet(options)
-    Hash[ Product.search("Product", options).facets["store_id"]["terms"].map{|v| [v["term"], v["count"]] } ]
+    Hash[Product.search("Product", options).facets["store_id"]["terms"].map { |v| [v["term"], v["count"]] }]
   end
  
 end
@@ -75,24 +75,24 @@ class TestIndex &lt; Minitest::Test
   def test_bad_mapping
     Product.searchkick_index.delete
     store_names ["Product A"]
-    assert_raises(Searchkick::InvalidQueryError){ Product.search "test" }
+    assert_raises(Searchkick::InvalidQueryError) { Product.search "test" }
   ensure
     Product.reindex
   end
  
   def test_missing_index
-    assert_raises(Searchkick::MissingIndexError){ Product.search "test", index_name: "not_found" }
+    assert_raises(Searchkick::MissingIndexError) { Product.search "test", index_name: "not_found" }
   end
  
   def test_unsupported_version
-    raises_exception = lambda { |s| raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
+    raises_exception = ->(s) { raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
     Searchkick.client.stub :search, raises_exception do
-      assert_raises(Searchkick::UnsupportedVersionError){ Product.search("test") }
+      assert_raises(Searchkick::UnsupportedVersionError) { Product.search("test") }
     end
   end
  
   def test_invalid_query
-    assert_raises(Searchkick::InvalidQueryError){ Product.search(query: {}) }
+    assert_raises(Searchkick::InvalidQueryError) { Product.search(query: {}) }
   end
  
   if defined?(ActiveRecord)
@@ -3,7 +3,7 @@ require_relative &quot;test_helper&quot;
 class TestReindexV2Job < Minitest::Test
  
   def setup
-    skip if !defined?(ActiveJob)
+    skip unless defined?(ActiveJob)
     super
     Searchkick.disable_callbacks
   end
@@ -8,7 +8,7 @@ class TestSql &lt; Minitest::Test
   end
  
   def test_no_limit
-    names = 20.times.map{|i| "Product #{i}" }
+    names = 20.times.map { |i| "Product #{i}" }
     store_names names
     assert_search "product", names
   end
@@ -57,7 +57,7 @@ class TestSql &lt; Minitest::Test
       {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, user_ids: [1]},
       {name: "Product C", store_id: 3, in_stock: false, backordered: true, created_at: now - 2, orders_count: 2, user_ids: [1, 3]},
-      {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1},
+      {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1}
     ]
     assert_search "product", ["Product A", "Product B"], where: {in_stock: true}
     # date
@@ -85,7 +85,7 @@ class TestSql &lt; Minitest::Test
     assert_search "product", ["Product A", "Product C"], where: {user_ids: {all: [1, 3]}}
     assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
     # any / nested terms
-    assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1,3]}}
+    assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1, 3]}}
     # not / exists
     assert_search "product", ["Product D"], where: {user_ids: nil}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {user_ids: {not: nil}}
@@ -288,7 +288,7 @@ class TestSql &lt; Minitest::Test
   def test_select
     store [{name: "Product A", store_id: 1}]
     result = Product.search("product", load: false, select: [:name, :store_id]).first
-    assert_equal %w[id name store_id], result.keys.reject{|k| k.start_with?("_") }.sort
+    assert_equal %w[id name store_id], result.keys.reject { |k| k.start_with?("_") }.sort
     assert_equal ["Product A"], result.name # this is not great
   end
  
@@ -19,13 +19,13 @@ class TestSuggest &lt; Minitest::Test
  
   def test_without_option
     store_names ["hi"] # needed to prevent ElasticsearchException - seed 668
-    assert_raises(RuntimeError){ Product.search("hi").suggestions }
+    assert_raises(RuntimeError) { Product.search("hi").suggestions }
   end
  
   def test_multiple_fields
     store [
       {name: "Shark", color: "Sharp"},
-      {name: "Shark", color: "Sharp"},
+      {name: "Shark", color: "Sharp"}
     ]
     assert_suggest_all "shar", ["shark", "sharp"]
   end
@@ -8,7 +8,7 @@ ENV[&quot;RACK_ENV&quot;] = &quot;test&quot;
  
 Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
  
-File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
+File.delete("elasticsearch.log") if File.exist?("elasticsearch.log")
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
  
 I18n.config.enforce_available_locales = true
@@ -26,7 +26,7 @@ if defined?(Mongoid)
     module BSON
       class ObjectId
         def <=>(other)
-          self.data <=> other.data
+          data <=> other.data
         end
       end
     end
@@ -223,7 +223,7 @@ class Animal
   searchkick \
     autocomplete: [:name],
     suggest: [:name],
-    index_name: -> { "#{self.name.tableize}-#{Date.today.year}" }
+    index_name: -> { "#{name.tableize}-#{Date.today.year}" }
     # wordnet: true
 end
  
@@ -252,7 +252,7 @@ class Minitest::Test
   end
  
   def store_names(names, klass = Product)
-    store names.map{|name| {name: name} }, klass
+    store names.map { |name| {name: name} }, klass
   end
  
   # no order
1		-source 'https://rubygems.org'
	1	+source "https://rubygems.org"
2	2
3	3	# Specify your gem's dependencies in searchkick.gemspec
4	4	gemspec
...	...
1	1	require "bundler/gem_tasks"
2	2	require "rake/testtask"
3	3
4		-task :default => :test
	4	+task default: :test
5	5	Rake::TestTask.new do \|t\|
6	6	t.libs << "test"
7	7	t.pattern = "test/*/_test.rb"
...	...
...	...	@@ -44,8 +44,8 @@ module Searchkick
44	44	)
45	45	end
46	46
47		- def self.client=(client)
48		- @client = client
	47	+ class << self
	48	+ attr_writer :client
49	49	end
50	50
51	51	def self.server_version
...	...
...	...	@@ -34,7 +34,7 @@ module Searchkick
34	34	rescue Elasticsearch::Transport::Transport::Errors::NotFound
35	35	[]
36	36	end
37		- actions = old_indices.map{\|old_name\| {remove: {index: old_name, alias: name}} } + [{add: {index: new_name, alias: name}}]
	37	+ actions = old_indices.map { \|old_name\| {remove: {index: old_name, alias: name}} } + [{add: {index: new_name, alias: name}}]
38	38	client.indices.update_aliases body: {actions: actions}
39	39	end
40	40
...	...	@@ -58,11 +58,11 @@ module Searchkick
58	58	end
59	59
60	60	def import(records)
61		- records.group_by{\|r\| document_type(r) }.each do \|type, batch\|
	61	+ records.group_by { \|r\| document_type(r) }.each do \|type, batch\|
62	62	client.bulk(
63	63	index: name,
64	64	type: type,
65		- body: batch.map{\|r\| {index: {_id: search_id(r), data: search_data(r)}} }
	65	+ body: batch.map { \|r\| {index: {_id: search_id(r), data: search_data(r)}} }
66	66	)
67	67	end
68	68	end
...	...	@@ -89,7 +89,7 @@ module Searchkick
89	89
90	90	def reindex_record_async(record)
91	91	if defined?(Searchkick::ReindexV2Job)
92		- Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
	92	+ Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
93	93	else
94	94	Delayed::Job.enqueue Searchkick::ReindexJob.new(record.class.name, record.id.to_s)
95	95	end
...	...	@@ -97,7 +97,7 @@ module Searchkick
97	97
98	98	def similar_record(record, options = {})
99	99	like_text = retrieve(record).to_hash
100		- .keep_if{\|k,v\| !options[:fields] \|\| options[:fields].map(&:to_s).include?(k) }
	100	+ .keep_if { \|k, v\| !options[:fields] \|\| options[:fields].map(&:to_s).include?(k) }
101	101	.values.compact.join(" ")
102	102
103	103	# TODO deep merge method
...	...	@@ -136,7 +136,7 @@ module Searchkick
136	136	# remove old indices that start w/ index_name
137	137	def clean_indices
138	138	all_indices = client.indices.get_aliases
139		- indices = all_indices.select{\|k, v\| (v.empty? \|\| v["aliases"].empty?) && k =~ /\A#{Regexp.escape(name)}_\d{14,17}\z/ }.keys
	139	+ indices = all_indices.select { \|k, v\| (v.empty? \|\| v["aliases"].empty?) && k =~ /\A#{Regexp.escape(name)}_\d{14,17}\z/ }.keys
140	140	indices.each do \|index\|
141	141	Searchkick::Index.new(index).delete
142	142	end
...	...	@@ -180,7 +180,7 @@ module Searchkick
180	180	scope = scope.search_import if scope.respond_to?(:search_import)
181	181	if scope.respond_to?(:find_in_batches)
182	182	scope.find_in_batches batch_size: batch_size do \|batch\|
183		- import batch.select{\|item\| item.should_index? }
	183	+ import batch.select(&:should_index?)
184	184	end
185	185	else
186	186	# https://github.com/karmi/tire/blob/master/lib/tire/model/import.rb
...	...	@@ -333,7 +333,7 @@ module Searchkick
333	333	if synonyms.any?
334	334	settings[:analysis][:filter][:searchkick_synonym] = {
335	335	type: "synonym",
336		- synonyms: synonyms.select{\|s\| s.size > 1 }.map{\|s\| s.join(",") }
	336	+ synonyms: synonyms.select { \|s\| s.size > 1 }.map { \|s\| s.join(",") }
337	337	}
338	338	# choosing a place for the synonym filter when stemming is not easy
339	339	# https://groups.google.com/forum/#!topic/elasticsearch/p7qcQlgHdB8
...	...	@@ -361,7 +361,7 @@ module Searchkick
361	361
362	362	if options[:special_characters] == false
363	363	settings[:analysis][:analyzer].each do \|analyzer, analyzer_settings\|
364		- analyzer_settings[:filter].reject!{\|f\| f == "asciifolding" }
	364	+ analyzer_settings[:filter].reject! { \|f\| f == "asciifolding" }
365	365	end
366	366	end
367	367
...	...	@@ -380,7 +380,7 @@ module Searchkick
380	380
381	381	mapping_options = Hash[
382	382	[:autocomplete, :suggest, :text_start, :text_middle, :text_end, :word_start, :word_middle, :word_end, :highlight]
383		- .map{\|type\| [type, (options[type] \|\| []).map(&:to_s)] }
	383	+ .map { \|type\| [type, (options[type] \|\| []).map(&:to_s)] }
384	384	]
385	385
386	386	mapping_options.values.flatten.uniq.each do \|field\|
...	...	@@ -457,7 +457,7 @@ module Searchkick
457	457	# other
458	458
459	459	def tokens(text, options = {})
460		- client.indices.analyze({text: text, index: name}.merge(options))["tokens"].map{\|t\| t["token"] }
	460	+ client.indices.analyze({text: text, index: name}.merge(options))["tokens"].map { \|t\| t["token"] }
461	461	end
462	462
463	463	def klass_document_type(klass)
...	...	@@ -488,24 +488,24 @@ module Searchkick
488	488
489	489	# stringify fields
490	490	# remove _id since search_id is used instead
491		- source = source.inject({}){\|memo,(k,v)\| memo[k.to_s] = v; memo}.except("_id")
	491	+ source = source.inject({}) { \|memo, (k, v)\| memo[k.to_s] = v; memo }.except("_id")
492	492
493	493	# conversions
494	494	conversions_field = options[:conversions]
495	495	if conversions_field && source[conversions_field]
496		- source[conversions_field] = source[conversions_field].map{\|k, v\| {query: k, count: v} }
	496	+ source[conversions_field] = source[conversions_field].map { \|k, v\| {query: k, count: v} }
497	497	end
498	498
499	499	# hack to prevent generator field doesn't exist error
500	500	(options[:suggest] \|\| []).map(&:to_s).each do \|field\|
501		- source[field] = nil if !source[field]
	501	+ source[field] = nil unless source[field]
502	502	end
503	503
504	504	# locations
505	505	(options[:locations] \|\| []).map(&:to_s).each do \|field\|
506	506	if source[field]
507	507	if source[field].first.is_a?(Array) # array of arrays
508		- source[field] = source[field].map{\|a\| a.map(&:to_f).reverse }
	508	+ source[field] = source[field].map { \|a\| a.map(&:to_f).reverse }
509	509	else
510	510	source[field] = source[field].map(&:to_f).reverse
511	511	end
...	...
...	...	@@ -77,7 +77,7 @@ module Searchkick
77	77
78	78	# no easy way to tell which host the client will use
79	79	host = Searchkick.client.transport.hosts.first
80		- debug " #{color(name, YELLOW, true)} curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map{\|t\| CGI.escape(t) }.join(",")}" : ""}/_search?pretty -d '#{payload[:query][:body].to_json}'"
	80	+ debug " #{color(name, YELLOW, true)} curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map { \|t\| CGI.escape(t) }.join(',')}" : ''}/_search?pretty -d '#{payload[:query][:body].to_json}'"
81	81	end
82	82
83	83	def request(event)
...	...
...	...	@@ -11,14 +11,14 @@ module Searchkick
11	11	class_eval do
12	12	cattr_reader :searchkick_options, :searchkick_klass
13	13
14		- callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true
	14	+ callbacks = options.key?(:callbacks) ? options[:callbacks] : true
15	15
16	16	class_variable_set :@@searchkick_options, options.dup
17	17	class_variable_set :@@searchkick_klass, self
18	18	class_variable_set :@@searchkick_callbacks, callbacks
19	19	class_variable_set :@@searchkick_index, options[:index_name] \|\| [options[:index_prefix], model_name.plural, Searchkick.env].compact.join("_")
20	20
21		- define_singleton_method(Searchkick.search_method_name) do \|term = nil, options={}, &block\|
	21	+ define_singleton_method(Searchkick.search_method_name) do \|term = nil, options = {}, &block\|
22	22	searchkick_index.search_model(self, term, options, &block)
23	23	end
24	24	extend Searchkick::Reindex # legacy for Searchjoy
...	...	@@ -68,10 +68,10 @@ module Searchkick
68	68	if callbacks
69	69	callback_name = callbacks == :async ? :reindex_async : :reindex
70	70	if respond_to?(:after_commit)
71		- after_commit callback_name, if: proc{ self.class.search_callbacks? }
	71	+ after_commit callback_name, if: proc { self.class.search_callbacks? }
72	72	else
73		- after_save callback_name, if: proc{ self.class.search_callbacks? }
74		- after_destroy callback_name, if: proc{ self.class.search_callbacks? }
	73	+ after_save callback_name, if: proc { self.class.search_callbacks? }
	74	+ after_destroy callback_name, if: proc { self.class.search_callbacks? }
75	75	end
76	76	end
77	77
...	...
...	...	@@ -22,19 +22,19 @@ module Searchkick
22	22	fields =
23	23	if options[:fields]
24	24	if options[:autocomplete]
25		- options[:fields].map{\|f\| "#{f}.autocomplete" }
	25	+ options[:fields].map { \|f\| "#{f}.autocomplete" }
26	26	else
27	27	options[:fields].map do \|value\|
28	28	k, v = value.is_a?(Hash) ? value.to_a.first : [value, :word]
29	29	k2, boost = k.to_s.split("^", 2)
30		- field = "#{k2}.#{v == :word ? "analyzed" : v}"
	30	+ field = "#{k2}.#{v == :word ? 'analyzed' : v}"
31	31	boost_fields[field] = boost.to_f if boost
32	32	field
33	33	end
34	34	end
35	35	else
36	36	if options[:autocomplete]
37		- (searchkick_options[:autocomplete] \|\| []).map{\|f\| "#{f}.autocomplete" }
	37	+ (searchkick_options[:autocomplete] \|\| []).map { \|f\| "#{f}.autocomplete" }
38	38	else
39	39	["_all"]
40	40	end
...	...	@@ -44,7 +44,7 @@ module Searchkick
44	44
45	45	# pagination
46	46	page = [options[:page].to_i, 1].max
47		- per_page = (options[:limit] \|\| options[:per_page] \|\| 100000).to_i
	47	+ per_page = (options[:limit] \|\| options[:per_page] \|\| 100_000).to_i
48	48	padding = [options[:padding].to_i, 0].max
49	49	offset = options[:offset] \|\| (page - 1) * per_page + padding
50	50
...	...	@@ -104,7 +104,7 @@ module Searchkick
104	104	shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search"),
105	105	shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search2")
106	106	]
107		- misspellings = options.has_key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
	107	+ misspellings = options.key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
108	108	if misspellings != false
109	109	edit_distance = (misspellings.is_a?(Hash) && (misspellings[:edit_distance] \|\| misspellings[:distance])) \|\| 1
110	110	qs.concat [
...	...	@@ -120,7 +120,7 @@ module Searchkick
120	120	qs << shared_options.merge(analyzer: analyzer)
121	121	end
122	122
123		- queries.concat(qs.map{\|q\| {match: {field => q}} })
	123	+ queries.concat(qs.map { \|q\| {match: {field => q}} })
124	124	end
125	125
126	126	payload = {
...	...	@@ -167,7 +167,7 @@ module Searchkick
167	167
168	168	boost_by = options[:boost_by] \|\| {}
169	169	if boost_by.is_a?(Array)
170		- boost_by = Hash[ boost_by.map{\|f\| [f, {factor: 1}] } ]
	170	+ boost_by = Hash[boost_by.map { \|f\| [f, {factor: 1}] }]
171	171	end
172	172	if options[:boost]
173	173	boost_by[options[:boost]] = {factor: 1}
...	...	@@ -218,7 +218,7 @@ module Searchkick
218	218	if !boost_by_distance[:field] \|\| !boost_by_distance[:origin]
219	219	raise ArgumentError, "boost_by_distance requires :field and :origin"
220	220	end
221		- function_params = boost_by_distance.select{\|k,v\| [:origin, :scale, :offset, :decay].include?(k) }
	221	+ function_params = boost_by_distance.select { \|k, v\| [:origin, :scale, :offset, :decay].include?(k) }
222	222	function_params[:origin] = function_params[:origin].reverse
223	223	custom_filters << {
224	224	boost_by_distance[:function] => {
...	...	@@ -248,7 +248,7 @@ module Searchkick
248	248	if options[:order]
249	249	order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
250	250	# TODO id transformation for arrays
251		- payload[:sort] = order.is_a?(Array) ? order : Hash[ order.map{\|k, v\| [k.to_s == "id" ? :_id : k, v] } ]
	251	+ payload[:sort] = order.is_a?(Array) ? order : Hash[order.map { \|k, v\| [k.to_s == "id" ? :_id : k, v] }]
252	252	end
253	253
254	254	# filters
...	...	@@ -263,14 +263,14 @@ module Searchkick
263	263	if options[:facets]
264	264	facets = options[:facets] \|\| {}
265	265	if facets.is_a?(Array) # convert to more advanced syntax
266		- facets = Hash[ facets.map{\|f\| [f, {}] } ]
	266	+ facets = Hash[facets.map { \|f\| [f, {}] }]
267	267	end
268	268
269	269	payload[:facets] = {}
270	270	facets.each do \|field, facet_options\|
271	271	# ask for extra facets due to
272	272	# https://github.com/elasticsearch/elasticsearch/issues/1305
273		- size = facet_options[:limit] ? facet_options[:limit] + 150 : 100000
	273	+ size = facet_options[:limit] ? facet_options[:limit] + 150 : 100_000
274	274
275	275	if facet_options[:ranges]
276	276	payload[:facets][field] = {
...	...	@@ -300,7 +300,7 @@ module Searchkick
300	300	# offset is not possible
301	301	# http://elasticsearch-users.115913.n3.nabble.com/Is-pagination-possible-in-termsStatsFacet-td3422943.html
302	302
303		- facet_options.deep_merge!(where: options[:where].reject{\|k\| k == field}) if options[:smart_facets] == true
	303	+ facet_options.deep_merge!(where: options[:where].reject { \|k\| k == field }) if options[:smart_facets] == true
304	304	facet_filters = where_filters(facet_options[:where])
305	305	if facet_filters.any?
306	306	payload[:facets][field][:facet_filter] = {
...	...	@@ -318,7 +318,7 @@ module Searchkick
318	318
319	319	# intersection
320	320	if options[:fields]
321		- suggest_fields = suggest_fields & options[:fields].map{\|v\| (v.is_a?(Hash) ? v.keys.first : v).to_s.split("^", 2).first }
	321	+ suggest_fields &= options[:fields].map { \|v\| (v.is_a?(Hash) ? v.keys.first : v).to_s.split("^", 2).first }
322	322	end
323	323
324	324	if suggest_fields.any?
...	...	@@ -336,11 +336,11 @@ module Searchkick
336	336	# highlight
337	337	if options[:highlight]
338	338	payload[:highlight] = {
339		- fields: Hash[ fields.map{\|f\| [f, {}] } ]
	339	+ fields: Hash[fields.map { \|f\| [f, {}] }]
340	340	}
341	341
342	342	if options[:highlight].is_a?(Hash)
343		- if tag = options[:highlight][:tag]
	343	+ if (tag = options[:highlight][:tag])
344	344	payload[:highlight][:pre_tags] = [tag]
345	345	payload[:highlight][:post_tags] = [tag.to_s.gsub(/\A</, "</")]
346	346	end
...	...	@@ -365,7 +365,7 @@ module Searchkick
365	365	end
366	366
367	367	if options[:type] \|\| klass != searchkick_klass
368		- @type = [options[:type] \|\| klass].flatten.map{\|v\| searchkick_index.klass_document_type(v) }
	368	+ @type = [options[:type] \|\| klass].flatten.map { \|v\| searchkick_index.klass_document_type(v) }
369	369	end
370	370	end
371	371
...	...	@@ -430,7 +430,7 @@ module Searchkick
430	430	field = field.to_s
431	431	facet = response["facets"][field]
432	432	response["facets"][field]["terms"] = facet["terms"].first(limit)
433		- response["facets"][field]["other"] = facet["total"] - facet["terms"].sum{\|term\| term["count"] }
	433	+ response["facets"][field]["other"] = facet["total"] - facet["terms"].sum { \|term\| term["count"] }
434	434	end
435	435
436	436	opts = {
...	...	@@ -453,7 +453,7 @@ module Searchkick
453	453
454	454	if field == :or
455	455	value.each do \|or_clause\|
456		- filters << {or: or_clause.map{\|or_statement\| {and: where_filters(or_statement)} }}
	456	+ filters << {or: or_clause.map { \|or_statement\| {and: where_filters(or_statement)} }}
457	457	end
458	458	else
459	459	# expand ranges
...	...	@@ -507,7 +507,7 @@ module Searchkick
507	507	raise "Unknown where operator"
508	508	end
509	509	# issue 132
510		- if existing = filters.find{ \|f\| f[:range] && f[:range][field] }
	510	+ if (existing = filters.find { \|f\| f[:range] && f[:range][field] })
511	511	existing[:range][field].merge!(range_query)
512	512	else
513	513	filters << {range: {field => range_query}}
...	...
...	...	@@ -21,7 +21,7 @@ module Searchkick
21	21	# results can have different types
22	22	results = {}
23	23
24		- hits.group_by{\|hit, i\| hit["_type"] }.each do \|type, grouped_hits\|
	24	+ hits.group_by { \|hit, i\| hit["_type"] }.each do \|type, grouped_hits\|
25	25	records = type.camelize.constantize
26	26	if options[:includes]
27	27	if defined?(NoBrainer::Document) && records < NoBrainer::Document
...	...	@@ -35,7 +35,7 @@ module Searchkick
35	35
36	36	# sort
37	37	hits.map do \|hit\|
38		- results[hit["_type"]].find{\|r\| r.id.to_s == hit["_id"].to_s }
	38	+ results[hit["_type"]].find { \|r\| r.id.to_s == hit["_id"].to_s }
39	39	end.compact
40	40	else
41	41	hits.map do \|hit\|
...	...	@@ -54,7 +54,7 @@ module Searchkick
54	54
55	55	def suggestions
56	56	if response["suggest"]
57		- response["suggest"].values.flat_map{\|v\| v.first["options"] }.sort_by{\|o\| -o["score"] }.map{\|o\| o["text"] }.uniq
	57	+ response["suggest"].values.flat_map { \|v\| v.first["options"] }.sort_by { \|o\| -o["score"] }.map { \|o\| o["text"] }.uniq
58	58	else
59	59	raise "Pass `suggest: true` to the search method for suggestions"
60	60	end
...	...	@@ -68,7 +68,7 @@ module Searchkick
68	68	each_with_hit.map do \|model, hit\|
69	69	details = {}
70	70	if hit["highlight"]
71		- details[:highlight] = Hash[ hit["highlight"].map{\|k, v\| [(options[:json] ? k : k.sub(/\.analyzed\z/, "")).to_sym, v.first] } ]
	71	+ details[:highlight] = Hash[hit["highlight"].map { \|k, v\| [(options[:json] ? k : k.sub(/\.analyzed\z/, "")).to_sym, v.first] }]
72	72	end
73	73	[model, details]
74	74	end
...	...	@@ -140,16 +140,16 @@ module Searchkick
140	140	def results_query(records, grouped_hits)
141	141	if records.respond_to?(:primary_key) && records.primary_key
142	142	# ActiveRecord
143		- records.where(records.primary_key => grouped_hits.map{\|hit\| hit["_id"] }).to_a
	143	+ records.where(records.primary_key => grouped_hits.map { \|hit\| hit["_id"] }).to_a
144	144	elsif records.respond_to?(:all) && records.all.respond_to?(:for_ids)
145	145	# Mongoid 2
146		- records.all.for_ids(grouped_hits.map{\|hit\| hit["_id"] }).to_a
	146	+ records.all.for_ids(grouped_hits.map { \|hit\| hit["_id"] }).to_a
147	147	elsif records.respond_to?(:queryable)
148	148	# Mongoid 3+
149		- records.queryable.for_ids(grouped_hits.map{\|hit\| hit["_id"] }).to_a
	149	+ records.queryable.for_ids(grouped_hits.map { \|hit\| hit["_id"] }).to_a
150	150	elsif records.respond_to?(:unscoped) && records.all.respond_to?(:preload)
151	151	# Nobrainer
152		- records.unscoped.where(:id.in => grouped_hits.map{\|hit\| hit["_id"] }).to_a
	152	+ records.unscoped.where(:id.in => grouped_hits.map { \|hit\| hit["_id"] }).to_a
153	153	else
154	154	raise "Not sure how to load records"
155	155	end
...	...
...	...	@@ -3,13 +3,13 @@ require "rake"
3	3	namespace :searchkick do
4	4
5	5	desc "reindex model"
6		- task :reindex => :environment do
	6	+ task reindex: :environment do
7	7	if ENV["CLASS"]
8	8	klass = ENV["CLASS"].constantize rescue nil
9	9	if klass
10	10	klass.reindex
11	11	else
12		- abort "Could not find class: #{ENV["CLASS"]}"
	12	+ abort "Could not find class: #{ENV['CLASS']}"
13	13	end
14	14	else
15	15	abort "USAGE: rake searchkick:reindex CLASS=Product"
...	...	@@ -20,7 +20,7 @@ namespace :searchkick do
20	20
21	21	namespace :reindex do
22	22	desc "reindex all models"
23		- task :all => :environment do
	23	+ task all: :environment do
24	24	Rails.application.eager_load!
25	25	Searchkick.models.each do \|model\|
26	26	puts "Reindexing #{model.name}..."
...	...
1	1	# coding: utf-8
2		-lib = File.expand_path('../lib', __FILE__)
	2	+lib = File.expand_path("../lib", __FILE__)
3	3	$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4		-require 'searchkick/version'
	4	+require "searchkick/version"
5	5
6	6	Gem::Specification.new do \|spec\|
7	7	spec.name = "searchkick"
8	8	spec.version = Searchkick::VERSION
9	9	spec.authors = ["Andrew Kane"]
10	10	spec.email = ["andrew@chartkick.com"]
11		- spec.description = %q{Intelligent search made easy}
12		- spec.summary = %q{Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users.}
	11	+ spec.description = "Intelligent search made easy"
	12	+ spec.summary = "Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users."
13	13	spec.homepage = "https://github.com/ankane/searchkick"
14	14	spec.license = "MIT"
15	15
16		- spec.files = `git ls-files`.split($/)
	16	+ spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
17	17	spec.executables = spec.files.grep(%r{^bin/}) { \|f\| File.basename(f) }
18	18	spec.test_files = spec.files.grep(%r{^(test\|spec\|features)/})
19	19	spec.require_paths = ["lib"]
...	...