searchkick 3.1.0 → 3.1.1

data/lib/searchkick/record_data.rb

@@ -61,7 +61,7 @@ module Searchkick
       # hack to prevent generator field doesn't exist error
       if !partial_reindex
         index.suggest_fields.each do |field|
-          if !source[field] && !source[field.to_sym]
+          if !source.key?(field) && !source.key?(field.to_sym)
             source[field] = nil
           end
         end
@@ -112,7 +112,7 @@ module Searchkick
           # performance
           if v.is_a?(BigDecimal)
             obj[k] = v.to_f
-          elsif v.is_a?(Enumerable) ||
+          elsif v.is_a?(Enumerable)
             obj[k] = cast_big_decimal(v)
           end
         end

data/lib/searchkick/results.rb

@@ -132,7 +132,7 @@ module Searchkick
     end
 
     def total_count
-      response["hits"]["total"]
+      options[:total_entries] || response["hits"]["total"]
     end
     alias_method :total_entries, :total_count
 
@@ -195,7 +195,7 @@ module Searchkick
     end
 
     def with_highlights(multiple: false)
-      with_hit do |result, hit|
+      with_hit.map do |result, hit|
         [result, hit_highlights(hit, multiple: multiple)]
       end
     end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -94,26 +94,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Intelligent search made easy
-email:
-- andrew@chartkick.com
+description: 
+email: andrew@chartkick.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- benchmark/Gemfile
-- benchmark/index.rb
-- benchmark/search.rb
-- docs/Searchkick-3-Upgrade.md
 - lib/searchkick.rb
 - lib/searchkick/bulk_indexer.rb
 - lib/searchkick/bulk_reindex_job.rb
@@ -135,48 +125,6 @@ files:
 - lib/searchkick/results.rb
 - lib/searchkick/tasks.rb
 - lib/searchkick/version.rb
-- searchkick.gemspec
-- test/aggs_test.rb
-- test/autocomplete_test.rb
-- test/boost_test.rb
-- test/callbacks_test.rb
-- test/ci/before_install.sh
-- test/errors_test.rb
-- test/gemfiles/activerecord42.gemfile
-- test/gemfiles/activerecord50.gemfile
-- test/gemfiles/activerecord51.gemfile
-- test/gemfiles/apartment.gemfile
-- test/gemfiles/cequel.gemfile
-- test/gemfiles/mongoid5.gemfile
-- test/gemfiles/mongoid6.gemfile
-- test/gemfiles/nobrainer.gemfile
-- test/gemfiles/parallel_tests.gemfile
-- test/geo_shape_test.rb
-- test/highlight_test.rb
-- test/index_test.rb
-- test/inheritance_test.rb
-- test/language_test.rb
-- test/marshal_test.rb
-- test/match_test.rb
-- test/misspellings_test.rb
-- test/model_test.rb
-- test/multi_search_test.rb
-- test/multi_tenancy_test.rb
-- test/order_test.rb
-- test/pagination_test.rb
-- test/partial_reindex_test.rb
-- test/query_test.rb
-- test/reindex_test.rb
-- test/reindex_v2_job_test.rb
-- test/routing_test.rb
-- test/should_index_test.rb
-- test/similar_test.rb
-- test/sql_test.rb
-- test/suggest_test.rb
-- test/support/kaminari.yml
-- test/synonyms_test.rb
-- test/test_helper.rb
-- test/where_test.rb
 homepage: https://github.com/ankane/searchkick
 licenses:
 - MIT
