mongoid_slug 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae9fab25b8db6880157df5b1fcab5608336cfe9e
-  data.tar.gz: e8cd36c3abc7acb9b1850e17feff903d4c965743
+  metadata.gz: cb9aaa8ca267d57f8a6b9a301cc904096c5b511a
+  data.tar.gz: 4ab3f142f2fcb037d5e9b1e0c61b66ea44d8d770
 SHA512:
-  metadata.gz: 21ee51edcd378221ba9057a806d4d3c609df8704a1c297145e3c72c8439d0a4266e4947faed5f8b8d487042b73bdd7759cab0618e001f5c2d957123d331509fc
-  data.tar.gz: 0a11a12f37b1b45a855ba89ca854b16adb71e184db4ca2c1a5799e9c50c511acd700807551a432f8224c4d29c912357e35b5576dccc13a29e9391e30f691f7f2
+  metadata.gz: 4432bce036538231bbf2b60704b192f6b600f1129400aa804093226369e01df038a215c7af1a058192b663ed9fcbb046285793040483c3882102a98d6fcacbdf
+  data.tar.gz: ae81c2411c4c53542ac761048dac229e2eb6016f11dae322e20b7060dbf575155cbed2d5874c4c1931fbe9cca878dfb63524a1ea884f782d44f7f5d95d5dcd49

data/README.md

@@ -257,7 +257,7 @@ Custom Find Strategies
 --------------
 
 By default find will search for the document by the id field if the provided id
