mongoid-paranoia 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2cadcf3b4063c6ad95cdd9c72aeedf8000166bb
-  data.tar.gz: 16fc73e78b17b5bb7091e38afa52eeaa177fcadd
+  metadata.gz: f9d063648fd0353a0d35ebf228c001fa23768746
+  data.tar.gz: 45d30f5c118fea59f4105da8f5780d5efe120a41
 SHA512:
-  metadata.gz: 036e55c67d31d6efbe45da862532e373500a1a4530efa46c62d50289aadfd4dd20ba6af825133e89a92f544a97f5aed25b42760a470069cc72150fd66e9378fb
-  data.tar.gz: a9dd85df18376228c86d20b62cf03ac374cd29eaee4037a659903f5e0ca118a4c78e54f1c02bce1a59c889edb23bf92ea7ad1c23875cd2ae89c7fdcabf62b001
+  metadata.gz: d3d00fdac7bc5d5b995d0888f33c6ee5fd1f61ecd61a72798a7958ba1d3141cd7cfceea7a8a09bcdc3249afd5c03cfb0fd1e46b813a228f3f0d59056f2c2e6b7
+  data.tar.gz: b69102aff52a05aae1bfb282389d1cf30251ce9b1499378aca300fbd8b754f23628f68f5579737bac6a63e70286cac692635f3743624b3716fc792daba6f1835

data/.rubocop.yml

@@ -0,0 +1,20 @@
+AllCops:
+  TargetRubyVersion: 2.2
+
+Documentation:
+  Enabled: false
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented

data/.travis.yml

@@ -1,11 +1,12 @@
+sudo: false
 language: ruby
 services: mongodb
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.3.0
 
 gemfile:
   - Gemfile

data/README.md

@@ -56,7 +56,7 @@ Person.deleted # Returns documents that have been "flagged" as deleted.
 
 (The MIT license)
 
-Copyright (c) 2013-2015 Mario Uher
+Copyright (c) 2009-2013 Durran Jordan, 2013-2015 Mario Uher
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mongoid/core_ext/relations/embedded/many.rb

@@ -3,7 +3,6 @@ module Mongoid
   module Relations
     module Embedded
       class Many < Relations::Many
-
         # Delete the supplied document from the target. This method is proxied
         # in order to reindex the array after the operation occurs.
         #

data/lib/mongoid/core_ext/validatable/uniqueness.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 module Mongoid
   module Validatable
-
     # Validates whether or not a field is unique against the documents in the
     # database.
     #
@@ -14,7 +13,6 @@ module Mongoid
     #     validates_uniqueness_of :title
     #   end
     class UniquenessValidator < ActiveModel::EachValidator
-
       # Scope the criteria to the scope options provided.
       #
       # @api private
@@ -28,7 +26,7 @@ module Mongoid
       # @return [ Criteria ] The scoped criteria.
       #
       # @since 2.3.0
-      def scope(criteria, document, attribute)
+      def scope(criteria, document, _attribute)
         Array.wrap(options[:scope]).each do |item|
           name = document.database_field_name(item)
           criteria = criteria.where(item => document.attributes[name])

data/lib/mongoid/paranoia.rb

@@ -5,7 +5,6 @@ require 'mongoid/core_ext/validatable/uniqueness'
 
 # encoding: utf-8
 module Mongoid
-
   # Include this module to get soft deletion of root level documents.
   # This will add a deleted_at field to the +Document+, managed automatically.
   # Potentially incompatible with unique indices. (if collisions with deleted items)
@@ -23,8 +22,8 @@ module Mongoid
       field :deleted_at, type: Time
       self.paranoid = true
 
-      default_scope ->{ where(deleted_at: nil) }
-      scope :deleted, ->{ ne(deleted_at: nil) }
+      default_scope -> { where(deleted_at: nil) }
+      scope :deleted, -> { ne(deleted_at: nil) }
     end
 
     # Delete the paranoid +Document+ from the database completely. This will
@@ -52,19 +51,19 @@ module Mongoid
     #
     # @todo Remove Mongoid 4 support.
     # @since 1.0.0
-    def remove_with_paranoia(options = {})
+    def remove_with_paranoia(_options = {})
       cascade!
       time = self.deleted_at = Time.now
       query = paranoid_collection.find(atomic_selector)
       query.respond_to?(:update_one) ?
-        query.update_one({ "$set" => { paranoid_field => time }}) :
-        query.update({ "$set" => { paranoid_field => time }})
+        query.update_one('$set' => { paranoid_field => time }) :
+        query.update('$set' => { paranoid_field => time })
 
       @destroyed = true
       true
     end
     alias_method_chain :remove, :paranoia
-    alias :delete :remove_with_paranoia
+    alias_method :delete, :remove_with_paranoia
 
     # Delete the paranoid +Document+ from the database completely.
     #
@@ -89,7 +88,7 @@ module Mongoid
     def destroyed?
       (@destroyed ||= false) || !!deleted_at
     end
-    alias :deleted? :destroyed?
+    alias_method :deleted?, :destroyed?
 
     def persisted?
       !new_record? && !(@destroyed ||= false)
