mongoid-slug 5.3.3 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d2eeaa1874b33c4764d7e493c7add3bb0da802be
-  data.tar.gz: d86e661864188f01289726e3bf4ec04a3494e36f
+SHA256:
+  metadata.gz: cf9ad642da6118dcc879edd3c4b6f43adf2b110e422d691926984ffb743f0dcf
+  data.tar.gz: 800d4c721c01fb89267218aaeff2c5a8d91a906f8587c87aa3680d774011180b
 SHA512:
-  metadata.gz: 1261be7d5ff0e72b1faeda6f8e8d5aa82289dfb14e65d43df4c0ca638d16351bcd172b3b0d92e0fa1891c498503c7a82368cd72d4177cca028ef16e12c27ca89
-  data.tar.gz: f2cad018dec3eb468121f9dd3c810502e466c688105d2f274c71285ca0dcf13b578cb293f45f249595abcec4e14aafd4cce17f5814e127566b5155cf65544301
+  metadata.gz: 8bb6300dd08988c87f922e5cfc308de3ea428a8730a75d9b2c261814cb1a8568ad266b94e8358d710602af131166dbf063ad1e163eca2a2d31108be7d147456d
+  data.tar.gz: 36dd52ca7e37b0e57cd4241ab616a20892688dfb4e79af8e02ada7f7802c30b158bb28b5594337eded30c47de948e20e1e40da69bc84ef2398e463d738c63188

data/README.md

