mongoid-slug 4.0.0 → 5.0.0

data/lib/mongoid/slug/version.rb

@@ -1,5 +1,5 @@
 module Mongoid #:nodoc:
   module Slug
-    VERSION = '4.0.0'
+    VERSION = '5.0.0'
   end
 end

data/spec/models/alias.rb

@@ -1,6 +1,6 @@
 class Alias
   include Mongoid::Document
   include Mongoid::Slug
-  field :name, :as => :author_name
-  slug  :author_name
+  field :name, as: :author_name
+  slug :author_name
 end

data/spec/models/article.rb

@@ -3,7 +3,7 @@ class Article
   include Mongoid::Slug
   field :brief
   field :title
-  slug  :title, :brief do |doc|
+  slug :title, :brief do |doc|
     [doc.title, doc.brief].reject(&:blank?).first
   end
 end

data/spec/models/author.rb

@@ -3,9 +3,9 @@ class Author
   include Mongoid::Slug
   field :first_name
   field :last_name
-  slug  :first_name, :last_name, :scope => :book
+  slug :first_name, :last_name, scope: :book
   belongs_to :book
   has_many :characters,
-           :class_name => 'Person',
-           :foreign_key => :author_id
+           class_name: 'Person',
+           foreign_key: :author_id
 end

data/spec/models/author_polymorphic.rb

@@ -3,9 +3,9 @@ class AuthorPolymorphic
   include Mongoid::Slug
   field :first_name
   field :last_name
-  slug  :first_name, :last_name, :scope => :book_polymorphic
+  slug :first_name, :last_name, scope: :book_polymorphic
   belongs_to :book_polymorphic
   has_many :characters,
-           :class_name => 'Person',
-           :foreign_key => :author_id
+           class_name: 'Person',
+           foreign_key: :author_id
 end

data/spec/models/book.rb

@@ -3,7 +3,7 @@ class Book
   include Mongoid::Slug
   field :title
 
-  slug  :title, :history => true
+  slug :title, history: true
   embeds_many :subjects
   has_many :authors
 end

data/spec/models/book_polymorphic.rb

@@ -3,7 +3,7 @@ class BookPolymorphic
   include Mongoid::Slug
   field :title
 
-  slug  :title, :history => true, :by_model_type => true
+  slug :title, history: true, by_model_type: true
   embeds_many :subjects
   has_many :author_polymorphics
 end

data/spec/models/caption.rb

@@ -1,7 +1,7 @@
 class Caption
   include Mongoid::Document
   include Mongoid::Slug
-  field :my_identity, :type => String
+  field :my_identity, type: String
   field :title
   field :medium
 

data/spec/models/entity.rb

@@ -1,4 +1,4 @@
-#encoding: utf-8
+# encoding: utf-8
 class Entity
   include Mongoid::Document
   include Mongoid::Slug
@@ -8,5 +8,5 @@ class Entity
   field :name
   field :user_edited_variation
 
-  slug  :user_edited_variation, :history => true
+  slug :user_edited_variation, history: true
 end

data/spec/models/friend.rb

@@ -2,6 +2,6 @@ class Friend
   include Mongoid::Document
   include Mongoid::Slug
   field :name
-  field :slug_history, :type => Array
-  slug  :name, :reserve => ['foo', 'bar', /^[a-z]{2}$/i], :history => true
+  field :slug_history, type: Array
+  slug :name, reserve: ['foo', 'bar', /^[a-z]{2}$/i], history: true
 end

data/spec/models/incorrect_slug_persistence.rb

@@ -1,9 +1,9 @@
 class IncorrectSlugPersistence
- include Mongoid::Document
- include Mongoid::Slug
+  include Mongoid::Document
+  include Mongoid::Slug
 
- field :name
- slug  :name, history: true
+  field :name
+  slug :name, history: true
 
- validates_length_of :name, :minimum => 4, :maximum => 5, :allow_blank => true
+  validates_length_of :name, minimum: 4, maximum: 5, allow_blank: true
 end

data/spec/models/integer_id.rb

@@ -6,4 +6,4 @@ class IntegerId
   field :name, type: String
 
   slug :name, history: true
-end
+end

data/spec/models/magazine.rb

@@ -3,5 +3,5 @@ class Magazine
   include Mongoid::Slug
   field :title
   field :publisher_id
-  slug  :title, :scope => :publisher_id
+  slug :title, scope: :publisher_id
 end

data/spec/models/page.rb

