mongoid_slug 0.2.1 → 0.3.0

data/README.rdoc

@@ -15,5 +15,5 @@ This gem generates a URL slug/permalink based on fields in a Mongoid model.
     >> book.update_attributes(:title => "Anti Oedipus")
     >> book.to_param
     "anti-oedipus"
-    >> Book.find_by_slug("anti-oedipus")
+    >> Book.find_by_slug("anti-oedipus").first
     #<Book _id: 4c23b1f7faa4a7479a000009, slug: "anti-oedipus", title: "Anti Oedipus">

data/lib/mongoid_slug.rb

@@ -1,24 +1,24 @@
 # Generates a URL slug/permalink based on fields in a Mongoid model.
 module Mongoid::Slug
-  
-  def self.included(base) #:nodoc:
-    base.extend ClassMethods
-    base.class_eval { field :slug; before_save :slugify }
+  extend ActiveSupport::Concern
+
+  included do
+    cattr_accessor :slugged
   end
 
   module ClassMethods #:nodoc:
-
     # Set a field or a number of fields as source of slug
     def slug(*fields)
-      class_variable_set(:@@slugged, fields)
+      self.slugged = fields
+      field :slug; index :slug, :unique => true; before_save :slugify
     end
 
+    # This returns an array containing the match rather than
+    # the match itself.
+    #
+    # http://groups.google.com/group/mongoid/browse_thread/thread/5905589e108d7cc0
     def find_by_slug(slug)
-      if embedded?
-        raise 'I have not implemented this method yet for embedded docs. Try: parent.children.where(:slug => "foo") instead'
-      else
-        where(:slug => slug).first
-      end
+      where(:slug => slug).limit(1)
     end
   end
 
@@ -29,19 +29,24 @@ module Mongoid::Slug
   private
 
   def slugify
-    self.slug = find_unique_slug if new_record? || slugged_changed?
+    if new_record? || slugged_changed?
+      self.slug = find_unique_slug
+    end
   end
 
   def slugged_changed?
-    self.class.class_eval('@@slugged').any? do |field|
+    self.class.slugged.any? do |field|
       self.send(field.to_s + '_changed?')
     end
   end
 
   def find_unique_slug(suffix='')
     slug = ("#{slug_base} #{suffix}").parameterize
-    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
+
+    if (embedded? ?
+        _parent.collection.find("#{association_name}.slug" => slug) :
+        collection.find(:slug => slug)
+      ).reject{ |doc| doc.id == self.id }.empty?
       slug
     else
       new_suffix = suffix.blank? ? '1' : "#{suffix.to_i + 1}"
@@ -50,6 +55,6 @@ module Mongoid::Slug
   end
 
   def slug_base
-    self.class.class_eval('@@slugged').collect{ |field| self.send(field) }.join(" ")
+    self.class.slugged.collect{ |field| self.send(field) }.join(" ")
   end
 end

data/spec/mongoid_slug_spec.rb

@@ -45,7 +45,7 @@ describe Mongoid::Slug do
 
     context ".find_by_slug" do
       it "finds by slug" do
-        Book.find_by_slug(@book.slug).should eql @book
+        Book.find_by_slug(@book.slug).first.should eql @book
       end
     end
 
@@ -87,12 +87,8 @@ describe Mongoid::Slug do
     end
 
     context ".find_by_slug" do
-      it "raises error" do
-        lambda { @book.subjects.find_by_slug(@subject.slug) }.should raise_error
-      end
-
-      it "does find by a regular where" do
-        @book.subjects.where(:slug => @subject.slug).first.should eql @subject
+      it "finds by slug" do
+        @book.subjects.find_by_slug(@subject.slug).first.should eql @subject
       end
     end
 
@@ -153,7 +149,7 @@ describe Mongoid::Slug do
 
     context ".find_by_slug" do
       it "finds by slug" do
-        Author.find_by_slug("gilles-deleuze").should eql @author
+        Author.find_by_slug("gilles-deleuze").first.should eql @author
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,16 +2,17 @@ require "rubygems"
 require "bundler"
 Bundler.require(:default)
 
-require File.expand_path("../../lib/mongoid_slug", __FILE__)
-Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |f| require f }
-
 Mongoid.configure do |config|
   name = "mongoid_slug_test"
   host = "localhost"
   config.master = Mongo::Connection.new.db(name)
 end
 
+require File.expand_path("../../lib/mongoid_slug", __FILE__)
+Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |f| require f }
+
 DatabaseCleaner.orm = "mongoid"
+
 Rspec.configure do |config|
   config.before(:all) do
     DatabaseCleaner.strategy = :truncation

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_slug
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Hakan Ensari
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +01:00
+date: 2010-06-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency