vidibus-permalink 1.1.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 515aa963b43b3d2cdf4576dfe00e9e8ddee3b819
-  data.tar.gz: 5d7edb952308577f1d5b0a2893df325bf26d08c8
+SHA256:
+  metadata.gz: 51f420dad962971000b45f721fc1179b27e5736dce2b2b8bfa2ca5d058789cea
+  data.tar.gz: bdd0f56bb07da5d649b2b9b68e5545f18b9bcfcef7fcdf0ad442e564d0e0436c
 SHA512:
-  metadata.gz: eaf165cd78288a6cb4ab0933b4d1c82b6a13954637b0ebb5bbbcf1549187a9b80b370c15e3b56afea9057ea290066bb0018378c489ce584b43a97537d51a420b
-  data.tar.gz: 426bb22b0fa89969a887b0efc58ba2b2d4b59b3ab3aeed27d8eab310cc203a3137f9555bbc7fd1bf2cd8be91e0c45f4332bfc1c7619b9a08bb6e116e16d65d64
+  metadata.gz: 2a0ef6ac2e4225da6aa42abfbc8883999b5194b7e87bfd6e1b1576e4a3a0af70c655fcaa0028e78a342a28a041e7e991fb2bb68fc33eff84a9cb788b3a50826f
+  data.tar.gz: 76f55494e22bf48e18ed6f6107b414c3049b638c0e939fd5c6c11b77407d7aadd2d7d1a91f7273d8a4773447eaefb7d2aff745c76433ef88c3ae1b59b512effb

data/app/models/permalink.rb

@@ -2,7 +2,7 @@ class Permalink
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :linkable, polymorphic: true
+  belongs_to :linkable, polymorphic: true, autosave: false
 
   field :value
   field :scope, type: Array
@@ -47,7 +47,11 @@ class Permalink
       if current?
         self
       else
-        Permalink.where(linkable_id: linkable.id, _current: true).first
+        Permalink.where({
+          linkable_id: linkable.id,
+          linkable_type: linkable.class.to_s,
+          _current: true
+        }).first
       end
     end
   end
@@ -61,14 +65,20 @@ class Permalink
   class << self
     # Scope method for finding Permalinks for given object.
     def for_linkable(object)
-      where(linkable_id: object.id)
+      where(linkable_id: object.id, linkable_type: object.class.to_s)
     end
 
     # Scope method for finding Permalinks for given value.
     # The value will be sanitized.
-    def for_value(value, sanitize = true)
-      value = sanitize(value) if sanitize
-      where(value: /^#{value}(-\d+)?$/)
+    def for_value(value, do_sanitize = true)
+      if do_sanitize
+        self.or([
+          {value: /^#{sanitize(value)}(-\d+)?$/},
+          {value: /^#{sanitize(value, true)}(-\d+)?$/}
+        ])
+      else
+        where(value: /^#{value}(-\d+)?$/)
+      end
     end
 
     def for_scope(scope)
@@ -83,9 +93,10 @@ class Permalink
 
     # Sanitizes string: Remove stopwords and format as permalink.
     # See Vidibus::CoreExtensions::String for details.
-    def sanitize(string)
+    def sanitize(string, keep_stopwords = false)
       return if string.blank?
-      remove_stopwords(string).permalink
+      string = remove_stopwords(string) unless keep_stopwords
+      string.permalink
     end
 
     def scope_list(scope)
@@ -147,7 +158,11 @@ class Permalink
   # Sets _current to false on all permalinks of the assigned linkable.
   def unset_other_current
     return unless linkable
-    conditions = {linkable_id: linkable.id, _id: {'$ne' => id}}
+    conditions = {
+      linkable_id: linkable.id,
+      linkable_type: linkable.class.to_s,
+      _id: {'$ne' => id}
+    }
     conditions[:scope] = Permalink.scope_list(scope) if scope.present?
     Permalink.where(conditions).each do |obj|
       obj.set(_current: false)
@@ -157,7 +172,7 @@ class Permalink
   # Sets the lastly updated permalink of the assigned linkable as current one.
   def set_last_current
     last = Permalink
-      .where(linkable_id: linkable.id)
+      .where(linkable_id: linkable.id, linkable_type: linkable.class.to_s)
       .order_by(:updated_at.desc)
       .limit(1)
       .first

data/lib/vidibus/permalink/mongoid.rb

@@ -40,6 +40,18 @@ module Vidibus
         end
       end
 
+      # Ensure that a current permalink object exists for this record.
+      def ensure_permalink_object
+        if permalink_repository
+          permalink_object || begin
+            obj = permalink_object_by_value(permalink)
+            obj.sanitize_value!
+            obj.current!
+            obj.save
+          end
+        end
+      end
+
       # Returns the defined permalink repository object.
       def permalink_repository
         @permalink_repository ||= begin
@@ -102,7 +114,7 @@ module Vidibus
       end
 
       # Initializes a new permalink object and sets permalink attribute.
-      def set_permalink
+      def set_permalink(force = false)
         begin
           attribute_names = self.class.permalink_attributes
         rescue NoMethodError
@@ -115,7 +127,7 @@ module Vidibus
           changed ||= send("#{name}_changed?")
           values << send(name)
         end
-        return unless permalink.blank? || changed
+        return unless permalink.blank? || changed || force
         value = values.join(' ')
         if permalink_repository
           @permalink_object = permalink_object_by_value(value)

data/lib/vidibus/permalink/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Permalink
-    VERSION = '1.1.3'
+    VERSION = '1.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidibus-permalink
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Andre Pankratz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Permalink handling