elasticsearch-model 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed2b3f49b07fddee98c7628224c50ed65147a28a27c0e1cad0234ebe38b645f
-  data.tar.gz: 9c2cea09cb144c08c912352d4f055d70796c6662713900382ee3672a33a90da2
+  metadata.gz: 75f65b56d90c490e0f107c9f57883a91eedc3c1c25793951df233872892f1a01
+  data.tar.gz: fe2cc84bbeb796de9b88f11f741f4822d6c3a4999bbaff5a54f40a339ff918a5
 SHA512:
-  metadata.gz: 3156e42603250f4e3a6deee15c7bf78bfe95a6f2de1c425a45e350e1f7bbe3fc366837dbcbf80b492c2dfedd815c0968e56ba9437da2434342d634bd3993155e
-  data.tar.gz: 3862bef940069503924101479c3c3514a20ae783658a2ae395245f5245328c5e41d5c7e485c6e2371534ccd4502bcc82cf1205846e3f550006fe2b4c79be4d3f
+  metadata.gz: a458e5ad312c67db37c7ff678c4bbfc19570202d72534a089a30818825fae380e06a40a419ec2f854838f0e924315a2d67f46ca9f966da91a264339c91f2be9f
+  data.tar.gz: dba1a2b0c88ecaca8a5b408f4f6ae8757812ad522320ecfd1f823e679398c6e1c042bb35deec5a6cbe38b9043e6e50605558f07cd0c2d33fd9e4642e5786478e

data/.gitignore

@@ -16,6 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 
-gemfiles/3.0.gemfile.lock
-gemfiles/4.0.gemfile.lock
-gemfiles/5.0.gemfile.lock
+gemfiles/*.gemfile.lock

data/elasticsearch-model.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
   s.rdoc_options      = [ "--charset=UTF-8" ]
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.2"
 
-  s.add_dependency "elasticsearch",       '> 1'
+  s.add_dependency "elasticsearch",       '~> 6'
   s.add_dependency "activesupport",       '> 3'
   s.add_dependency "hashie"
 

data/gemfiles/4.0.gemfile

@@ -9,10 +9,11 @@ gemspec path: '../'
 
 gem 'activemodel',  '~> 4'
 gem 'activerecord', '~> 4'
-gem 'sqlite3', '~> 1.3.6' unless defined?(JRUBY_VERSION)
 gem 'mongoid', '~> 5'
+gem 'sqlite3', '~> 1.3.6' unless defined?(JRUBY_VERSION)
 
 group :development, :testing do
-  gem 'rspec'
+  gem 'bigdecimal', '~> 1'
   gem 'pry-nav'
-end
+  gem 'rspec'
+end

data/gemfiles/5.0.gemfile

@@ -10,7 +10,7 @@ gemspec path: '../'
 gem 'activemodel',  '~> 5'
 gem 'activerecord', '~> 5'
 gem 'sqlite3' unless defined?(JRUBY_VERSION)
-gem 'mongoid', '~> 6'
+gem 'mongoid', '~> 6.4'
 
 group :development, :testing do
   gem 'rspec'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,18 @@
+# Usage:
+#
+# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
+# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activemodel',  '~> 6'
+gem 'activerecord', '~> 6'
+gem 'sqlite3' unless defined?(JRUBY_VERSION)
+gem 'mongoid', '~> 7'
+
+group :development, :testing do
+  gem 'rspec'
+  gem 'pry-nav'
+end

data/lib/elasticsearch/model/adapters/active_record.rb

@@ -85,7 +85,7 @@ module Elasticsearch
             scope = scope.__send__(named_scope) if named_scope
             scope = scope.instance_exec(&query) if query
 
-            scope.find_in_batches(options) do |batch|
+            scope.find_in_batches(**options) do |batch|
               batch = self.__send__(preprocess, batch) if preprocess
               yield(batch) if batch.present?
             end

data/lib/elasticsearch/model/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Model
-    VERSION = '6.1.0'
+    VERSION = '6.1.1'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -347,6 +347,7 @@ files:
 - gemfiles/3.0.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/6.0.gemfile
 - lib/elasticsearch/model.rb
 - lib/elasticsearch/model/adapter.rb
 - lib/elasticsearch/model/adapters/active_record.rb
@@ -448,14 +449,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.