@@ -3,7 +3,7 @@ class Page
   include Mongoid::Slug
   field :title
   field :content
-  field :order, :type => Integer
-  slug  :title
-  default_scope ->{ asc(:order) }
+  field :order, type: Integer
+  slug :title
+  default_scope -> { asc(:order) }
 end

data/spec/models/page_localize.rb

@@ -3,7 +3,7 @@ class PageLocalize
   include Mongoid::Slug
   field :title, localize: true
   field :content
-  field :order, :type => Integer
-  slug  :title
-  default_scope ->{ asc(:order) }
+  field :order, type: Integer
+  slug :title
+  default_scope -> { asc(:order) }
 end

data/spec/models/page_slug_localized.rb

@@ -3,7 +3,7 @@ class PageSlugLocalized
   include Mongoid::Slug
   field :title, localize: true
   field :content
-  field :order, :type => Integer
-  slug  :title, localize: true
-  default_scope ->{ asc(:order) }
+  field :order, type: Integer
+  slug :title, localize: true
+  default_scope -> { asc(:order) }
 end

data/spec/models/page_slug_localized_custom.rb

@@ -7,5 +7,4 @@ class PageSlugLocalizedCustom
   slug :title, localize: true do |obj|
     obj.title.to_url
   end
-
 end

data/spec/models/page_slug_localized_history.rb

@@ -3,7 +3,7 @@ class PageSlugLocalizedHistory
   include Mongoid::Slug
   field :title, localize: true
   field :content
-  field :order, :type => Integer
-  slug  :title, localize: true, history: true
-  default_scope ->{ asc(:order) }
+  field :order, type: Integer
+  slug :title, localize: true, history: true
+  default_scope -> { asc(:order) }
 end

data/spec/models/paranoid_document.rb

@@ -4,5 +4,5 @@ class ParanoidDocument
   include Mongoid::Slug
 
   field :title
-  slug  :title
+  slug :title
 end

data/spec/models/paranoid_permanent.rb

@@ -4,5 +4,5 @@ class ParanoidPermanent
   include Mongoid::Slug
 
   field :title
-  slug  :title, permanent: true
+  slug :title, permanent: true
 end

data/spec/models/partner.rb

@@ -2,6 +2,6 @@ class Partner
   include Mongoid::Document
   include Mongoid::Slug
   field :name
-  slug  :name
+  slug :name
   embedded_in :relationship
 end

data/spec/models/person.rb

@@ -2,7 +2,7 @@ class Person
   include Mongoid::Document
   include Mongoid::Slug
   field :name
-  slug  :name, :permanent => true, :scope => :author
+  slug :name, permanent: true, scope: :author
   embeds_many :relationships
-  belongs_to :author, :inverse_of => :characters
+  belongs_to :author, inverse_of: :characters
 end

data/spec/models/relationship.rb

@@ -2,7 +2,7 @@ class Relationship
   include Mongoid::Document
   include Mongoid::Slug
   field :name
-  slug  :name
+  slug :name
   embeds_many :partners
   embedded_in :person
 end

data/spec/models/string_id.rb

@@ -6,4 +6,4 @@ class StringId
   field :name, type: String
 
   slug :name, history: true
-end
+end

data/spec/models/subject.rb

@@ -2,6 +2,6 @@ class Subject
   include Mongoid::Document
   include Mongoid::Slug
   field :name
-  slug  :name, :scope => :book, :history => true
+  slug :name, scope: :book, history: true
   embedded_in :book
 end

data/spec/models/without_slug.rb

@@ -2,4 +2,4 @@ class WithoutSlug
   include Mongoid::Document
 
   field :_id, type: Integer
-end
+end

data/spec/mongoid/criteria_spec.rb

@@ -1,188 +1,188 @@
-#encoding: utf-8
-require "spec_helper"
+# encoding: utf-8
+require 'spec_helper'
 
 describe Mongoid::Slug::Criteria do