@@ -108,10 +107,10 @@ module Mongoid
     def restore
       query = paranoid_collection.find(atomic_selector)
       query.respond_to?(:update_one) ?
-        query.update_one({ "$unset" => { paranoid_field => true }}) :
-        query.update({ "$unset" => { paranoid_field => true }})
+        query.update_one('$unset' => { paranoid_field => true }) :
+        query.update('$unset' => { paranoid_field => true })
 
-      attributes.delete("deleted_at")
+      attributes.delete('deleted_at')
       @destroyed = false
       true
     end
@@ -132,7 +131,7 @@ module Mongoid
     #
     # @since 2.3.1
     def paranoid_collection
-      embedded? ? _root.collection : self.collection
+      embedded? ? _root.collection : collection
     end
 
     # Get the field to be used for paranoid operations.
@@ -144,7 +143,7 @@ module Mongoid
     #
     # @since 2.3.1
     def paranoid_field
-      embedded? ? "#{atomic_position}.deleted_at" : "deleted_at"
+      embedded? ? "#{atomic_position}.deleted_at" : 'deleted_at'
     end
   end
 end

data/lib/mongoid/paranoia/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Paranoia
-    VERSION = '1.3.0'
+    VERSION = '2.0.0'.freeze
   end
 end

data/mongoid-paranoia.gemspec

@@ -1,11 +1,11 @@
-$: << File.expand_path('../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
 require 'mongoid/paranoia/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'mongoid-paranoia'
   gem.version       = Mongoid::Paranoia::VERSION
-  gem.authors       = 'Mario Uher'
-  gem.email         = 'uher.mario@gmail.com'
+  gem.authors       = ['Durran Jordan', 'Mario Uher']
+  gem.email         = ['durran@gmail.com', 'uher.mario@gmail.com']
   gem.homepage      = 'https://github.com/haihappen/mongoid-paranoia'
   gem.summary       = 'Extraction of mongoid-paranoia into its own gem.'
   gem.description   = "There may be times when you don't want documents to actually get deleted from the database, but \"flagged\" as deleted."

data/spec/app/models/address.rb

@@ -1,7 +1,7 @@
 class Address
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ street.try(:parameterize) }
+  field :_id, type: String, default: -> { street.try(:parameterize) }
 
   attr_accessor :mode
 
@@ -25,10 +25,11 @@ class Address
 
   embedded_in :addressable, polymorphic: true do
     def extension
-      "Testing"
+      'Testing'
     end
+
     def doctor?
-      title == "Dr"
+      title == 'Dr'
     end
   end
 
@@ -38,10 +39,10 @@ class Address
   belongs_to :account
   belongs_to :band
 
-  scope :without_postcode, ->{ where(postcode: nil) }
-  scope :rodeo, ->{ where(street: "Rodeo Dr") } do
+  scope :without_postcode, -> { where(postcode: nil) }
+  scope :rodeo, -> { where(street: 'Rodeo Dr') } do
     def mansion?
-      all? { |address| address.street == "Rodeo Dr" }
+      all? { |address| address.street == 'Rodeo Dr' }
     end
   end
 
@@ -58,11 +59,11 @@ class Address
 
   class << self
     def california
-      where(state: "CA")
+      where(state: 'CA')
     end
 
     def homes
-      where(address_type: "Home")
+      where(address_type: 'Home')
     end
 
     def streets

data/spec/app/models/appointment.rb

@@ -3,5 +3,5 @@ class Appointment
   field :active, type: Boolean, default: true
   field :timed, type: Boolean, default: true
   embedded_in :person
-  default_scope ->{ where(active: true) }
+  default_scope -> { where(active: true) }
 end

data/spec/app/models/paranoid_post.rb

@@ -17,7 +17,7 @@ class ParanoidPost
   has_many :authors, dependent: :delete
   has_many :titles, dependent: :restrict
 
-  scope :recent, ->{ where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago }) }
+  scope :recent, -> { where(created_at: { '$lt' => Time.now, '$gt' => 30.days.ago }) }
 
   before_destroy :before_destroy_stub
   after_destroy :after_destroy_stub
@@ -32,7 +32,7 @@ class ParanoidPost
 
   class << self
     def old
-      where(created_at: { "$lt" => 30.days.ago })
+      where(created_at: { '$lt' => 30.days.ago })
     end
   end
 end

data/spec/app/models/person.rb

@@ -9,7 +9,7 @@ class Person
   field :title
   field :terms, type: Boolean
   field :pets, type: Boolean, default: false
-  field :age, type: Integer, default: "100"
+  field :age, type: Integer, default: '100'
   field :dob, type: Date
   field :employer_id
   field :lunch_time, type: Time
@@ -17,7 +17,7 @@ class Person
   field :map, type: Hash
   field :map_with_default, type: Hash, default: {}
   field :score, type: Integer
-  field :blood_alcohol_content, type: Float, default: ->{ 0.0 }
+  field :blood_alcohol_content, type: Float, default: -> { 0.0 }
   field :last_drink_taken_at, type: Date
   field :ssn
   field :owner_id, type: Integer
