nagybence-railhead_permalink 0.1.6 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,7 +26,7 @@ module RailheadPermalink
26
26
  def find_with_permalink(*args)
27
27
  key = args.first
28
28
  if key.is_a?(String)
29
- find_without_permalink(:first, :conditions => ['permalink = ?', key]) || find_without_permalink(*args)
29
+ find_without_permalink(:first, :conditions => {:permalink => key}) || find_without_permalink(*args)
30
30
  else
31
31
  find_without_permalink(*args)
32
32
  end
@@ -39,9 +39,10 @@ module RailheadPermalink
39
39
  key, counter = self[permalink_options[:field]].parameterize.to_s, '-1'
40
40
  unless self.permalink == key
41
41
  permalink = key
42
- while permalink_options[:reserved_names].include?(permalink) or self.class.exists?(:permalink => permalink)
43
- counter.succ!
44
- permalink = key + counter
42
+ while permalink_options[:reserved_names].include?(permalink) or
43
+ (self.class.exists?(:permalink => permalink) and not self == self.class.find_without_permalink(:first, :conditions => {:permalink => permalink}))
44
+ counter.succ!
45
+ permalink = key + counter
45
46
  end
46
47
  self[:permalink] = permalink
47
48
  end
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "railhead_permalink"
3
- s.version = "0.1.6"
3
+ s.version = "0.1.7"
4
4
  s.date = "2009-01-28"
5
5
  s.summary = "RailheadPermalink is a Ruby on Rails plugin that automatically finds ActiveRecord objects with permalink."
6
6
  s.email = "nagybence@tipogral.hu"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nagybence-railhead_permalink
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bence Nagy