elasticsearch-model 7.0.0 → 7.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ced6c99b3278104e708dc2db19a73422273f92b9c18d3aa1f0d552e0ba27d97
-  data.tar.gz: 9075efe50a3f7da082933e3e9acc9751901dc4561f92a70c4d3cbea000c581ee
+  metadata.gz: b92bc72627459220a08885cccd70605e9123b44f23561438fa71d11bf6e64ff5
+  data.tar.gz: 0bf5e719b65b1dda889680f7058676207522293acee1285a6d4d8af6877556fa
 SHA512:
-  metadata.gz: b8f7d0e726d805048544b8ffce8a81b269be4f17c3696241372f6258a7c9add622998718fb23c35b752cc1a51d64a0b8ef42a293b31718f6ba4ed51cfced7586
-  data.tar.gz: 36e3325b72bfa63f8ea133b44086d579bb8727a6e5d8c71115ab25d424b6058e849a32aa68326f5450c1f0fbe5c75fedead8878893309ffbca29901c773367be
+  metadata.gz: 2088cc1213eb7f0f6a078029c386f3f41ecdcf60ba88c0e5d8a6aaccea3564cc4a0c34128fd14b0ac6631d34b8d3ecea46ec901fcad6874b052f3766f6ce6850
+  data.tar.gz: 0721dac95902a27db984c68a49b91cd6b9ad8ceda1c5da3ade39acf5a083ea20423757d4d2391d34103532a1768e673f53f89d086d8c4c1e7437e9c66ef75612

data/README.md

@@ -533,7 +533,7 @@ class Indexer
   Logger = Sidekiq.logger.level == Logger::DEBUG ? Sidekiq.logger : nil
   Client = Elasticsearch::Client.new host: 'localhost:9200', logger: Logger
 
-  def perform_async(operation, record_id)
+  def perform(operation, record_id)
     logger.debug [operation, "ID: #{record_id}"]
 
     case operation.to_s

data/Rakefile

@@ -15,17 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-desc "Run unit tests"
-task :default => 'test:unit'
-task :test    => 'test:unit'
+desc 'Run unit tests'
+task default: 'test:all'
+task test:    'test:all'
 
-if RUBY_VERSION < '2.3'
-  GEMFILES = ['3.0.gemfile', '4.0.gemfile', '5.0.gemfile']
-else
-  GEMFILES = ['4.0.gemfile', '5.0.gemfile', '6.0.gemfile']
-end
+GEMFILES = ['4.0.gemfile', '5.0.gemfile', '6.0.gemfile']
 
 namespace :bundle do
   desc 'Install dependencies for all the Gemfiles in /gemfiles. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
@@ -47,7 +43,6 @@ end
 
 require 'rake/testtask'
 namespace :test do
-
   desc 'Run all tests. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
   task :all, [:rails_versions] do |task, args|
     gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map {|v| "#{v}.gemfile"} : GEMFILES

data/elasticsearch-model.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_dependency "hashie"
 
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 11.1"
+  s.add_development_dependency "rake", "~> 12"
 
   s.add_development_dependency "elasticsearch-extensions"
 

data/lib/elasticsearch/model/importing.rb

@@ -143,6 +143,7 @@ module Elasticsearch
           target_index = options.delete(:index)     || index_name
           target_type  = options.delete(:type)      || document_type
           transform    = options.delete(:transform) || __transform
+          pipeline     = options.delete(:pipeline)
           return_value = options.delete(:return)    || 'count'
 
           unless transform.respond_to?(:call)
@@ -158,10 +159,15 @@ module Elasticsearch
           end
 
           __find_in_batches(options) do |batch|
-            response = client.bulk \
-                         index:   target_index,
-                         type:    target_type,
-                         body:    __batch_to_bulk(batch, transform)
+            params = {
+              index: target_index,
+              type:  target_type,
+              body:  __batch_to_bulk(batch, transform)
+            }
+
+            params[:pipeline] = pipeline if pipeline
+
+            response = client.bulk params
 
             yield response if block_given?
 

data/lib/elasticsearch/model/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Model
-    VERSION = "7.0.0"
+    VERSION = "7.1.0.pre"
   end
 end

data/spec/elasticsearch/model/adapters/active_record/import_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
-
   before(:all) do
     ActiveRecord::Schema.define(:version => 1) do
       create_table :import_articles do |t|
@@ -43,11 +42,9 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
   end
 
   describe '#import' do
