dm-is-slug 0.10.2 → 1.0.0

data/.gitignore

@@ -1,3 +1,7 @@
+Gemfile.lock
 pkg
 coverage
 tmp
+*.gem
+.yardoc
+doc

data/Gemfile

@@ -0,0 +1,142 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can use
+# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
+# worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by setting
+# an environment variable. This of course also works when using the Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
+# and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's recommended
+# that you first install all adapters that you are planning to use or work on
+# by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to bundler.
+# Once you have them installed you can easily switch between adapters for the
+# various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
+# when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by setting
+# an environment variable. This also works when using the Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
+# for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.2'
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  if ENV['EXTLIB']
+    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
+  else
+    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+  end
+
+  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+
+  gem 'unidecode',         '~> 1.0.0'
+
+end
+
+group(:development) do # Development dependencies (as in the gemspec)
+
+  gem 'rake',           '~> 0.8.7'
+  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
+  gem 'jeweler',        '~> 1.4'
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'metric_fu',      '~> 1.3'
+  gem 'rcov',           '~> 0.9.8'
+  gem 'reek',           '~> 1.2.8'
+  gem 'roodi',          '~> 2.1'
+  gem 'yard',           '~> 0.5'
+  gem 'yardstick',      '~> 0.1'
+
+end
+
+group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
+
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+
+    gem 'data_objects',  DO_VERSION, options.dup
+
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+  end
+
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/README.rdoc

@@ -0,0 +1,58 @@
+= dm-is-slug
+
+DataMapper plugin for creating and slugs(permalinks).
+
+== Installation
+
+  > gem install dm-is-slug
+
+== Usage
+
+=== Creating a slug from property
+
+  class Post
+    include DataMapper::Resource
+
+    property :id, Serial
+    property :title, String
+    property :content, String
+
+    # here we define that it should have a slug that uses title as the permalink
+    # it will generate an extra slug property of String type, with the same size as title
+    is :slug, :source => :title
+  end
+
+=== Creating a slug from arbitrary methods
+
+  class User
+    include DataMapper::Resource
+
+    property :id, Serial
+    property :email, String
+    property :password, String
+  
+    # we only want to strip out the domain name 
+    # and use only the email account name as the permalink
+    def slug_for_email
+      email.split("@").first
+    end
+  
+    # here we define that it should have a slug that uses title as the permalink
+    # it will generate an extra slug property of String type, with the same size as title
+    is :slug, :source => :slug_for_email, :size => 255
+  end
+
+=== Finding objects by slug
+
+ post = Post.first(:slug => "your_slug")
+
+== Development
+
+It's recommended to use bundler in development.
+
+  gem install bundler
+  ADAPTERS='in_memory yaml sqlite postgres mysql' bundle install --without quality
+
+This will install all dependencies so that you could run specs.
+
+  bundler exec rake spec ADAPTER=in_memory

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 begin
   gem 'jeweler', '~> 1.4'
   require 'jeweler'
- 
+
   Jeweler::Tasks.new do |gem|
     gem.name = "dm-is-slug"
     gem.summary = "DataMapper plugin that generates unique slugs"
@@ -15,18 +15,20 @@ begin
       'nik [a] terminaldischarge [d] net',
       'maverick.stoklosa@gmail.com',
       'frawl021@gmail.com',
-      'cheba@pointlessone.org'
+      'cheba+github@pointlessone.org'
     ]
     gem.homepage = "http://github.com/aq1018/dm-is-slug"
-    gem.authors = ['Aaron Qian', 'James Herdman', 'Nik Radford', 'Paul', 'Mike Frawley', 'Alex Makuta']
-    gem.add_dependency "dm-core", "~>0.10.2"
-    gem.add_dependency "unidecode", "~>1.0.0"
+    gem.authors = ['Aaron Qian', 'James Herdman', 'Nik Radford', 'Paul', 'Mike Frawley', 'Alexander Mankuta']
+
+    gem.add_dependency "dm-core", "~> 1.0.2"
+    gem.add_dependency "unidecode", "~> 1.0.0"
+
     gem.add_development_dependency 'rspec', '~> 1.3'
   end
- 
+
   Jeweler::GemcutterTasks.new
- 
+
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
+end

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.0

data/dm-is-slug.gemspec

@@ -5,22 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-slug}
-  s.version = "0.10.2"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Qian", "James Herdman", "Nik Radford", "Paul", "Mike Frawley", "Alex Makuta"]
-  s.date = %q{2010-02-07}
+  s.authors = ["Aaron Qian", "James Herdman", "Nik Radford", "Paul", "Mike Frawley", "Alexander Mankuta"]
+  s.date = %q{2010-10-17}
   s.description = %q{DataMapper plugin that generates unique slugs}
-  s.email = ["aq1018@gmail.com", "james.herdman@gmail.com", "nik [a] terminaldischarge [d] net", "maverick.stoklosa@gmail.com", "frawl021@gmail.com", "cheba@pointlessone.org"]
+  s.email = ["aq1018@gmail.com", "james.herdman@gmail.com", "nik [a] terminaldischarge [d] net", "maverick.stoklosa@gmail.com", "frawl021@gmail.com", "cheba+github@pointlessone.org"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile",
+     "README.rdoc",
      "TODO"
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "LICENSE",
-     "README.textile",
+     "README.rdoc",
      "Rakefile",
      "TODO",
      "VERSION",
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
@@ -40,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aq1018/dm-is-slug}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{DataMapper plugin that generates unique slugs}
   s.test_files = [
     "spec/integration/slug_spec.rb",
@@ -51,17 +53,17 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
       s.add_runtime_dependency(%q<unidecode>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
       s.add_dependency(%q<unidecode>, ["~> 1.0.0"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
     s.add_dependency(%q<unidecode>, ["~> 1.0.0"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end

data/lib/dm-is-slug.rb

@@ -1,7 +1 @@
-require 'pathname'
-require 'dm-core'
-
-# Require plugin-files
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-slug' / 'is' / 'slug.rb'
-
-DataMapper::Model.append_extensions DataMapper::Is::Slug
+require 'dm-is-slug/is/slug'

data/lib/dm-is-slug/is/slug.rb

@@ -1,9 +1,14 @@
 require 'unidecode'
+require 'dm-core'
 require 'dm-core/support/chainable'
 
 module DataMapper
   module Is
     module Slug
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
       class InvalidSlugSourceError < StandardError; end
 
       # @param [String] str A string to escape for use as a slug
@@ -66,9 +71,12 @@ module DataMapper
 
 
         options[:length] ||= get_slug_length
-        property(:slug, String, options.merge(:unique => true)) unless slug_property
+        if slug_property && slug_property.class >= DataMapper::Property::String
+            options.merge! slug_property.options
+        end
+        property :slug, String, options.merge(:unique => true)
 
-        before :valid?, :generate_slug
+        before respond_to?(:valid?) ? :valid? : :save, :generate_slug
         before :save, :generate_slug
       end
 
@@ -95,11 +103,11 @@ module DataMapper
 
         def detect_slug_property_by_name(name)
           p = properties[name]
-          !p.nil? && p.type == String ? p : nil
+          !p.nil? && DataMapper::Property::String >= p.class ? p : nil
         end
 
         def get_slug_length
-          slug_property.nil? ? (slug_source_property.nil? ? DataMapper::Property::DEFAULT_LENGTH : slug_source_property.length) : slug_property.length
+          slug_property.nil? ? (slug_source_property.nil? ? DataMapper::Property::String::DEFAULT_LENGTH : slug_source_property.length) : slug_property.length
         end
       end # ClassMethods
 
@@ -132,13 +140,12 @@ module DataMapper
         # 1. the slug is permanent, and slug column has something valid in it
         # 2. the slug source value is nil or empty
         def stale_slug?
-          !((permanent_slug? && slug && !slug.empty?) || (slug_source_value.nil? || slug_source_value.empty?))
+          !((permanent_slug? && !slug.blank?) || slug_source_value.blank?)
         end
 
         private
 
         def generate_slug
-          #puts "\nGenerating slug for #{self.class.name}: #{self.key.inspect}\n"
           return unless self.class.respond_to?(:slug_options) && self.class.slug_options
           raise InvalidSlugSourceError, 'Invalid slug source.' unless slug_source_property || self.respond_to?(slug_source)
           return unless stale_slug?
@@ -146,40 +153,52 @@ module DataMapper
         end
 
         def unique_slug
-          old_slug = self.slug
           max_length = self.class.send(:get_slug_length)
           base_slug = ::DataMapper::Is::Slug.escape(slug_source_value)[0, max_length]
-          i = 1
+          # Assuming that 5 digits is more than enought
+          index_length = 5
           new_slug = base_slug
 
-          if old_slug != new_slug
-            not_self_conditions = {}
-            unless new?
-              self.model.key.each do |property|
-                not_self_conditions.merge!(property.name.not => self.send(property.name))
-              end
-              #puts "Not self: #{not_self_conditions.inspect}"
+          variations = max_length - base_slug.length - 1
+
+          slugs = if variations > index_length + 1
+            [base_slug]
+          else
+            ((variations - 1)..index_length).map do |n|
+              base_slug[0, max_length - n - 1]
+            end.uniq
+          end
+
+          not_self_conditions = {}
+          unless new?
+            self.model.key.each do |property|
+              not_self_conditions.merge!(property.name.not => self.send(property.name))
             end
+          end
+
+          max_index = slugs.map do |s|
+            self.class.all(not_self_conditions.merge :slug.like => "#{s}-%")
+          end.flatten.map do |r|
+            index = r.slug.gsub /^(#{slugs.join '|'})-/, ''
+            index =~ /\d+/ ? index.to_i : nil
+          end.compact.max
 
-            lambda do
-              #puts "Lambda new slug: #{new_slug}"
-              dupe = self.class.first(not_self_conditions.merge(:slug => new_slug))
-              if dupe
-                #puts "Got dupe: #{dupe.inspect}"
-                i = i + 1
-                slug_length = max_length - i.to_s.length - 1
-                new_slug = "#{base_slug[0, slug_length]}-#{i}"
-                #puts "New slug: #{new_slug}"
-                redo
-              end
-            end.call
-            #puts "Found new slug: #{new_slug}"
-            new_slug
+          new_index = if max_index.nil?
+            self.class.first(not_self_conditions.merge :slug => base_slug).present? ? 2 : 1
           else
-            old_slug
+            max_index + 1
+          end
+
+          if new_index > 1
+            slug_length = max_length - new_index.to_s.length - 1
+            new_slug = "#{base_slug[0, slug_length]}-#{new_index}"
           end
+
+          new_slug
         end
       end # InstanceMethods
+
+      Model.send(:include, self)
     end # Slug
   end # Is
 end # DataMapper

data/spec/integration/slug_spec.rb

@@ -1,10 +1,12 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+# encoding: utf-8
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe 'DataMapper::Is::Slug' do
+require 'spec_helper'
 
-    class User
+
+describe DataMapper::Is::Slug do
+
+  before :all do
+    class ::User
       include DataMapper::Resource
 
       property :id, Serial
@@ -19,7 +21,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       is :slug, :source => :slug_for_email, :length => 80, :permanent_slug => false
     end
 
-    class Post
+    class ::Post
       include DataMapper::Resource
 
       property :id, Serial
@@ -31,7 +33,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       is :slug, :source => :title
     end
 
-    class Todo
+    class ::Todo
       include DataMapper::Resource
       property :id, Serial
       property :title, String
@@ -39,43 +41,53 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       belongs_to :user
     end
 
-    class SlugKey
+    class ::SlugKey
       include DataMapper::Resource
       property :title, String
 
       is :slug, :source => :title, :key => true
     end
 
+    class ::Post2
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :title, String, :length => 30
+      property :content, Text
+
+      is :slug, :source => :title, :permanent_slug => false
+    end
+  end
+
+  supported_by :sqlite, :mysql, :postgres do
+
     before :all do
-      User.auto_migrate!(:default)
-      Post.auto_migrate!(:default)
-      Todo.auto_migrate!(:default)
-      SlugKey.auto_migrate!(:default)
-
-      @u1 = User.create(:email => "john@ekohe.com")
-      @p1 = Post.create(:user => @u1, :title => "My first shinny blog post")
-      @p2 = Post.create(:user => @u1, :title => "My second shinny blog post")
-      @p3 = Post.create(:user => @u1, :title => "My third shinny blog post")
-
-      @u2 = User.create(:email => "john@someotherplace.com")
-      @p4 = Post.create(:user => @u2, :title => "My first Shinny blog post")
-      @p5 = Post.create(:user => @u2, :title => "i heart merb and dm")
-      @p6 = Post.create(:user => @u2, :title => "A fancy café")
-      @p7 = Post.create(:user => @u2, :title => "你好")
-
-      (1..10).each do |i|
-        instance_variable_set "@p1_#{i}".to_sym, Post.create(:user => @u2, :title => "another productive day!!")
-      end
-      (1..10).each do |i|
-        instance_variable_set "@p2_#{i}".to_sym, Post.create(:user => @u2, :title => "DM tricks")
-      end
+      DataMapper.repository do
+        @u1 = User.create(:email => "john@ekohe.com")
+        @p1 = Post.create(:user => @u1, :title => "My first shinny blog post")
+        @p2 = Post.create(:user => @u1, :title => "My second shinny blog post")
+        @p3 = Post.create(:user => @u1, :title => "My third shinny blog post")
+
+        @u2 = User.create(:email => "john@someotherplace.com")
+        @p4 = Post.create(:user => @u2, :title => "My first Shinny blog post")
+        @p5 = Post.create(:user => @u2, :title => "i heart merb and dm")
+        @p6 = Post.create(:user => @u2, :title => "A fancy café")
+        @p7 = Post.create(:user => @u2, :title => "你好")
+
+        (1..10).each do |i|
+          instance_variable_set "@p1_#{i}".to_sym, Post.create(:user => @u2, :title => "another productive day!!")
+        end
+        (1..10).each do |i|
+          instance_variable_set "@p2_#{i}".to_sym, Post.create(:user => @u2, :title => "DM tricks")
+        end
 
-      @sk = SlugKey.create(:title => 'slug key')
+        @sk = SlugKey.create(:title => 'slug key')
 
-      @post1 = Post.create :user => @u1, :title => 'a' * Post.slug_property.length
-      @post2 = Post.create :user => @u1, :title => 'a' * Post.slug_property.length
+        @post1 = Post.create :user => @u1, :title => 'a' * Post.slug_property.length
+        @post2 = Post.create :user => @u1, :title => 'a' * Post.slug_property.length
+      end
     end
-    
+
     it "should raise error if :source option is not specified" do
       lambda {
         class BadUsage
@@ -89,20 +101,24 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
     
     it "should display obsolete warning if :size option is used" do
-      class Thingy
+      module M
+        class Thingy
+        end
       end
-      Thingy.stub!(:warn)
-      Thingy.should_receive(:warn).with("Slug with :size option is deprecated, use :length instead")
+      M::Thingy.stub!(:warn)
+      M::Thingy.should_receive(:warn).with("Slug with :size option is deprecated, use :length instead")
 
       lambda {
-        class Thingy
+        class M::Thingy
           include DataMapper::Resource
+          property :id, Serial
           property :title, String
 
           is :slug, :source => :title, :size => 20
         end
       }.should_not raise_error
 
+      M.const_set 'Thingy', nil
     end
 
     it "should generate slugs" do
@@ -171,15 +187,15 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     it "should have the right size for properties" do
       user_slug_property = User.properties[:slug]
       user_slug_property.should_not be_nil
-      user_slug_property.type.should == String
+      user_slug_property.should be_an_instance_of(DataMapper::Property::String)
       user_slug_property.length.should == 80
 
       post_title_property = Post.properties[:title]
-      post_title_property.type.should == String
+      post_title_property.should be_an_instance_of(DataMapper::Property::String)
       post_title_property.length.should == 30
 
       post_slug_property = Post.properties[:slug]
-      post_slug_property.type.should == String
+      post_slug_property.should be_an_instance_of(DataMapper::Property::String)
       post_slug_property.should_not be_nil
       post_slug_property.length.should == 30
     end
@@ -238,25 +254,15 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     describe 'editing' do
-      class Post2
-        include DataMapper::Resource
-        property :id, Serial
-        property :title, String, :length => 30
-        property :content, Text
-
-        is :slug, :source => :title, :permanent_slug => false
-      end
-
-      Post2.auto_migrate!
-
       before :each do
         Post2.all.destroy!
         @post = Post2.create :title => 'The Post', :content => 'The content.'
       end
 
       it 'should not change slug if source is not changed' do
-        @post.update :content => 'The other content.'
-        Post2.first.slug.should == 'the-post'
+        @post.update(:content => 'The other content.').should be_true
+        @post.reload
+        @post.slug.should == 'the-post'
       end
 
       it 'should change slug if source is changed' do

data/spec/spec_helper.rb

@@ -1,38 +1,13 @@
 require 'rubygems'
- 
-# use local dm-core if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-core', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-core'
- 
-# use local dm-adjust if running from a typical dev checkout.
-lib = File.join('..', 'dm-adjust', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-adjust'
- 
-# Support running specs with 'rake spec' and 'spec'
-$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
- 
-require 'dm-validations'
+
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
+
 require 'dm-is-slug'
- 
-def load_driver(name, default_uri)
-  return false if ENV['ADAPTER'] != name.to_s
- 
-  begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] = DataMapper::Repository.adapters[name]
-    true
-  rescue LoadError => e
-    warn "Could not load do_#{name}: #{e}"
-    false
-  end
-end
- 
-ENV['ADAPTER'] ||= 'sqlite3'
- 
-HAS_SQLITE3 = load_driver(:sqlite3, 'sqlite3::memory:')
-HAS_MYSQL = load_driver(:mysql, 'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+require 'dm-migrations'
 
+DataMapper::Spec.setup!
 
+Spec::Runner.configure do |config|
+  config.extend(DataMapper::Spec::Adapters::Helpers)
+end

data/tasks/local_gemfile.rake

@@ -0,0 +1,16 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root       = Pathname(__FILE__).dirname.parent
+  datamapper = root.parent
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
+      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-slug
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  hash: 23
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Aaron Qian
@@ -9,44 +15,61 @@ authors:
 - Nik Radford
 - Paul
 - Mike Frawley
-- Alex Makuta
+- Alexander Mankuta
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +08:00
+date: 2010-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: unidecode
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
         version: "1.3"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: DataMapper plugin that generates unique slugs
 email: 
 - aq1018@gmail.com
@@ -54,19 +77,20 @@ email:
 - nik [a] terminaldischarge [d] net
 - maverick.stoklosa@gmail.com
 - frawl021@gmail.com
-- cheba@pointlessone.org
+- cheba+github@pointlessone.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.textile
+- README.rdoc
 - TODO
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
-- README.textile
+- README.rdoc
 - Rakefile
 - TODO
 - VERSION
@@ -78,6 +102,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
@@ -92,21 +117,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin that generates unique slugs

data/README.textile

@@ -1,56 +0,0 @@
-= dm-is-slug
-
-DataMapper plugin for creating and slugs(permalinks).
-
-== Installation
-
-NOTE: You no longer need to download dm-more source code in order to install
-this.
-
-All you need to do is:
-
-$ sudo rake install
-
-Remember to require it in your app's init.rb
-
-dependency 'dm-is-slug'
-
-== Getting started
-
-Lets say we have a post-class, and we want to generate permalinks or slugs for all posts.
-
-class Post
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :title, String
-  property :content, String
-
-  # here we define that it should have a slug that uses title as the permalink
-  # it will generate an extra slug property of String type, with the same size as title
-  is :slug, :source => :title
-end
-
-Let's Say we need to define a permalink based on a method instead of a property.
-
-class User
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :email, String
-  property :password, String
-  
-  # we only want to strip out the domain name 
-  # and use only the email account name as the permalink
-  def slug_for_email
-    email.split("@").first
-  end
-  
-  # here we define that it should have a slug that uses title as the permalink
-  # it will generate an extra slug property of String type, with the same size as title
-  is :slug, :source => :slug_for_email, :size => 255
-end
-
-You can now find objects by slug like this:
-
- post = Post.first(:slug => "your_slug")