nagybence-railhead_permalink 0.1.6 → 0.1.7

data/lib/railhead_permalink.rb

@@ -26,7 +26,7 @@ module RailheadPermalink
     def find_with_permalink(*args)
       key = args.first
       if key.is_a?(String)
-        find_without_permalink(:first, :conditions => ['permalink = ?', key]) || find_without_permalink(*args)
+        find_without_permalink(:first, :conditions => {:permalink => key}) || find_without_permalink(*args)
       else
         find_without_permalink(*args)
       end
@@ -39,9 +39,10 @@ module RailheadPermalink
         key, counter = self[permalink_options[:field]].parameterize.to_s, '-1'
         unless self.permalink == key
           permalink = key
-          while permalink_options[:reserved_names].include?(permalink) or self.class.exists?(:permalink => permalink)
-            counter.succ!
-            permalink = key + counter
+          while permalink_options[:reserved_names].include?(permalink) or
+            (self.class.exists?(:permalink => permalink) and not self == self.class.find_without_permalink(:first, :conditions => {:permalink => permalink}))
+              counter.succ!
+              permalink = key + counter
           end
           self[:permalink] = permalink
         end

data/railhead_permalink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "railhead_permalink"
-  s.version  = "0.1.6"
+  s.version  = "0.1.7"
   s.date     = "2009-01-28"
   s.summary  = "RailheadPermalink is a Ruby on Rails plugin that automatically finds ActiveRecord objects with permalink."
   s.email    = "nagybence@tipogral.hu"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nagybence-railhead_permalink
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Bence Nagy