mm-sluggable 0.1.1 → 0.2.0

data/Rakefile

@@ -2,15 +2,9 @@ require "rubygems"
 require "rake/gempackagetask"
 require "rake/rdoctask"
 
-require "spec"
-require "spec/rake/spectask"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = %w(--format specdoc --colour)
-  t.libs = ["spec"]
-end
-
-
-task :default => ["spec"]
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
 
 # This builds the actual gem. For details of what all these options
 # mean, and other ones you can add, check the documentation here:
@@ -21,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "mm-sluggable"
-  s.version           = "0.1.1"
+  s.version           = "0.2.0"
   s.summary           = "Tiny plugin for MongoMapper to cache a slugged version of a field"
   s.author            = "Richard Livsey"
   s.email             = "richard@livsey.org"
@@ -39,6 +33,8 @@ spec = Gem::Specification.new do |s|
   # relevant versions
   # s.add_dependency("some_other_gem", "~> 0.1.0")
 
+  s.add_dependency("mongo_mapper", ">= 0.9.0")
+
   # If your tests use any gems, include them here
   s.add_development_dependency("rspec")
 end
@@ -48,7 +44,7 @@ end
 # be automatically building a gem for this project. If you're not
 # using GitHub, edit as appropriate.
 #
-# To publish your gem online, install the 'gemcutter' gem; Read more 
+# To publish your gem online, install the 'gemcutter' gem; Read more
 # about that here: http://gemcutter.org/pages/gem_docs
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec

data/lib/mm-sluggable.rb

@@ -3,9 +3,7 @@ require 'mongo_mapper'
 module MongoMapper
   module Plugins
     module Sluggable
-      def self.included(model)
-        model.plugin self
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods
         def sluggable(to_slug = :title, options = {})
@@ -17,12 +15,16 @@ module MongoMapper
             :index        => true,
             :method       => :parameterize,
             :scope        => nil,
-            :callback     => :before_validation_on_create
+            :callback     => [:before_validation, {:on => :create}]
           }.merge(options)
 
           key slug_options[:key], String, :index => slug_options[:index]
 
-          self.send(slug_options[:callback], :set_slug)
+          if slug_options[:callback].is_a?(Array)
+            self.send(slug_options[:callback][0], :set_slug, slug_options[:callback][1])
+          else
+            self.send(slug_options[:callback], :set_slug)
+          end
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mm-sluggable
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Richard Livsey
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +00:00
+date: 2011-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mongo_mapper
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,7 +47,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 description: 
 email: richard@livsey.org
 executables: []
@@ -76,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Tiny plugin for MongoMapper to cache a slugged version of a field