vidibus-permalink 0.1.3 → 0.1.4

data/app/models/permalink.rb

@@ -10,6 +10,7 @@ class Permalink
   field :scope, :type => Array
   field :_current, :type => Boolean, :default => true
 
+  before_validation :sanitize_value!
   after_save :unset_other_current, :if => :current?
   after_destroy :set_last_current, :if => :current?
 
@@ -37,17 +38,15 @@ class Permalink
     end
   end
 
-  # Assigns given string as value.
   # Sanitizes and increments string, if necessary.
-  def value=(string)
-    unless string == value
-      string = sanitize(string)
-      unless string == value
-        string = increment(string)
-        self.write_attribute(:value, string)
-      end
+  def sanitize_value!
+    return true unless value_changed? || new_record?
+    string = sanitize(value)
+    if string != value_was
+      string = increment(string)
     end
-    string
+    self.value = string
+    true
   end
 
   def scope=(scope)
@@ -157,7 +156,8 @@ class Permalink
   # Finds existing permalinks with current value.
   def existing(string)
     @existing ||= {}
-    @existing[string] ||= Permalink.where(:value => /^#{string}(-\d+)?$/).excludes(:_id => id).to_a
+    @existing[string] ||=
+      Permalink.for_scope(scope).where(:value => /^#{string}(-\d+)?$/).excludes(:_id => id).to_a
   end
 
   # Sets _current to false on all permalinks of the assigned linkable.

data/lib/vidibus/permalink/mongoid.rb

@@ -9,10 +9,12 @@ module Vidibus
         field :permalink, :type => String
         index :permalink
 
-        before_validation :set_permalink
-        validates :permalink, :presence => true
+        attr_accessor :skip_permalink
 
-        after_save :store_permalink_object
+        before_validation :set_permalink, :unless => :skip_permalink
+        validates :permalink, :presence => true, :unless => :skip_permalink
+
+        after_save :store_permalink_object, :unless => :skip_permalink
         after_destroy :destroy_permalink_objects
       end
 
@@ -42,7 +44,8 @@ module Vidibus
 
       # Returns the current permalink object.
       def permalink_object
-        @permalink_object || permalink_repository.for_linkable(self).where(:_current => true).first if permalink_repository
+        @permalink_object ||
+          permalink_repository.for_linkable(self).where(:_current => true).first if permalink_repository
       end
 
       # Returns all permalink objects ordered by time of update.
@@ -101,6 +104,7 @@ module Vidibus
         value = values.join(" ")
         if permalink_repository
           @permalink_object = permalink_object_by_value(value)
+          @permalink_object.sanitize_value!
           @permalink_object.current!
           self.permalink = @permalink_object.value
         else

data/lib/vidibus/permalink/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Permalink
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-permalink
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +02:00
+date: 2011-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency