delete_soft 0.0.1 → 0.0.2

data/delete_soft.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "delete_soft"
 
-  s.add_dependency('squeel', '>= 0.9.3')
-
   s.add_development_dependency('sqlite3', ['>= 1.3.4'])
   s.add_development_dependency('activerecord', ['>= 3.1.0'])
   s.add_development_dependency('rake', ['0.9.2'])

data/lib/class_methods.rb

@@ -9,8 +9,13 @@ module DeleteSoftly
     # Will result in:
     #   Item.at_time(DateTime.parse('2010-01-01')) #=> (SELECT "items".* FROM "items" WHERE (((("items"."deleted_at" > '2010-01-01 00:00:00') OR ("items"."deleted_at" IS NULL)) AND ("items"."created_at" < '2010-01-01 00:00:00')))
     def at_time(date = Time.now.utc)
-      with_deleted.where{ (deleted_at > date || deleted_at != nil) && created_at < date }
+      with_deleted do
+        where('(deleted_at > :date OR deleted_at IS NULL) AND created_at < :date', {:date => date})
+      end
     end
+    
+    "created_at >= :start_date AND created_at <= :end_date"
+    
     alias_method :at_date, :at_time
 
     # Give the currently active items. When delete_soflty is added this is invoked by default
@@ -26,13 +31,13 @@ module DeleteSoftly
     #   Item.all #=> SELECT "items".* FROM "items"
     #   Item.active #=> SELECT "items".* FROM "items" WHERE ("items"."deleted_at" IS NULL)
     def active
-      where{deleted_at == nil}
+      where('deleted_at IS NULL')
     end
 
     # Same as active, but not to be overwritten. Active might become with disabled => false
     # or something like that. Without deleted should remain intact
     def without_deleted
-      where{deleted_at.nil?}
+      where('deleted_at IS NULL')
     end
 
     # Include deleted items when performing queries
@@ -50,11 +55,13 @@ module DeleteSoftly
     #   IHaveManyItems.first.items #=> SELECT "items".* FROM "items" WHERE ("items"."deleted_at" IS NULL) AND ("items".i_have_many_items_id = 1) ORDER BY "items"."content"
     #   IHaveManyItems.first.items.with_deleted #=> SELECT "items".* FROM "items" WHERE ("items".i_have_many_items_id = 1) ORDER BY "items"."content"
     def with_deleted(&block)
-      unscoped
+      unscoped(&block)
     end
-
+    
     def deleted
-      with_deleted.where{deleted_at != nil}
+      with_deleted do 
+        where( "deleted_at NOT NULL" )
+      end
     end
 
     # Support for paper_trail if it is installed as well. Then you can use:

data/lib/delete_soft/version.rb

@@ -1,3 +1,3 @@
 module DeleteSoft
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/instance_methods.rb

@@ -18,7 +18,6 @@ module DeleteSoftly
       end
     
       @destroyed = true
-      freeze
     end
    
     # Revive a destroyed item. For a model like:

data/test/delete_softly_test.rb

@@ -17,10 +17,11 @@ class DeleteSoftlyTest < ActiveSupport::TestCase
     @post2_id = @post2.id
 
   end
+
   test "two records available" do
     assert_equal 2, Post.count
   end
-  
+
   test "destroy count test" do
     @post1.destroy
     assert_equal 1, Post.count
@@ -47,10 +48,19 @@ class DeleteSoftlyTest < ActiveSupport::TestCase
     assert_equal [@post2], Post.without_deleted
     assert_equal [@post1, @post2], Post.at_time(t)
   end
-  
+
   test "other default scopes" do
     assert_equal 2, Comment.count
     @comment2_1.destroy
     assert_equal 1, Comment.count
   end
+
+  test "revive" do
+    assert_equal 2, Post.without_deleted.count
+    @post1.destroy
+    assert_equal 1, Post.without_deleted.count
+    @post1.revive
+    assert_equal 2, Post.without_deleted.count
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delete_soft
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Orban Botond
@@ -21,22 +21,6 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 9
-        - 3
-        version: 0.9.3
-  type: :runtime
-  name: squeel
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,10 +33,10 @@ dependencies:
         version: 1.3.4
   type: :development
   name: sqlite3
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,10 +49,10 @@ dependencies:
         version: 3.1.0
   type: :development
   name: activerecord
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -81,7 +65,7 @@ dependencies:
         version: 0.9.2
   type: :development
   name: rake
-  version_requirements: *id004
+  version_requirements: *id003
 description: A gem which adds soft delete functionality
 email: 
 - orbanbotond@gmail.com