vidibus-permalink 0.1.2 → 0.1.3

data/app/models/permalink.rb

@@ -10,7 +10,7 @@ class Permalink
   field :scope, :type => Array
   field :_current, :type => Boolean, :default => true
 
-  before_save :set_current
+  after_save :unset_other_current, :if => :current?
   after_destroy :set_last_current, :if => :current?
 
   validates :linkable_uuid, :uuid => true
@@ -61,7 +61,7 @@ class Permalink
   # Returns true if this permalink is the current one
   # of the assigned linkable.
   def current?
-    @is_current ||= !!_current
+    !!_current
   end
 
   # Returns the current permalink of the assigned linkable.
@@ -75,6 +75,12 @@ class Permalink
     end
   end
 
+  # Sets this permalink as the current one.
+  # All other permalinks of this linkable will be updated after saving.
+  def current!
+    self._current = true
+  end
+
   class << self
     # Scope method for finding Permalinks for given object.
     def for_linkable(object)
@@ -106,7 +112,7 @@ class Permalink
 
     def scope_list(scope)
       return [] unless scope
-      scope.inject([]) { |array, (key, value)| array << "#{key}:#{value}"; array}
+      scope.map {|key, value| "#{key}:#{value}"}
     end
   end
 
@@ -154,17 +160,13 @@ class Permalink
     @existing[string] ||= Permalink.where(:value => /^#{string}(-\d+)?$/).excludes(:_id => id).to_a
   end
 
-  # Sets this permalink as the current one and unsets all others.
-  def set_current
-    unset_other_current
-    self._current = true
-  end
-
   # Sets _current to false on all permalinks of the assigned linkable.
   def unset_other_current
     return unless linkable
+    conditions = {:linkable_uuid => linkable_uuid, :_id => {"$ne" => _id}}
+    conditions[:scope] = Permalink.scope_list(scope) if scope.present?
     collection.update(
-      {:linkable_uuid => linkable_uuid, :_id => {"$ne" => _id}},
+      conditions,
       {"$set" => {:_current => false}},
       {:multi => true}
     )

data/lib/vidibus/permalink/mongoid.rb

@@ -55,13 +55,15 @@ module Vidibus
         @permalink_scope ||= get_scope
       end
 
-      def find_or_initialize(value, scope)
-        permalink_repository.for_linkable(self).for_value(value).for_scope(scope).first ||
-          permalink_repository.new(:value => value, :scope => scope, :linkable => self)
-      end
-
       private
 
+      # Returns a existing or new permalink object with wanted value.
+      # The permalink scope is also applied
+      def permalink_object_by_value(value)
+        permalink_repository.for_linkable(self).for_value(value).for_scope(permalink_scope).first ||
+          permalink_repository.new(:value => value, :scope => permalink_scope, :linkable => self)
+      end
+
       def get_scope
         scope = self.class.permalink_options[:scope]
         return unless scope
@@ -98,7 +100,8 @@ module Vidibus
         return unless permalink.blank? or changed
         value = values.join(" ")
         if permalink_repository
-          @permalink_object = find_or_initialize(value, permalink_scope)
+          @permalink_object = permalink_object_by_value(value)
+          @permalink_object.current!
           self.permalink = @permalink_object.value
         else
           self.permalink = ::Permalink.sanitize(value)

data/lib/vidibus/permalink/version.rb

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

metadata

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