@@ -325,30 +325,6 @@ unique = Mongoid::Slug::UniqueSlug.new(Book.new).find_unique(title)
 # return some representation of unique
 ```
 
-### Mongoid::Paranoia Support
-
-The [Mongoid::Paranoia](http://github.com/simi/mongoid-paranoia) gem adds "soft-destroy" functionality to Mongoid documents.
-
-Mongoid::Slug contains special handling for Mongoid::Paranoia:
-
-* When destroying a paranoid document, the slug will be unset from the database.
-* When restoring a paranoid document, the slug will be rebuilt. Note that the new slug may not match the old one.
-* When resaving a destroyed paranoid document, the slug will remain unset in the database.
-* For indexing purposes, sparse unique indexes are used. The sparse condition will ignore any destroyed paranoid documents, since their slug is not set in database.
-
-```ruby
-class Entity
-  include Mongoid::Document
-  include Mongoid::Slug
-  include Mongoid::Paranoia
-end
-```
-
-The following variants of Mongoid Paranoia are officially supported:
-
-* Mongoid 3 built-in `Mongoid::Paranoia`
-* Mongoid 4 or 5 gem http://github.com/simi/mongoid_paranoia
-
 Contributing
 ------------
 
@@ -357,4 +333,4 @@ Mongoid-slug is work of [many of contributors](https://github.com/mongoid/mongoi
 Copyright & License
 -------------------
 
-Copyright (c) 2010-2016 Hakan Ensari & Contributors, see [LICENSE](LICENSE) for details.
+Copyright (c) 2010-2017 Hakan Ensari & Contributors, see [LICENSE](LICENSE) for details.

data/lib/mongoid/slug.rb

@@ -2,7 +2,6 @@ require 'mongoid'
 require 'stringex'
 require 'mongoid/slug/criteria'
 require 'mongoid/slug/index'
-require 'mongoid/slug/paranoia'
 require 'mongoid/slug/unique_slug'
 require 'mongoid/slug/slug_id_strategy'
 require 'mongoid-compatibility'
@@ -76,7 +75,7 @@ module Mongoid
         options = fields.extract_options!
 
         self.slug_scope            = options[:scope]
-        self.slug_reserved_words   = options[:reserve] || Set.new(%w(new edit))
+        self.slug_reserved_words   = options[:reserve] || Set.new(%w[new edit])
         self.slugged_attributes    = fields.map(&:to_s)
         self.slug_history          = options[:history]
         self.slug_by_model_type    = options[:by_model_type]
@@ -86,9 +85,7 @@ module Mongoid
         alias_attribute :slugs, :_slugs
 
         # Set index
-        unless embedded?
-          index(*Mongoid::Slug::Index.build_index(slug_scope_key, slug_by_model_type))
-        end
+        index(*Mongoid::Slug::Index.build_index(slug_scope_key, slug_by_model_type)) unless embedded?
 
         self.slug_url_builder = block_given? ? block : default_slug_url_builder
 
@@ -99,19 +96,6 @@ module Mongoid
         else
           set_callback :save, :before, :build_slug, if: :slug_should_be_rebuilt?
         end
-
-        # If paranoid document:
-        # - include shim to add callbacks for restore method
-        # - unset the slugs on destroy
-        # - recreate the slug on restore
-        # - force reset the slug when saving a destroyed paranoid document, to ensure it stays unset in the database
-        if is_paranoid_doc?
-          send(:include, Mongoid::Slug::Paranoia) unless respond_to?(:before_restore)
-          set_callback :destroy, :after,  :unset_slug!
-          set_callback :restore, :before, :set_slug!
-          set_callback :save,    :before, :reset_slug!, if: :paranoid_deleted?
-          set_callback :save,    :after,  :clear_slug!, if: :paranoid_deleted?
-        end
       end
 
       def default_slug_url_builder
@@ -124,7 +108,7 @@ module Mongoid
 
       # Returns the scope key for indexing, considering associations
       #
-      # @return [ Array<Document>, Document ] Whether the document is paranoid
+      # @return [ Array<Document>, Document ]
       def slug_scope_key
         return nil unless slug_scope
         reflect_on_association(slug_scope).try(:key) || slug_scope
@@ -155,26 +139,13 @@ module Mongoid
         current_scope || Criteria.new(self) # Use Mongoid::Slug::Criteria for slugged documents.
       end
 
-      # Indicates whether or not the document includes Mongoid::Paranoia
-      #
-      # This can be replaced with .paranoid? method once the following PRs are merged:
-      # - https://github.com/simi/mongoid-paranoia/pull/19
-      # - https://github.com/haihappen/mongoid-paranoia/pull/3
-      #
-      # @return [ Array<Document>, Document ] Whether the document is paranoid
-      def is_paranoid_doc?
-        !!(defined?(::Mongoid::Paranoia) && self < ::Mongoid::Paranoia)
-      end
-
       private
 
-      if Mongoid::Compatibility::Version.mongoid5? ||
-         Mongoid::Compatibility::Version.mongoid6? &&
-         Threaded.method(:current_scope).arity == -1
+      if Mongoid::Compatibility::Version.mongoid5_or_newer? && Threaded.method(:current_scope).arity == -1
         def current_scope
           Threaded.current_scope(self)
         end
-      elsif Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      elsif Mongoid::Compatibility::Version.mongoid5_or_newer?
         def current_scope
           Threaded.current_scope
         end
@@ -223,7 +194,6 @@ module Mongoid
     end
 
     # Builds slug then atomically sets it in the database.
-    # This is used when working with the Mongoid::Paranoia restore callback.
     #
     # This method is adapted to use the :set method variants from both
     # Mongoid 3 (two args) and Mongoid 4 (hash arg)
@@ -263,15 +233,7 @@ module Mongoid
 
     # @return [Boolean] Whether the slug requires to be rebuilt
     def slug_should_be_rebuilt?
-      (new_record? || _slugs_changed? || slugged_attributes_changed?) && !paranoid_deleted?
-    end
-
-    # Indicates whether or not the document has been deleted in paranoid fashion
-    # Always returns false if the document is not paranoid
-    #
-    # @return [Boolean] Whether or not the document has been deleted in paranoid fashion
-    def paranoid_deleted?
-      !!(self.class.is_paranoid_doc? && !deleted_at.nil?)
+      new_record? || _slugs_changed? || slugged_attributes_changed?
     end
 
     def slugged_attributes_changed?
@@ -343,7 +305,7 @@ module Mongoid
 
     def localized?
       fields['_slugs'].options[:localize]
-    rescue
+    rescue StandardError
       false
     end
 

data/lib/mongoid/slug/criteria.rb

@@ -79,7 +79,7 @@ module Mongoid
         # _translations
         localized = (begin
                        @klass.fields['_slugs'].options[:localize]
-                     rescue
+                     rescue StandardError
                        false
                      end)
         if localized

data/lib/mongoid/slug/index.rb

@@ -28,12 +28,6 @@ module Mongoid
         #    irrespective of how STI is defined in Mongoid, i.e. ANY child index will be applied to EVERY child.
         #    This can cause collisions using various combinations of scopes.
         #
-        # 3) Paranoid docs rely on sparse indexes to exclude paranoid-deleted records
-        #    from the unique index constraint (i.e. when _slugs is unset.) However, when
-        #    using compound keys (`by_model_type` or `scope_key`), paranoid-deleted records
-        #    can become inadvertently indexed when _slugs is unset, causing duplicates. This
-        #    is already covered by #1 and #2 above.
-        #
         # In the future, MongoDB may implement partial indexes or improve sparse index behavior.
         # See: https://jira.mongodb.org/browse/SERVER-785
         #      https://jira.mongodb.org/browse/SERVER-13780

data/lib/mongoid/slug/unique_slug.rb

@@ -64,7 +64,8 @@ module Mongoid
 
       def_delegators :@model, :slug_scope, :reflect_on_association, :read_attribute,
                      :check_against_id, :slug_reserved_words, :slug_url_builder, :collection_name,
-                     :embedded?, :reflect_on_all_associations, :slug_by_model_type, :slug_max_length
+                     :embedded?, :reflect_on_all_associations, :reflect_on_all_association,
+                     :slug_by_model_type, :slug_max_length
 
       def initialize(model)
         @model = model
@@ -73,7 +74,13 @@ module Mongoid
       end
 
       def metadata
-        @model.respond_to?(:relation_metadata) ? @model.relation_metadata : @model.metadata
+        if @model.respond_to?(:_association)
+          @model.send(:_association)
+        elsif @model.respond_to?(:relation_metadata)
+          @model.relation_metadata
+        else
+          @model.metadata
+        end
       end
 
       def find_unique(attempt = nil)
@@ -96,9 +103,7 @@ module Mongoid
             where_hash[scope] = model.try(:read_attribute, scope)
           end
 
-          if slug_by_model_type
-            where_hash[:_type] = model.try(:read_attribute, :_type)
-          end
+          where_hash[:_type] = model.try(:read_attribute, :_type) if slug_by_model_type
 
           @state = SlugState.new @_slug, uniqueness_scope.unscoped.where(where_hash), escaped_pattern
 
@@ -150,15 +155,17 @@ module Mongoid
         end
 
         if embedded?
-          parent_metadata = reflect_on_all_associations(:embedded_in)[0]
+          parent_metadata = if Mongoid::Compatibility::Version.mongoid7_or_newer?
+                              reflect_on_all_association(:embedded_in)[0]
+                            else
+                              reflect_on_all_associations(:embedded_in)[0]
+                            end
           return model._parent.send(parent_metadata.inverse_of || self.metadata.name)
         end
 
         # unless embedded or slug scope, return the deepest document superclass
         appropriate_class = model.class
-        while appropriate_class.superclass.include?(Mongoid::Document)
-          appropriate_class = appropriate_class.superclass
-        end
+        appropriate_class = appropriate_class.superclass while appropriate_class.superclass.include?(Mongoid::Document)
         appropriate_class
       end
     end

data/lib/mongoid/slug/version.rb

@@ -1,5 +1,5 @@
 module Mongoid #:nodoc:
   module Slug
-    VERSION = '5.3.3'.freeze
+    VERSION = '6.0.0'.freeze
   end
 end

data/spec/models/author.rb

@@ -3,7 +3,7 @@ class Author
   include Mongoid::Slug
   field :first_name
   field :last_name
-  if Mongoid::Compatibility::Version.mongoid6?
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
     belongs_to :book, required: false
   else
     belongs_to :book

data/spec/models/author_polymorphic.rb

@@ -4,7 +4,7 @@ class AuthorPolymorphic
   field :first_name
   field :last_name
   slug :first_name, :last_name, scope: :book_polymorphic
-  if Mongoid::Compatibility::Version.mongoid6?
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
     belongs_to :book_polymorphic, required: false
   else
     belongs_to :book_polymorphic

data/spec/models/entity.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Entity
   include Mongoid::Document
   include Mongoid::Slug

data/spec/models/person.rb

@@ -4,7 +4,7 @@ class Person
   field :name
   slug :name, permanent: true, scope: :author
   embeds_many :relationships
-  if Mongoid::Compatibility::Version.mongoid6?
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
     belongs_to :author, inverse_of: :characters, required: false
   else
     belongs_to :author, inverse_of: :characters

data/spec/mongoid/criteria_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Mongoid::Slug::Criteria do

data/spec/mongoid/index_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Mongoid::Slug::Index do

data/spec/mongoid/slug_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 module Mongoid
@@ -596,7 +595,7 @@ module Mongoid
     end
 
     context 'with a value exceeding mongodb max index key' do
-      if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      if Mongoid::Compatibility::Version.mongoid5_or_newer?
         it 'errors with a model without a max length' do
           expect do
             Book.create!(title: 't' * 1025)
@@ -679,7 +678,7 @@ module Mongoid
         expect(friend2.slugs).to include('foo-2')
       end
 
-      %w(new edit).each do |word|
+      %w[new edit].each do |word|
         it "should overwrite the default reserved words allowing the word '#{word}'" do
           friend = Friend.create(name: word)
           expect(friend.slugs).to include word
@@ -687,7 +686,7 @@ module Mongoid
       end
     end
     context 'when the model does not have any reserved words set' do
-      %w(new edit).each do |word|
+      %w[new edit].each do |word|
         it "does not use the default reserved word '#{word}'" do
           book = Book.create(title: word)
           expect(book.slugs).not_to include word
@@ -736,7 +735,7 @@ module Mongoid
 
       context 'when called on an existing record with no slug' do
         let!(:book_no_slug) do
-          if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+          if Mongoid::Compatibility::Version.mongoid5_or_newer?
             Book.collection.insert_one(title: 'Proust and Signs')
           else
             Book.collection.insert(title: 'Proust and Signs')
@@ -796,7 +795,7 @@ module Mongoid
         it 'ensures uniqueness' do
           book1 = Book.create(title: 'A Thousand Plateaus', slugs: ['not-what-you-expected'])
           expect(book1.to_param).to eql 'not-what-you-expected'
-          if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+          if Mongoid::Compatibility::Version.mongoid5_or_newer?
             expect do
               Book.create(title: 'A Thousand Plateaus', slugs: ['not-what-you-expected'])
             end.to raise_error Mongo::Error::OperationFailure, /duplicate/
@@ -825,7 +824,7 @@ module Mongoid
           Book.create(title: 'Sleepyhead')
           book2 = Book.create(title: 'A Thousand Plateaus')
           book2.slugs.push 'sleepyhead'
-          if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+          if Mongoid::Compatibility::Version.mongoid5_or_newer?
             expect do
               book2.save
             end.to raise_error Mongo::Error::OperationFailure, /duplicate/
@@ -885,13 +884,13 @@ module Mongoid
         # Turn on i18n fallback
         require 'i18n/backend/fallbacks'
         I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-        ::I18n.fallbacks[:nl] = [:nl, :en]
+        ::I18n.fallbacks[:nl] = %i[nl en]
         expect(page.slug).to eql 'title-on-english'
         fallback_slug = page.slug
 
         fallback_page = begin
                           PageSlugLocalized.find(fallback_slug)
-                        rescue
+                        rescue StandardError
                           nil
                         end
         expect(fallback_page).to eq(page)
@@ -916,17 +915,17 @@ module Mongoid
         page = PageSlugLocalized.new
         page.title_translations = { 'en' => 'Title on English', 'nl' => 'Title on Netherlands' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
       end
 
       it 'exact same title multiple langauges' do
         page = PageSlugLocalized.new
         page.title_translations = { 'en' => 'Title on English', 'nl' => 'Title on English' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['title-on-english'], 'nl' => ['title-on-english'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english'], 'nl' => ['title-on-english'])
 
         page = PageSlugLocalized.create(title_translations: { 'en' => 'Title on English2', 'nl' => 'Title on English2' })
-        expect(page['_slugs']).to eq('en' => ['title-on-english2'], 'nl' => ['title-on-english2'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english2'], 'nl' => ['title-on-english2'])
       end
 
       it 'does not produce duplicate slugs' do
@@ -944,7 +943,7 @@ module Mongoid
         I18n.locale = old_locale
         page.title = 'Title on English'
         expect(page.title_translations).to eq('en' => 'Title on English', 'nl' => 'Title on Netherlands')
-        expect(page['_slugs']).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs when one has changed' do
@@ -964,8 +963,8 @@ module Mongoid
         page.save
         expect(page.title_translations).to eq('en' => 'Modified Title on English',
                                               'nl' => 'Title on Netherlands')
-        expect(page['_slugs']).to eq('en' => ['modified-title-on-english'],
-                                     'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['modified-title-on-english'],
+                                               'nl' => ['title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs when transactions are set directly' do
@@ -974,7 +973,7 @@ module Mongoid
         page.save
         page.title_translations = { 'en' => 'Title on English', 'nl' => 'Title on Netherlands' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs when transactions are set directly and one has changed' do
@@ -984,15 +983,15 @@ module Mongoid
         page.title_translations = { 'en' => 'Modified Title on English',
                                     'nl' => 'Title on Netherlands' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['modified-title-on-english'],
-                                     'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['modified-title-on-english'],
+                                               'nl' => ['title-on-netherlands'])
       end
 
       it 'works with a custom slug strategy' do
         page = PageSlugLocalizedCustom.new
         page.title = 'a title for the slug'
         page.save
-        expect(page['_slugs']).to eq('en' => ['a-title-for-the-slug'], 'nl' => ['a-title-for-the-slug'])
+        expect(page._slugs_translations).to eq('en' => ['a-title-for-the-slug'], 'nl' => ['a-title-for-the-slug'])
       end
     end
 
@@ -1048,13 +1047,13 @@ module Mongoid
         # Turn on i18n fallback
         require 'i18n/backend/fallbacks'
         I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-        ::I18n.fallbacks[:nl] = [:nl, :en]
+        ::I18n.fallbacks[:nl] = %i[nl en]
         expect(page.slug).to eql 'title-on-english'
         fallback_slug = page.slug
 
         fallback_page = begin
                           PageSlugLocalizedHistory.find(fallback_slug)
-                        rescue
+                        rescue StandardError
                           nil
                         end
         expect(fallback_page).to eq(page)
@@ -1067,8 +1066,8 @@ module Mongoid
         page.title_translations = { 'en' => 'Modified Title on English',
                                     'nl' => 'Modified Title on Netherlands' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['title-on-english', 'modified-title-on-english'],
-                                     'nl' => ['title-on-netherlands', 'modified-title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english', 'modified-title-on-english'],
+                                               'nl' => ['title-on-netherlands', 'modified-title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs' do
@@ -1086,7 +1085,7 @@ module Mongoid
         I18n.locale = old_locale
         page.title = 'Title on English'
         expect(page.title_translations).to eq('en' => 'Title on English', 'nl' => 'Title on Netherlands')
-        expect(page['_slugs']).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs when one has changed' do
@@ -1106,8 +1105,8 @@ module Mongoid
         page.save
         expect(page.title_translations).to eq('en' => 'Modified Title on English',
                                               'nl' => 'Title on Netherlands')
-        expect(page['_slugs']).to eq('en' => ['title-on-english', 'modified-title-on-english'],
-                                     'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english', 'modified-title-on-english'],
+                                               'nl' => ['title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs when transactions are set directly' do
@@ -1116,7 +1115,7 @@ module Mongoid
         page.save
         page.title_translations = { 'en' => 'Title on English', 'nl' => 'Title on Netherlands' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english'], 'nl' => ['title-on-netherlands'])
       end
 
       it 'does not produce duplicate slugs when transactions are set directly and one has changed' do
@@ -1125,8 +1124,8 @@ module Mongoid
         page.save
         page.title_translations = { 'en' => 'Modified Title on English', 'nl' => 'Title on Netherlands' }
         page.save
-        expect(page['_slugs']).to eq('en' => ['title-on-english', 'modified-title-on-english'],
-                                     'nl' => ['title-on-netherlands'])
+        expect(page._slugs_translations).to eq('en' => ['title-on-english', 'modified-title-on-english'],
+                                               'nl' => ['title-on-netherlands'])
       end
     end
 

data/spec/spec_helper.rb

@@ -6,13 +6,10 @@ require 'awesome_print'
 require 'active_support'
 require 'active_support/deprecation'
 require 'mongoid'
-require 'mongoid/paranoia'
 require 'rspec/its'
 require 'mongoid/compatibility'
 
-require File.expand_path '../../lib/mongoid/slug', __FILE__
-
-require 'mongoid-observers' unless Mongoid.const_defined?(:Observer)
+require File.expand_path '../lib/mongoid/slug', __dir__
 
 module Mongoid
   module Slug
@@ -32,24 +29,21 @@ Mongoid.configure do |config|
   config.connect_to database_id
 end
 
-%w(models shared).each do |dir|
+%w[models shared].each do |dir|
   Dir["./spec/#{dir}/*.rb"].each { |f| require f }
 end
 
-I18n.available_locales = [:en, :nl]
+I18n.available_locales = %i[en nl]
 
 RSpec.configure do |c|
   c.raise_errors_for_deprecations!
 
   c.before :all do
     Mongoid.logger.level = Logger::INFO
-    if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
-      Mongo::Logger.logger.level = Logger::INFO
-    end
+    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5_or_newer?
   end
 
   c.before(:each) do
-    Mongoid.purge!
     Author.create_indexes
     Book.create_indexes
     AuthorPolymorphic.create_indexes
@@ -57,7 +51,7 @@ RSpec.configure do |c|
     Mongoid::IdentityMap.clear if defined?(Mongoid::IdentityMap)
   end
 
-  c.after(:all) do
+  c.after(:each) do
     if Mongoid::Compatibility::Version.mongoid3? || Mongoid::Compatibility::Version.mongoid4?
       Mongoid.default_session.drop
     else

data/spec/tasks/mongoid_slug_rake_spec.rb

@@ -3,7 +3,7 @@ require 'rake'
 
 describe 'mongoid_slug:set' do
   before :all do
-    load File.expand_path('../../../lib/tasks/mongoid_slug.rake', __FILE__)
+    load File.expand_path('../../lib/tasks/mongoid_slug.rake', __dir__)
     Rake::Task.define_task(:environment)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-slug
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 6.0.0
 platform: ruby
 authors:
 - Andreas Saebjoernsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -148,7 +148,6 @@ files:
 - lib/mongoid/slug.rb
 - lib/mongoid/slug/criteria.rb
 - lib/mongoid/slug/index.rb
-- lib/mongoid/slug/paranoia.rb
 - lib/mongoid/slug/railtie.rb
 - lib/mongoid/slug/slug_id_strategy.rb
 - lib/mongoid/slug/unique_slug.rb
@@ -164,7 +163,6 @@ files:
 - spec/models/book.rb
 - spec/models/book_polymorphic.rb
 - spec/models/caption.rb
-- spec/models/document_paranoid.rb
 - spec/models/entity.rb
 - spec/models/friend.rb
 - spec/models/incorrect_slug_persistence.rb
@@ -175,8 +173,6 @@ files:
 - spec/models/page_slug_localized.rb
 - spec/models/page_slug_localized_custom.rb
 - spec/models/page_slug_localized_history.rb
-- spec/models/paranoid_document.rb
-- spec/models/paranoid_permanent.rb
 - spec/models/partner.rb
 - spec/models/person.rb
 - spec/models/relationship.rb
@@ -185,7 +181,6 @@ files:
 - spec/models/without_slug.rb
 - spec/mongoid/criteria_spec.rb
 - spec/mongoid/index_spec.rb
-- spec/mongoid/paranoia_spec.rb
 - spec/mongoid/slug_spec.rb
 - spec/shared/indexes.rb
 - spec/spec_helper.rb
@@ -210,43 +205,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid-slug
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mongoid URL slugs
 test_files:
-- spec/models/alias.rb
+- spec/mongoid/criteria_spec.rb
+- spec/mongoid/slug_spec.rb
+- spec/mongoid/index_spec.rb
+- spec/spec_helper.rb
+- spec/tasks/mongoid_slug_rake_spec.rb
+- spec/shared/indexes.rb
 - spec/models/article.rb
-- spec/models/artist.rb
-- spec/models/artwork.rb
-- spec/models/author.rb
-- spec/models/author_polymorphic.rb
+- spec/models/integer_id.rb
 - spec/models/book.rb
-- spec/models/book_polymorphic.rb
-- spec/models/caption.rb
-- spec/models/document_paranoid.rb
 - spec/models/entity.rb
-- spec/models/friend.rb
-- spec/models/incorrect_slug_persistence.rb
-- spec/models/integer_id.rb
-- spec/models/magazine.rb
+- spec/models/caption.rb
+- spec/models/without_slug.rb
+- spec/models/artist.rb
+- spec/models/string_id.rb
 - spec/models/page.rb
-- spec/models/page_localize.rb
 - spec/models/page_slug_localized.rb
-- spec/models/page_slug_localized_custom.rb
-- spec/models/page_slug_localized_history.rb
-- spec/models/paranoid_document.rb
-- spec/models/paranoid_permanent.rb
+- spec/models/author.rb
+- spec/models/friend.rb
+- spec/models/subject.rb
+- spec/models/magazine.rb
 - spec/models/partner.rb
+- spec/models/alias.rb
 - spec/models/person.rb
+- spec/models/page_slug_localized_custom.rb
 - spec/models/relationship.rb
-- spec/models/string_id.rb
-- spec/models/subject.rb
-- spec/models/without_slug.rb
-- spec/mongoid/criteria_spec.rb
-- spec/mongoid/index_spec.rb
-- spec/mongoid/paranoia_spec.rb
-- spec/mongoid/slug_spec.rb
-- spec/shared/indexes.rb
-- spec/spec_helper.rb
-- spec/tasks/mongoid_slug_rake_spec.rb
+- spec/models/book_polymorphic.rb
+- spec/models/page_slug_localized_history.rb
+- spec/models/author_polymorphic.rb
+- spec/models/incorrect_slug_persistence.rb
+- spec/models/page_localize.rb
+- spec/models/artwork.rb

data/lib/mongoid/slug/paranoia.rb

@@ -1,20 +0,0 @@
-module Mongoid
-  module Slug
-    # Lightweight compatibility shim which adds the :restore callback to
-    # older versions of Mongoid::Paranoia
-    module Paranoia
-      extend ActiveSupport::Concern
-
-      included do
-        define_model_callbacks :restore
-
-        def restore_with_callbacks
-          run_callbacks(:restore) do
-            restore_without_callbacks
-          end
-        end
-        alias_method_chain :restore, :callbacks
-      end
-    end
-  end
-end

data/spec/models/document_paranoid.rb

@@ -1,9 +0,0 @@
-class DocumentParanoid
-  include Mongoid::Document
-  # slug, then paranoia
-  include Mongoid::Slug
-  include Mongoid::Paranoia
-
-  field :title
-  slug :title
-end

data/spec/models/paranoid_document.rb

@@ -1,8 +0,0 @@
-class ParanoidDocument
-  include Mongoid::Document
-  include Mongoid::Paranoia
-  include Mongoid::Slug
-
-  field :title
-  slug :title
-end

data/spec/models/paranoid_permanent.rb

@@ -1,10 +0,0 @@
-class ParanoidPermanent
-  include Mongoid::Document
-  include Mongoid::Paranoia
-  include Mongoid::Slug
-
-  field :title
-  field :foo
-
-  slug :title, scope: :foo, permanent: true
-end

data/spec/mongoid/paranoia_spec.rb

@@ -1,230 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'Mongoid::Paranoia with Mongoid::Slug' do
-  let(:paranoid_doc)    { ParanoidDocument.create!(title: 'slug') }
-  let(:paranoid_doc_2)  { ParanoidDocument.create!(title: 'slug') }
-  let(:paranoid_perm)   { ParanoidPermanent.create!(title: 'slug') }
-  let(:paranoid_perm_2) { ParanoidPermanent.create!(title: 'slug') }
-  let(:non_paranoid_doc) { Article.create!(title: 'slug') }
-  subject { paranoid_doc }
-
-  describe '.paranoid?' do
-    context 'when Mongoid::Paranoia is included' do
-      subject { paranoid_doc.class }
-      specify { expect(subject.is_paranoid_doc?).to be true }
-    end
-
-    context 'when Mongoid::Paranoia not included' do
-      subject { non_paranoid_doc.class }
-      specify { expect(subject.is_paranoid_doc?).to be false }
-    end
-  end
-
-  describe '#paranoid_deleted?' do
-    context 'when Mongoid::Paranoia is included' do
-      context 'when not destroyed' do
-        specify { expect(subject.paranoid_deleted?).to be false }
-      end
-
-      context 'when destroyed' do
-        before { subject.destroy }
-        specify { expect(subject.paranoid_deleted?).to be true }
-      end
-    end
-
-    context 'when Mongoid::Paranoia not included' do
-      subject { non_paranoid_doc }
-      specify { expect(subject.paranoid_deleted?).to be false }
-    end
-  end
-
-  describe 'restore callbacks' do
-    context 'when Mongoid::Paranoia is included' do
-      subject { paranoid_doc.class }
-      it { is_expected.to respond_to(:before_restore) }
-      it { is_expected.to respond_to(:after_restore) }
-    end
-
-    context 'when Mongoid::Paranoia not included' do
-      it { is_expected.to_not respond_to(:before_restore) }
-      it { is_expected.to_not respond_to(:after_restore) }
-    end
-  end
-
-  describe 'index' do
-    context 'simple index' do
-      before  { ParanoidDocument.create_indexes }
-      after   { ParanoidDocument.remove_indexes }
-      subject { ParanoidDocument }
-
-      it_should_behave_like 'has an index', { _slugs: 1 }, unique: true, sparse: true
-    end
-
-    context 'compound index' do
-      before  { ParanoidPermanent.create_indexes }
-      after   { ParanoidPermanent.remove_indexes }
-      subject { ParanoidPermanent }
-
-      it_should_behave_like 'has an index', { foo: 1, _slugs: 1 }, unique: nil, sparse: nil
-    end
-  end
-
-  shared_examples_for 'paranoid slugs' do
-    context 'querying' do
-      it 'returns paranoid_doc for correct slug' do
-        expect(subject.class.find(subject.slug)).to eq subject
-      end
-    end
-
-    context 'delete (callbacks not fired)' do
-      before { subject.delete }
-
-      it 'retains slug value' do
-        expect(subject.slug).to eq 'slug'
-        expect(subject.class.unscoped.find('slug')).to eq subject
-      end
-    end
-
-    context 'destroy' do
-      before { subject.destroy }
-
-      it 'unsets slug value when destroyed' do
-        expect(subject._slugs).to eq []
-        expect(subject.slug).to be_nil
-      end
-
-      it 'persists the removed slug' do
-        expect(subject.reload._slugs).to be nil
-        expect(subject.reload.slug).to eq subject._id.to_s
-      end
-
-      it 'persists the removed slug in the database' do
-        expect(subject.class.unscoped.exists(_slugs: false).first).to eq subject
-        expect { subject.class.unscoped.find('slug') }.to raise_error(Mongoid::Errors::DocumentNotFound)
-      end
-
-      context 'when saving the doc again' do
-        before { subject.save }
-
-        it 'should have the default slug value' do
-          expect(subject._slugs).to eq []
-          expect(subject.slug).to be_nil
-        end
-
-        it 'the slug remains unset in the database' do
-          expect(subject.class.unscoped.exists(_slugs: false).first).to eq subject
-          expect { subject.class.unscoped.find('slug') }.to raise_error(Mongoid::Errors::DocumentNotFound)
-        end
-      end
-    end
-
-    context 'restore' do
-      before do
-        subject.destroy
-        subject.restore
-      end
-
-      it 'resets slug value when restored' do
-        expect(subject.slug).to eq 'slug'
-        expect(subject.reload.slug).to eq 'slug'
-      end
-    end
-
-    context 'multiple documents' do
-      it 'new documents should be able to use the slug of destroyed documents' do
-        expect(subject.slug).to eq 'slug'
-        subject.destroy
-        expect(subject.reload.slug).to eq subject._id.to_s
-        expect(other_doc.slug).to eq 'slug'
-        subject.restore
-        expect(subject.slug).to eq 'slug-1'
-        expect(subject.reload.slug).to eq 'slug-1'
-      end
-
-      it 'should allow multiple documents to be destroyed without index conflict' do
-        expect(subject.slug).to eq 'slug'
-        subject.destroy
-        expect(subject.reload.slug).to eq subject._id.to_s
-        expect(other_doc.slug).to eq 'slug'
-        other_doc.destroy
-        expect(other_doc.reload.slug).to eq other_doc._id.to_s
-      end
-    end
-  end
-
-  [ParanoidDocument, DocumentParanoid].each do |paranoid_klass|
-    context paranoid_klass.to_s do
-      let(:paranoid_doc) { paranoid_klass.create!(title: 'slug') }
-      let(:non_paranoid_doc) { Article.create!(title: 'slug') }
-
-      subject { paranoid_doc }
-
-      describe '.paranoid?' do
-        context 'when Mongoid::Paranoia is included' do
-          subject { paranoid_doc.class }
-          its(:is_paranoid_doc?) { is_expected.to be_truthy }
-        end
-
-        context 'when Mongoid::Paranoia not included' do
-          subject { non_paranoid_doc.class }
-          its(:is_paranoid_doc?) { is_expected.to be_falsey }
-        end
-      end
-
-      describe '#paranoid_deleted?' do
-        context 'when Mongoid::Paranoia is included' do
-          context 'when not destroyed' do
-            its(:paranoid_deleted?) { is_expected.to be_falsey }
-          end
-
-          context 'when destroyed' do
-            before { subject.destroy }
-            its(:paranoid_deleted?) { is_expected.to be_truthy }
-          end
-        end
-
-        context 'when Mongoid::Paranoia not included' do
-          subject { non_paranoid_doc }
-          its(:paranoid_deleted?) { is_expected.to be_falsey }
-        end
-      end
-
-      describe 'restore callbacks' do
-        context 'when Mongoid::Paranoia is included' do
-          subject { paranoid_doc.class }
-          it { is_expected.to respond_to(:before_restore) }
-          it { is_expected.to respond_to(:after_restore) }
-        end
-
-        context 'when Mongoid::Paranoia not included' do
-          it { is_expected.not_to respond_to(:before_restore) }
-          it { is_expected.not_to respond_to(:after_restore) }
-        end
-      end
-
-      describe 'index' do
-        before  { paranoid_klass.create_indexes }
-        after   { paranoid_klass.remove_indexes }
-        subject { paranoid_klass }
-
-        it_should_behave_like 'has an index', { _slugs: 1 }, unique: true, sparse: true
-      end
-
-      context 'non-permanent slug' do
-        let(:paranoid_doc_2) { paranoid_klass.create!(title: 'slug') }
-        subject { paranoid_doc }
-        let(:other_doc) { paranoid_doc_2 }
-        it_behaves_like 'paranoid slugs'
-      end
-    end
-  end
-
-  context 'permanent slug' do
-    let(:paranoid_perm) { ParanoidPermanent.create!(title: 'slug') }
-    let(:paranoid_perm_2) { ParanoidPermanent.create!(title: 'slug') }
-    subject { paranoid_perm }
-    let(:other_doc) { paranoid_perm_2 }
-    it_behaves_like 'paranoid slugs'
-  end
-end