vidibus-permalink 1.1.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f00dec174def77cba9500663b540a6ffc8cf7a0b
-  data.tar.gz: fd3d2f0a87f99dd7c36ddec51003ee2fa17bf059
+SHA256:
+  metadata.gz: bac98f8cc4d3e6a7e575bab1edf72c67eb04eeffde1a0715d7ab8232037db918
+  data.tar.gz: 1d4204aea086cb8a69017ae2f0b3985839895c949f6a2dd9a780a461b41ff6bb
 SHA512:
-  metadata.gz: '0915a7c00cdf3e4212c24f13fc4bb044222230473f56a44c4efd49d3457d2b5e37be1b95fcf52f2469eefcd2e4a5ebc35b55349de44370a50286f94612ca4104'
-  data.tar.gz: 1bae7199adbea407806612f98f15e60f26d84065c29de92e23c81138c6b1950998b6eb2f4e4ac41371442c42e29486be949b5a058474151976480a617c060a26
+  metadata.gz: ff6e288516dd3863daedf254e561b1f7257d0e9cf49254c07295bf3f334ab962b6a96838076ee4653cfbd7f2e4a8d3ca49bc1f71969dbef7e7132c9666fe6ce0
+  data.tar.gz: ca8be7dde7894295b1ed8cdd7356be5ef24875138773df1dccd841cd2f83ee9d69c616ffe5ac5d3bacf0092998dce1dd2cc2ed219bbf08eade1c9c5efab282ad

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,13 +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)
-      where(value: sanitize(value))
+    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)
@@ -82,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)
@@ -138,7 +150,7 @@ class Permalink
     @existing ||= {}
     @existing[string] ||= Permalink
       .for_scope(scope)
-      .where(value: /^#{string}(-\d+)?$/)
+      .for_value(string, false)
       .excludes(:_id => id)
       .to_a
   end
@@ -146,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)
@@ -156,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

data/lib/vidibus/permalink/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Permalink
-    VERSION = '1.1.2'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidibus-permalink
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Andre Pankratz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2020-10-03 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