mongoid_paranoia 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2edfadf14fc3b166efd190f331c5e86a75de4c20
-  data.tar.gz: 988223f244d3537c149c7d354163031fbb658c5e
+  metadata.gz: f5e32d59286713e858a9dceb94d5f4fb41adeb83
+  data.tar.gz: bb428d1861efb3f46e00934b27f337b9ea1a5c65
 SHA512:
-  metadata.gz: 37fb1381901fc197f18f79cbbfea5f8db627c94f8d9fa84da71a234878a69c4c9d6eec6e1ac6486f9fac4c59343556fc66ef186f0da5e92700396929b28534b7
-  data.tar.gz: f69bd91ff7eeabf02d205608a4081967ec02f703b4b807489b251898d44786739023263f44a6c55e07e638d01abe0aafb9386b98da5af67cd44581065662671e
+  metadata.gz: c692991d080ea171430e3114f53c4dea77ebcb1dd0c5cbf74543ffb7433610541070c5da097482608277ac4b75bea095a9c4f9c510b29b0fb46085fae2fff43b
+  data.tar.gz: 21ccd86425e06c85938fad3121f01ae457b5e1b2061606a2bff1cdc894432bbbe3de728381b87cc5e099403c0511bd2e533347075e713bca972c094c1c41d2a6

data/README.md

@@ -1,8 +1,8 @@
-# Paranoid Documents for Mongoid 4 and 5 [![Build Status](https://travis-ci.org/simi/mongoid_paranoia.png?branch=master)](https://travis-ci.org/simi/mongoid_paranoia)[![Gitter chat](https://badges.gitter.im/simi/mongoid_paranoia.png)](https://gitter.im/simi/mongoid_paranoia)
+# Paranoid Documents for Mongoid [![Build Status](https://travis-ci.org/simi/mongoid_paranoia.png?branch=master)](https://travis-ci.org/simi/mongoid_paranoia)[![Gitter chat](https://badges.gitter.im/simi/mongoid_paranoia.png)](https://gitter.im/simi/mongoid_paranoia)
 
 `Mongoid::Paranoia` enables a "soft delete" of Mongoid documents. Instead of being removed from the database, paranoid docs are flagged with a `deleted_at` timestamp and are ignored from queries by default.
 
