mongoid_paranoia 0.4.0 → 0.4.1

data/lib/mongoid/paranoia/configuration.rb

@@ -1,11 +1,13 @@
-module Mongoid
-  module Paranoia
-    class Configuration
-      attr_accessor :paranoid_field
-
-      def initialize
-        @paranoid_field = :deleted_at
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Mongoid
+  module Paranoia
+    class Configuration
+      attr_accessor :paranoid_field
+
+      def initialize
+        @paranoid_field = :deleted_at
+      end
+    end
+  end
+end

data/lib/mongoid/paranoia/monkey_patches.rb

@@ -1,113 +1,114 @@
-# encoding: utf-8
-module Mongoid
-  module Paranoia
-    module Document
-      extend ActiveSupport::Concern
-
-      included do
-        # Indicates whether or not the document includes Mongoid::Paranoia.
-        # In Mongoid 3, this method was defined on all Mongoid::Documents.
-        # In Mongoid 4, it is no longer defined, hence we are shimming it here.
-        class_attribute :paranoid
-      end
-    end
-  end
-end
-
-Mongoid::Document.send(:include, Mongoid::Paranoia::Document)
-
-module Mongoid
-  module Association
-    module Nested
-      class Many
-        # Destroy the child document, needs to do some checking for embedded
-        # relations and delay the destroy in case parent validation fails.
-        #
-        # @api private
-        #
-        # @example Destroy the child.
-        #   builder.destroy(parent, relation, doc)
-        #
-        # @param [ Document ] parent The parent document.
-        # @param [ Proxy ] relation The relation proxy.
-        # @param [ Document ] doc The doc to destroy.
-        #
-        # @since 3.0.10
-        def destroy(parent, relation, doc)
-          doc.flagged_for_destroy = true
-          if !doc.embedded? || parent.new_record? || doc.paranoid?
-            destroy_document(relation, doc)
-          else
-            parent.flagged_destroys.push(->{ destroy_document(relation, doc) })
-          end
-        end
-      end
-    end
-  end
-end
-
-module Mongoid
-  module Association
-    module Embedded
-      class EmbedsMany
-        class Proxy < Association::Many
-          # Delete the supplied document from the target. This method is proxied
-          # in order to reindex the array after the operation occurs.
-          #
-          # @example Delete the document from the relation.
-          #   person.addresses.delete(address)
-          #
-          # @param [ Document ] document The document to be deleted.
-          #
-          # @return [ Document, nil ] The deleted document or nil if nothing deleted.
-          #
-          # @since 2.0.0.rc.1
-          def delete(document)
-            execute_callback :before_remove, document
-            doc = _target.delete_one(document)
-            if doc && !_binding?
-              _unscoped.delete_one(doc) unless doc.paranoid?
-              if _assigning?
-                if doc.paranoid?
-                  doc.destroy(suppress: true)
-                else
-                  _base.add_atomic_pull(doc)
-                end
-              else
-                doc.delete(suppress: true)
-                unbind_one(doc)
-              end
-            end
-            reindex
-            execute_callback :after_remove, document
-            doc
-          end
-        end
-      end
-    end
-  end
-end
-
-module Mongoid
-  module Association
-    module Embedded
-      class EmbedsMany
-        class Proxy < Association::Many
-          # For use only with Mongoid::Paranoia - will be removed in 4.0.
-          #
-          # @example Get the deleted documents from the relation.
-          #   person.paranoid_phones.deleted
-          #
-          # @return [ Criteria ] The deleted documents.
-          #
-          # @since 3.0.10
-          def deleted
-            unscoped.deleted
-          end
-          # This class handles the behaviour for a document that embeds many other
-          # documents within in it as an array.
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Mongoid
+  module Paranoia
+    module Document
+      extend ActiveSupport::Concern
+
+      included do
+        # Indicates whether or not the document includes Mongoid::Paranoia.
+        # In Mongoid 3, this method was defined on all Mongoid::Documents.
+        # In Mongoid 4, it is no longer defined, hence we are shimming it here.
+        class_attribute :paranoid
+      end
+    end
+  end
+end
+
+Mongoid::Document.include Mongoid::Paranoia::Document
+
+module Mongoid
+  module Association
+    module Nested
+      class Many
+        # Destroy the child document, needs to do some checking for embedded
+        # relations and delay the destroy in case parent validation fails.
+        #
+        # @api private
+        #
+        # @example Destroy the child.
+        #   builder.destroy(parent, relation, doc)
+        #
+        # @param [ Document ] parent The parent document.
+        # @param [ Proxy ] relation The relation proxy.
+        # @param [ Document ] doc The doc to destroy.
+        #
+        # @since 3.0.10
+        def destroy(parent, relation, doc)
+          doc.flagged_for_destroy = true
+          if !doc.embedded? || parent.new_record? || doc.paranoid?
+            destroy_document(relation, doc)
+          else
+            parent.flagged_destroys.push(-> { destroy_document(relation, doc) })
+          end
+        end
+      end
+    end
+  end
+end
+
+module Mongoid
+  module Association
+    module Embedded
+      class EmbedsMany
+        class Proxy < Association::Many
+          # Delete the supplied document from the target. This method is proxied
+          # in order to reindex the array after the operation occurs.
+          #
+          # @example Delete the document from the relation.
+          #   person.addresses.delete(address)
+          #
+          # @param [ Document ] document The document to be deleted.
+          #
+          # @return [ Document, nil ] The deleted document or nil if nothing deleted.
+          #
+          # @since 2.0.0.rc.1
+          def delete(document)
+            execute_callback :before_remove, document
+            doc = _target.delete_one(document)
+            if doc && !_binding?
+              _unscoped.delete_one(doc) unless doc.paranoid?
+              if _assigning?
+                if doc.paranoid?
+                  doc.destroy(suppress: true)
+                else
+                  _base.add_atomic_pull(doc)
+                end
+              else
+                doc.delete(suppress: true)
+                unbind_one(doc)
+              end
+            end
+            reindex
+            execute_callback :after_remove, document
+            doc
+          end
+        end
+      end
+    end
+  end
+end
+
+module Mongoid
+  module Association
+    module Embedded
+      class EmbedsMany
+        class Proxy < Association::Many
+          # For use only with Mongoid::Paranoia - will be removed in 4.0.
+          #
+          # @example Get the deleted documents from the relation.
+          #   person.paranoid_phones.deleted
+          #
+          # @return [ Criteria ] The deleted documents.
+          #
+          # @since 3.0.10
+          def deleted
+            unscoped.deleted
+          end
+          # This class handles the behaviour for a document that embeds many other
+          # documents within in it as an array.
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/paranoia/version.rb

