sluggable_finder 2.2.2 → 2.3.0

data/README.markdown

@@ -68,6 +68,14 @@ If you're using Integer-like strings in your slug column, you can ignore integer
     class Comment < ActiveRecord::Base
       sluggable_finder :title, :allow_integer_ids => false
     end
+    
+### Single Table Inheritance (STI)
+
+Slug uniqueness will be checked accross all classes in STI models. If you want to scope by sub-class, use :ignore_sti
+
+    class Comment < SomeParentClass
+      sluggable_finder :title, :ignore_sti => true
+    end
 
 ### Controllers
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 2
-:patch: 2
-:build: 
 :major: 2
+:minor: 3
+:patch: 0
+:build: 

data/lib/sluggable_finder/orm.rb

@@ -20,7 +20,8 @@ module SluggableFinder
         	:to			        =>  :slug,
         	:reserved_slugs => [],
         	:allow_integer_ids => true,
-        	:upcase         => false
+        	:upcase         => false,
+        	:ignore_sti     => false # if true, Uniqueness won't check sibling classes.
         }.merge( options ))
         class_inheritable_reader :sluggable_finder_options
 
@@ -95,9 +96,14 @@ module SluggableFinder
         else
           "id != #{id} AND "
         end
+        _type_column = slugable_class.inheritance_column
+        _class_name = self.class.name
+        puts 'AAAAAAAAAAAAAAAAAA' + _class_name
         slugable_class.transaction do
           #case insensitive
-          existing = slugable_class.find(:first, :conditions => ["#{cond}#{destination_column} LIKE ? and #{scope_condition}",  proposed_slug + suffix])
+          conds_sql = "#{cond}#{destination_column} LIKE ? and #{scope_condition}"
+          conds_sql << " and #{_type_column} = '#{_class_name}'" if sluggable_finder_options[:ignore_sti]
+          existing = slugable_class.find(:first, :conditions => [conds_sql,  proposed_slug + suffix])
           while existing != nil or sluggable_finder_options[:reserved_slugs].include?(proposed_slug + suffix)
             if suffix.empty?
               suffix = "-2"

data/sluggable_finder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sluggable_finder}
-  s.version = "2.2.2"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ismael Celis"]
-  s.date = %q{2010-06-11}
+  s.date = %q{2011-03-01}
   s.description = %q{This plugin allows models to generate a unique "slug" (url-enabled name) from any regular attribute. Add friendly URLs to your models with one line.}
   s.email = %q{ismaelct@gmail.com}
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ismasan/sluggable-finder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easy friendly URLs for your ActiveRecord models}
   s.test_files = [
     "spec/sluggable_finder_spec.rb",
@@ -52,7 +52,7 @@ 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
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.2.2"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.2.2"])

data/spec/sluggable_finder_spec.rb

@@ -19,6 +19,14 @@ class Item < ActiveRecord::Base
   named_scope :published, :conditions => {:published => true}
 end
 
+class StiParent < Item
+  sluggable_finder :title, :ignore_sti => true
+end
+
+class StiChild < StiParent
+  
+end
+
 # No sluggable finder, should be unnaffected
 #
 class NoFinder < Item
@@ -348,4 +356,16 @@ describe "SluggableFinder" do
       }.should_not raise_error
     end
   end
+  
+  describe 'STI scope' do
+    before do
+      @sti1 = StiParent.create(:title => 'Slug')
+      @sti2 = StiChild.create(:title => 'Slug')
+    end
+    
+    it 'should not auto increment slugs' do
+      @sti1.slug.should == 'slug'
+      @sti2.slug.should == 'slug'
+    end
+  end
 end

data/tasks/db.rake

@@ -19,6 +19,7 @@ class TestSchema < ActiveRecord::Migration
     create_table :items do |t|
       t.string :title
       t.string :slug
+      t.string :type
       t.string :permalink
       t.boolean :published
       t.integer :category_id
@@ -28,6 +29,7 @@ class TestSchema < ActiveRecord::Migration
 
   def self.down
     drop_table :items
+    drop_table :categories
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sluggable_finder
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 2
-  - 2
-  - 2
-  version: 2.2.2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Ismael Celis
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +01:00
+date: 2011-03-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 2
@@ -71,23 +74,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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy friendly URLs for your ActiveRecord models