Minor updates

Author: picandocodigo

Gemfile

@@ -17,13 +17,13 @@
 
 source 'https://rubygems.org'
 
-gem "rake", "~> 12"
-gem "elasticsearch"
-gem "pry"
-gem "ansi"
-gem "cane"
+gem 'ansi'
+gem 'cane'
+gem 'elasticsearch', '~> 7'
+gem 'pry'
+gem 'rake', '~> 12'
 
 group :development do
-  gem 'yard'
   gem 'rspec'
+  gem 'yard'
 end

elasticsearch-model/Rakefile

@@ -48,12 +48,12 @@ 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
+    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"
+      sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " \
+             ' bundle exec rspec'
       puts '-' * 80
     end
   end

elasticsearch-model/elasticsearch-model.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.name          = 'elasticsearch-model'
   s.version       = Elasticsearch::Model::VERSION
   s.authors       = ['Karel Minarik']
-  s.email         = ['karel.minarik@elasticsearch.org']
+  s.email         = ['support@elastic.co']
   s.description   = 'ActiveModel/Record integrations for Elasticsearch.'
   s.summary       = 'ActiveModel/Record integrations for Elasticsearch.'
   s.homepage      = 'https://github.com/elasticsearch/elasticsearch-rails/'

elasticsearch-model/gemfiles/6.0.gemfile

@@ -20,17 +20,16 @@
 # $ 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.0.0'
 gem 'activerecord', '6.0.0'
 gem 'sqlite3' unless defined?(JRUBY_VERSION)
-#gem 'mongoid', '~> 6'
+# gem 'mongoid', '~> 6'
 
 group :development, :testing do
-  gem 'rspec'
   gem 'pry-nav'
+  gem 'rspec'
 end

elasticsearch-model/lib/elasticsearch/model/adapters/mongoid.rb

@@ -18,18 +18,21 @@
 module Elasticsearch
   module Model
     module Adapter
-
       # An adapter for Mongoid-based models
       #
       # @see http://mongoid.org
       #
       module Mongoid
-
-        Adapter.register self,
-                         lambda { |klass| !!defined?(::Mongoid::Document) && klass.respond_to?(:ancestors) && klass.ancestors.include?(::Mongoid::Document) }
+        Adapter.register(
+          self,
+          lambda do |klass|
+            !!defined?(::Mongoid::Document) &&
+              klass.respond_to?(:ancestors) &&
+              klass.ancestors.include?(::Mongoid::Document)
+          end
+        )
 
         module Records
-
           # Return a `Mongoid::Criteria` instance
           #
           def records
@@ -59,7 +62,6 @@ def records
         end
 
         module Callbacks
-
           # Handle index updates (creating, updating or deleting documents)
           # when the model changes, by hooking into the lifecycle
           #
@@ -73,7 +75,6 @@ def self.included(base)
         end
 
         module Importing
-
           # Fetch batches of records from the database
           #
           # @see https://github.com/mongoid/mongoid/issues/1334
@@ -88,19 +89,16 @@ def __find_in_batches(options={}, &block)
             scope = all
             scope = scope.send(named_scope) if named_scope
             scope = query.is_a?(Proc) ? scope.class_exec(&query) : scope.where(query) if query
-  
             scope.no_timeout.each_slice(batch_size) do |items|
               yield (preprocess ? self.__send__(preprocess, items) : items)
             end
           end
 
           def __transform
-            lambda {|a|  { index: { _id: a.id.to_s, data: a.as_indexed_json } }}
+            lambda { |a| { index: { _id: a.id.to_s, data: a.as_indexed_json } } }
           end
         end
-
       end
-
     end
   end
 end

elasticsearch-model/spec/spec_helper.rb

@@ -43,8 +43,10 @@
     require 'ansi'
     tracer = ::Logger.new(STDERR)
     tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
-                                                            tracer: (ENV['QUIET'] ? nil : tracer)
+    Elasticsearch::Model.client = Elasticsearch::Client.new(
+      host: ELASTICSEARCH_URL,
+      tracer: (ENV['QUIET'] ? nil : tracer)
+    )
     puts "Elasticsearch Version: #{Elasticsearch::Model.client.info['version']}"
 
     unless ActiveRecord::Base.connected?