-  describe ".find" do
-    let!(:book) { Book.create(:title => "A Working Title").tap { |d| d.update_attribute(:title, "A Thousand Plateaus") } }
-    let!(:book2) { Book.create(:title => "Difference and Repetition") }
-    let!(:friend) { Friend.create(:name => "Jim Bob") }
-    let!(:friend2) { Friend.create(:name => friend.id.to_s) }
-    let!(:integer_id) { IntegerId.new(:name => "I have integer ids").tap { |d| d.id = 123; d.save } }
-    let!(:integer_id2) { IntegerId.new(:name => integer_id.id.to_s).tap { |d| d.id = 456; d.save } }
-    let!(:string_id) { StringId.new(:name => "I have string ids").tap { |d| d.id = 'abc'; d.save } }
-    let!(:string_id2) { StringId.new(:name => string_id.id.to_s).tap { |d| d.id = 'def'; d.save } }
-    let!(:subject) { Subject.create(:name  => "A Subject", :book => book) }
-    let!(:subject2) { Subject.create(:name  => "A Subject", :book => book2) }
-    let!(:without_slug) { WithoutSlug.new().tap { |d| d.id = 456; d.save } }
-
-    context "when the model does not use mongoid slugs" do
+  describe '.find' do
+    let!(:book) { Book.create(title: 'A Working Title').tap { |d| d.update_attribute(:title, 'A Thousand Plateaus') } }
+    let!(:book2) { Book.create(title: 'Difference and Repetition') }
+    let!(:friend) { Friend.create(name: 'Jim Bob') }
+    let!(:friend2) { Friend.create(name: friend.id.to_s) }
+    let!(:integer_id) { IntegerId.new(name: 'I have integer ids').tap { |d| d.id = 123; d.save! } }
+    let!(:integer_id2) { IntegerId.new(name: integer_id.id.to_s).tap { |d| d.id = 456; d.save! } }
+    let!(:string_id) { StringId.new(name: 'I have string ids').tap { |d| d.id = 'abc'; d.save! } }
+    let!(:string_id2) { StringId.new(name: string_id.id.to_s).tap { |d| d.id = 'def'; d.save! } }
+    let!(:subject) { Subject.create(name: 'A Subject', book: book) }
+    let!(:subject2) { Subject.create(name: 'A Subject', book: book2) }
+    let!(:without_slug) { WithoutSlug.new.tap { |d| d.id = 456; d.save! } }
+
+    context 'when the model does not use mongoid slugs' do
       it "should not use mongoid slug's custom find methods" do
-        Mongoid::Slug::Criteria.any_instance.should_not_receive(:find)
-        WithoutSlug.find(without_slug.id.to_s).should == without_slug
+        expect_any_instance_of(Mongoid::Slug::Criteria).not_to receive(:find)
+        expect(WithoutSlug.find(without_slug.id.to_s)).to eq(without_slug)
       end
     end
 
-    context "using slugs" do
-      context "(single)" do
-        context "and a document is found" do
-          it "returns the document as an object" do
-            Book.find(book.slugs.first).should == book
+    context 'using slugs' do
+      context '(single)' do
+        context 'and a document is found' do
+          it 'returns the document as an object' do
+            expect(Book.find(book.slugs.first)).to eq(book)
           end
         end
 
-        context "but no document is found" do
-          it "raises a Mongoid::Errors::DocumentNotFound error" do
-            lambda {
-              Book.find("Anti Oedipus")
-            }.should raise_error(Mongoid::Errors::DocumentNotFound)
+        context 'but no document is found' do
+          it 'raises a Mongoid::Errors::DocumentNotFound error' do
+            expect do
+              Book.find('Anti Oedipus')
+            end.to raise_error(Mongoid::Errors::DocumentNotFound)
           end
         end
       end
 
-      context "(multiple)" do
-        context "and all documents are found" do
-          it "returns the documents as an array without duplication" do
-            Book.find(book.slugs + book2.slugs).should =~ [book, book2]
+      context '(multiple)' do
+        context 'and all documents are found' do
+          it 'returns the documents as an array without duplication' do
+            expect(Book.find(book.slugs + book2.slugs)).to match_array([book, book2])
           end
         end
 
-        context "but not all documents are found" do
-          it "raises a Mongoid::Errors::DocumentNotFound error" do
-            lambda {
+        context 'but not all documents are found' do
+          it 'raises a Mongoid::Errors::DocumentNotFound error' do
+            expect do
               Book.find(book.slugs + ['something-nonexistent'])
-            }.should raise_error(Mongoid::Errors::DocumentNotFound)
+            end.to raise_error(Mongoid::Errors::DocumentNotFound)
           end
         end
       end
 
-      context "when no documents match" do
-        it "raises a Mongoid::Errors::DocumentNotFound error" do
-          lambda {
-            Book.find("Anti Oedipus")
-          }.should raise_error(Mongoid::Errors::DocumentNotFound)
+      context 'when no documents match' do
+        it 'raises a Mongoid::Errors::DocumentNotFound error' do
+          expect do
+            Book.find('Anti Oedipus')
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
         end
       end
 
