chewy 5.1.0 → 5.2.0

data/spec/chewy/search/response_spec.rb

@@ -72,7 +72,10 @@ describe Chewy::Search::Response, :orm do
         Chewy::Search::Request.new(PlacesIndex)
           .query(script: {script: {inline: 'sleep(100); true', lang: 'groovy'}})
       end
-      specify { expect(subject.took).to be > 100 }
+      specify do
+        pending
+        expect(subject.took).to be > 100
+      end
     end
   end
 
@@ -84,7 +87,10 @@ describe Chewy::Search::Response, :orm do
         Chewy::Search::Request.new(PlacesIndex)
           .query(script: {script: {inline: 'sleep(100); true', lang: 'groovy'}}).timeout('10ms')
       end
-      specify { expect(subject.timed_out?).to eq(true) }
+      specify do
+        pending
+        expect(subject.timed_out?).to eq(true)
+      end
     end
   end
 

data/spec/chewy/search_spec.rb

@@ -71,12 +71,12 @@ describe Chewy::Search do
             filter { match name: "Name#{index}" }
           end
 
-          field :name, KEYWORD_FIELD
+          field :name, **KEYWORD_FIELD
           field :rating, type: :integer
         end
 
         define_type Country do
-          field :name, KEYWORD_FIELD
+          field :name, **KEYWORD_FIELD
           field :rating, type: :integer
         end
       end

data/spec/chewy/strategy/active_job_spec.rb

@@ -2,7 +2,12 @@ require 'spec_helper'
 
 if defined?(::ActiveJob)
   describe Chewy::Strategy::ActiveJob do
-    around { |example| Chewy.strategy(:bypass) { example.run } }
+    around do |example|
+      active_job_settings = Chewy.settings[:active_job]
+      Chewy.settings[:active_job] = {queue: 'low'}
+      Chewy.strategy(:bypass) { example.run }
+      Chewy.settings[:active_job] = active_job_settings
+    end
     before(:all) do
       ::ActiveJob::Base.logger = Chewy.logger
     end
@@ -36,7 +41,15 @@ if defined?(::ActiveJob)
       end
       enqueued_job = ::ActiveJob::Base.queue_adapter.enqueued_jobs.first
       expect(enqueued_job[:job]).to eq(Chewy::Strategy::ActiveJob::Worker)
-      expect(enqueued_job[:queue]).to eq('chewy')
+      expect(enqueued_job[:queue]).to eq('low')
+    end
+
+    specify do
+      Chewy.strategy(:active_job) do
+        [city, other_city].map(&:save!)
+      end
+      enqueued_job = ::ActiveJob::Base.queue_adapter.enqueued_jobs.first
+      expect(enqueued_job[:queue]).to eq('low')
     end
 
     specify do

data/spec/chewy/strategy/shoryuken_spec.rb

@@ -4,7 +4,12 @@ if defined?(::Shoryuken)
   require 'aws-sdk-sqs'
 
   describe Chewy::Strategy::Shoryuken do
-    around { |example| Chewy.strategy(:bypass) { example.run } }
+    around do |example|
+      shoryuken_settings = Chewy.settings[:shoryuken]
+      Chewy.settings[:shoryuken] = {queue: 'low'}
+      Chewy.strategy(:bypass) { example.run }
+      Chewy.settings[:shoryuken] = shoryuken_settings
+    end
     before { ::Shoryuken.groups.clear }
     before do
       stub_model(:city) do
@@ -31,7 +36,6 @@ if defined?(::Shoryuken)
     end
 
     specify do
-      Chewy.settings[:shoryuken] = {queue: 'low'}
       expect(Chewy::Strategy::Shoryuken::Worker).to receive(:perform_async)
         .with(hash_including(type: 'CitiesIndex::City', ids: [city.id, other_city.id]), hash_including(queue: 'low'))
       Chewy.strategy(:shoryuken) do

data/spec/chewy/strategy/sidekiq_spec.rb

@@ -4,7 +4,12 @@ if defined?(::Sidekiq)
   require 'sidekiq/testing'
 
   describe Chewy::Strategy::Sidekiq do