-looks like a BSON ObjectId, and it will otherwise find by the _slugs field. However,
+looks like a BSON::ObjectId, and it will otherwise find by the _slugs field. However,
 custom strategies can ovveride the default behavior, like e.g:
 
 ```ruby

data/lib/mongoid/slug.rb

@@ -133,8 +133,6 @@ module Mongoid
       if localized?
         begin
           orig_locale = I18n.locale
-          all_locales = self.slugged_attributes
-                            .map{|attr| self.send("#{attr}_translations").keys}.flatten.uniq
           all_locales.each do |target_locale|
             I18n.locale = target_locale
             set_slug
@@ -206,7 +204,9 @@ module Mongoid
       _cur_slug || pre_slug_string
     end
 
-
+    def self.mongoid3?
+      ::Mongoid.const_defined? :Observer
+    end
 
     private
 
@@ -253,6 +253,18 @@ module Mongoid
       self.fields['_slugs'].options[:localize] rescue false
     end
 
+    # Return all possible locales for model
+    # Avoiding usage of I18n.available_locales in case the user hasn't set it properly, or is
+    # doing something crazy, but at the same time we need a fallback in case the model doesn't
+    # have any localized attributes at all (extreme edge case).
+    def all_locales
+      locales = self.slugged_attributes
+                    .map{|attr| self.send("#{attr}_translations").keys if self.respond_to?("#{attr}_translations")}
+                    .flatten.compact.uniq
+      locales = I18n.available_locales if locales.empty?
+      locales
+    end
+
     def pre_slug_string
       self.slugged_attributes.map { |f| self.send f }.join ' '
     end

data/lib/mongoid/slug/criteria.rb

@@ -1,12 +1,10 @@
-# require 'moped/bson/object_id'
-
 module Mongoid
   module Slug
     class Criteria < Mongoid::Criteria
       # Find the matchind document(s) in the criteria for the provided ids or slugs.
       #
-      # If the document _ids are of the type Moped::BSON::ObjectId, and all the supplied parameters are
-      # convertible to Moped::BSON::ObjectId (via Moped::BSON::ObjectId#from_string), finding will be
+      # If the document _ids are of the type BSON::ObjectId, and all the supplied parameters are
+      # convertible to BSON::ObjectId (via BSON::ObjectId#from_string), finding will be
       # performed via _ids.
       #
       # If the document has any other type of _id field, and all the supplied parameters are of the same
@@ -15,10 +13,10 @@ module Mongoid
       # Otherwise finding will be performed via slugs.
       #
       # @example Find by an id.
-      #   criteria.find(Moped::BSON::ObjectId.new)
+      #   criteria.find(BSON::ObjectId.new)
       #
       # @example Find by multiple ids.
-      #   criteria.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
+      #   criteria.find([ BSON::ObjectId.new, BSON::ObjectId.new ])
       #
       # @example Find by a slug.
       #   criteria.find('some-slug')
@@ -67,9 +65,13 @@ module Mongoid
         self.respond_to?(type_method, true) ? method(type_method) : lambda {|id| false}
       end
 
-      # a string will not look like a slug if it looks like a legal ObjectId
+      # a string will not look like a slug if it looks like a legal BSON::ObjectId
       def objectid_slug_strategy id
-        Moped::BSON::ObjectId.legal?(id)
+        if Mongoid::Slug.mongoid3?
+          Moped::BSON::ObjectId.legal? id
+        else
+          BSON::ObjectId.legal?(id)
+        end
       end
 
       # a string will always look like a slug

data/lib/mongoid/slug/version.rb

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

data/spec/models/page_slug_localized_custom.rb

@@ -0,0 +1,11 @@
+class PageSlugLocalizedCustom
+  include Mongoid::Document
+  include Mongoid::Slug
+
+  attr_accessor :title
+
+  slug :title, localize: true do |obj|
+    obj.title.to_url
+  end
+
+end

data/spec/mongoid/criteria_spec.rb

@@ -187,4 +187,4 @@ describe Mongoid::Slug::Criteria do
       end
     end
   end
-end
+end

data/spec/mongoid/slug_spec.rb

@@ -101,8 +101,8 @@ module Mongoid
         }
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
-        bson_id = Moped::BSON::ObjectId.new.to_s
+      it "does not allow a BSON::ObjectId as use for a slug" do
+        bson_id = Mongoid::Slug.mongoid3? ? Moped::BSON::ObjectId.new.to_s : BSON::ObjectId.new.to_s
         bad = Book.create(:title => bson_id)
         bad.slugs.should_not include(bson_id)
       end
@@ -127,11 +127,11 @@ module Mongoid
           Book.find([book.id.to_s]).should eql [book]
         end
 
-        it "finds by id as Moped::BSON::ObjectId" do
+        it "finds by id as BSON::ObjectId" do
           Book.find(book.id).should eql book
         end
 
-        it "finds by id as an array of Moped::BSON::ObjectIds" do
+        it "finds by id as an array of BSON::ObjectIds" do
           Book.find([book.id]).should eql [book]
         end
 
@@ -161,7 +161,7 @@ module Mongoid
         dup.to_param.should eql "psychoanalysis-1"
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
+      it "does not allow a BSON::ObjectId as use for a slug" do
         bad = book.subjects.create(:name => "4ea0389f0364313d79104fb3")
         bad.slugs.should_not eql "4ea0389f0364313d79104fb3"
       end
@@ -185,11 +185,11 @@ module Mongoid
           book.subjects.find([subject.id.to_s]).should eql [subject]
         end
 
-        it "finds by id as Moped::BSON::ObjectId" do
+        it "finds by id as BSON::ObjectId" do
           book.subjects.find(subject.id).should eql subject
         end
 
-        it "finds by id as an array of Moped::BSON::ObjectIds" do
+        it "finds by id as an array of BSON::ObjectIds" do
           book.subjects.find([subject.id]).should eql [subject]
         end
 
@@ -228,7 +228,7 @@ module Mongoid
         dup.to_param.should eql "jane-smith-1"
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
+      it "does not allow a BSON::ObjectId as use for a slug" do
         bad = relationship.partners.create(:name => "4ea0389f0364313d79104fb3")
         bad.slugs.should_not eql "4ea0389f0364313d79104fb3"
       end
@@ -258,11 +258,11 @@ module Mongoid
           relationship.partners.find([partner.id.to_s]).should eql [partner]
         end
 
-        it "finds by id as Moped::BSON::ObjectId" do
+        it "finds by id as BSON::ObjectId" do
           relationship.partners.find(partner.id).should eql partner
         end
 
-        it "finds by id as an array of Moped::BSON::ObjectIds" do
+        it "finds by id as an array of BSON::ObjectIds" do
           relationship.partners.find([partner.id]).should eql [partner]
         end
 
@@ -305,7 +305,7 @@ module Mongoid
         dup2.to_param.should eql "gilles-deleuze-2"
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
+      it "does not allow a BSON::ObjectId as use for a slug" do
         bad = Author.create(:first_name => "4ea0389f0364",
                             :last_name => "313d79104fb3")
         bad.to_param.should_not eql "4ea0389f0364313d79104fb3"
@@ -372,7 +372,7 @@ module Mongoid
         dup.to_param.should eql "book-title-1"
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
+      it "does not allow a BSON::ObjectId as use for a slug" do
         bad = Book.create(:title => "4ea0389f0364313d79104fb3")
         bad.to_param.should_not eql "4ea0389f0364313d79104fb3"
       end
@@ -405,7 +405,7 @@ module Mongoid
         dup.to_param.should eql "gilles-deleuze-1"
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
+      it "does not allow a BSON::ObjectId as use for a slug" do
         bad = book.authors.create(:first_name => "4ea0389f0364",
                                   :last_name => "313d79104fb3")
         bad.to_param.should_not eql "4ea0389f0364313d79104fb3"
@@ -447,7 +447,7 @@ module Mongoid
         dup.to_param.should eql "big-weekly-1"
       end
 
-      it "does not allow a Moped::BSON::ObjectId as use for a slug" do
+      it "does not allow a BSON::ObjectId as use for a slug" do
         bad = Magazine.create(:title  => "4ea0389f0364313d79104fb3", :publisher_id => "abc123")
         bad.to_param.should_not eql "4ea0389f0364313d79104fb3"
       end
@@ -522,36 +522,24 @@ module Mongoid
       end
 
       context "when slug is not scoped by a reference association" do
-        it "defines an index on the slug" do
-          Book.index_options.should have_key( :_slugs => 1 )
-        end
-
-        it "defines a unique index" do
-          Book.index_options[ :_slugs => 1 ][:unique].should be_true
-        end
+        subject { Book }
+        it_should_behave_like "has an index", { _slugs: 1 }, { unique: true }
       end
 
       context "when slug is scoped by a reference association" do
-        it "does not define an index on the slug" do
-          Author.index_options.should_not have_key(:_slugs => 1 )
-        end
+        subject { Author }
+        it_should_behave_like "does not have an index", { _slugs: 1 }
       end
 
       context "for subclass scope" do
         context "when slug is not scoped by a reference association" do
-          it "defines an index on the slug" do
-            BookPolymorphic.index_options.should have_key( :_type => 1, :_slugs => 1 )
-          end
-
-          it "defines a unique index" do
-            BookPolymorphic.index_options[ :_type => 1, :_slugs => 1 ][:unique].should_not be_true
-          end
+          subject { BookPolymorphic }
+          it_should_behave_like "has an index", { _type: 1, _slugs: 1 }, { unique: nil }
         end
 
         context "when slug is scoped by a reference association" do
-          it "does not define an index on the slug" do
-            AuthorPolymorphic.index_options.should_not have_key(:_type => 1, :_slugs => 1 )
-          end
+          subject { AuthorPolymorphic }
+          it_should_behave_like "does not have an index", { _type: 1, _slugs: 1 }
         end
 
         context "when the object has STI" do
@@ -879,6 +867,13 @@ module Mongoid
         page["_slugs"].should == {"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
+        page["_slugs"].should == {"en" => ["a-title-for-the-slug"]}
+      end
     end
 
     context "slug can be localized when using history" do

data/spec/shared/indexes.rb

@@ -0,0 +1,27 @@
+shared_examples "has an index" do |key, options|
+  it "has a #{key} index" do
+    index = if Mongoid::Slug.mongoid3?
+      subject.index_options[key]
+    else
+      subject.index_specifications.detect { |spec| spec.key == key }
+    end
+    index.should_not be_nil
+    options.each_pair { |name, value|
+      if Mongoid::Slug.mongoid3?
+        index[name].should == value
+      else
+        index.options[name].should == value
+      end
+    } if options
+  end
+end
+
+shared_examples "does not have an index" do |key, option|
+  it "does not have the #{key} index" do
+    if Mongoid::Slug.mongoid3?
+      subject.index_options[key].should be_nil
+    else
+      subject.index_specifications.detect { |spec| spec.key == key }.should be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,7 +23,9 @@ Mongoid.configure do |config|
   config.connect_to database_id
 end
 
-Dir['./spec/models/*.rb'].each { |f| require f }
+[ 'models', 'shared' ].each do |dir|
+  Dir["./spec/#{dir}/*.rb"].each { |f| require f }
+end
 
 RSpec.configure do |c|
   c.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_slug
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Andreas Saebjoernsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,7 @@ files:
 - 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/partner.rb
@@ -163,9 +164,11 @@ files:
 - spec/mongoid/criteria_spec.rb
 - spec/mongoid/slug_spec.rb
 - spec/mongoid/slug_spec.rb.b00
+- spec/shared/indexes.rb
 - spec/spec_helper.rb
 homepage: https://github.com/digitalplaywright/mongoid-slug
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -183,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_slug
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Mongoid URL slugs
@@ -203,6 +206,7 @@ test_files:
 - 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/partner.rb
@@ -214,5 +218,5 @@ test_files:
 - spec/mongoid/criteria_spec.rb
 - spec/mongoid/slug_spec.rb
 - spec/mongoid/slug_spec.rb.b00
+- spec/shared/indexes.rb
 - spec/spec_helper.rb
-has_rdoc: