mongoid_slug 0.7.0 → 0.7.1

data/lib/mongoid/slug.rb

@@ -24,8 +24,7 @@ module Mongoid #:nodoc:
 
       # Sets one ore more fields as source of slug.
       #
-      # Takes a list of one or more fields to slug and an optional options
-      # hash.
+      # Takes a list of fields to slug and an optional options hash.
       #
       # The options hash respects the following members:
       #
@@ -63,14 +62,14 @@ module Mongoid #:nodoc:
         options = fields.extract_options!
         self.slug_scope = options[:scope]
         self.slug_name = options[:as] || :slug
-        self.slugged_fields = fields
+        self.slugged_fields = fields.map(&:to_s)
 
         self.slug_builder =
           if block_given?
             block
           else
             lambda do |doc|
-              slugged_fields.map { |f| doc.send(f) }.join(',')
+              slugged_fields.map { |f| doc.read_attribute(f) }.join(',')
             end
           end
 
@@ -107,23 +106,31 @@ module Mongoid #:nodoc:
 
     # Returns the slug.
     def to_param
-      self.send(slug_name)
+      read_attribute(slug_name)
     end
 
     private
 
-    def build_slug
-      ("#{slug_builder.call(self)} #{@slug_counter}").to_url
-    end
-
     def find_unique_slug
-      slug = build_slug
-      if unique_slug?(slug)
-        slug
-      else
-        increment_slug_counter
-        find_unique_slug
+      slug = slug_builder.call(self).to_url
+
+      # Regular expression that matches slug, slug-1, slug-2, ... slug-n
+      # If slug_name field was indexed, MongoDB will utilize that index to
+      # match /^.../ pattern
+      pattern = /^#{Regexp.escape(slug)}(?:-\d+)?$/
+      
+      # Get the maximum counter slug
+      max_counter_slug = uniqueness_scope.only(slug_name).
+        where(slug_name => pattern, :_id.ne => _id).
+        order_by([slug_name, :desc]).first.try(:read_attribute, slug_name)
+      
+      if max_counter_slug
+        max_counter = max_counter_slug.match(/-(\d+)$/).try(:[], 1).to_i
+        # Use max_counter + 1 as unique counter
+        slug += "-#{max_counter + 1}"
       end
+      
+      slug
     end
 
     def generate_slug
@@ -133,21 +140,11 @@ module Mongoid #:nodoc:
     end
 
     def generate_slug!
-      self.send("#{slug_name}=", find_unique_slug)
-    end
-
-    def increment_slug_counter
-      @slug_counter = (@slug_counter.to_i + 1).to_s
+      write_attribute(slug_name, find_unique_slug)
     end
 
     def slugged_fields_changed?
-      slugged_fields.any? { |f| self.send("#{f}_changed?") }
-    end
-
-    def unique_slug?(slug)
-      uniqueness_scope.where(slug_name => slug).
-        reject { |doc| doc.id == self.id }.
-        empty?
+      slugged_fields.any? { |f| attribute_changed?(f) }
     end
 
     def uniqueness_scope

data/lib/mongoid/slug/version.rb

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

data/spec/mongoid/slug_spec.rb

@@ -146,6 +146,13 @@ module Mongoid
           :first_name => author.first_name,
           :last_name  => author.last_name)
         dup.to_param.should eql 'gilles-deleuze-1'
+
+        dup2 = Author.create(
+          :first_name => author.first_name,
+          :last_name  => author.last_name)
+
+        dup.save
+        dup2.to_param.should eql 'gilles-deleuze-2'
       end
 
       it "does not update slug if slugged fields have changed but generated slug is identical" do

metadata

@@ -2,7 +2,7 @@
 name: mongoid_slug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +01:00
+date: 2011-04-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency