geothird_friendly_id 4.0.9.5 → 4.0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4517be54a99468e6efcce36bcfeaebf0c895ef9
-  data.tar.gz: e5b63a953bc1e79134fa3c782cf246d3ef0b5703
+  metadata.gz: 865522c23934f0ec1b360a57d3659b07137ed2c3
+  data.tar.gz: c3e371c31cddcfce242dfcade11eedde48b7e5b7
 SHA512:
-  metadata.gz: e140a454c0774bd355b412b94c3b808bb483b5e13bebbdbc1505b8c89cead604c703e03964c2966bf084e6fa797d79fef97424af126303228cf1ba36195fa122
-  data.tar.gz: 731bd86bb8a54ddfef13632a427fbc56f8c78d510c308fe7b6935fbd11cd3b07dc946ad756af93f4292295f6d3404f4d4cb161f9bcf7762b300500cdaf9c8aa1
+  metadata.gz: 7253a59b9bd02bbc45c0935420d988d39c1fa2654e7c02feca1c5e59afeec6d72631c395364daa6e1232c5ee5ee1ab4fa33cf56927a2884df50d525460965725
+  data.tar.gz: 732091b1b707108e8158dd4c2b21605ddd98d1cd9b1f9a178b0043ad0b9c578eaa7c9060b6bf342e7f397942d8d2f93b5f4f72aba73f40e7d1f2d9c8c7257ea9

data/geothird_friendly_id.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- {test}/*`.split("\n")
   s.require_paths     = ["lib"]
 
+  s.add_dependency 'acts_as_paranoid', '0.4.1'
+
   s.add_development_dependency "railties", "~> 3.2.0"
   s.add_development_dependency "activerecord", "~> 3.2.0"
   s.add_development_dependency "minitest", "3.2.0"

data/lib/friendly_id.rb

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

data/lib/friendly_id/base.rb

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

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?
-      with_deleted.where(@klass.friendly_id_config.query_field => id).first or super
+      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/history.rb

@@ -124,7 +124,7 @@ method.
         pkey            = sluggable_class.primary_key
         value           = sluggable.send pkey
 
-        scope = Slug.where("slug = ? OR slug LIKE ?", normalized, wildcard)
+        scope = Slug.with_deleted.where("slug = ? OR slug LIKE ?", normalized, wildcard)
         scope = scope.where(:sluggable_type => sluggable_class.to_s)
         scope = scope.where("sluggable_id <> ?", value) unless sluggable.new_record?
         scope.order("LENGTH(slug) DESC, slug DESC")

data/lib/friendly_id/migration.rb

@@ -2,10 +2,11 @@ class CreateFriendlyIdSlugs < ActiveRecord::Migration
 
   def self.up
     create_table :friendly_id_slugs do |t|
-      t.string   :slug,           :null => false
-      t.integer  :sluggable_id,   :null => false
-      t.string   :sluggable_type, :limit => 40
-      t.datetime :created_at
+      t.string     :slug,           :null => false
+      t.integer    :sluggable_id,   :null => false
+      t.string     :sluggable_type, :limit => 40
+      t.datetime   :created_at
+      t.deleted_at :boolean
     end
     add_index :friendly_id_slugs, :sluggable_id
     add_index :friendly_id_slugs, [:slug, :sluggable_type], :unique => true

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.with_deleted.where(column => sluggable.send(column))
+           memo.where(column => sluggable.send(column))
         end
 
         matched.first

data/lib/friendly_id/slug.rb

@@ -3,6 +3,7 @@ module FriendlyId
   #
   # @see FriendlyId::History
   class Slug < ActiveRecord::Base
+    acts_as_paranoid column_type: 'boolean'
     self.table_name = "friendly_id_slugs"
     belongs_to :sluggable, :polymorphic => true
 

data/lib/friendly_id/slug_generator.rb

@@ -57,8 +57,8 @@ 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.with_deleted.where(base, normalized, wildcard)
-      scope = scope.with_deleted.where("#{pkey} <> ?", value) unless sluggable.new_record?
+      scope = sluggable_class.unscoped.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.5
+  version: 4.0.9.6
 platform: ruby
 authors:
 - Norman Clarke
@@ -11,6 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: acts_as_paranoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement