mongoid_fulltext 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 424bedb9121315f16c39308131cf6a9611b0ce1f
-  data.tar.gz: 62c8a5bb13b1367dd238114b275d9e3648a7672a
+SHA256:
+  metadata.gz: 177a2fc11491445aa0dfeaba3932e40fd2a2c37e89914dc7a1849ecfa6904e8c
+  data.tar.gz: 1ad51ce427c54fea7b7feed000bd2443b66d33d901c3713d72707e36620c32da
 SHA512:
-  metadata.gz: ff22fc634046b8408da5f2e6bbcb4825092785f1d6ebce3f60ade99d97de28318ca050c1d1a9740a55bf2343e626b31cf4e09ea617e1e7952526b072623a67d1
-  data.tar.gz: c80cc59816cee90f221c5d8e677cd087c6d76a7082eb8add87186a08836e08071fae3d2d9d733e6230e75b413856546aeca54637090605be927bf0564f13c9cb
+  metadata.gz: c48d9412a4141c93888b67cb8c3bac7bae22c35a19cf20612be770c152af77502f408316b21a98802dc7417235067bf6d3114501d22e7be3ec2fc9870cd38bde
+  data.tar.gz: 1337bddf536cbda56b5d638e5e4f3c1458dc145043d45d1a810ec386ad0d6c13d5f27760503a2cd0da3bb596af572f02ae4198d00139b58a52c9c17ac11b1d80

data/.rubocop_todo.yml

@@ -1,22 +1,31 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-09-18 15:56:53 -0400 using RuboCop version 0.34.1.
+# on 2018-05-08 14:54:25 +0200 using RuboCop version 0.55.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 6
+# Configuration parameters: Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/DuplicatedGem:
+  Exclude:
+    - 'Gemfile'
+
 # Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
   Exclude:
     - 'lib/mongoid/full_text_search.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-Lint/EndAlignment:
-  Enabled: false
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/mongoid/full_text_search.rb'
 
 # Offense count: 2
 Lint/HandleExceptions:
@@ -36,17 +45,17 @@ Lint/UselessAssignment:
 
 # Offense count: 5
 Metrics/AbcSize:
-  Max: 106
+  Max: 104
+
+# Offense count: 7
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 622
 
 # Offense count: 4
 Metrics/CyclomaticComplexity:
   Max: 22
 
-# Offense count: 262
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 174
-
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
@@ -55,47 +64,73 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 224
+  Max: 223
 
 # Offense count: 4
 Metrics/PerceivedComplexity:
   Max: 25
 
 # Offense count: 1
+Naming/ConstantName:
+  Exclude:
+    - 'spec/models/russian_artwork.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedChars.
 Style/AsciiComments:
   Exclude:
     - 'spec/mongoid/full_text_search_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/mongoid/full_text_search.rb'
 
-# Offense count: 1
-Style/ConstantName:
-  Exclude:
-    - 'spec/models/russian_artwork.rb'
-
-# Offense count: 22
+# Offense count: 4
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/mongoid/full_text_search.rb'
+    - 'lib/mongoid/full_text_search/indexable.rb'
+    - 'lib/mongoid/full_text_search/indexes.rb'
 
 # Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Exclude:
     - 'lib/mongoid/full_text_search.rb'
     - 'spec/models/external_artwork_no_fields_supplied.rb'
 
+# Offense count: 6
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  Exclude:
+    - 'lib/mongoid/full_text_search.rb'
+    - 'spec/models/external_artwork_no_fields_supplied.rb'
+
 # Offense count: 2
 Style/MultilineBlockChain:
   Exclude:
     - 'lib/mongoid/full_text_search.rb'
 
-# Offense count: 4
-# Configuration parameters: Methods.
-Style/SingleLineBlockParams:
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
   Exclude:
+    - 'spec/**/*'
     - 'lib/mongoid/full_text_search.rb'
-    - 'spec/mongoid/full_text_search_spec.rb'
+
+# Offense count: 262
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 174

