slug 0.5.7 → 0.6.0

data/README.rdoc

@@ -4,7 +4,7 @@ Slug provides simple, straightforward slugging for your ActiveRecord models.
 
 Slug is based on code from Norman Clarke's fantastic {friendly_id}[http://friendly-id.rubyforge.org] project and Nick Zadrozny's {friendly_identifier}[http://code.google.com/p/friendly-identifier/].
 
-Here's what's different:
+What's different:
 
 * Unlike friendly_id, slugs are stored directly in your model's table.  friendly_id stores its data in a separate sluggable table, which enables cool things like slug versioning--but forces yet another join when trying to do complex find_by_slugs.
 * Like friendly_id, diacritics (accented characters) are stripped from slug strings.
@@ -12,14 +12,16 @@ Here's what's different:
 
 == INSTALLATION
 
-  sudo gem install slug --source http://gemcutter.org
+  sudo gem install slug
 
 then add
 
-  config.gem 'slug', :source => 'http://gemcutter.org'
+  config.gem 'slug'
 
 to your rails project.
 
+Note that this version of slug is only compatible with Rails/active_support/active_record 3.x+.  Rails 2 applications should use slug 0.5.3.
+
 == USAGE
 
 It's up to you to set up the appropriate column in your model.  By default, Slug saves the slug to a column called 'slug', so in most cases you'll just want to add

data/Rakefile

@@ -8,13 +8,13 @@ begin
     s.email = "ben.koski@gmail.com"
     s.homepage = "http://github.com/bkoski/slug"
     s.description = "Simple, straightforward slugs for your ActiveRecord models."
-    s.add_dependency 'activerecord'
-    s.add_dependency 'activesupport'
+    s.add_dependency 'activerecord', '> 3.0.0'
+    s.add_dependency 'activesupport', '> 3.0.0'
     s.authors = ["Ben Koski"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/rdoctask'

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 7
+:patch: 0
 :major: 0
-:minor: 5
+:minor: 6

data/lib/slug.rb

@@ -3,4 +3,8 @@ require File.join(File.dirname(__FILE__), 'slug', 'ascii_approximations')
 
 if defined?(ActiveRecord)
   ActiveRecord::Base.instance_eval { extend Slug::ClassMethods }
+end
+
+if defined?(Rails) && Rails.version.to_i < 3
+  raise "This version of slug requires Rails 3 or higher"
 end

data/lib/slug/slug.rb

@@ -8,7 +8,7 @@ module Slug
     #
     # Options:
     # * <tt>:column</tt> - the column the slug will be saved to (defaults to <tt>:slug</tt>)
-    # * <tt>:validates_uniquness_if</tt> - proc to determine whether uniqueness validation runs, same format as validates_uniquness_of :if
+    # * <tt>:validate_uniquness_if</tt> - proc to determine whether uniqueness validation runs, same format as validates_uniquness_of :if
     #
     # Slug will take care of validating presence and uniqueness of slug.
     
@@ -24,12 +24,12 @@ module Slug
       self.slug_column = opts.has_key?(:column) ? opts[:column] : :slug
 
       uniqueness_opts = {}
-      uniqueness_opts.merge!(:if => opts[:validates_uniqueness_if]) if opts[:validates_uniqueness_if].present?
+      uniqueness_opts[:if] = opts[:validate_uniqueness_if] if opts.key?(:validate_uniqueness_if)
       
-      validates_presence_of     self.slug_column, :message => "cannot be blank. Is #{self.slug_source} sluggable?"
-      validates_uniqueness_of   self.slug_column, uniqueness_opts
-      validates_format_of       self.slug_column, :with => /^[a-z0-9-]+$/, :message => "contains invalid characters. Only downcase letters, numbers, and '-' are allowed."
-      before_validation_on_create :set_slug 
+      validates                 self.slug_column, :presence => { :message => "cannot be blank. Is #{self.slug_source} sluggable?" }
+      validates                 self.slug_column, :uniqueness => uniqueness_opts
+      validates                 self.slug_column, :format => { :with => /^[a-z0-9-]+$/, :message => "contains invalid characters. Only downcase letters, numbers, and '-' are allowed." }
+      before_validation :set_slug, :on => :create
     end
   end
   
@@ -113,8 +113,7 @@ module Slug
   
     # Returns the next unique index for a slug.
     def next_slug_sequence
-      last_in_sequence = self.class.find(:first, :conditions => ["#{self.slug_column} LIKE ?", self[self.slug_column] + '%'],
-                                           :order => "CAST(REPLACE(#{self.slug_column},'#{self[self.slug_column]}','') AS UNSIGNED)")
+      last_in_sequence = self.class.where("#{self.slug_column} LIKE ?", self[self.slug_column] + '%').order("CAST(REPLACE(#{self.slug_column},'#{self[self.slug_column]}-','') AS UNSIGNED) DESC").first
       if last_in_sequence.nil?
         return 0
       else

data/slug.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slug}
-  s.version = "0.5.7"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Koski"]
-  s.date = %q{2010-06-25}
+  s.date = %q{2011-03-18}
   s.description = %q{Simple, straightforward slugs for your ActiveRecord models.}
   s.email = %q{ben.koski@gmail.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bkoski/slug}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Simple, straightforward slugs for your ActiveRecord models.}
   s.test_files = [
     "test/models.rb",
@@ -44,18 +44,17 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    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<activerecord>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, ["> 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["> 3.0.0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["> 3.0.0"])
+      s.add_dependency(%q<activesupport>, ["> 3.0.0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["> 3.0.0"])
+    s.add_dependency(%q<activesupport>, ["> 3.0.0"])
   end
 end

data/test/models.rb

@@ -14,7 +14,7 @@ class Company < ActiveRecord::Base
 end
 
 class Post < ActiveRecord::Base
-  slug :headline, :validates_uniqueness_if => Proc.new { false } 
+  slug :headline, :validate_uniqueness_if => Proc.new { false } 
 end
 
 # Used to test slugs based on methods rather than database attributes

data/test/test_slug.rb

@@ -45,13 +45,13 @@ class TestSlug < Test::Unit::TestCase
     article = Article.create
     assert !article.valid?
     require 'ruby-debug'
-    assert article.errors.on(:slug)
+    assert article.errors[:slug]
   end
   
   should "set validation error if normalization makes source value empty" do
     article = Article.create(:headline => '$$$')
     assert !article.valid?
-    assert article.errors.on(:slug)
+    assert article.errors[:slug]
   end
   
   should "not update the slug even if the source column changes" do
@@ -77,7 +77,7 @@ class TestSlug < Test::Unit::TestCase
     assert article2.errors[:slug].present?
   end
 
-  should "use validate_uniquness_if proc to decide whether uniqueness validation applies" do
+  should "use validate_uniqueness_if proc to decide whether uniqueness validation applies" do
     article1 = Post.create!(:headline => 'Test Headline')
     article2 = Post.new
     article2.slug = 'test-headline'
@@ -240,7 +240,11 @@ class TestSlug < Test::Unit::TestCase
       12.times { |i| Article.create!(:headline => 'Test Headline') }
       article_13 = Article.create!(:headline => 'Test Headline')
       assert_equal 'test-headline-12', article_13.slug
-    end
+      
+      12.times { |i| Article.create!(:headline => 'latest from lybia') }
+      article_13 = Article.create!(:headline => 'latest from lybia')
+      assert_equal 'latest-from-lybia-12', article_13.slug
+    end    
   end
 
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slug
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  hash: 7
+  prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ben Koski
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -04:00
+date: 2011-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  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"
-    version: 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  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 
-        version: "0"
-    version: 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id002
 description: Simple, straightforward slugs for your ActiveRecord models.
 email: ben.koski@gmail.com
 executables: []
@@ -65,21 +83,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.4.1
 signing_key: 
 specification_version: 3
 summary: Simple, straightforward slugs for your ActiveRecord models.