mongoid-slug 5.2.0 → 5.3.0

data/spec/shared/indexes.rb

@@ -1,27 +1,41 @@
+shared_context 'with an index' do |key|
+  if Mongoid::Compatibility::Version.mongoid3?
+    let(:index) { subject.index_options[key] }
+    let(:index_keys) { key }
+    let(:index_options) { index }
+  else
+    let(:index) { subject.index_specifications.detect { |spec| spec.key == key } }
+    let(:index_keys) { index.key }
+    let(:index_options) { index.options }
+  end
+end
+
 shared_examples 'has an index' do |key, options|
-  it "has a #{key} index" do
-    index = if Mongoid::Compatibility::Version.mongoid3?
-              subject.index_options[key]
-            else
-              subject.index_specifications.detect { |spec| spec.key == key }
-            end
+  include_context 'with an index', key
+
+  it "has a #{[key, options].compact.join(', ')} index" do
     expect(index).not_to be_nil
+  end
+
+  it 'has the correct order of keys' do
+    expect(index_keys.keys).to eq key.keys
+  end
+
+  it 'has the correct order of key values' do
+    expect(index_keys.values).to eq key.values
+  end
+
+  it 'matches option values' do
     options.each_pair do |name, value|
-      if Mongoid::Compatibility::Version.mongoid3?
-        expect(index[name]).to eq(value)
-      else
-        expect(index.options[name]).to eq(value)
-      end
-    end if options
+      expect(index_options[name]).to eq(value)
+    end
   end
 end
 
-shared_examples 'does not have an index' do |key, _option|
+shared_examples 'does not have an index' do |key|
+  include_context 'with an index', key
+
   it "does not have the #{key} index" do
-    if Mongoid::Compatibility::Version.mongoid3?
-      expect(subject.index_options[key]).to be_nil
-    else
-      expect(subject.index_specifications.detect { |spec| spec.key == key }).to be_nil
-    end
+    expect(index).to be nil
   end
 end

data/spec/spec_helper.rb

@@ -43,11 +43,25 @@ RSpec.configure do |c|
 
   c.before :all do
     Mongoid.logger.level = Logger::INFO
-    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5?
+    if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      Mongo::Logger.logger.level = Logger::INFO
+    end
   end
 
   c.before(:each) do
     Mongoid.purge!
+    Author.create_indexes
+    Book.create_indexes
+    AuthorPolymorphic.create_indexes
+    BookPolymorphic.create_indexes
     Mongoid::IdentityMap.clear if defined?(Mongoid::IdentityMap)
   end
+
+  c.after(:all) do
+    if Mongoid::Compatibility::Version.mongoid3? || Mongoid::Compatibility::Version.mongoid4?
+      Mongoid.default_session.drop
+    else
+      Mongoid::Clients.default.database.drop
+    end
+  end
 end

data/spec/tasks/mongoid_slug_rake_spec.rb

@@ -41,7 +41,7 @@ describe 'mongoid_slug:set' do
       Rake::Task['mongoid_slug:set'].invoke('UninitalizedSlugFirst')
 
       expect(uninitalized_slug1.reload.slugs).to eq(['uninitalized-slug1'])
-      expect(uninitalized_slug2.reload.slugs).to eq []
+      expect(uninitalized_slug2.reload.slugs).to be nil
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-slug
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Andreas Saebjoernsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -136,34 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.34.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.34.2
 description: Mongoid URL slug or permalink generator
 email:
 - andy@cosemble.com
@@ -218,7 +190,7 @@ files:
 - spec/shared/indexes.rb
 - spec/spec_helper.rb
 - spec/tasks/mongoid_slug_rake_spec.rb
-homepage: https://github.com/digitalplaywright/mongoid-slug
+homepage: https://github.com/mongoid/mongoid-slug
 licenses:
 - MIT
 metadata: {}
@@ -238,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid-slug
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mongoid URL slugs