@@ -1,5 +1,7 @@
-module Mongoid
-  module Paranoia
-    VERSION = '0.4.0'.freeze
-  end
-end
+# frozen_string_literal: true
+
+module Mongoid
+  module Paranoia
+    VERSION = '0.4.1'
+  end
+end

data/lib/mongoid_paranoia.rb

@@ -1 +1,3 @@
-require "mongoid/paranoia"
+# frozen_string_literal: true
+
+require 'mongoid/paranoia'

data/perf/scope.rb

@@ -1,64 +1,65 @@
-require 'bundler/setup'
-require 'mongoid'
-require 'mongoid/paranoia'
-require 'benchmark'
-
-
-Mongoid.configure do |config|
-  config.connect_to('my_little_test')
-end
-
-class Model
-  include Mongoid::Document
-  field :text, type: String
-
-  index({ text: "text" })
-end
-
-class ParanoidModel
-  include Mongoid::Document
-  include Mongoid::Paranoia
-  field :text, type: String
-
-  index({ text: "text" })
-end
-
-class MetaParanoidModel
-  include Mongoid::Document
-  field :text, type: String
-  field :deleted_at, type: Time
-  default_scope -> { where(deleted_at: nil) }
-
-  index({ text: "text" })
-end
-
-if ENV['FORCE']
-  Mongoid.purge!
-  ::Mongoid::Tasks::Database.create_indexes
-
-  n = 50_000
-  n.times {|i| Model.create(text: "text #{i}")}
-  n.times {|i| ParanoidModel.create(text: "text #{i}")}
-  n.times {|i| MetaParanoidModel.create(text: "text #{i}")}
-end
-
-n = 100
-
-puts "text_search benchmark ***"
-Benchmark.bm(20) do |x|
-  x.report("without") { n.times { Model.text_search("text").execute } }
-  x.report("with")    { n.times { ParanoidModel.text_search("text").execute } }
-  x.report("meta")    { n.times { MetaParanoidModel.text_search("text").execute } }
-  x.report("unscoped meta")    { n.times { MetaParanoidModel.unscoped.text_search("text").execute } }
-  x.report("unscoped paranoid")    { n.times { ParanoidModel.unscoped.text_search("text").execute } }
-end
-
-puts ""
-puts "Pluck all ids benchmark ***"
-Benchmark.bm(20) do |x|
-  x.report("without") { n.times { Model.all.pluck(:id) } }
-  x.report("with")    { n.times { ParanoidModel.all.pluck(:id) } }
-  x.report("meta")    { n.times { MetaParanoidModel.all.pluck(:id) } }
-  x.report("unscoped meta")    { n.times { MetaParanoidModel.unscoped.all.pluck(:id) } }
-  x.report("unscoped paranoid")    { n.times { ParanoidModel.unscoped.all.pluck(:id) } }
-end
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'mongoid'
+require 'mongoid/paranoia'
+require 'benchmark'
+
+Mongoid.configure do |config|
+  config.connect_to('my_little_test')
+end
+
+class Model
+  include Mongoid::Document
+  field :text, type: String
+
+  index({ text: 'text' })
+end
+
+class ParanoidModel
+  include Mongoid::Document
+  include Mongoid::Paranoia
+  field :text, type: String
+
+  index({ text: 'text' })
+end
+
+class MetaParanoidModel
+  include Mongoid::Document
+  field :text, type: String
+  field :deleted_at, type: Time
+  default_scope -> { where(deleted_at: nil) }
+
+  index({ text: 'text' })
+end
+
+if ENV['FORCE']
+  Mongoid.purge!
+  ::Mongoid::Tasks::Database.create_indexes
+
+  n = 50_000
+  n.times {|i| Model.create(text: "text #{i}") }
+  n.times {|i| ParanoidModel.create(text: "text #{i}") }
+  n.times {|i| MetaParanoidModel.create(text: "text #{i}") }
+end
+
+n = 100
+
+puts 'text_search benchmark ***'
+Benchmark.bm(20) do |x|
+  x.report('without') { n.times { Model.text_search('text').execute } }
+  x.report('with')    { n.times { ParanoidModel.text_search('text').execute } }
+  x.report('meta')    { n.times { MetaParanoidModel.text_search('text').execute } }
+  x.report('unscoped meta') { n.times { MetaParanoidModel.unscoped.text_search('text').execute } }
+  x.report('unscoped paranoid') { n.times { ParanoidModel.unscoped.text_search('text').execute } }
+end
+
+puts ''
+puts 'Pluck all ids benchmark ***'
+Benchmark.bm(20) do |x|
+  x.report('without') { n.times { Model.all.pluck(:id) } }
+  x.report('with')    { n.times { ParanoidModel.all.pluck(:id) } }
+  x.report('meta')    { n.times { MetaParanoidModel.all.pluck(:id) } }
+  x.report('unscoped meta') { n.times { MetaParanoidModel.unscoped.all.pluck(:id) } }
+  x.report('unscoped paranoid') { n.times { ParanoidModel.unscoped.all.pluck(:id) } }
+end

