geothird_friendly_id 4.0.9.3 → 4.0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8525835913c321adb72c5c749f1f0d5d46231a0
-  data.tar.gz: 46acec1b6840cf1dd6874020a9e4d666a38b0e95
+  metadata.gz: e8156570acc66ffd77342d64504f59435d8e0c3d
+  data.tar.gz: 12d5abb500f2004dc4a5ae2864e1c2ed6a9ab1bf
 SHA512:
-  metadata.gz: ce93b26fcfac3b7f7511aaced9e5925c52341528cad17fb4192b582e16118e7a8735690d17718001f6b703546a8110f81a173732ec7edbda7ba7b0fb7b964c74
-  data.tar.gz: 7b0dac21cdc66f1a70116c97216fa6dd98ca1360f94f3920a95fce20f579bebd9a70dd48d320fab1995c47232815226df1e7c8ae2a46d34df5b494951e3e86cb
+  metadata.gz: 5eed9ae32ec35718f79139a1a77713f193023cba771f4edc090e4550715dbc5a73985927a935d70aa723e926f8c59b9871412e717dc613a0a63aaca4caf22559
+  data.tar.gz: 888c7942bb557ebdd1cfaf7a97ec3239b577e5b67ff24732325b6a4a002b31bacc3efe6908da19289a98453598eab23678355f8ca1b930644e377f1cea6903db

data/lib/friendly_id.rb

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

data/lib/friendly_id/finder_methods.rb

@@ -14,7 +14,7 @@ module FriendlyId
     # @see FriendlyId::ObjectUtils
     def find_one(id)
       return super if id.unfriendly_id?
-      where(@klass.friendly_id_config.query_field => id).first or super
+      with_deleted.where(@klass.friendly_id_config.query_field => id).first or super
     end
 
     # FriendlyId overrides this method to make it possible to use friendly id's

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

@@ -58,7 +58,7 @@ module FriendlyId
       # 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.with_deleted.where(base, normalized, wildcard)
-      scope = scope.where("#{pkey} <> ?", value) unless sluggable.new_record?
+      scope = scope.with_deleted.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.3
+  version: 4.0.9.4
 platform: ruby
 authors:
 - Norman Clarke