chewy 7.3.1 → 7.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79428eb9af436a7a4c80a2db3c034583768eacc45d00074525f8e6559341ae20
-  data.tar.gz: 23377b8abb6ebfa81f8140990916022f8bbca769b5ad4474a076c8d890ece979
+  metadata.gz: 60e69fe04eed332db4c9ce826c821609a19745f093a12d396d30a25e7785ae4a
+  data.tar.gz: fe8112b8ff752725b4535ad32ffac4483fc210bd4250de92c26251a04e94890b
 SHA512:
-  metadata.gz: 89b6aa83fa54a6b5056623f8255eb34675ad9c3e1494915aa324af752d1a72f9c010fcbcbb3c929a232b32811bbc36956624848efabc09cb382c59fbcee54940
-  data.tar.gz: 90e1da06cf5c38903ca52c6b5379a9271cf277e3c70604b80d77d9ed13496b15ac3874249f2bf67fca7aec3eb9ac9db5e9a20de95eb1da7bb1bfa84307c9c846
+  metadata.gz: 78188a2f073d618aafc5b5677694196c9f4102be5530873a49514bc1bddd93fef87394238ea4220746671a9ea112c9df8b9ada89b41ca56d32b7bc2dfe72f451
+  data.tar.gz: 207b683ccfc886536cf626e8621b1b6dece73bb155251109d9a226e2a9583516bdc7cfedcc140ddbc1c0e2b4893965668a9c4a803baa5e0907c1dfa20dd0fe27

data/CHANGELOG.md

@@ -8,6 +8,26 @@
 
 ### Bugs Fixed
 
+## 7.3.3 (2023-07-07)
+
+### New Features
+
+* [#888](https://github.com/toptal/chewy/pull/888/files): Skip journal creation on import ([@konalegi](https://github.com/konalegi))
+
+### Changes
+
+### Bugs Fixed
+
+## 7.3.2 (2023-04-20)
+
+### New Features
+
+### Changes
+
+### Bugs Fixed
+
+* [#861](https://github.com/toptal/chewy/pull/861): Fix bug in mock_elasticsearch_response_sources ([@lafeber](https://github.com/lafeber))
+
 ## 7.3.1 (2023-04-20)
 
 ### Bugs Fixed

data/lib/chewy/index/import/routine.rb

@@ -64,7 +64,7 @@ module Chewy
         # Creates the journal index and the corresponding index if necessary.
         # @return [Object] whatever
         def create_indexes!
-          Chewy::Stash::Journal.create if @options[:journal]
+          Chewy::Stash::Journal.create if @options[:journal] && !Chewy.configuration[:skip_journal_creation_on_import]
           return if Chewy.configuration[:skip_index_creation_on_import]
 
           @index.create!(**@bulk_options.slice(:suffix)) unless @index.exists?

data/lib/chewy/minitest/helpers.rb

@@ -97,7 +97,7 @@ module Chewy
               {
                 '_index' => index.index_name,
                 '_type' => '_doc',
-                '_id' => (i + 1).to_s,
+                '_id' => hit[:id] || (i + 1).to_s,
                 '_score' => 3.14,
                 '_source' => hit
               }

data/lib/chewy/rake_helper.rb

@@ -197,6 +197,19 @@ module Chewy
         end
       end
 
+      # Creates journal index.
+      #
+      # @example
+      #   Chewy::RakeHelper.journal_create # creates journal
+      #
+      # @param output [IO] output io for logging
+      # @return Chewy::Index Returns instance of chewy index
+      def journal_create(output: $stdout)
+        subscribed_task_stats(output) do
+          Chewy::Stash::Journal.create!
+        end
+      end
+
       # Eager loads and returns all the indexes defined in the application
       # except Chewy::Stash::Specification and Chewy::Stash::Journal.
       #

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '7.3.1'.freeze
+  VERSION = '7.3.3'.freeze
 end

data/lib/tasks/chewy.rake

@@ -87,6 +87,11 @@ namespace :chewy do
   end
 
   namespace :journal do
+    desc 'Create manually journal, useful when `skip_journal_creation_on_import` is used'
+    task create: :environment do |_task, _args|
+      Chewy::RakeHelper.journal_create
+    end
+
     desc 'Applies changes that were done after the specified time for the specified indexes/types or all of them'
     task apply: :environment do |_task, args|
       Chewy::RakeHelper.journal_apply(**parse_journal_args(args.extras))

data/spec/chewy/index/import_spec.rb

@@ -60,6 +60,19 @@ describe Chewy::Index::Import do
         CitiesIndex.import(dummy_city)
       end
     end
+
+    context 'skip journal creation on import' do
+      before do
+        Chewy::Stash::Journal.create!
+        Chewy.config.settings[:skip_journal_creation_on_import] = true
+      end
+      after { Chewy.config.settings[:skip_journal_creation_on_import] = nil }
+
+      specify do
+        expect(Chewy::Stash::Journal).not_to receive(:create!)
+        CitiesIndex.import(dummy_city, journal: true)
+      end
+    end
   end
 
   shared_examples 'importing' do

data/spec/chewy/minitest/helpers_spec.rb

@@ -32,14 +32,14 @@ describe :minitest_helper do
         {
           '_index' => 'dummies',
           '_type' => '_doc',
-          '_id' => '1',
+          '_id' => '2',
           '_score' => 3.14,
           '_source' => source
         }
       ]
     end
 
-    let(:source) { {'name' => 'some_name'} }
+    let(:source) { {'name' => 'some_name', id: '2'} }
     let(:sources) { [source] }
 
     context 'mocks by raw response' do

data/spec/chewy/rake_helper_spec.rb

@@ -470,6 +470,17 @@ Total: \\d+s\\Z
     end
   end
 
+  describe '.journal_create' do
+    specify do
+      output = StringIO.new
+      described_class.journal_create(output: output)
+      expect(Chewy::Stash::Journal.exists?).to be_truthy
+      expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
+Total: \\d+s\\Z
+      OUTPUT
+    end
+  end
+
   describe '.reindex' do
     before do
       journal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.3.3
 platform: ruby
 authors:
 - Toptal, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
@@ -482,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Elasticsearch ODM client wrapper