@@ -37,18 +37,19 @@ class Person
   index name: 1
   index title: 1
 
-  index({ ssn: 1 }, { unique: true })
+  index({ ssn: 1 }, unique: true)
 
   attr_reader :rescored
 
   embeds_many :favorites, order: :title.desc, inverse_of: :perp, validate: false
-  embeds_many :videos, order: [[ :title, :asc ]], validate: false
-  embeds_many :phone_numbers, class_name: "Phone", validate: false
+  embeds_many :videos, order: [[:title, :asc]], validate: false
+  embeds_many :phone_numbers, class_name: 'Phone', validate: false
   embeds_many :phones, store_as: :mobile_phones, validate: false
   embeds_many :addresses, as: :addressable, validate: false do
     def extension
-      "Testing"
+      'Testing'
     end
+
     def find_by_street(street)
       where(street: street).first
     end
@@ -61,20 +62,21 @@ class Person
   embeds_many :appointments, validate: false
 
   embeds_one :passport, autobuild: true, store_as: :pass, validate: false
-  embeds_one :pet, class_name: "Animal", validate: false
+  embeds_one :pet, class_name: 'Animal', validate: false
   embeds_one :name, as: :namable, validate: false do
     def extension
-      "Testing"
+      'Testing'
     end
+
     def dawkins?
-      first_name == "Richard" && last_name == "Dawkins"
+      first_name == 'Richard' && last_name == 'Dawkins'
     end
   end
   embeds_one :quiz, validate: false
 
   has_one :game, dependent: :destroy, validate: false do
     def extension
-      "Testing"
+      'Testing'
     end
   end
 
@@ -83,7 +85,7 @@ class Person
     dependent: :delete,
     validate: false do
     def extension
-      "Testing"
+      'Testing'
     end
   end
   has_many :ordered_posts, order: :rating.desc, validate: false
@@ -121,9 +123,9 @@ class Person
   accepts_nested_attributes_for :quiz
   accepts_nested_attributes_for :services, allow_destroy: true
 
-  scope :minor, ->{ where(:age.lt => 18) }
-  scope :without_ssn, ->{ without(:ssn) }
-  scope :search, ->(query){ any_of({ title: query }) }
+  scope :minor, -> { where(:age.lt => 18) }
+  scope :without_ssn, -> { without(:ssn) }
+  scope :search, ->(query) { any_of(title: query) }
 
   def score_with_rescoring=(score)
     @rescored = score.to_i + 20
@@ -134,7 +136,7 @@ class Person
 
   def update_addresses
     addresses.each do |address|
-      address.street = "Updated Address"
+      address.street = 'Updated Address'
     end
   end
 
@@ -154,11 +156,13 @@ class Person
     def accepted
       scoped.where(terms: true)
     end
+
     def knight
-      scoped.where(title: "Sir")
+      scoped.where(title: 'Sir')
     end
+
     def old
-      scoped.where(age: { "$gt" => 50 })
+      scoped.where(age: { '$gt' => 50 })
     end
   end
 
@@ -175,10 +179,10 @@ class Person
   end
 
   def preference_names=(names)
-    names.split(",").each do |name|
+    names.split(',').each do |name|
       preference = Preference.where(name: name).first
       if preference
-        self.preferences << preference
+        preferences << preference
       else
         preferences.build(name: name)
       end
@@ -186,7 +190,7 @@ class Person
   end
 
   def set_on_map_with_default=(value)
-    self.map_with_default["key"] = value
+    map_with_default['key'] = value
   end
 
   reset_callbacks(:validate)
@@ -195,4 +199,4 @@ class Person
   reset_callbacks(:destroy)
 end
 
-require "app/models/doctor"
+require 'app/models/doctor'

data/spec/app/models/phone.rb

@@ -3,7 +3,7 @@ class Phone
 
   attr_accessor :number_in_observer
 
-  field :_id, type: String, default: ->{ number }
+  field :_id, type: String, default: -> { number }
 
   field :number
   embeds_one :country_code

data/spec/app/models/service.rb

@@ -5,7 +5,7 @@ class Service
   field :after_destroy_called, type: Boolean, default: false
   field :after_initialize_called, type: Boolean, default: false
   embedded_in :person
-  belongs_to :target, class_name: "User"
+  belongs_to :target, class_name: 'User'
   validates_numericality_of :sid
 
   before_destroy do |doc|

data/spec/app/models/symptom.rb

@@ -2,5 +2,5 @@ class Symptom
   include Mongoid::Document
   field :name, type: String
   embedded_in :person
-  default_scope ->{ asc(:name) }
+  default_scope -> { asc(:name) }
 end

data/spec/app/models/tag.rb

@@ -4,5 +4,5 @@ class Tag
   has_and_belongs_to_many :actors
   has_and_belongs_to_many :articles
   has_and_belongs_to_many :posts
-  has_and_belongs_to_many :related, class_name: "Tag", inverse_of: :related
+  has_and_belongs_to_many :related, class_name: 'Tag', inverse_of: :related
 end