sluggy 0.1.1 → 0.1.2

data/lib/sluggy.rb

@@ -27,11 +27,15 @@ module Sluggy
 
         exists = self.class.where("#{slug_column} = ? OR #{slug_column} LIKE ?", slug, "#{slug}--%")
         exists = exists.where('id != ?', id) unless new_record?
-        exists = exists.where("#{slug_scope} = ?", send(slug_scope)) if slug_scope
+        if slug_scope
+          Array(slug_scope).each do |sc|
+            exists = exists.where("#{sc} = ?", send(sc))
+          end
+        end
         exists = exists.order("LENGTH(#{slug_column}) DESC, #{slug_column} DESC")
 
         if conflict = exists.first
-          last_number =  conflict.send(slug_column).gsub(/^#{Regexp.quote(slug)}--/, '').to_i
+          last_number = conflict.send(slug_column).gsub(/^#{Regexp.quote(slug)}--/, '').to_i
           slug << "--#{last_number+1}"
         end
 

data/sluggy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'sluggy'
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.authors     = ['Ary Djmal']
   s.email       = ['arydjmal@gmail.com']
   s.summary     = 'Minimal slugging/permalink gem for ActiveRecord. Nothing fancy.'

data/test/sluggy_test.rb

@@ -1,9 +1,12 @@
 require 'test_helper'
 
 class SluggyDefaultsTest < Test::Unit::TestCase
+  class Post < ActiveRecord::Base
+    slug_for :title
+  end
+
   def setup
     Post.delete_all
-    Post.send(:slug_for, :title)
     Post.create!(:title => 'First Post')
   end
 
@@ -42,9 +45,12 @@ class SluggyDefaultsTest < Test::Unit::TestCase
 end
 
 class SluggyWithOptionsTest < Test::Unit::TestCase
+  class User < ActiveRecord::Base
+    slug_for :name, {:column => :handle, :scope => :account_id}
+  end
+
   def setup
     User.delete_all
-    User.send(:slug_for, :name, {:column => :handle, :scope => :account_id})
     User.create!(:name => 'Ary Djmal', :account_id => 1)
   end
 
@@ -81,3 +87,21 @@ class SluggyWithOptionsTest < Test::Unit::TestCase
     assert_equal('ary-djmal--1', user.reload.handle)
   end
 end
+
+class SluggyWithScopeArrayTest < Test::Unit::TestCase
+  class User < ActiveRecord::Base
+    slug_for :name, {:column => :handle, :scope => [:account_id, :deleted]}
+  end
+
+  def setup
+    User.delete_all
+    User.create!(:name => 'Ary Djmal', :account_id => 1)
+  end
+
+  def test_with_same_name
+    user = User.create!(:name => 'Ary Djmal', :account_id => 1)
+    assert_equal('ary-djmal--1', user.handle)
+    user = User.create!(:name => 'Ary Djmal', :account_id => 1, :deleted => true)
+    assert_equal('ary-djmal', user.handle)
+  end
+end

data/test/test_helper.rb

@@ -15,11 +15,6 @@ ActiveRecord::Schema.define do
   create_table :users do |t|
     t.string  :name, :handle
     t.integer :account_id
+    t.boolean :deleted, :default => false
   end
 end
-
-class Post < ActiveRecord::Base
-end
-
-class User < ActiveRecord::Base
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sluggy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2012-05-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70299863568480 !ruby/object:Gem::Requirement
+  requirement: &70281588899640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299863568480
+  version_requirements: *70281588899640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70299863559640 !ruby/object:Gem::Requirement
+  requirement: &70281588897780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299863559640
+  version_requirements: *70281588897780
 description: 
 email:
 - arydjmal@gmail.com
@@ -45,6 +45,7 @@ files:
 - ./Rakefile
 - ./README.md
 - ./sluggy-0.1.0.gem
+- ./sluggy-0.1.1.gem
 - ./sluggy.gemspec
 - ./test/sluggy_test.rb
 - ./test/test_helper.rb