geothird_friendly_id 4.0.9.7 → 4.0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 590b9ee0101b51a41c1a8676891e5245a0bdbb55
-  data.tar.gz: a4234e8d235f8f87877112182f53aa857d6013ac
+  metadata.gz: a9af828fb58fbdd77b333c711b690dc89a93ce30
+  data.tar.gz: 5695d4a6c99397fa88afd21bb222a967a7c07b04
 SHA512:
-  metadata.gz: ffbfe3662868b6acd468088e217e0491fee518c99127d05c044c7f8c3e9c979c95b0134a269ff9cf8e1728182f5484037162ae7f40aae04c849e65d5d974c01c
-  data.tar.gz: 77771114f5d921d999f6d5363910f6c5cf7a0a6cf9c9fa6077258d7a66fdea21d2f655dd274857edf5a929210bf6a8f17f73be4982f07ee36d7d03b7bacc8725
+  metadata.gz: 99d6d7544fe2d00a2a4394e1793b3329613d6994250218d76eedbec45a6931e55db61465ee07b9cce20eacde3e2e392c152cfab5c4fc809f3540aa1f97b185ec
+  data.tar.gz: f1273b40fa402e9be540e0b5499ecad1d258973c2db3d3c1d783a2a6984d16ac54236f953a9b42ddc8c8c7d6e3b0bdf3ffa7ab0d126d09c02deadcda86e09a18

data/lib/friendly_id.rb

@@ -45,7 +45,7 @@ with numeric ids:
 module FriendlyId
 
   # The current version.
-  VERSION = "4.0.9.7"
+  VERSION = "4.0.9.8"
 
   @mutex = Mutex.new
 

data/lib/friendly_id/base.rb

@@ -221,7 +221,7 @@ often better and easier to use {FriendlyId::Slugged slugs}.
       relation = relation_class.new(self, arel_table)
 
       if finder_needs_type_condition?
-        relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
+        relation.with_deleted.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
       else
         relation
       end

data/lib/friendly_id/scoped.rb

@@ -139,7 +139,7 @@ an example of one way to set this up:
       def conflict
         columns = friendly_id_config.scope_columns
         matched = columns.inject(conflicts) do |memo, column|
-           memo.where(column => sluggable.send(column))
+           memo.with_deleted.where(column => sluggable.send(column))
         end
 
         matched.first

data/lib/friendly_id/slug_generator.rb

@@ -57,7 +57,7 @@ module FriendlyId
       base = "#{column} = ? OR #{column} LIKE ?"
       # Awful hack for SQLite3, which does not pick up '\' as the escape character without this.
       base << "ESCAPE '\\'" if sluggable.connection.adapter_name =~ /sqlite/i
-      scope = sluggable_class.unscoped.where(base, normalized, wildcard)
+      scope = sluggable_class.unscoped.with_deleted.where(base, normalized, wildcard)
       scope = scope.where("#{pkey} <> ?", value) unless sluggable.new_record?
       scope = scope.order("LENGTH(#{column}) DESC, #{column} DESC")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geothird_friendly_id
 version: !ruby/object:Gem::Version
-  version: 4.0.9.7
+  version: 4.0.9.8
 platform: ruby
 authors:
 - Norman Clarke