vidibus-permalink 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0f6739c06733a192c1cc9d64e185be44323af2a
-  data.tar.gz: 87b4010b49dab36fbe7e7bd23a0566a046721fd2
+SHA256:
+  metadata.gz: d118d572faff0ee081b71af77b77058c3a7226fcb9339467684fd9402ab1ba75
+  data.tar.gz: 06f9e27805f167fde0af86c410ea42905bffaf50235404dcafe6d4201bc33412
 SHA512:
-  metadata.gz: a32a63c0e96135aa6915add4a471666008bdfac1fe19053094b53a874268dc49925e60d61df67efa40e377797fdabe5c8944444fa21f23677308a8ea08f13a8e
-  data.tar.gz: 55eac63dd2eba1965e68624cdb516bb99d6028c6e17c079a1a0c0fd6d7c13a559a0592dab10f3656da438de8bef6701b74ee486bee45a7bed3ab67727a1144cf
+  metadata.gz: 6387c90b049d3f7985b35bc4ee7aa539a6919d839ad0f5e12742b156a35e70566b3e4ae60a295ab5876add428260f53356770c080bb0da6c78792744d637cacd
+  data.tar.gz: de8536cb2af02207d2b8145496a3deaa17819ae66e922cd3656166e5e5d841c044df6a8ce5f49b40deb2162479669ccee01e3a478b4d5f6d5afb1ecdedbf4227

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

@@ -112,8 +112,8 @@ module Vidibus
         changed = false
         values = []
         attribute_names.each do |name|
-          changed ||= changes[name].present?
-          values << attributes[name.to_s]
+          changed ||= send("#{name}_changed?")
+          values << send(name)
         end
         return unless permalink.blank? || changed
         value = values.join(' ')

data/lib/vidibus/permalink/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Permalink
-    VERSION = '1.1.1'
+    VERSION = '1.3.0'
   end
 end

metadata

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