@@ -189,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -197,54 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-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.
-test_files:
-- benchmark/Gemfile
-- benchmark/index.rb
-- benchmark/search.rb
-- test/aggs_test.rb
-- test/autocomplete_test.rb
-- test/boost_test.rb
-- test/callbacks_test.rb
-- test/ci/before_install.sh
-- test/errors_test.rb
-- test/gemfiles/activerecord42.gemfile
-- test/gemfiles/activerecord50.gemfile
-- test/gemfiles/activerecord51.gemfile
-- test/gemfiles/apartment.gemfile
-- test/gemfiles/cequel.gemfile
-- test/gemfiles/mongoid5.gemfile
-- test/gemfiles/mongoid6.gemfile
-- test/gemfiles/nobrainer.gemfile
-- test/gemfiles/parallel_tests.gemfile
-- test/geo_shape_test.rb
-- test/highlight_test.rb
-- test/index_test.rb
-- test/inheritance_test.rb
-- test/language_test.rb
-- test/marshal_test.rb
-- test/match_test.rb
-- test/misspellings_test.rb
-- test/model_test.rb
-- test/multi_search_test.rb
-- test/multi_tenancy_test.rb
-- test/order_test.rb
-- test/pagination_test.rb
-- test/partial_reindex_test.rb
-- test/query_test.rb
-- test/reindex_test.rb
-- test/reindex_v2_job_test.rb
-- test/routing_test.rb
-- test/should_index_test.rb
-- test/similar_test.rb
-- test/sql_test.rb
-- test/suggest_test.rb
-- test/support/kaminari.yml
-- test/synonyms_test.rb
-- test/test_helper.rb
-- test/where_test.rb
+summary: Intelligent search made easy
+test_files: []

data/.github/ISSUE_TEMPLATE.md

@@ -1,7 +0,0 @@
-Hi,
-
-Before creating an issue, please check out the Contributing Guide:
-
-https://github.com/ankane/searchkick/blob/master/CONTRIBUTING.md
-
-Thanks!

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-*.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.log
-.DS_Store
-.ruby-*
-.idea/
-*.sqlite3

data/.travis.yml

@@ -1,33 +0,0 @@
-sudo: false
-language: ruby
-rvm: 2.4.2
-services:
-  - mongodb
-  - redis-server
-before_install:
-  - ./test/ci/before_install.sh
-script: bundle exec rake test
-before_script:
-  - psql -c 'create database searchkick_test;' -U postgres
-notifications:
-  email:
-    on_success: never
-    on_failure: change
-gemfile:
-  - Gemfile
-  - test/gemfiles/activerecord51.gemfile
-  - test/gemfiles/activerecord50.gemfile
-  - test/gemfiles/activerecord42.gemfile
-  - test/gemfiles/mongoid5.gemfile
-  - test/gemfiles/mongoid6.gemfile
-env:
-  - ELASTICSEARCH_VERSION=6.2.3
-jdk: oraclejdk8
-matrix:
-  include:
-    - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=5.0.1
-    - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=5.6.7
-    - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=6.0.0

data/Gemfile

@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in searchkick.gemspec
-gemspec
-
-gem "sqlite3"
-gem "activerecord"
-gem "gemoji-parser"
-gem "typhoeus"
-gem "activejob"
-gem "redis"
-gem "connection_pool"
-
-# kaminari
-gem "actionpack"
-gem "kaminari"

data/Rakefile

@@ -1,16 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-begin
-  require "parallel_tests/tasks"
-  require "shellwords"
-rescue LoadError
-  # do nothing
-end
-
-task default: :test
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-  t.warning = false
-end

data/benchmark/Gemfile

@@ -1,24 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
-
-gem "sqlite3"
-gem "pg"
-gem "activerecord", "~> 5.1.0"
-gem "activerecord-import"
-gem "activejob"
-gem "redis"
-gem "sidekiq"
-
-# performance
-gem "typhoeus"
-gem "oj"
-
-# profiling
-gem "ruby-prof"
-gem "allocation_stats"
-gem "get_process_mem"
-gem "memory_profiler"
-gem "allocation_tracer"
-gem "benchmark-ips"

data/benchmark/index.rb