elasticsearch-persistence/Rakefile

@@ -15,26 +15,27 @@
 # 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:unit'
+task test: 'test:unit'
 
 # ----- Test tasks ------------------------------------------------------------
 
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 
 namespace :test do
-
   RSpec::Core::RakeTask.new(:spec)
 
   Rake::TestTask.new(:all) do |test|
     test.verbose = false
     test.warning = false
-    test.deps = [ :spec ]
+    test.deps = [:spec]
   end
+
+  task unit: :spec
 end
 
 namespace :bundle do
@@ -65,6 +66,6 @@ if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
       cane.style_measure = 120
     end
   rescue LoadError
-    warn "cane not available, quality task not provided."
+    warn 'cane not available, quality task not provided.'
   end
 end

elasticsearch-persistence/elasticsearch-persistence.gemspec

@@ -16,52 +16,49 @@
 # under the License.
 
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'elasticsearch/persistence/version'
 
 Gem::Specification.new do |s|
-  s.name          = "elasticsearch-persistence"
+  s.name          = 'elasticsearch-persistence'
   s.version       = Elasticsearch::Persistence::VERSION
-  s.authors       = ["Karel Minarik"]
-  s.email         = ["karel.minarik@elasticsearch.org"]
-  s.description   = "Persistence layer for Ruby models and Elasticsearch."
-  s.summary       = "Persistence layer for Ruby models and Elasticsearch."
-  s.homepage      = "https://github.com/elasticsearch/elasticsearch-rails/"
-  s.license       = "Apache 2"
+  s.authors       = ['Karel Minarik']
+  s.email         = ['support@elastic.co']
+  s.description   = 'Persistence layer for Ruby models and Elasticsearch.'
+  s.summary       = 'Persistence layer for Ruby models and Elasticsearch.'
+  s.homepage      = 'https://github.com/elasticsearch/elasticsearch-rails/'
+  s.license       = 'Apache 2'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
-  s.rdoc_options      = [ "--charset=UTF-8" ]
-
-  s.required_ruby_version = ">= 1.9.3"
-
-  s.add_dependency "elasticsearch",       '~> 7'
-  s.add_dependency "elasticsearch-model", '7.2.1'
-  s.add_dependency "activesupport",       '> 4'
-  s.add_dependency "activemodel",         '> 4'
-  s.add_dependency "hashie"
-
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 12"
+  s.require_paths = ['lib']
 
-  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
+  s.extra_rdoc_files  = ['README.md', 'LICENSE.txt']
+  s.rdoc_options      = ['--charset=UTF-8']
 
-  s.add_development_dependency "rails", '> 4'
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "shoulda-context"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "turn"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
-  s.add_development_dependency "pry"
+  s.add_dependency 'activemodel',         '> 4'
+  s.add_dependency 'activesupport',       '> 4'
+  s.add_dependency 'elasticsearch',       '~> 7'
+  s.add_dependency 'elasticsearch-model', '7.2.1'
+  s.add_dependency 'hashie'
 
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "cane"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'cane'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'oj' unless defined?(JRUBY_VERSION)
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rails', '> 4'
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'ruby-prof' unless defined?(JRUBY_VERSION)
+  s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'turn'
+  s.add_development_dependency 'yard'
 end

elasticsearch-rails/Rakefile

@@ -34,6 +34,8 @@ namespace :test do
     test.warning = false
     test.deps = [:spec] unless defined?(JRUBY_VERSION)
   end
+
+  task unit: :spec
 end
 
 namespace :bundle do

elasticsearch-rails/elasticsearch-rails.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.name          = 'elasticsearch-rails'
   s.version       = Elasticsearch::Rails::VERSION
   s.authors       = ['Karel Minarik']
-  s.email         = ['karel.minarik@elasticsearch.org']
+  s.email         = ['support@elastic.co']
   s.description   = 'Ruby on Rails integrations for Elasticsearch.'
   s.summary       = 'Ruby on Rails integrations for Elasticsearch.'
   s.homepage      = 'https://github.com/elasticsearch/elasticsearch-rails/'