-    around { |example| Chewy.strategy(:bypass) { example.run } }
+    around do |example|
+      sidekiq_settings = Chewy.settings[:sidekiq]
+      Chewy.settings[:sidekiq] = {queue: 'low'}
+      Chewy.strategy(:bypass) { example.run }
+      Chewy.settings[:sidekiq] = sidekiq_settings
+    end
     before { ::Sidekiq::Worker.clear_all }
     before do
       stub_model(:city) do
@@ -25,7 +30,6 @@ if defined?(::Sidekiq)
     end
 
     specify do
-      Chewy.settings[:sidekiq] = {queue: 'low'}
       expect(::Sidekiq::Client).to receive(:push).with(hash_including('queue' => 'low')).and_call_original
       ::Sidekiq::Testing.inline! do
         expect { [city, other_city].map(&:save!) }

data/spec/chewy/type/adapter/active_record_spec.rb

@@ -454,9 +454,9 @@ describe Chewy::Type::Adapter::ActiveRecord, :active_record do
       specify do
         expect(subject.import_fields(fields: [:updated_at], typecast: false))
           .to match([contain_exactly(
-            [1, match(/#{Time.now.strftime('%Y-%m-%d')}/)],
-            [2, match(/#{Time.now.strftime('%Y-%m-%d')}/)],
-            [3, match(/#{Time.now.strftime('%Y-%m-%d')}/)]
+            [1, match(/#{Time.now.utc.strftime('%Y-%m-%d')}/)],
+            [2, match(/#{Time.now.utc.strftime('%Y-%m-%d')}/)],
+            [3, match(/#{Time.now.utc.strftime('%Y-%m-%d')}/)]
           )])
       end
     end

data/spec/chewy/type/import/bulk_builder_spec.rb

@@ -117,7 +117,7 @@ describe Chewy::Type::Import::BulkBuilder do
       context 'updating parent' do
         before do
           PlacesIndex::City.import(city)
-          city.update_attributes(country_id: another_country.id)
+          city.update(country_id: another_country.id)
         end
         let(:index) { [city] }
 

data/spec/chewy/type/observe_spec.rb

@@ -75,11 +75,11 @@ describe Chewy::Type::Observe do
       specify { expect { city.save! }.to update_index('cities#city').and_reindex(city).only }
       specify { expect { city.save! }.to update_index('countries#country').and_reindex(country1).only }
 
-      specify { expect { city.update_attributes!(country: nil) }.to update_index('cities#city').and_reindex(city).only }
-      specify { expect { city.update_attributes!(country: nil) }.to update_index('countries#country').and_reindex(country1).only }
+      specify { expect { city.update!(country: nil) }.to update_index('cities#city').and_reindex(city).only }
+      specify { expect { city.update!(country: nil) }.to update_index('countries#country').and_reindex(country1).only }
 
-      specify { expect { city.update_attributes!(country: country2) }.to update_index('cities#city').and_reindex(city).only }
-      specify { expect { city.update_attributes!(country: country2) }.to update_index('countries#country').and_reindex(country1, country2).only }
+      specify { expect { city.update!(country: country2) }.to update_index('cities#city').and_reindex(city).only }
+      specify { expect { city.update!(country: country2) }.to update_index('countries#country').and_reindex(country1, country2).only }
     end
 
     context do

data/spec/spec_helper.rb

@@ -21,8 +21,11 @@ require 'support/class_helpers'
 
 require 'chewy/rspec'
 
+host = ENV['ES_HOST'] || 'localhost'
+port = ENV['ES_PORT'] || 9250
+
 Chewy.settings = {
-  host: 'localhost:9250',
+  host: "#{host}:#{port}",
   wait_for_status: 'green',
   index: {
     number_of_shards: 1,

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
+- Toptal, LLC
 - pyromaniac
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -84,14 +85,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
 - !ruby/object:Gem::Dependency
@@ -198,14 +199,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -237,16 +238,17 @@ dependencies:
 description: Chewy provides functionality for Elasticsearch index handling, documents
   import mappings and chainable query DSL
 email:
+- open-source@toptal.com
 - kinwizard@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
@@ -258,15 +260,11 @@ files:
 - Rakefile
 - chewy.gemspec
 - filters
-- gemfiles/rails.4.0.activerecord.gemfile
-- gemfiles/rails.4.1.activerecord.gemfile
-- gemfiles/rails.4.2.activerecord.gemfile
-- gemfiles/rails.4.2.mongoid.5.2.gemfile
-- gemfiles/rails.5.0.activerecord.gemfile
-- gemfiles/rails.5.0.mongoid.6.1.gemfile
-- gemfiles/rails.5.1.activerecord.gemfile
-- gemfiles/rails.5.1.mongoid.6.3.gemfile
 - gemfiles/rails.5.2.activerecord.gemfile
+- gemfiles/rails.5.2.mongoid.6.4.gemfile
+- gemfiles/rails.6.0.activerecord.gemfile
+- gemfiles/rails.6.1.activerecord.gemfile
+- gemfiles/ruby3.gemfile
 - gemfiles/sequel.4.45.gemfile
 - lib/chewy.rb
 - lib/chewy/backports/deep_dup.rb
@@ -521,7 +519,7 @@ homepage: https://github.com/toptal/chewy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -536,8 +534,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
 test_files:

data/.travis.yml

@@ -1,45 +0,0 @@
-language: ruby
-sudo: false
-services:
-  - mongodb
-jdk:
-  - oraclejdk8
-rvm:
-  - 2.4.3
-env:
-  global:
-    - TEST_CLUSTER_NODES=1
-  matrix:
-    - ES_VERSION=5.6.7
-gemfile:
-  - gemfiles/rails.5.0.activerecord.gemfile
-  - gemfiles/rails.5.1.activerecord.gemfile
-  - gemfiles/rails.5.0.mongoid.6.1.gemfile
-  - gemfiles/rails.5.1.mongoid.6.3.gemfile
-  - gemfiles/sequel.4.45.gemfile
-matrix:
-  include:
-  - rvm: 2.2.9
-    gemfile: gemfiles/rails.4.0.activerecord.gemfile
-    env: ES_VERSION=2.4.6
-  - rvm: 2.2.9
-    gemfile: gemfiles/rails.4.1.activerecord.gemfile
-    env: ES_VERSION=2.4.6
-  - rvm: 2.3.6
-    gemfile: gemfiles/rails.4.2.activerecord.gemfile
-    env: ES_VERSION=2.4.6
-  - rvm: 2.3.6
-    gemfile: gemfiles/rails.4.2.mongoid.5.2.gemfile
-    env: ES_VERSION=2.4.6
-  - rvm: 2.5.1
-    gemfile: gemfiles/rails.5.2.activerecord.gemfile
-    env: ES_VERSION=5.6.7
-before_install:
-  - curl -s https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.6/elasticsearch-2.4.6.tar.gz | tar xz -C /tmp
-  - curl -s https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.7.tar.gz | tar xz -C /tmp
-before_script:
-  - /tmp/elasticsearch-2.4.6/bin/plugin install delete-by-query
-  - TEST_CLUSTER_COMMAND=/tmp/elasticsearch-$ES_VERSION/bin/elasticsearch TEST_CLUSTER_LOGS=/tmp/log rake es:start
-script:
-  - bundle exec rspec
-  - bundle exec rubocop

data/gemfiles/rails.4.0.activerecord.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari", "~> 0.17.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
-
-gemspec path: "../"

data/gemfiles/rails.4.1.activerecord.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.0"
-gem "activesupport", "~> 4.1.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari", "~> 0.17.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
-
-gemspec path: "../"

data/gemfiles/rails.4.2.activerecord.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.0"
-gem "activesupport", "~> 4.2.0"
-gem "activejob", "~> 4.2.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari", "~> 0.17.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
-
-gemspec path: "../"

data/gemfiles/rails.4.2.mongoid.5.2.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "~> 5.2.0"
-gem "activesupport", "~> 4.2.0"
-gem "activejob", "~> 4.2.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari", "~> 0.17.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
-
-gemspec path: "../"

data/gemfiles/rails.5.1.mongoid.6.3.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", "~> 6.3.0"
-gem "activesupport", "~> 5.1.0"
-gem "activejob", "~> 5.1.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.1.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
-
-gemspec path: "../"