semanticart-is_paranoid 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,5 +1,8 @@
 This will only document major changes.  Please see the commit log for minor changes.
 
+-2009-09-17
+* fixed when primary key was not "id" (ie: "uuid") via Thibaud Guillaume-Gentil
+
 -2009-09-15
 * added support for has_many associations (i.e. @r2d2.components_with_destroyed) via Amiel Martin
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 9
-:patch: 3
+:patch: 4
 :major: 0

data/is_paranoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{is_paranoid}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey Chupp"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-17}
   s.description = %q{}
   s.email = %q{jeff@semanticart.com}
   s.extra_rdoc_files = [

data/lib/is_paranoid.rb

@@ -60,8 +60,8 @@ module IsParanoid
       options.reverse_merge!({:include_destroyed_dependents => true}) unless options[:include]
       with_exclusive_scope do
         update_all(
-        "#{destroyed_field} = #{connection.quote(field_not_destroyed)}",
-        "id = #{id}"
+          "#{destroyed_field} = #{connection.quote(field_not_destroyed)}",
+          primary_key.to_sym => id
         )
       end
 
@@ -212,7 +212,7 @@ module IsParanoid
     def destroy_without_callbacks
       self.class.update_all(
         "#{destroyed_field} = #{self.class.connection.quote(( field_destroyed.respond_to?(:call) ? field_destroyed.call : field_destroyed))}",
-        "id = #{self.id}"
+        self.class.primary_key.to_sym => self.id
       )
       self
     end

data/spec/is_paranoid_spec.rb

@@ -281,4 +281,12 @@ describe IsParanoid do
     end
 
   end
+
+  describe "alternate primary key" do
+    it "should destroy without problem" do
+      uuid = Uuid.create(:name => "foo")
+      uuid.destroy.should be_true
+    end
+  end
+
 end

data/spec/models.rb

@@ -91,4 +91,14 @@ class UndestroyablePirate < ActiveRecord::Base #:nodoc:
   def before_destroy
     false
   end
-end
+end
+
+class Uuid < ActiveRecord::Base #:nodoc:
+  set_primary_key "uuid"
+
+  def before_create
+    self.uuid = "295b3430-85b8-012c-cfe4-002332cf7d5e"
+  end
+
+  is_paranoid
+end

data/spec/schema.rb

@@ -48,4 +48,11 @@ ActiveRecord::Schema.define(:version => 20090317164830) do
     t.string   "name"
     t.boolean  "alive", :default => true
   end
+
+  create_table "uuids", :id => false, :force => true  do |t|
+    t.string   "uuid",     :limit => 36,  :primary => true
+    t.string   "name"
+    t.datetime "deleted_at"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: semanticart-is_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jeffrey Chupp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: []