-The `Mongoid::Paranoia` functionality was originally supported in Mongoid itself, but was dropped from version 4.0.0 onwards. This gem was extracted from the [Mongoid 3.0.0-stable branch](https://github.com/mongoid/mongoid/tree/3.0.0-stable). This gem should not be used with Mongoid versions 3.x and prior.
+The `Mongoid::Paranoia` functionality was originally supported in Mongoid itself, but was dropped from version 4.0.0 onwards. This gem was extracted from the [Mongoid 3.0.0-stable branch](https://github.com/mongoid/mongoid/tree/3.0.0-stable). This gem should not be used with Mongoid versions 3.x and prior. Current master branch targeted on Mongoid 6.0. With release 0.3.0 Mongoid 4 and 5 versions will be dropped.
 
 **Caution:** This repo/gem `mongoid_paranoia` (underscored) is different than [mongoid-paranoia](https://github.com/haihappen/mongoid-paranoia) (hyphenated). The goal of `mongoid-paranoia` (hyphenated) is to stay API compatible and it only accepts security fixes.
 
@@ -14,21 +14,6 @@ Add this line to your application's Gemfile:
 gem 'mongoid_paranoia'
 ```
 
-## Changes in 4.0
-
-### Uniqueness validator is not overriden
-
-#### Old syntax:
-```ruby
-validates_uniqueness_of :title
-validates :title, :uniqueness => true
-```
-
-#### New syntax:
-```ruby
-validates :title, uniqueness: { conditions: -> { where(deleted_at: nil) } }
-```
-
 ## Usage
 
 ```ruby
@@ -67,6 +52,13 @@ Mongoid::Paranoia.configure do |c|
 end
 ```
 
+### Validations
+#### You need override uniqueness validates
+
+```ruby
+validates :title, uniqueness: { conditions: -> { where(deleted_at: nil) } }
+```
+
 ### Callbacks
 
 #### Restore

data/lib/mongoid/paranoia.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'mongoid/compatibility'
 require 'mongoid/paranoia/monkey_patches'
 require 'mongoid/paranoia/configuration'
 require 'active_support'
@@ -95,15 +94,17 @@ module Mongoid
     # @return [ true ] True.
     #
     # @since 1.0.0
-    def remove_with_paranoia(options = {})
+    alias orig_remove :remove
+
+    def remove(_ = {})
       cascade!
       time = self.deleted_at = Time.now
-      _paranoia_update("$set" => { paranoid_field => time })
+      _paranoia_update('$set' => { paranoid_field => time })
       @destroyed = true
       true
     end
-    alias_method_chain :remove, :paranoia
-    alias :delete :remove
+
+    alias delete :remove
 
     # Delete the paranoid +Document+ from the database completely.
     #
@@ -114,7 +115,7 @@ module Mongoid
     #
     # @since 1.0.0
     def delete!
-      remove_without_paranoia
+      orig_remove
     end
 
     # Determines if this document is destroyed.
@@ -193,16 +194,10 @@ module Mongoid
       embedded? ? "#{atomic_position}.#{field}" : field
     end
 
-    # Update value in the collection (compatibility layer for Mongoid 4/5).
-    #
     # @return [ Object ] Update result.
+    #
     def _paranoia_update(value)
-      query = paranoid_collection.find(atomic_selector)
-      if Mongoid::Compatibility::Version.mongoid5?
-        query.update_one(value)
-      else
-        query.update(value)
-      end
+      paranoid_collection.find(atomic_selector).update_one(value)
     end
   end
 end

data/lib/mongoid/paranoia/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Paranoia
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'.freeze
   end
 end

data/spec/mongoid/nested_attributes_spec.rb

@@ -91,7 +91,7 @@ describe Mongoid::Attributes::Nested do
                           context "when saving the parent" do
 
                             before do
-                              persisted.with(safe: true).save
+                              persisted.save
                             end
 
                             it "deletes the marked document from the relation" do

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "mongoid"
 require "mongoid/paranoia"
 require "rspec"
-Dir[File.join(File.dirname(__FILE__), "app/models/*.rb")].each{ |f| require f }
 
 # These environment variables can be set if wanting to test against a database
 # that is not on the local machine.
@@ -33,6 +32,7 @@ end
 
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
+  config.belongs_to_required_by_default = false
   config.connect_to(database_id)
 end
 
@@ -55,7 +55,7 @@ RSpec.configure do |config|
 
   config.before(:all) do
     Mongoid.logger.level = Logger::INFO
-    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5?
+    Mongo::Logger.logger.level = Logger::INFO
   end
 
   config.after(:all) do
@@ -71,3 +71,5 @@ end
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.singular("address_components", "address_component")
 end
+
+Dir[File.join(File.dirname(__FILE__), "app/models/*.rb")].each{ |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_paranoia
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,28 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: mongoid-compatibility
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 description: There may be times when you don't want documents to actually get deleted
   from the database, but "flagged" as deleted. Mongoid provides a Paranoia module
   to give you just that.
@@ -102,21 +88,21 @@ specification_version: 4
 summary: Paranoid documents
 test_files:
 - perf/scope.rb
-- spec/app/models/author.rb
-- spec/app/models/title.rb
-- spec/app/models/appointment.rb
-- spec/app/models/address.rb
+- spec/mongoid/nested_attributes_spec.rb
+- spec/mongoid/scoping_spec.rb
+- spec/mongoid/configuration_spec.rb
+- spec/mongoid/paranoia_spec.rb
+- spec/mongoid/document_spec.rb
+- spec/mongoid/validatable/uniqueness_spec.rb
 - spec/app/models/paranoid_phone.rb
-- spec/app/models/fish.rb
-- spec/app/models/person.rb
-- spec/app/models/phone.rb
 - spec/app/models/paranoid_post.rb
 - spec/app/models/tag.rb
+- spec/app/models/title.rb
+- spec/app/models/person.rb
+- spec/app/models/address.rb
+- spec/app/models/appointment.rb
+- spec/app/models/fish.rb
 - spec/app/models/relations.rb
+- spec/app/models/author.rb
+- spec/app/models/phone.rb
 - spec/spec_helper.rb
-- spec/mongoid/paranoia_spec.rb
-- spec/mongoid/validatable/uniqueness_spec.rb
-- spec/mongoid/nested_attributes_spec.rb
-- spec/mongoid/document_spec.rb
-- spec/mongoid/configuration_spec.rb
-- spec/mongoid/scoping_spec.rb