@@ -1,8 +1,6 @@ class Post < ActiveRecord::Base - extend Sluggable::ClassMethods - include Sluggable::InstanceMethods - + include Sluggable include ActionController::UrlWriter slug_column :title app/models/post.rb @@ -1,7 +1,6 @@ class Tag < ActiveRecord::Base - extend Sluggable::ClassMethods - include Sluggable::InstanceMethods + include Sluggable slug_column :name app/models/tag.rb @@ -13,10 +13,10 @@ ActiveRecord::Schema.define(:version => 20081027000700) do create_table "posts", :force => true do |t| t.string "title", :null => false + t.string "slug", :null => false t.text "body", :null => false t.datetime "created_at" t.datetime "updated_at" - t.string "slug", :null => false end add_index "posts", ["slug"], :name => "index_posts_on_slug", :unique => true @@ -29,13 +29,12 @@ ActiveRecord::Schema.define(:version => 20081027000700) do end add_index "taggings", ["post_id", "tag_id"], :name => "index_taggings_on_post_id_and_tag_id", :unique => true - add_index "taggings", ["tag_id"], :name => "fk_taggings_tag_id_tags_id" create_table "tags", :force => true do |t| t.string "name", :limit => 32, :null => false + t.string "slug", :limit => 32, :null => false t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "slug", :limit => 32, :null => false end add_index "tags", ["slug"], :name => "index_tags_on_slug", :unique => true db/schema.rb @@ -38,4 +38,10 @@ module Sluggable private :next_available_slug, :generate_slug end + + def self.included(other) + other.send(:extend, Sluggable::ClassMethods) + other.send(:include, Sluggable::InstanceMethods) + end + end \ No newline at end of file lib/sluggable.rb @@ -1,8 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' class SluggableImplementation - extend Sluggable::ClassMethods - include Sluggable::InstanceMethods + include Sluggable end class SluggableImplementationTest < ActiveSupport::TestCase test/unit/sluggable_test.rb 7e0419fd29cd1bde273185b388c0f8896ccba459 Patrick Reagan patrick.reagan@viget.com http://github.com/reagent/blurt/commit/f17727353a138350cad76ac1da7a2d3a0f978409 f17727353a138350cad76ac1da7a2d3a0f978409 2009-09-30T11:11:40-07:00 2009-09-30T11:11:40-07:00 Simplify include 23457b70490ba67aab8c4fb2661952c6e674649d Patrick Reagan patrick.reagan@viget.com