-      context "when ids are BSON::ObjectIds and the supplied argument looks like a BSON::ObjectId" do
-        it "it should find based on ids not slugs" do # i.e. it should type cast the argument
-          Friend.find(friend.id.to_s).should == friend
+      context 'when ids are BSON::ObjectIds and the supplied argument looks like a BSON::ObjectId' do
+        it 'it should find based on ids not slugs' do # i.e. it should type cast the argument
+          expect(Friend.find(friend.id.to_s)).to eq(friend)
         end
       end
 
-      context "when ids are Strings" do
-        it "it should find based on ids not slugs" do # i.e. string ids should take precedence over string slugs
-          StringId.find(string_id.id.to_s).should == string_id
+      context 'when ids are Strings' do
+        it 'it should find based on ids not slugs' do # i.e. string ids should take precedence over string slugs
+          expect(StringId.find(string_id.id.to_s)).to eq(string_id)
         end
       end
 
-      context "when ids are Integers and the supplied arguments looks like an Integer" do
-        it "it should find based on slugs not ids" do # i.e. it should not type cast the argument
-          IntegerId.find(integer_id.id.to_s).should == integer_id2
+      context 'when ids are Integers and the supplied arguments looks like an Integer' do
+        it 'it should find based on slugs not ids' do # i.e. it should not type cast the argument
+          expect(IntegerId.find(integer_id.id.to_s)).to eq(integer_id2)
         end
       end
 
-      context "models that does not use slugs, should find using the original find" do
-        it "it should find based on ids" do # i.e. it should not type cast the argument
-          WithoutSlug.find(without_slug.id.to_s).should == without_slug
+      context 'models that does not use slugs, should find using the original find' do
+        it 'it should find based on ids' do # i.e. it should not type cast the argument
+          expect(WithoutSlug.find(without_slug.id.to_s)).to eq(without_slug)
         end
       end
 
-      context "when scoped" do
-        context "and a document is found" do
-          it "returns the document as an object" do
-            book.subjects.find(subject.slugs.first).should == subject
-            book2.subjects.find(subject.slugs.first).should == subject2
+      context 'when scoped' do
+        context 'and a document is found' do
+          it 'returns the document as an object' do
+            expect(book.subjects.find(subject.slugs.first)).to eq(subject)
+            expect(book2.subjects.find(subject.slugs.first)).to eq(subject2)
           end
         end
 
-        context "but no document is found" do
-          it "raises a Mongoid::Errors::DocumentNotFound error" do
-            lambda {
+        context 'but no document is found' do
+          it 'raises a Mongoid::Errors::DocumentNotFound error' do
+            expect do
               book.subjects.find('Another Subject')
-            }.should raise_error(Mongoid::Errors::DocumentNotFound)
+            end.to raise_error(Mongoid::Errors::DocumentNotFound)
           end
         end
       end
     end
 
-    context "using ids" do
-      it "raises a Mongoid::Errors::DocumentNotFound error if no document is found" do
-        lambda {
+    context 'using ids' do
+      it 'raises a Mongoid::Errors::DocumentNotFound error if no document is found' do
+        expect do
           Book.find(friend.id)
-        }.should raise_error(Mongoid::Errors::DocumentNotFound)
+        end.to raise_error(Mongoid::Errors::DocumentNotFound)
       end
 
-      context "given a single document" do
-        it "returns the document" do
-          Friend.find(friend.id).should == friend
+      context 'given a single document' do
+        it 'returns the document' do
+          expect(Friend.find(friend.id)).to eq(friend)
         end
       end
 
-      context "given multiple documents" do
-        it "returns the documents" do
-          Book.find([book.id, book2.id]).should =~ [book, book2]
+      context 'given multiple documents' do
+        it 'returns the documents' do
+          expect(Book.find([book.id, book2.id])).to match_array([book, book2])
         end
       end
     end
   end
 