data/.travis.yml

@@ -2,11 +2,14 @@ sudo: false
 
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.5.0
       env:
-        - MONGOID_VERSION=6.0
+        - MONGOID_VERSION=7.0
       before_script:
         - bundle exec danger
+    - rvm: 2.3.1
+      env:
+        - MONGOID_VERSION=6.0
     - rvm: 2.3.1
       env:
         - MONGOID_VERSION=5.0
@@ -25,6 +28,6 @@ services: mongodb
 addons:
   apt:
     sources:
-      - mongodb-3.2-precise
+      - mongodb-3.4-precise
     packages:
       - mongodb-org-server

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.8.1 (Next)
+
+* [#35](https://github.com/mongoid/mongoid_fulltext/pull/35): Mongoid 7 compatibility - [@tomasc](https://github.com/tomasc).
+* Your contribution here.
+
 ### 0.8.0 (1/19/2017)
 
 * [#28](https://github.com/mongoid/mongoid_fulltext/pull/28): Moved to the mongoid organization - [@dblock](https://github.com/dblock).

data/Dangerfile

@@ -1 +1 @@
-danger.import_dangerfile(gem: "mongoid-danger")
+danger.import_dangerfile(gem: 'mongoid-danger')

data/Gemfile

@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 
-case version = ENV['MONGOID_VERSION'] || '6'
+case version = ENV['MONGOID_VERSION'] || '7'
+when /7/
+  gem 'mongoid', '~> 7.0'
 when /6/
   gem 'mongoid', '~> 6.0'
 when /5/
@@ -22,7 +24,7 @@ group :test do
 end
 
 group :development do
-  gem 'rake', '< 11'
-  gem 'rubocop', '0.34.1'
   gem 'mongoid-danger', '~> 0.1.1'
+  gem 'rake', '< 11'
+  gem 'rubocop', '~> 0.55'
 end

data/README.md

@@ -13,7 +13,7 @@ lets you do a fuzzy string search across relatively short strings, which makes i
 Install
 -------
 
-Version 0.6.1 or newer of this gem requires Ruby 1.9.3 or newer and works with Mongoid 3, 4, 5 and 6.
+Version 0.6.1 or newer of this gem requires Ruby 1.9.3 or newer and works with Mongoid 3, 4, 5 and 6, 7.
 Use version 0.5.x for Mongoid 2.4.x and Ruby 1.8.7, 1.9.2 or 1.9.3.
 For Ruby 1.8.7 and/or Mongoid 2.x use [mongoid_fulltext 0.5.x](https://github.com/mongoid/mongoid_fulltext/tree/0.5-stable).
 
@@ -397,4 +397,3 @@ Copyright and License
 MIT License, see [LICENSE](LICENSE) for details.
 
 (c) 2011-2017 [Artsy Inc.](http://artsy.github.io)
-

data/RELEASING.md

@@ -0,0 +1,43 @@
+# Releasing `mongoid_fulltext`
+## Guidelines
+Generally, `mongoid_fulltext` should be released with enthusiasm but care. Release bug fixes as added, features as desired, and breaking API changes as absolutely necessary.
+
+## This is how we do it.
+1. Run the test suite in your local environment first, and ensure that everything's passing.
+
+    ```bash
+    bundle install
+    rake
+    ```
+
+2. Run the test suite on [Travis](https://travis-ci.org) to be certain that your changes work in a variety of environments. Only merge and release when all tests are passing.
+
+3. Bump the version in [`lib/mongoid/full_text_search/version.rb`](lib/mongoid/full_text_search/version.rb).
+
+    * If the release fixes bugs or adds features with negligible impact, increment the third number (e.g., `0.3.2` → `0.3.3`).
+    * If the release adds significant new features, increment the second number and zero out the third (e.g., `0.3.2` → `0.4.0`).
+    * If the release adds breaking API changes, increment the first number and zero out the second and third (e.g., `0.3.2` → `1.0.0`).
+
+    You've gotta know it---it's semantic!
+
+4. Add a header for the new version to [`CHANGELOG.md`](CHANGELOG.md) and list all the changes your release will include underneath it, crediting contributors as appropriate.
+
+6. Update the [`README`](README.md) to document any new features. Remove any warnings indicating that users are reading the documentation for an unreleased version.
+
+7. Commit your changes...
+
+    ```bash
+    git add README.md CHANGELOG.md lib/mongoid/full_text_search/version.rb
+    git commit -m "Preparing for release, 0.4.0."
+    git push origin master
+    ```
+
+8. ...and do the thing!
+
+    ```bash
+    rake release
+    #=> mongoid_fulltext 0.4.0 built to pkg/mongoid_fulltext-0.4.0.gem
+    #=> Tagged 0.4.0.
+    #=> Pushed git commits and tags.
+    #=> Pushed mongoid_fulltext 0.4.0 to rubygems.org.
+    ```

data/Rakefile

@@ -13,4 +13,4 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/lib/mongoid/full_text_search.rb

@@ -24,11 +24,11 @@ module Mongoid::FullTextSearch
     def fulltext_search_in(*args)
       self.mongoid_fulltext_config = {} if mongoid_fulltext_config.nil?
       options = args.last.is_a?(Hash) ? args.pop : {}
-      if options.key?(:index_name)
-        index_name = options[:index_name]
-      else
-        index_name = 'mongoid_fulltext.index_%s_%s' % [name.downcase, mongoid_fulltext_config.count]
-      end
+      index_name = if options.key?(:index_name)
+                     options[:index_name]
+                   else
+                     'mongoid_fulltext.index_%s_%s' % [name.downcase, mongoid_fulltext_config.count]
+                   end
 
       config = {
         alphabet: 'abcdefghijklmnopqrstuvwxyz0123456789 ',
@@ -41,7 +41,7 @@ module Mongoid::FullTextSearch
         max_candidate_set_size: 1000,
         remove_accents: true,
         reindex_immediately: true,
-        stop_words: Hash[%w(i a s t me my we he it am is be do an if
+        stop_words: Hash[%w[i a s t me my we he it am is be do an if
                             or as of at by to up in on no so our you him
                             his she her its who are was has had did the and
                             but for out off why how all any few nor not own
@@ -52,7 +52,7 @@ module Mongoid::FullTextSearch
                             being doing until while about after above below under
                             again there where other myself itself theirs having during
                             before should himself herself because against between through
-                            further yourself ourselves yourselves themselves).map { |x| [x, true] }]
+                            further yourself ourselves yourselves themselves].map { |x| [x, true] }]
       }
 
       config.update(options)
@@ -95,7 +95,7 @@ module Mongoid::FullTextSearch
         all_filter_keys |= keys.find_all { |key| key.starts_with?('filter_values.') }
         next unless keys & correct_keys != correct_keys
         Mongoid.logger.info "Dropping #{idef['name']} [#{keys & correct_keys} <=> #{correct_keys}]" if Mongoid.logger
-        if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+        if Mongoid::Compatibility::Version.mongoid5_or_newer?
           coll.indexes.drop_one(idef['key'])
         else
           coll.indexes.drop(idef['key'])
@@ -108,14 +108,14 @@ module Mongoid::FullTextSearch
       end
 
       Mongoid.logger.info "Ensuring fts_index on #{coll.name}: #{index_definition}" if Mongoid.logger
-      if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      if Mongoid::Compatibility::Version.mongoid5_or_newer?
         coll.indexes.create_one(Hash[index_definition], name: 'fts_index')
       else
         coll.indexes.create(Hash[index_definition], name: 'fts_index')
       end
 
       Mongoid.logger.info "Ensuring document_id index on #{coll.name}" if Mongoid.logger
-      if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      if Mongoid::Compatibility::Version.mongoid5_or_newer?
         coll.indexes.create_one('document_id' => 1) # to make removes fast
       else
         coll.indexes.create('document_id' => 1) # to make removes fast
@@ -127,7 +127,7 @@ module Mongoid::FullTextSearch
       return_scores = options.key?(:return_scores) ? options.delete(:return_scores) : false
       if mongoid_fulltext_config.count > 1 && !options.key?(:index)
         error_message = '%s is indexed by multiple full-text indexes. You must specify one by passing an :index_name parameter'
-        fail UnspecifiedIndexError, error_message % name, caller
+        raise UnspecifiedIndexError, error_message % name, caller
       end
       index_name = options.key?(:index) ? options.delete(:index) : mongoid_fulltext_config.keys.first
 
@@ -143,7 +143,7 @@ module Mongoid::FullTextSearch
       coll = collection.database[index_name]
       cursors = ngrams.map do |ngram|
         query = { 'ngram' => ngram[0] }
-        query.update(map_query_filters options)
+        query.update(map_query_filters(options))
         count = coll.find(query).count
         { ngram: ngram, count: count, query: query }
       end.sort! { |record1, record2| record1[:count] <=> record2[:count] }
@@ -182,8 +182,7 @@ module Mongoid::FullTextSearch
         scores = candidates.map do |candidate_id, data|
           { id: candidate_id,
             clazz: data[:clazz],
-            score: data[:score] + candidates_list.map { |others| (others.delete(candidate_id) || { score: 0 })[:score] }.sum
-           }
+            score: data[:score] + candidates_list.map { |others| (others.delete(candidate_id) || { score: 0 })[:score] }.sum }
         end
         all_scores.concat(scores)
       end
@@ -220,11 +219,11 @@ module Mongoid::FullTextSearch
       # Figure out how many ngrams to extract from the string. If we can't afford to extract all ngrams,
       # step over the string in evenly spaced strides to extract ngrams. For example, to extract 3 3-letter
       # ngrams from 'abcdefghijk', we'd want to extract 'abc', 'efg', and 'ijk'.
-      if bound_number_returned
-        step_size = [((filtered_str.length - config[:ngram_width]).to_f / config[:max_ngrams_to_search]).ceil, 1].max
-      else
-        step_size = 1
-      end
+      step_size = if bound_number_returned
+                    [((filtered_str.length - config[:ngram_width]).to_f / config[:max_ngrams_to_search]).ceil, 1].max
+                  else
+                    1
+                  end
 
       # Create an array of records of the form {:ngram => x, :score => y} for all ngrams that occur in the
       # input string using the step size that we just computed. Let score(x,y) be the score of string x
@@ -233,12 +232,12 @@ module Mongoid::FullTextSearch
       # property that score(x,y) > score(x,z) for any string z containing y and score(x,y) > score(x,z)
       # for any string z contained in y.
       ngram_array = (0..filtered_str.length - config[:ngram_width]).step(step_size).map do |i|
-        if i == 0 || (config[:apply_prefix_scoring_to_all_words] && \
+        score = if i == 0 || (config[:apply_prefix_scoring_to_all_words] && \
                       config[:word_separators].key?(filtered_str[i - 1].chr))
-          score = Math.sqrt(1 + 1.0 / filtered_str.length)
-        else
-          score = Math.sqrt(2.0 / filtered_str.length)
-        end
+                  Math.sqrt(1 + 1.0 / filtered_str.length)
+                else
+                  Math.sqrt(2.0 / filtered_str.length)
+                end
         { ngram: filtered_str[i..i + config[:ngram_width] - 1], score: score }
       end
 
@@ -282,7 +281,7 @@ module Mongoid::FullTextSearch
     def remove_from_ngram_index
       mongoid_fulltext_config.each_pair do |index_name, _fulltext_config|
         coll = collection.database[index_name]
-        if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+        if Mongoid::Compatibility::Version.mongoid5_or_newer?
           coll.find('class' => name).delete_many
         else
           coll.find('class' => name).remove_all
@@ -299,12 +298,12 @@ module Mongoid::FullTextSearch
     # Take a list of filters to be mapped so they can update the query
     # used upon the fulltext search of the ngrams
     def map_query_filters(filters)
-      Hash[filters.map do|key, value|
+      Hash[filters.map do |key, value|
         case value
         when Hash then
           if value.key? :any then format_query_filter('$in', key, value[:any])
           elsif value.key? :all then format_query_filter('$all', key, value[:all])
-          else fail UnknownFilterQueryOperator, value.keys.join(','), caller end
+          else raise UnknownFilterQueryOperator, value.keys.join(','), caller end
         else format_query_filter('$all', key, value)
         end
       end]
@@ -328,7 +327,7 @@ module Mongoid::FullTextSearch
 
       # remove existing ngrams from external index
       coll = collection.database[index_name.to_sym]
-      if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      if Mongoid::Compatibility::Version.mongoid5_or_newer?
         coll.find('document_id' => _id).delete_many
       else
         coll.find('document_id' => _id).remove_all
@@ -343,7 +342,7 @@ module Mongoid::FullTextSearch
         filter_values = Hash[fulltext_config[:filters].map do |key, value|
           begin
             [key, value.call(self)]
-          rescue
+          rescue StandardError
             # Suppress any exceptions caused by filters
           end
         end.compact]
@@ -352,7 +351,7 @@ module Mongoid::FullTextSearch
       ngrams.each_pair do |ngram, score|
         index_document = { 'ngram' => ngram, 'document_id' => _id, 'score' => score, 'class' => self.class.name }
         index_document['filter_values'] = filter_values if fulltext_config.key?(:filters)
-        if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+        if Mongoid::Compatibility::Version.mongoid5_or_newer?
           coll.insert_one(index_document)
         else
           coll.insert(index_document)
@@ -364,7 +363,7 @@ module Mongoid::FullTextSearch
   def remove_from_ngram_index
     mongoid_fulltext_config.each_pair do |index_name, _fulltext_config|
       coll = collection.database[index_name]
-      if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      if Mongoid::Compatibility::Version.mongoid5_or_newer?
         coll.find('document_id' => _id).delete_many
       else
         coll.find('document_id' => _id).remove_all

data/lib/mongoid/full_text_search/indexable.rb

@@ -2,7 +2,7 @@
 module Mongoid
   module Indexable
     module ClassMethods
-      alias_method :create_fulltext_indexes_hook, :create_indexes
+      alias create_fulltext_indexes_hook create_indexes
 
       def create_indexes
         create_fulltext_indexes if respond_to?(:create_fulltext_indexes)

data/lib/mongoid/full_text_search/indexes.rb

@@ -2,7 +2,7 @@
 module Mongoid
   module Indexes
     module ClassMethods
-      alias_method :create_fulltext_indexes_hook, :create_indexes
+      alias create_fulltext_indexes_hook create_indexes
 
       def create_indexes
         create_fulltext_indexes if respond_to?(:create_fulltext_indexes)

data/lib/mongoid/full_text_search/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module FullTextSearch
-    VERSION = '0.8.0'
+    VERSION = '0.8.2'.freeze
   end
 end

data/mongoid_fulltext.gemspec

@@ -1,4 +1,4 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'mongoid/full_text_search/version'
 
 Gem::Specification.new do |s|
@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/mongoid/mongoid_fulltext'
   s.licenses = ['MIT']
   s.summary = 'Full-text search for the Mongoid ORM, using n-grams extracted from text.'
-  s.add_dependency 'mongoid', '>= 3.0'
-  s.add_dependency 'mongoid-compatibility'
+  s.add_dependency 'mongoid', '>= 3.0', '< 8'
+  s.add_dependency 'mongoid-compatibility', '>= 0.5.1'
   s.add_dependency 'unicode_utils'
+  s.add_development_dependency 'database_cleaner'
 end

data/spec/models/filtered_artist.rb

@@ -5,6 +5,5 @@ class FilteredArtist
   fulltext_search_in :full_name, index_name: 'mongoid_fulltext.artworks_and_artists',
                                  filters: { is_foobar: ->(x) { x.full_name == 'foobar' },
                                             is_artist: ->(_x) { true },
-                                            is_artwork: ->(_x) { false }
-                                  }
+                                            is_artwork: ->(_x) { false } }
 end

data/spec/models/filtered_artwork.rb

@@ -7,6 +7,5 @@ class FilteredArtwork
                              filters: { is_foobar: ->(x) { x.title == 'foobar' },
                                         is_artwork: ->(_x) { true },
                                         is_artist: ->(_x) { false },
-                                        colors?: ->(x) { x.colors }
-                                  }
+                                        colors?: ->(x) { x.colors } }
 end

data/spec/models/filtered_other.rb

@@ -6,6 +6,5 @@ class FilteredOther
   field :name
   fulltext_search_in :name, index_name: 'mongoid_fulltext.artworks_and_artists',
                             filters: { is_fuzzy: ->(_x) { true },
-                                       is_awesome: ->(_x) { false }
-                                  }
+                                       is_awesome: ->(_x) { false } }
 end

data/spec/models/partitioned_artist.rb

@@ -8,7 +8,7 @@ class PartitionedArtist
   fulltext_search_in :full_name,
                      index_name: 'mongoid_fulltext.partitioned_artists',
                      filters: {
-                       has_exhibitions: ->(x) { x.exhibitions.size > 0 },
+                       has_exhibitions: ->(x) { !x.exhibitions.empty? },
                        exhibitions: ->(x) { [x.exhibitions].flatten }
                      }
 end

data/spec/models/russian_artwork.rb

@@ -1,9 +1,9 @@
-# coding: utf-8
+
 class RussianArtwork
   include Mongoid::Document
   include Mongoid::FullTextSearch
 
-  Alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789абвгдежзиклмнопрстуфхцчшщъыьэюя'
+  Alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789абвгдежзиклмнопрстуфхцчшщъыьэюя'.freeze
 
   field :title
   fulltext_search_in :title, alphabet: Alphabet

data/spec/mongoid/full_text_search_spec.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+
 require 'spec_helper'
 
 describe Mongoid::FullTextSearch do
@@ -355,6 +355,8 @@ describe Mongoid::FullTextSearch do
     # fields as well as the union of all the filter fields to allow for efficient lookups.
 
     it 'creates a proper index for searching efficiently' do
+      # see https://github.com/mongoid/mongoid_fulltext/pull/39
+      pending unless Mongoid::Compatibility::Version.mongoid5_or_newer?
       [FilteredArtwork, FilteredArtist, FilteredOther].each(&:create_indexes)
       index_collection = FilteredArtwork.collection.database['mongoid_fulltext.artworks_and_artists']
       ngram_indexes = []
@@ -421,7 +423,7 @@ describe Mongoid::FullTextSearch do
     let!(:somao)        { ExternalArtwork.create(title: 'Somao by Randy Morehall') }
 
     it "returns basic matches that don't match a whole word and aren't prefixes with score < 1" do
-      %w(paox porehall).each do |query|
+      %w[paox porehall].each do |query|
         results = ExternalArtist.fulltext_search(query, return_scores: true)
         expect(results.length).to be > 0
         expect(results.map { |result| result[-1] }.inject(true) { |accum, item| accum &= (item < 1) }).to be_truthy
@@ -429,7 +431,7 @@ describe Mongoid::FullTextSearch do
     end
 
     it 'returns prefix matches with a score >= 1 but < 2' do
-      %w(warho rand).each do |query|
+      %w[warho rand].each do |query|
         results = ExternalArtist.fulltext_search(query, return_scores: true)
         expect(results.length).to be > 0
         expect(results.map { |result| result[-1] if result[0].to_s.starts_with?(query) }.compact.inject(true) { |accum, item| accum &= (item >= 1 && item < 2) }).to be_truthy
@@ -437,7 +439,7 @@ describe Mongoid::FullTextSearch do
     end
 
     it 'returns full-word matches with a score >= 2' do
-      %w(andy warhol mao).each do |query|
+      %w[andy warhol mao].each do |query|
         results = ExternalArtist.fulltext_search(query, return_scores: true)
         expect(results.length).to be > 0
         expect(results.map { |result| result[-1] if result[0].to_s.split(' ').member?(query) }.compact.inject(true) { |accum, item| accum &= (item >= 2) }).to be_truthy
@@ -568,7 +570,7 @@ describe Mongoid::FullTextSearch do
 
       context 'and is not a symbol, string, or proc' do
         before(:each) do
-          conditional_index[:update_if] = %w(this isn't a symbol, string, or proc)
+          conditional_index[:update_if] = %w[this isn't a symbol string or proc]
         end
 
         it "doesn't update the index for the document" do
@@ -597,7 +599,7 @@ describe Mongoid::FullTextSearch do
     context 'incremental' do
       it 'removes an existing record' do
         coll = Mongoid.default_session['mongoid_fulltext.index_basicartwork_0']
-        if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+        if Mongoid::Compatibility::Version.mongoid5_or_newer?
           coll.find('document_id' => flowers1._id).delete_many
         else
           coll.find('document_id' => flowers1._id).remove_all
@@ -609,11 +611,13 @@ describe Mongoid::FullTextSearch do
 
     context 'mongoid indexes' do
       it 'can re-create dropped indexes' do
+        # see https://github.com/mongoid/mongoid_fulltext/pull/39
+        pending unless Mongoid::Compatibility::Version.mongoid5_or_newer?
         # there're no indexes by default as Mongoid.autocreate_indexes is set to false
         # but mongo will automatically attempt to index _id in the background
         expect(Mongoid.default_session['mongoid_fulltext.index_basicartwork_0'].indexes.count).to be <= 1
         BasicArtwork.create_indexes
-        expected_indexes = %w(_id_ fts_index document_id_1).sort
+        expected_indexes = %w[_id_ fts_index document_id_1].sort
         current_indexes = []
         Mongoid.default_session['mongoid_fulltext.index_basicartwork_0'].indexes.each do |idef|
           current_indexes << idef['name']

data/spec/spec_helper.rb

@@ -3,27 +3,30 @@ require 'bundler/setup'
 require 'rspec'
 
 require 'mongoid'
+require 'database_cleaner'
 
 ENV['MONGOID_ENV'] = 'test'
 
-require File.expand_path('../../lib/mongoid_fulltext', __FILE__)
+require File.expand_path('../lib/mongoid_fulltext', __dir__)
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each { |f| require f }
 
+DatabaseCleaner.orm = :mongoid
+DatabaseCleaner.strategy = :truncation
+
+Mongoid.logger.level = Logger::INFO
+Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5_or_newer?
+
 Mongoid.configure do |config|
   config.connect_to('mongoid_fulltext_test')
 end
 
 RSpec.configure do |c|
   c.before :each do
-    Mongoid.purge!
+    DatabaseCleaner.clean
   end
   c.after :all do
-    Mongoid.purge!
-  end
-  c.before :all do
-    Mongoid.logger.level = Logger::INFO
-    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+    DatabaseCleaner.clean
   end
 end

data/spec/support/mongoid.rb

@@ -1,5 +1,7 @@
-module Mongoid
-  def self.default_session
-    default_client
+if Mongoid::Compatibility::Version.mongoid5_or_newer?
+  module Mongoid
+    def self.default_session
+      default_client
+    end
   end
-end if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_fulltext
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Aaron Windsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: mongoid-compatibility
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: aaron.windsor@gmail.com
 executables: []
@@ -69,6 +89,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
 - lib/mongoid/full_text_search.rb
 - lib/mongoid/full_text_search/indexable.rb
@@ -118,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Full-text search for the Mongoid ORM, using n-grams extracted from text.