elasticsearch-model 6.1.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed2b3f49b07fddee98c7628224c50ed65147a28a27c0e1cad0234ebe38b645f
-  data.tar.gz: 9c2cea09cb144c08c912352d4f055d70796c6662713900382ee3672a33a90da2
+  metadata.gz: b03831123fac4d5c82bed8ab8136476abd886d907d6a04b186c2de104c73d785
+  data.tar.gz: 1a54df7450657fc3c86340a4ec391b12d75ca782e8e75066c2cc3558c488f981
 SHA512:
-  metadata.gz: 3156e42603250f4e3a6deee15c7bf78bfe95a6f2de1c425a45e350e1f7bbe3fc366837dbcbf80b492c2dfedd815c0968e56ba9437da2434342d634bd3993155e
-  data.tar.gz: 3862bef940069503924101479c3c3514a20ae783658a2ae395245f5245328c5e41d5c7e485c6e2371534ccd4502bcc82cf1205846e3f550006fe2b4c79be4d3f
+  metadata.gz: 1893f7a7eb133a07221107867a12edce4dce2b6fd0d1ef983f82ca0b09312a3b80a1ae6dfcede98d6471340310a1115dba1bb3f0eac13ff15ba2f95a06546b4d
+  data.tar.gz: 247f34bddbb52d4a6cdabf5b23b4691f6b95ed81018ee80731194916423ccc409fd1b47d20a3ea8c134d6eb6749fcbc6f62ebf7fa4378867d3b781c2872521bf

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/Rakefile

@@ -14,13 +14,14 @@ 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'
   task :install do
     unless defined?(JRUBY_VERSION)
-      puts '-'*80
+      puts '-' * 80
       gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map { |v| "#{v}.gemfile"} : GEMFILES
       gemfiles.each do |gemfile|
-        Bundler.with_clean_env do
+        puts "GEMFILE: #{gemfile}"
+        Bundler.with_unbundled_env do
           sh "bundle install --gemfile #{File.expand_path('../gemfiles/'+gemfile, __FILE__)}"
         end
-        puts '-'*80
+        puts '-' * 80
       end
     end
   end
@@ -36,6 +37,7 @@ namespace :test do
     gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map {|v| "#{v}.gemfile"} : GEMFILES
     puts '-' * 80
     gemfiles.each do |gemfile|
+      puts "GEMFILE: #{gemfile}"
       sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " +
              " bundle exec rspec"
       puts '-' * 80

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.2'
   end
 end

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

@@ -37,7 +37,8 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Serialization' do
     context 'when a document is updated' do
 
       before do
-        article.update_attributes(title: 'UPDATED', status: 'yellow')
+        article.update_attribute(:title, 'UPDATED')
+        article.update_attribute(:status, 'yellow')
         ArticleWithCustomSerialization.__elasticsearch__.refresh_index!
       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.2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2023-01-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.3.7
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.