data/spec/app/models/address.rb

@@ -1,71 +1,71 @@
-class Address
-  include Mongoid::Document
-
-  field :_id, type: String, default: ->{ street.try(:parameterize) }
-
-  attr_accessor :mode
-
-  field :address_type
-  field :number, type: Integer
-  field :street
-  field :city
-  field :state
-  field :post_code
-  field :parent_title
-  field :services, type: Array
-  field :latlng, type: Array
-  field :map, type: Hash
-  field :move_in, type: DateTime
-  field :s, type: String, as: :suite
-  field :name, localize: true
-
-  embeds_one :code, validate: false
-  embeds_one :target, as: :targetable, validate: false
-
-  embedded_in :addressable, polymorphic: true do
-    def extension
-      "Testing"
-    end
-    def doctor?
-      title == "Dr"
-    end
-  end
-
-  accepts_nested_attributes_for :code, :target
-
-  belongs_to :account
-
-  scope :without_postcode, -> {where(postcode: nil)}
-  scope :rodeo, -> {
-    where(street: "Rodeo Dr") do
-      def mansion?
-        all? { |address| address.street == "Rodeo Dr" }
-      end
-    end
-  }
-
-  validates_presence_of :street, on: :update
-  validates_format_of :street, with: /\D/, allow_nil: true
-
-  def set_parent=(set = false)
-    self.parent_title = addressable.title if set
-  end
-
-  def <=>(other)
-    street <=> other.street
-  end
-
-  class << self
-    def california
-      where(state: "CA")
-    end
-
-    def homes
-      where(address_type: "Home")
-    end
-
-    def streets
-      all.map(&:street)
-    end
-  end
-end
+class Address
+  include Mongoid::Document
+
+  field :_id, type: String, default: ->{ street.try(:parameterize) }
+
+  attr_accessor :mode
+
+  field :address_type
+  field :number, type: Integer
+  field :street
+  field :city
+  field :state
+  field :post_code
+  field :parent_title
+  field :services, type: Array
+  field :latlng, type: Array
+  field :map, type: Hash
+  field :move_in, type: DateTime
+  field :s, type: String, as: :suite
+  field :name, localize: true
+
+  embeds_one :code, validate: false
+  embeds_one :target, as: :targetable, validate: false
+
+  embedded_in :addressable, polymorphic: true do
+    def extension
+      "Testing"
+    end
+    def doctor?
+      title == "Dr"
+    end
+  end
+
+  accepts_nested_attributes_for :code, :target
+
+  belongs_to :account
+
+  scope :without_postcode, -> {where(postcode: nil)}
+  scope :rodeo, -> {
+    where(street: "Rodeo Dr") do
+      def mansion?
+        all? { |address| address.street == "Rodeo Dr" }
+      end
+    end
+  }
+
+  validates_presence_of :street, on: :update
+  validates_format_of :street, with: /\D/, allow_nil: true
+
+  def set_parent=(set = false)
+    self.parent_title = addressable.title if set
+  end
+
+  def <=>(other)
+    street <=> other.street
+  end
+
+  class << self
+    def california
+      where(state: "CA")
+    end
+
+    def homes
+      where(address_type: "Home")
+    end
+
+    def streets
+      all.map(&:street)
+    end
+  end
+end