has_unique_slug 0.1.5 → 0.1.6

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+script: bundle exec rspec spec

data/README.md

@@ -52,6 +52,11 @@ All the standard url helper methods will still work since `to_param`  is overrid
     post = Post.create! :title => "Sample Post"
     post_path(post)     # /posts/sample-post
 
+
+## Gotchas
+
+If you are adding this to an existing project that already contains records, perform the necessary setup then run something like `Post.all.each {|p| p.save }` in the rails console to populate the slug columns.
+
 ## TODO:
 
 - Add support for scopes

data/lib/has_unique_slug.rb

@@ -16,9 +16,9 @@ module HasUniqueSlug
     def has_unique_slug args = {}
       
       # Setup default options
-      options = { :column => :slug, :subject => :title }
+      options = { :column => :slug, :subject => :title, :scope => nil }
       options.merge! args
-      slug_column, subject_column = options[:column], options[:subject]
+      slug_column, subject_column, scope_column = options[:column], options[:subject], options[:scope]
       
       # Use before_validates otherwise ActiveRecord uniqueness validations on the model will fail.  Uniqueness is already guarneteed.
       # It is not recommend to use a 'validates :slug, :uniqueness => true' validation because that will add unndeeded stress on the
@@ -31,6 +31,13 @@ module HasUniqueSlug
         # Ensure the current slug is unique in the database, if not, make it unqiue
         test_slug, i = slug_prefix, 1
         record_scope = record.new_record? ? record.class.scoped : record.class.where("id != ?", record.id)
+        
+        # Add scope to uniqueness call
+        unless scope_column.nil?
+          record_scope = record_scope.where("#{scope_column} = ?", record[scope_column])
+        end
+        
+        # Test for uniqueness
         while not record_scope.where("#{slug_column} = ?", test_slug).count.zero? 
           test_slug = "#{slug_prefix}-#{(i += 1)}"
         end

data/lib/has_unique_slug/version.rb

@@ -1,3 +1,3 @@
 module HasUniqueSlug
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/has_unique_slug_spec.rb

@@ -8,6 +8,14 @@ class Standard < ActiveRecord::Base
   end
 end
 
+class StandardWithScope < ActiveRecord::Base
+  has_unique_slug :scope => :some_scope
+  
+  def self.table_name 
+    "standard" 
+  end
+end
+
 class Custom < ActiveRecord::Base
   has_unique_slug :column => :permalink, :subject => :name
   
@@ -34,12 +42,18 @@ describe HasUniqueSlug do
     teardown_db
   end
   
+  after(:each) do
+    Standard.destroy_all
+    Custom.destroy_all
+  end
+  
   it "creates a unique slug" do
     r = Standard.create! :title => "Sample Record"
     r.slug.should == "sample-record"
   end
   
   it "should add incremental column if not unique" do
+    Standard.create! :title => "Sample Record"
     2.upto 5 do |i|
       r = Standard.create! :title => "Sample Record"
       r.slug.should == "sample-record-#{i}"
@@ -47,7 +61,7 @@ describe HasUniqueSlug do
   end
   
   it "should not increment the slug if the duplicate is itself" do
-    r = Standard.last
+    r = Standard.create! :title => "Sample Record"
     slug = r.slug
     r.save.should be_true
     r.slug.should == slug
@@ -79,4 +93,20 @@ describe HasUniqueSlug do
     r.permalink.should == slug
   end
   
+  it "should allow two slugs with the same value if scopes differ" do
+    r = StandardWithScope.create! :title => "Sample Record", :some_scope => 1
+    r.slug.should == "sample-record"
+    
+    r = StandardWithScope.create! :title => "Sample Record", :some_scope => 2
+    r.slug.should == "sample-record"
+  end
+  
+  it "should increment the slug if two records share the same scope" do
+    r = StandardWithScope.create! :title => "Sample Record", :some_scope => 1
+    r.slug.should == "sample-record"
+    
+    r = StandardWithScope.create! :title => "Sample Record", :some_scope => 1
+    r.slug.should == "sample-record-2"
+  end
+  
 end

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ def setup_db
     create_table :standard do |t|
       t.column :title, :string
       t.column :slug, :string
+      t.column :some_scope, :integer
     end
     create_table :custom do |t|
       t.column :name, :string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_unique_slug
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285815385920 !ruby/object:Gem::Requirement
+  requirement: &70256493008000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285815385920
+  version_requirements: *70256493008000
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70285815385340 !ruby/object:Gem::Requirement
+  requirement: &70256493007320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285815385340
+  version_requirements: *70256493007320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70285815384660 !ruby/object:Gem::Requirement
+  requirement: &70256493006540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285815384660
+  version_requirements: *70256493006540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70285815383900 !ruby/object:Gem::Requirement
+  requirement: &70256493005660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285815383900
+  version_requirements: *70256493005660
 description: Generates a unique slug for use as a drop-in replacement for ids.
 email:
 - brendan@unknowncollective.com
@@ -63,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -85,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4232824133400025288
+      hash: -4480308170059512738
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4232824133400025288
+      hash: -4480308170059512738
 requirements: []
 rubyforge_project: has_unique_slug
 rubygems_version: 1.8.10