mongoid-slug 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb594c9cba9d0b1747cfe7de88bd16025729bb92
-  data.tar.gz: c196bf56ba7b22a85277955c87a46054be646d7b
+  metadata.gz: f62313ab069384e3dea183cd680aae50318beb85
+  data.tar.gz: 8881c0bef60727f9c57d8210b74f04bd48f545d6
 SHA512:
-  metadata.gz: 5114980882e64954cfa197753e32c36ff78f32d09aa933e75d5ea705a1f04c6efe3837a8060b2f0747e2d8a4fe382c07e4f50d4ee1ec6623a4fae2962bda8d3b
-  data.tar.gz: 7d29e77096446b20be262a5e648a845e5621e5b8402aab368103115ae890e7a297c5213dc7f31a61fb395227e0e6c7cae5096f016c0af8c65cf2777237a6aae0
+  metadata.gz: 0bbf0cc529c6c8da1955ab3f9d40dfddb5e081c740bee1f012b3c115ad1698ed00bd5c8b81e158ce3626678e99dc9337a565ea3a8c67107583e940d20eed78f7
+  data.tar.gz: d9b4553651b7c2f588a8fe188974c1074283846dae8e5962d05471b216d50e7dc0db1ae10bad7ed46c932debf502ea28ebe7e1726fa1360866cbb9da802add49

data/lib/mongoid/slug.rb

@@ -136,8 +136,7 @@ module Mongoid
       end
 
       def queryable
-        scope = Mongoid::Compatibility::Version.mongoid5? ? Threaded.current_scope : scope_stack.last
-        scope || Criteria.new(self) # Use Mongoid::Slug::Criteria for slugged documents.
+        current_scope || Criteria.new(self) # Use Mongoid::Slug::Criteria for slugged documents.
       end
 
       # Indicates whether or not the document includes Mongoid::Paranoia
@@ -150,6 +149,22 @@ module Mongoid
       def is_paranoid_doc?
         !!(defined?(::Mongoid::Paranoia) && self < ::Mongoid::Paranoia)
       end
+
+      private
+
+      if Mongoid::Compatibility::Version.mongoid5? && Threaded.method(:current_scope).arity == -1
+        def current_scope
+          Threaded.current_scope(self)
+        end
+      elsif Mongoid::Compatibility::Version.mongoid5?
+        def current_scope
+          Threaded.current_scope
+        end
+      else
+        def current_scope
+          scope_stack.last
+        end
+      end
     end
 
     # Builds a new slug.

data/lib/mongoid/slug/version.rb

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

data/spec/models/artist.rb

@@ -0,0 +1,8 @@
+class Artist
+  include Mongoid::Document
+  include Mongoid::Slug
+
+  slug :name
+  field :name
+  has_and_belongs_to_many :artworks
+end

data/spec/models/artwork.rb

@@ -0,0 +1,10 @@
+class Artwork
+  include Mongoid::Document
+  include Mongoid::Slug
+
+  slug :title
+  field :title
+  field :published, type: Boolean, default: true
+  scope :published, -> { where(published: true) }
+  has_and_belongs_to_many :artists
+end

data/spec/models/document_paranoid.rb

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

data/spec/mongoid/criteria_spec.rb

@@ -187,4 +187,22 @@ describe Mongoid::Slug::Criteria do
       end
     end
   end
+
+  describe '.where' do
+    let!(:artist1) { Artist.create!(name: 'Leonardo') }
+    let!(:artist2) { Artist.create!(name: 'Malevich') }
+    let!(:artwork1) { Artwork.create!(title: 'Mona Lisa', artist_ids: [artist1.id], published: true) }
+    let!(:artwork2) { Artwork.create!(title: 'Black Square', artist_ids: [artist2.id], published: false) }
+    let!(:artwork3) { Artwork.create! }
+
+    it 'counts artworks' do
+      expect(Artwork.in(artist_ids: artist1.id).count).to eq 1
+      expect(Artwork.in(artist_ids: artist2.id).count).to eq 1
+    end
+
+    it 'counts published artworks' do
+      expect(Artwork.in(artist_ids: artist1.id).published.count).to eq 1
+      expect(Artwork.in(artist_ids: artist2.id).published.count).to eq 0
+    end
+  end
 end

data/spec/mongoid/paranoia_spec.rb

@@ -2,64 +2,6 @@
 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 }
-      its(:is_paranoid_doc?) { should be_truthy }
-    end
-
-    context 'when Mongoid::Paranoia not included' do
-      subject { non_paranoid_doc.class }
-      its(:is_paranoid_doc?) { should be_falsey }
-    end
-  end
-
-  describe '#paranoid_deleted?' do
-    context 'when Mongoid::Paranoia is included' do
-      context 'when not destroyed' do
-        its(:paranoid_deleted?) { should be_falsey }
-      end
-
-      context 'when destroyed' do
-        before { subject.destroy }
-        its(:paranoid_deleted?) { should be_truthy }
-      end
-    end
-
-    context 'when Mongoid::Paranoia not included' do
-      subject { non_paranoid_doc }
-      its(:paranoid_deleted?) { should 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  { ParanoidDocument.create_indexes }
-    after   { ParanoidDocument.remove_indexes }
-    subject { ParanoidDocument }
-
-    it_should_behave_like 'has an index', { _slugs: 1 }, unique: true, sparse: true
-  end
-
   shared_examples_for 'paranoid slugs' do
     context 'querying' do
       it 'returns paranoid_doc for correct slug' do
@@ -143,13 +85,76 @@ describe 'Mongoid::Paranoia with Mongoid::Slug' do
     end
   end
 
-  context 'non-permanent slug' do
-    subject { paranoid_doc }
-    let(:other_doc) { paranoid_doc_2 }
-    it_behaves_like 'paranoid slugs'
+  [ParanoidDocument, DocumentParanoid].each do |paranoid_klass|
+    context "#{paranoid_klass}" 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?) { should be_truthy }
+        end
+
+        context 'when Mongoid::Paranoia not included' do
+          subject { non_paranoid_doc.class }
+          its(:is_paranoid_doc?) { should be_falsey }
+        end
+      end
+
+      describe '#paranoid_deleted?' do
+        context 'when Mongoid::Paranoia is included' do
+          context 'when not destroyed' do
+            its(:paranoid_deleted?) { should be_falsey }
+          end
+
+          context 'when destroyed' do
+            before { subject.destroy }
+            its(:paranoid_deleted?) { should be_truthy }
+          end
+        end
+
+        context 'when Mongoid::Paranoia not included' do
+          subject { non_paranoid_doc }
+          its(:paranoid_deleted?) { should 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-slug
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Andreas Saebjoernsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -183,11 +183,14 @@ files:
 - lib/mongoid_slug.rb
 - spec/models/alias.rb
 - spec/models/article.rb
+- spec/models/artist.rb
+- spec/models/artwork.rb
 - spec/models/author.rb
 - spec/models/author_polymorphic.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
@@ -239,11 +242,14 @@ summary: Mongoid URL slugs
 test_files:
 - spec/models/alias.rb
 - spec/models/article.rb
+- spec/models/artist.rb
+- spec/models/artwork.rb
 - spec/models/author.rb
 - spec/models/author_polymorphic.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