-
     context 'when no search criteria is specified' do
-
       before do
-        10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
+        10.times { |i| ImportArticle.create! title: 'Test', views: i.to_s }
         ImportArticle.import
         ImportArticle.__elasticsearch__.refresh_index!
       end
@@ -58,7 +55,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when batch size is specified' do
-
       before do
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
       end
@@ -82,7 +78,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when a scope is specified' do
-
       before do
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
         ImportArticle.import(scope: 'popular', force: true)
@@ -95,7 +90,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when a query is specified' do
-
       before do
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
         ImportArticle.import(query: -> { where('views >= 3') })
@@ -108,7 +102,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when there are invalid documents' do
-
       let!(:result) do
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
         new_article
@@ -132,7 +125,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when a transform proc is specified' do
-
       before do
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
         ImportArticle.import( transform: ->(a) {{ index: { data: { name: a.title, foo: 'BAR' } }}} )
@@ -151,7 +143,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when the model has a default scope' do
-
       around(:all) do |example|
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
         ImportArticle.instance_eval { default_scope { where('views > 3') } }
@@ -170,7 +161,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when there is a default scope and a query specified' do
-
       around(:all) do |example|
         10.times { |i| ImportArticle.create! title: 'Test', views: "#{i}" }
         ImportArticle.instance_eval { default_scope { where('views > 3') } }
@@ -189,7 +179,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
     end
 
     context 'when the batch is empty' do
-
       before do
         ImportArticle.delete_all
         ImportArticle.import

data/spec/elasticsearch/model/adapters/mongoid/multi_model_spec.rb

@@ -24,10 +24,10 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Multimodel', if: test_mong
 
     begin
       ActiveRecord::Schema.define(:version => 1) do
-      create_table Episode.table_name do |t|
-        t.string :name
-        t.datetime :created_at, :default => 'NOW()'
-      end
+        create_table Episode.table_name do |t|
+          t.string :name
+          t.datetime :created_at, :default => 'NOW()'
+        end
       end
     rescue
     end
@@ -36,22 +36,22 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Multimodel', if: test_mong
   before do
     clear_tables(Episode, Image)
     Episode.__elasticsearch__.create_index! force: true
-    Episode.create name: "TheEpisode"
-    Episode.create name: "A great Episode"
-    Episode.create name: "The greatest Episode"
+    Episode.create name: 'TheEpisode'
+    Episode.create name: 'A great Episode'
+    Episode.create name: 'The greatest Episode'
     Episode.__elasticsearch__.refresh_index!
 
     Image.__elasticsearch__.create_index! force: true
-    Image.create! name: "The Image"
-    Image.create! name: "A great Image"
-    Image.create! name: "The greatest Image"
+    Image.create! name: 'The Image'
+    Image.create! name: 'A great Image'
+    Image.create! name: 'The greatest Image'
     Image.__elasticsearch__.refresh_index!
     Image.__elasticsearch__.client.cluster.health wait_for_status: 'yellow'
   end
 
   after do
     [Episode, Image].each do |model|
-      model.__elasticsearch__.client.delete_by_query(index: model.index_name, q: '*')
+      model.__elasticsearch__.client.delete_by_query(index: model.index_name, q: '*', body: {})
       model.delete_all
       model.__elasticsearch__.refresh_index!
     end

data/spec/elasticsearch/model/importing_spec.rb

@@ -227,5 +227,17 @@ describe Elasticsearch::Model::Importing do
         end
       end
     end
+
+    context 'when a pipeline is provided as an options' do
+
+      before do
+        expect(DummyImportingModel).to receive(:client).and_return(client)
+        expect(client).to receive(:bulk).with(body: nil, index: 'foo', type: 'foo', pipeline: 'my-pipeline').and_return(response)
+      end
+
+      it 'uses the pipeline option' do
+        expect(DummyImportingModel.import(pipeline: 'my-pipeline')).to eq(0)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -81,8 +81,16 @@ end
 # @since 6.0.1
 def clear_indices(*models)
   models.each do |model|
-    begin; Elasticsearch::Model.client.delete_by_query(index: model.index_name, q: '*'); rescue; end
-  end and true
+    begin
+      Elasticsearch::Model.client.delete_by_query(
+        index: model.index_name,
+        q: '*',
+        body: {}
+      )
+    rescue
+    end
+  end
+  true
 end
 
 # Delete all documents from the tables of the provided list of models.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -452,11 +452,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.