mongoid_slug 0.6.3 → 0.6.4

data/lib/mongoid/slug/version.rb

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

data/lib/mongoid/slug.rb

@@ -26,6 +26,13 @@ module Mongoid #:nodoc:
 
         self.slug_name      = options[:as] || :slug
         self.slug_scope     = options[:scope] || nil
+
+        class_eval <<-CODE
+          def slug_any?
+            #{!!options[:any]}
+          end
+        CODE
+
         self.slugged_fields = fields
 
         if options[:scoped]
@@ -101,9 +108,15 @@ module Mongoid #:nodoc:
     end
 
     def slug_base
-      self.class.slugged_fields.map do |field|
+      values = self.class.slugged_fields.map do |field|
         self.send(field)
-      end.join(" ")
+      end
+
+      if slug_any?
+        values.detect { |value| value.present? }
+      else
+        values.join(' ')
+      end
     end
 
     def slugged_fields_changed?

data/spec/models/article.rb

@@ -0,0 +1,7 @@
+class Article
+  include Mongoid::Document
+  include Mongoid::Slug
+  field :brief
+  field :title
+  slug  :title, :brief, :any => true
+end

data/spec/mongoid/slug_spec.rb

@@ -157,6 +157,26 @@ module Mongoid
       it "finds by slug" do
         Author.find_by_slug("gilles-deleuze").should eql author
       end
+
+    end
+
+    context "when :any is passed as an argument" do
+      let!(:article) do
+        Article.create(
+          :brief => "This is the brief",
+          :title => "This is the title")
+      end
+
+      it "uses the first available field for the slug if any option is used" do
+        article.to_param.should eql 'this-is-the-title'
+        article.title = ""
+        article.save
+        article.to_param.should eql 'this-is-the-brief'
+
+        article.title = nil
+        article.save
+        article.to_param.should eql 'this-is-the-brief'
+      end
     end
 
     context "when :as is passed as an argument" do

metadata

@@ -2,7 +2,7 @@
 name: mongoid_slug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Paper Cavalier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +00:00
+date: 2011-02-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - lib/mongoid/slug.rb
 - LICENSE
 - README.md
+- spec/models/article.rb
 - spec/models/author.rb
 - spec/models/book.rb
 - spec/models/comic_book.rb
@@ -126,11 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongoid_slug
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Generates a URL slug
 test_files: 
+- spec/models/article.rb
 - spec/models/author.rb
 - spec/models/book.rb
 - spec/models/comic_book.rb