mongoid_slug 0.2.0 → 0.2.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = Mongoid Slug
 
-This gem generates a URL slug/permalink based on a field or set of fields in a Mongoid model.
+This gem generates a URL slug/permalink based on fields in a Mongoid model.
 
     class Book
       include Mongoid::Document

data/lib/mongoid_slug.rb

@@ -1,16 +1,16 @@
-# Generates a URL slug/permalink based on a field in a Mongoid model.
+# Generates a URL slug/permalink based on fields in a Mongoid model.
 module Mongoid::Slug
   
-  def self.included(base)
+  def self.included(base) #:nodoc:
     base.extend ClassMethods
     base.class_eval { field :slug; before_save :slugify }
   end
 
   module ClassMethods #:nodoc:
 
-    # Set a field as source of slug
-    def slug(*field)
-      class_variable_set(:@@slugged_fields, field)
+    # Set a field or a number of fields as source of slug
+    def slug(*fields)
+      class_variable_set(:@@slugged, fields)
     end
 
     def find_by_slug(slug)
@@ -29,18 +29,19 @@ module Mongoid::Slug
   private
 
   def slugify
-    self.slug = find_unique_slug if new_record? || slugged_fields_changed?
+    self.slug = find_unique_slug if new_record? || slugged_changed?
   end
 
-  def slugged_fields_changed?
-    self.class.class_eval('@@slugged_fields').any? do |field|
+  def slugged_changed?
+    self.class.class_eval('@@slugged').any? do |field|
       self.send(field.to_s + '_changed?')
     end
   end
 
   def find_unique_slug(suffix='')
     slug = ("#{slug_base} #{suffix}").parameterize
-    if (embedded? ? self._parent.collection.find("#{self.class.to_s.downcase.pluralize}.slug" => slug) : collection.find(:slug => slug)).count == 0
+    if (embedded? ? _parent.collection.find("#{self.class.to_s.downcase.pluralize}.slug" => slug) : collection.find(:slug => slug)).
+      to_a.reject{ |doc| doc.id == self.id }.count == 0
       slug
     else
       new_suffix = suffix.blank? ? '1' : "#{suffix.to_i + 1}"
@@ -49,6 +50,6 @@ module Mongoid::Slug
   end
 
   def slug_base
-    self.class.class_eval('@@slugged_fields').collect{ |field| self.send(field) }.join(" ")
+    self.class.class_eval('@@slugged').collect{ |field| self.send(field) }.join(" ")
   end
 end

data/spec/{unit/mongoid_slug_spec.rb → mongoid_slug_spec.rb}

@@ -6,7 +6,7 @@ describe Mongoid::Slug do
     @book = Book.create(:title => "A Thousand Plateaus", :isbn => "9789245242475")
   end
 
-  context "root" do
+  context "root document" do
 
     it "generates slug" do
       @book.to_param.should eql @book.title.parameterize
@@ -31,10 +31,16 @@ describe Mongoid::Slug do
       @book.slug.should_not match /\d$/
     end
 
-    it "does not update slug if slugged field has not changed" do
-      existing_slug = @book.slug
-      @book.update_attributes('isbn' => "9785545858118")
-      @book.slug.should eql existing_slug
+    it "does not update slug if slugged fields have not changed" do
+      former_slug = @book.slug
+      @book.update_attributes(:isbn => "9785545858118")
+      @book.slug.should eql former_slug
+    end
+
+    it "does not update slug if slugged fields have changed but generated slug is the same" do
+      former_slug = @book.slug
+      @book.update_attributes(:title => "A thousand plateaus")
+      @book.slug.should eql former_slug
     end
 
     context ".find_by_slug" do
@@ -75,9 +81,9 @@ describe Mongoid::Slug do
     end
 
     it "does not update slug if slugged field has not changed" do
-      existing_slug = @subject.slug
+      former_slug = @subject.slug
       @subject.update_attributes(:description => "Lorem ipsum dolor sit amet")
-      @subject.slug.should eql existing_slug
+      @subject.slug.should eql former_slug
     end
 
     context ".find_by_slug" do
@@ -108,14 +114,14 @@ describe Mongoid::Slug do
     end
 
     it "does not update slug if slugged field has not changed" do
-      existing_slug = @publisher.slug
+      former_slug = @publisher.slug
       @publisher.update_attributes(:year => 2001)
-      @publisher.slug.should eql existing_slug
+      @publisher.slug.should eql former_slug
     end
 
   end
 
-  context "slugging composite fields" do
+  context "composite fields" do
     before(:each) do
       @author = Author.create(:first_name => "Gilles", :last_name => "Deleuze")
     end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_slug
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Hakan Ensari
+- Gerhard Lazu
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 +01:00
+date: 2010-06-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +36,7 @@ dependencies:
         version: 2.0.0.beta7
   type: :runtime
   version_requirements: *id001
-description: Mongoid Slug generates a URL slug/permalink based on a field in a Mongoid model.
+description: Mongoid Slug generates a URL slug/permalink based on fields in a Mongoid model.
 email: code@papercavalier.com
 executables: []
 
@@ -52,8 +53,8 @@ files:
 - spec/models/book.rb
 - spec/models/publisher.rb
 - spec/models/subject.rb
+- spec/mongoid_slug_spec.rb
 - spec/spec_helper.rb
-- spec/unit/mongoid_slug_spec.rb
 has_rdoc: true
 homepage: http://github.com/papercavalier/mongoid-slug
 licenses: []
@@ -93,5 +94,5 @@ test_files:
 - spec/models/book.rb
 - spec/models/publisher.rb
 - spec/models/subject.rb
+- spec/mongoid_slug_spec.rb
 - spec/spec_helper.rb
-- spec/unit/mongoid_slug_spec.rb