-  describe ".find_by_slug!" do
-    let!(:book) { Book.create(:title => "A Working Title").tap { |d| d.update_attribute(:title, "A Thousand Plateaus") } }
-    let!(:book2) { Book.create(:title => "Difference and Repetition") }
-    let!(:friend) { Friend.create(:name => "Jim Bob") }
-    let!(:friend2) { Friend.create(:name => friend.id.to_s) }
-    let!(:integer_id) { IntegerId.new(:name => "I have integer ids").tap { |d| d.id = 123; d.save } }
-    let!(:integer_id2) { IntegerId.new(:name => integer_id.id.to_s).tap { |d| d.id = 456; d.save } }
-    let!(:string_id) { StringId.new(:name => "I have string ids").tap { |d| d.id = 'abc'; d.save } }
-    let!(:string_id2) { StringId.new(:name => string_id.id.to_s).tap { |d| d.id = 'def'; d.save } }
-    let!(:subject) { Subject.create(:name  => "A Subject", :book => book) }
-    let!(:subject2) { Subject.create(:name  => "A Subject", :book => book2) }
+  describe '.find_by_slug!' do
+    let!(:book) { Book.create(title: 'A Working Title').tap { |d| d.update_attribute(:title, 'A Thousand Plateaus') } }
+    let!(:book2) { Book.create(title: 'Difference and Repetition') }
+    let!(:friend) { Friend.create(name: 'Jim Bob') }
+    let!(:friend2) { Friend.create(name: friend.id.to_s) }
+    let!(:integer_id) { IntegerId.new(name: 'I have integer ids').tap { |d| d.id = 123; d.save! } }
+    let!(:integer_id2) { IntegerId.new(name: integer_id.id.to_s).tap { |d| d.id = 456; d.save! } }
+    let!(:string_id) { StringId.new(name: 'I have string ids').tap { |d| d.id = 'abc'; d.save! } }
+    let!(:string_id2) { StringId.new(name: string_id.id.to_s).tap { |d| d.id = 'def'; d.save! } }
+    let!(:subject) { Subject.create(name: 'A Subject', book: book) }
+    let!(:subject2) { Subject.create(name: 'A Subject', book: book2) }
 
-    context "(single)" do
-      context "and a document is found" do
-        it "returns the document as an object" do
-          Book.find_by_slug!(book.slugs.first).should == book
+    context '(single)' do
+      context 'and a document is found' do
+        it 'returns the document as an object' do
+          expect(Book.find_by_slug!(book.slugs.first)).to eq(book)
         end
       end
 
-      context "but no document is found" do
-        it "raises a Mongoid::Errors::DocumentNotFound error" do
-          lambda {
-            Book.find_by_slug!("Anti Oedipus")
-          }.should raise_error(Mongoid::Errors::DocumentNotFound)
+      context 'but no document is found' do
+        it 'raises a Mongoid::Errors::DocumentNotFound error' do
+          expect do
+            Book.find_by_slug!('Anti Oedipus')
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
         end
       end
     end
 
-    context "(multiple)" do
-      context "and all documents are found" do
-        it "returns the documents as an array without duplication" do
-          Book.find_by_slug!(book.slugs + book2.slugs).should =~ [book, book2]
+    context '(multiple)' do
+      context 'and all documents are found' do
+        it 'returns the documents as an array without duplication' do
+          expect(Book.find_by_slug!(book.slugs + book2.slugs)).to match_array([book, book2])
         end
       end
 
-      context "but not all documents are found" do
-        it "raises a Mongoid::Errors::DocumentNotFound error" do
-          lambda {
+      context 'but not all documents are found' do
+        it 'raises a Mongoid::Errors::DocumentNotFound error' do
+          expect do
             Book.find_by_slug!(book.slugs + ['something-nonexistent'])
-          }.should raise_error(Mongoid::Errors::DocumentNotFound)
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
         end
       end
     end
 
-    context "when scoped" do
-      context "and a document is found" do
-        it "returns the document as an object" do
-          book.subjects.find_by_slug!(subject.slugs.first).should == subject
-          book2.subjects.find_by_slug!(subject.slugs.first).should == subject2
+    context 'when scoped' do
+      context 'and a document is found' do
+        it 'returns the document as an object' do
+          expect(book.subjects.find_by_slug!(subject.slugs.first)).to eq(subject)
+          expect(book2.subjects.find_by_slug!(subject.slugs.first)).to eq(subject2)
         end
       end
 
-      context "but no document is found" do
-        it "raises a Mongoid::Errors::DocumentNotFound error" do
-          lambda {
+      context 'but no document is found' do
+        it 'raises a Mongoid::Errors::DocumentNotFound error' do
+          expect do
             book.subjects.find_by_slug!('Another Subject')
-          }.should raise_error(Mongoid::Errors::DocumentNotFound)
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
         end
       end
     end