paranoia 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 691a38d6362b87d499cca9ca12d0988c45acbdcd
-  data.tar.gz: 8bbbab8f2754a65876552d494c93373186f89a04
+  metadata.gz: 699077f31f4cc413787d2132a6a36fc18051392d
+  data.tar.gz: 3ad7c463ced3e000c097c76c3b77d3378f4100e7
 SHA512:
-  metadata.gz: 5bb99eaac69f702473907da7b3988ed9487b4bd8904817dcf6e670498692343414c7db9f4fb987157953fb8cefcccd91a9ddae1d13186ddcb0d4f366b2448818
-  data.tar.gz: d363de9761f82f26fcc927892b6cbe4f9ee60f9a41ad1ae878f7586d73f65a6c69263ffa1028e22b660aa9063823b33d867b4a090e4308267cb00bb80864e073
+  metadata.gz: d9b72b34e364d624fc9b0152f6be5d57903f87b0aed34ac6a010cb7bc0b117df0954db926595f67873cb43e3e6b5542ac4a07a6626e0d59de4af9d4c2874e132
+  data.tar.gz: 423bdba7a858510b877973e0746d0fbe896f96d43b6eae06793da88e9566755e53b9740bcaa1a82b883a12ac1876927f47a60cb58626200f02ec2678a89af6af

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# paranoia Changelog
+
+## 2.0.4 (2014-12-02)
+
+### Features
+* Add paranoia_scope as named version of default_scope [#184](https://github.com/radar/paranoia/pull/184) [Jozsef Nyitrai](https://github.com/nyjt)
+
+
+### Bug Fixes
+* Fix initialization problems when missing table or no database connection [#186](https://github.com/radar/paranoia/issues/186)
+* Fix broken restore of has_one associations [#185](https://github.com/radar/paranoia/issues/185) [#171](https://github.com/radar/paranoia/pull/171) [Martin Sereinig](https://github.com/srecnig)

data/lib/paranoia.rb

@@ -144,7 +144,7 @@ module Paranoia
       if association_data.nil? && association.macro.to_s == "has_one"
         association_class_name = association.options[:class_name].present? ? association.options[:class_name] : association.name.to_s.camelize
         association_foreign_key = association.options[:foreign_key].present? ? association.options[:foreign_key] : "#{self.class.name.to_s.underscore}_id"
-        Object.const_get(association_class_name).only_deleted.where(association_foreign_key, self.id).first.try(:restore, recursive: true)
+        Object.const_get(association_class_name).only_deleted.where(association_foreign_key => self.id).first.try(:restore, recursive: true)
       end
     end
 
@@ -154,7 +154,6 @@ end
 
 class ActiveRecord::Base
   def self.acts_as_paranoid(options={})
-    raise "primary key required for "+self.name unless self.primary_key
     alias :destroy! :destroy
     alias :delete! :delete
     def really_destroy!
@@ -183,7 +182,10 @@ class ActiveRecord::Base
 
     self.paranoia_column = (options[:column] || :deleted_at).to_s
     self.paranoia_sentinel_value = options.fetch(:sentinel_value) { Paranoia.default_sentinel_value }
-    default_scope { where(table_name => { paranoia_column => paranoia_sentinel_value }) }
+    def self.paranoia_scope
+      where(table_name => { paranoia_column => paranoia_sentinel_value })
+    end
+    default_scope { paranoia_scope }
 
     before_restore {
       self.class.notify_observers(:before_restore, self) if self.class.respond_to?(:notify_observers)

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/test/paranoia_test.rb

@@ -11,6 +11,10 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/paranoia")
 
 def connect!
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'
+end
+
+def setup!
+  connect!
   ActiveRecord::Base.connection.execute 'CREATE TABLE parent_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
   ActiveRecord::Base.connection.execute 'CREATE TABLE paranoid_models (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER, deleted_at DATETIME)'
   ActiveRecord::Base.connection.execute 'CREATE TABLE paranoid_model_with_belongs (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER, deleted_at DATETIME, paranoid_model_with_has_one_id INTEGER)'
@@ -28,7 +32,6 @@ def connect!
   ActiveRecord::Base.connection.execute 'CREATE TABLE custom_column_models (id INTEGER NOT NULL PRIMARY KEY, destroyed_at DATETIME)'
   ActiveRecord::Base.connection.execute 'CREATE TABLE custom_sentinel_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME NOT NULL)'
   ActiveRecord::Base.connection.execute 'CREATE TABLE non_paranoid_models (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER)'
-  ActiveRecord::Base.connection.execute 'CREATE TABLE idless_models (deleted_at DATETIME)'
 end
 
 class WithDifferentConnection < ActiveRecord::Base
@@ -37,7 +40,7 @@ class WithDifferentConnection < ActiveRecord::Base
   acts_as_paranoid
 end
 
-connect!
+setup!
 
 class ParanoiaTest < test_framework
   def setup
@@ -535,7 +538,28 @@ class ParanoiaTest < test_framework
     
     assert hasOne.reload.deleted_at.nil?
   end
-  
+
+  # covers #185
+  def test_restoring_recursive_has_one_restores_correct_object
+    hasOnes = 2.times.map { ParanoidModelWithHasOne.create }
+    belongsTos = 2.times.map { ParanoidModelWithBelong.create }
+
+    hasOnes[0].update paranoid_model_with_belong: belongsTos[0]
+    hasOnes[1].update paranoid_model_with_belong: belongsTos[1]
+
+    hasOnes.each(&:destroy)
+
+    ParanoidModelWithHasOne.restore(hasOnes[1], :recursive => true)
+    hasOnes.each(&:reload)
+    belongsTos.each(&:reload)
+
+    # without #185, belongsTos[0] will be restored instead of belongsTos[1]
+    refute_nil hasOnes[0].deleted_at
+    refute_nil belongsTos[0].deleted_at
+    assert_nil hasOnes[1].deleted_at
+    assert_nil belongsTos[1].deleted_at
+  end
+
   # covers #131
   def test_has_one_really_destroy_with_nil
     model = ParanoidModelWithHasOne.create
@@ -603,7 +627,8 @@ class ParanoiaTest < test_framework
     a.destroy!
     a.restore!
     # This test passes if no exception is raised
-    connect! # Reconnect the main connection
+  ensure
+    setup! # Reconnect the main connection
   end
 
   def test_restore_clear_association_cache_if_associations_present
@@ -621,10 +646,12 @@ class ParanoiaTest < test_framework
     assert_equal 3, parent.very_related_models.size
   end
 
-  def test_model_without_primary_key
-    assert_raises(RuntimeError) do
-      IdlessModel.class_eval{ acts_as_paranoid }
-    end
+  def test_model_without_db_connection
+    ActiveRecord::Base.remove_connection
+
+    NoConnectionModel.class_eval{ acts_as_paranoid }
+  ensure
+    setup!
   end
 
   private
@@ -766,5 +793,5 @@ class AsplodeModel < ActiveRecord::Base
   end
 end
 
-class IdlessModel < ActiveRecord::Base
+class NoConnectionModel < ActiveRecord::Base
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,6 +65,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md