delete_paranoid 1.0.4 → 1.0.5

data/.rvmrc

@@ -0,0 +1 @@
+rvm use @delete_paranoid --create

data/lib/delete_paranoid.rb

@@ -3,12 +3,12 @@ require 'active_record'
 
 module ActiveRecord
   class Relation
-    alias_method :delete_all!, :delete_all
+    alias_method :delete_all_permanently, :delete_all
     def delete_all(conditions = nil)
       if @klass.paranoid?
         update_all({:deleted_at => Time.now.utc}, conditions)
       else
-        delete_all!(conditions)
+        delete_all_permanently(conditions)
       end
     end
   end
@@ -17,7 +17,7 @@ end
 module DeleteParanoid
   module ActiveRecordExtensions
     def acts_as_paranoid
-      default_scope where(:deleted_at => nil)
+      default_scope { where(:deleted_at => nil) }
 
       extend DeleteParanoid::ClassMethods
       include DeleteParanoid::InstanceMethods
@@ -29,9 +29,9 @@ module DeleteParanoid
   end
 
   module ClassMethods
-    # permenantly delete the record from the database
-    def delete!(id_or_array)
-      where(self.primary_key => id_or_array).delete_all!
+    # permanently delete the record from the database
+    def delete_permanently(id_or_array)
+      where(self.primary_key => id_or_array).delete_all_permanently
     end
     # allow for queries within block to find soft deleted records
     def with_deleted
@@ -45,19 +45,19 @@ module DeleteParanoid
   end
 
   module InstanceMethods
-    # permenantly delete this specific instance from the database
-    def destroy!
+    # permanently delete this specific instance from the database
+    def destroy_permanently
       result = destroy
       self.class.with_deleted do
-        self.class.delete! self.id
+        self.class.delete_permanently self.id
       end
       result
     end
     # permenantly delete this specific instance from the database
-    def delete!
+    def delete_permanently
       result = delete
       self.class.with_deleted do
-        self.class.delete! self.id
+        self.class.delete_permanently self.id
       end
       result
     end

data/lib/delete_paranoid/version.rb

@@ -1,3 +1,3 @@
 module DeleteParanoid
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/test/test_delete_paranoid.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'helper.rb')
 
 class TestDeleteParanoid < Test::Unit::TestCase
   context 'with non-paranoid activerecord class' do
@@ -22,7 +22,6 @@ class TestDeleteParanoid < Test::Unit::TestCase
         @blog.destroy
         @blog
       end
-      
       should destroy_subject.softly.and_freeze.and_mark_as_destroyed
       should trigger_callbacks_for :destroy
       should_not trigger_callbacks_for :update
@@ -34,32 +33,32 @@ class TestDeleteParanoid < Test::Unit::TestCase
       end
       should destroy_subject.softly
     end
-    context "when destroying instance with Class.delete_all!" do
+    context "when destroying instance with Class.delete_all_permanently" do
       subject do
-        Blog.where({:id => @blog.id}).delete_all!
+        Blog.where({:id => @blog.id}).delete_all_permanently
         @blog
       end
       should destroy_subject
     end
-    context "when destroying instance with Class.delete!" do
+    context "when destroying instance with Class.delete_permanently" do
       subject do
-        Blog.delete! @blog.id
+        Blog.delete_permanently @blog.id
         @blog
       end
       should destroy_subject
     end
-    context 'when destroying instance with instance.destroy!' do
+    context 'when destroying instance with instance.destroy_permanently' do
       subject do
-        @blog.destroy!
+        @blog.destroy_permanently
         @blog
       end
       should destroy_subject
       should trigger_callbacks_for :destroy
       should_not trigger_callbacks_for :update
     end
-    context 'when destroying instance with instance.delete!' do
+    context 'when destroying instance with instance.delete_permanently' do
       subject do
-        @blog.delete!
+        @blog.delete_permanently
         @blog
       end
       should destroy_subject
@@ -81,9 +80,9 @@ class TestDeleteParanoid < Test::Unit::TestCase
       should trigger_callbacks_for :destroy
       #should_not trigger_callbacks_for :update
     end
-    context 'when destroying parent paranoid instance with delete_all!' do
+    context 'when destroying parent paranoid instance with delete_all_permanently' do
        subject do
-         Blog.where({:id => @blog.id}).delete_all!
+         Blog.where({:id => @blog.id}).delete_all_permanently
          @comment
        end
 
@@ -106,9 +105,9 @@ class TestDeleteParanoid < Test::Unit::TestCase
       should trigger_callbacks_for :destroy
       #should_not trigger_callbacks_for :update
     end
-    context 'when destroying parent paranoid instance with delete_all!' do
+    context 'when destroying parent paranoid instance with delete_all_permanently' do
        subject do
-         Blog.where({:id => @blog.id}).delete_all!
+         Blog.where({:id => @blog.id}).delete_all_permanently
          @link
        end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delete_paranoid
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152368180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152368180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152367060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152367060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152364200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152364200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152362780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152362780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2152359780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2152359780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152358320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152358320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152357260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2152357260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: flag database records as deleted and hide them from subsequent queries
 email:
 - ryan@codecrate.com
@@ -96,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - .travis.yml
 - CONTRIBUTORS.txt
 - Gemfile
@@ -123,15 +159,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2970473381417290609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2970473381417290609
 requirements: []
 rubyforge_project: delete_paranoid
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: soft delete Rails ActiveRecord objects