paranoia 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6d1586094e7835b1d718602ae37b0c333a45a553
+  data.tar.gz: 3df4961b93e213a09baf0eb4db5c0df0a40bb5cf
+SHA512:
+  metadata.gz: 6c803ff4e4a54f80fd99fbd10ee8ae18b9db6a3c85ac12ba7d8da0199fa639fcb812190310735ed36fa2c4c3ddcb7684f57b6a579cd58bb4be6b513e7fa25a87
+  data.tar.gz: e0df9dc5dacce1342a164a03d9bd462b2d4c2e3acf231a85dbe2297a0d38fd49ea8a8fa39bdec98c89c79e4130e1bb3a7385c2d111ed8d37c4b99c32a6d9854d

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 tmp
 .rvmrc
+Gemfile.lock

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in paranoia.gemspec
 gemspec

data/README.md

@@ -12,52 +12,32 @@ Put this in your Gemfile:
 gem 'paranoia'
 ```
 
-Then run `bundle`. Done.
-
-Updating is as simple as `bundle update paranoia`.
-
-#### Rails 3
-
-In your _Gemfile_:
-
-```ruby
-gem 'paranoia'
-```
-
 Then run:
 
 ```shell
 bundle install
 ```
 
-#### Rails 2:
-
-In your _config/environment.rb_:
+Updating is as simple as `bundle update paranoia`.
 
-```ruby
-config.gem 'paranoia'
-```
+#### Run your migrations for the desired models
 
-Then run:
+Run:
 
 ```shell
-rake gems:install
+rails generate migration AddDeletedAtToClients deleted_at:datetime
 ```
 
-#### Run your migrations for the desired models
+and now you have a migration
 
 ```ruby
-class AddDeletedAtToClient < ActiveRecord::Migration
-  def self.up
+class AddDeletedAtToClients < ActiveRecord::Migration
+  def change
     add_column :clients, :deleted_at, :datetime
   end
-
-  def self.down
-    remove_column :clients, :deleted_at
-  end
 end
 ```
-    
+
 ### Usage
 
 #### In your model:
@@ -90,16 +70,12 @@ end
 
 You can replace the older acts_as_paranoid methods as follows:
 
-```ruby
-find_with_deleted(:all)       # => with_deleted
-find_with_deleted(:first)     # => with_deleted.first
-find_with_deleted(id)         # => with_deleted.find(id)
-
-find_only_deleted(:all)       # => only_deleted
-find_only_deleted(:first)     # => only_deleted.first
-find_only_deleted(id)         # => only_deleted.find(id)
-```
+| Old Syntax                 | New Syntax                     |
+|:-------------------------- |:------------------------------ |
+|`find_with_deleted(:all)`   | `Client.with_deleted`          |
+|`find_with_deleted(:first)` | `Client.with_deleted.first`    |
+|`find_with_deleted(id)`     | `Client.with_deleted.find(id)` |
 
 ## License
 
-This gem is released under the MIT license.
+This gem is released under the MIT license.

data/lib/paranoia.rb

@@ -7,21 +7,21 @@ module Paranoia
     def paranoid? ; true ; end
 
     def only_deleted
-      scoped.tap { |x| x.default_scoped = false }.where("#{self.table_name}.deleted_at is not null")
+      all.tap { |x| x.default_scoped = false }.where("#{self.table_name}.deleted_at is not null")
     end
 
     def with_deleted
-      scoped.tap { |x| x.default_scoped = false }
+      all.tap { |x| x.default_scoped = false }
     end
   end
 
   def destroy
-    _run_destroy_callbacks { delete }
+    run_callbacks(:destroy) { delete }
   end
 
   def delete
-    update_attribute_or_column(:deleted_at, Time.now) if !deleted? && persisted?
-    freeze
+    return if new_record? or destroyed?
+    update_attribute_or_column :deleted_at, Time.now
   end
 
   def restore!
@@ -43,10 +43,10 @@ end
 
 class ActiveRecord::Base
   def self.acts_as_paranoid
-    alias_method :destroy!, :destroy
-    alias_method :delete!,  :delete
+    alias :destroy! :destroy
+    alias :delete!  :delete
     include Paranoia
-    default_scope :conditions => { :deleted_at => nil }
+    default_scope { where(:deleted_at => nil) }
   end
 
   def self.paranoid? ; false ; end

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/paranoia.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "paranoia"
   
-  s.add_dependency "activerecord", ">= 3.0.0"
+  s.add_dependency "activerecord", "~> 3.2"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rake", "0.8.7"
+  s.add_development_dependency "pry"
   
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/paranoia_test.rb

@@ -54,7 +54,6 @@ class ParanoiaTest < Test::Unit::TestCase
     model.destroy
 
     assert_equal true, model.deleted_at.nil?
-    assert model.frozen?
 
     assert_equal 0, model.class.count
     assert_equal 0, model.class.unscoped.count
@@ -68,7 +67,6 @@ class ParanoiaTest < Test::Unit::TestCase
     model.destroy
 
     assert_equal false, model.deleted_at.nil?
-    assert model.frozen?
 
     assert_equal 0, model.class.count
     assert_equal 1, model.class.unscoped.count
@@ -105,7 +103,8 @@ class ParanoiaTest < Test::Unit::TestCase
   # Regression test for #24
   def test_chaining_for_paranoid_models
     scope = FeaturefulModel.where(:name => "foo").only_deleted
-    assert_equal "foo", scope.where_values_hash[:name]
+
+    assert_equal "foo", scope.where_values_hash["name"]
     assert_equal 2, scope.where_values.count
   end
 
@@ -185,6 +184,7 @@ class ParanoiaTest < Test::Unit::TestCase
 
     model = ParanoidModel.only_deleted.find(id)
     model.restore!
+    model.reload
 
     assert_equal false, model.destroyed?
   end
@@ -194,7 +194,7 @@ class ParanoiaTest < Test::Unit::TestCase
     model.save
     model.destroy!
 
-    assert_equal false, ParanoidModel.unscoped.exists?(model.id)
+    assert_equal false, !!ParanoidModel.unscoped.exists?(model.id)
   end
 
   def test_real_delete
@@ -202,7 +202,7 @@ class ParanoiaTest < Test::Unit::TestCase
     model.save
     model.delete!
 
-    assert_equal false, ParanoidModel.unscoped.exists?(model.id)
+    assert_equal false, !!ParanoidModel.unscoped.exists?(model.id)
   end
 
   private

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,11 +62,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using
   much, much, much less code. You would use either plugin / gem if you wished that
   when you called destroy on an Active Record object that it didn't actually destroy
@@ -88,7 +93,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -98,27 +102,26 @@ files:
 - test/paranoia_test.rb
 homepage: http://rubygems.org/gems/paranoia
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: paranoia
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much,
   much, much less code.
 test_files: []

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    paranoia (1.1.0)
-      activerecord (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
-      builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.0)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.0)
-    builder (3.0.0)
-    i18n (0.6.0)
-    multi_json (1.0.4)
-    rake (0.8.7)
-    sqlite3 (1.3.5)
-    tzinfo (0.3.31)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.0)
-  paranoia!
-  rake (= 0.8.7)
-  sqlite3