@@ -1,99 +0,0 @@
-require "bundler/setup"
-Bundler.require(:default)
-require "active_record"
-require "benchmark"
-require "active_support/notifications"
-
-ActiveSupport::Notifications.subscribe "request.searchkick" do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  puts "Import: #{event.duration.round}ms"
-end
-
-ActiveJob::Base.queue_adapter = :sidekiq
-
-Searchkick.redis = Redis.new
-
-ActiveRecord::Base.default_timezone = :utc
-ActiveRecord::Base.time_zone_aware_attributes = true
-# ActiveRecord::Base.establish_connection adapter: "sqlite3", database: "/tmp/searchkick"
-ActiveRecord::Base.establish_connection "postgresql://localhost/searchkick_demo_development"
-# ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-ActiveJob::Base.logger = nil
-
-class Product < ActiveRecord::Base
-  searchkick batch_size: 1000
-
-  def search_data
-    {
-      name: name,
-      color: color,
-      store_id: store_id
-    }
-  end
-end
-
-if ENV["SETUP"]
-  total_docs = 100000
-
-  ActiveRecord::Migration.create_table :products, force: :cascade do |t|
-    t.string :name
-    t.string :color
-    t.integer :store_id
-  end
-
-  Product.import ["name", "color", "store_id"], total_docs.times.map { |i| ["Product #{i}", ["red", "blue"].sample, rand(10)] }
-
-  puts "Imported"
-end
-
-result = nil
-report = nil
-stats = nil
-
-Product.searchkick_index.delete rescue nil
-
-GC.start
-GC.disable
-start_mem = GetProcessMem.new.mb
-
-time =
-  Benchmark.realtime do
-    # result = RubyProf.profile do
-    # report = MemoryProfiler.report do
-    # stats = AllocationStats.trace do
-    reindex = Product.reindex #(async: true)
-    # p reindex
-    # end
-
-    # 60.times do |i|
-    #   if reindex.is_a?(Hash)
-    #     docs = Searchkick::Index.new(reindex[:index_name]).total_docs
-    #   else
-    #     docs = Product.searchkick_index.total_docs
-    #   end
-    #   puts "#{i}: #{docs}"
-    #   if docs == total_docs
-    #     break
-    #   end
-    #   p Searchkick.reindex_status(reindex[:index_name]) if reindex.is_a?(Hash)
-    #   sleep(1)
-    #   # Product.searchkick_index.refresh
-    # end
-  end
-
-puts
-puts "Time: #{time.round(1)}s"
-
-if result
-  printer = RubyProf::GraphPrinter.new(result)
-  printer.print(STDOUT, min_percent: 5)
-end
-
-if report
-  puts report.pretty_print
-end
-
-if stats
-  puts result.allocations(alias_paths: true).group_by(:sourcefile, :class).to_text
-end

data/benchmark/search.rb

@@ -1,48 +0,0 @@
-require "bundler/setup"
-Bundler.require(:default)
-require "active_record"
-require "benchmark/ips"
-
-ActiveRecord::Base.default_timezone = :utc
-ActiveRecord::Base.time_zone_aware_attributes = true
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: "/tmp/searchkick"
-
-class Product < ActiveRecord::Base
-  searchkick batch_size: 1000
-
-  def search_data
-    {
-      name: name,
-      color: color,
-      store_id: store_id
-    }
-  end
-end
-
-if ENV["SETUP"]
-  total_docs = 1000000
-
-  ActiveRecord::Migration.create_table :products, force: :cascade do |t|
-    t.string :name
-    t.string :color
-    t.integer :store_id
-  end
-
-  Product.import ["name", "color", "store_id"], total_docs.times.map { |i| ["Product #{i}", ["red", "blue"].sample, rand(10)] }
-
-  puts "Imported"
-
-  Product.reindex
-
-  puts "Reindexed"
-end
-
-query = Product.search("product", fields: [:name], where: {color: "red", store_id: 5}, limit: 10000, load: false, execute: false)
-
-require "pp"
-pp query.body.as_json
-puts
-
-Benchmark.ips do |x|
-  x.report { query.dup.execute }
-end