mongoid-paranoia 0.3.0 → 1.0.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8cc35c39d324745e9ac2fd3625d74cc8ee8f1238
+  data.tar.gz: 53e4e5d0f8446ae913890b7d17480b52af0e1e61
+SHA512:
+  metadata.gz: 44901d318bd60903538cc48e7e843cdb4f952eeb510df20ea352a6e259a4eebbb49ff859a9d34509a064e59f3afd8b1405ffb74b725c352f0f0cc072a349a201
+  data.tar.gz: 905096d61a53be6e81448a77a3f5144ece4ca7af67671edd5c39b90179e47d2ab602ed72af0f3666b7d92551593f09474fd365e50fe9820ec62029170f6f5d27

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
 
 gemfile:

data/Gemfile

@@ -4,3 +4,5 @@ gemspec
 
 gem 'rspec'
 gem 'rake'
+
+gem 'mongoid-versioning', '1.0.0.beta1'

data/Rakefile

@@ -1,7 +1,5 @@
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 
-Rake::TestTask.new do |t|
-  t.test_files = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task default: :test
+task default: :spec

data/gemfiles/mongoid_master.gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
+gemspec
+
 gem 'mongoid', github: 'mongoid/mongoid'
-gem 'activesupport', '4.0.0.rc1'
 
 gem 'rspec'
 gem 'rake'

data/lib/mongoid/core_ext/builders/nested_attributes/many.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+module Mongoid
+  module Relations
+    module Builders
+      module NestedAttributes
+        class Many < NestedBuilder
+
+          # 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)
+            if doc.respond_to?(:paranoid?)
+              destroy_document(relation, doc)
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# encoding: utf-8
+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.
+        #
+        # @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.respond_to?(:paranoid?)
+            if _assigning?
+              if doc.respond_to?(: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
+
+        # 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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# encoding: utf-8
+module Mongoid
+  module Validatable
+
+    # Validates whether or not a field is unique against the documents in the
+    # database.
+    #
+    # @example Define the uniqueness validator.
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     field :title
+    #
+    #     validates_uniqueness_of :title
+    #   end
+    class UniquenessValidator < ActiveModel::EachValidator
+
+      # Scope the criteria to the scope options provided.
+      #
+      # @api private
+      #
+      # @example Scope the criteria.
+      #   validator.scope(criteria, document)
+      #
+      # @param [ Criteria ] criteria The criteria to scope.
+      # @param [ Document ] document The document being validated.
+      #
+      # @return [ Criteria ] The scoped criteria.
+      #
+      # @since 2.3.0
+      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])
+        end
+        criteria = criteria.where(deleted_at: nil) if document.respond_to?(:paranoid?)
+        criteria
+      end
+    end
+  end
+end

data/lib/mongoid/paranoia.rb

@@ -1,3 +1,7 @@
+require 'mongoid/core_ext/builders/nested_attributes/many'
+require 'mongoid/core_ext/relations/embedded/many'
+require 'mongoid/core_ext/validatable/uniqueness'
+
 # encoding: utf-8
 module Mongoid
 
@@ -11,14 +15,16 @@ module Mongoid
   #     include Mongoid::Paranoia
   #   end
   module Paranoia
+    include Mongoid::Persistable::Deletable
     extend ActiveSupport::Concern
 
     included do
       field :deleted_at, type: Time
+      class_attribute :paranoid
       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
@@ -34,18 +40,6 @@ module Mongoid
       run_callbacks(:destroy) { delete! }
     end
 
-    # Delete the paranoid +Document+ from the database completely.
-    #
-    # @example Hard delete the document.
-    #   document.delete!
-    #
-    # @return [ true, false ] If the operation succeeded.
-    #
-    # @since 1.0.0
-    def delete!
-      Persistence::Operations.remove(self).persist
-    end
-
     # Delete the +Document+, will set the deleted_at timestamp and not actually
     # delete it.
     #
@@ -57,17 +51,28 @@ module Mongoid
     # @return [ true ] True.
     #
     # @since 1.0.0
-    def remove(options = {})
+    def remove_with_paranoia(options = {})
       cascade!
       time = self.deleted_at = Time.now
       paranoid_collection.find(atomic_selector).
         update({ "$set" => { paranoid_field => time }})
       @destroyed = true
-      IdentityMap.remove(self)
-      clear_timeless_option
       true
     end
-    alias :delete :remove
+    alias_method_chain :remove, :paranoia
+    alias :delete :remove_with_paranoia
+
+    # Delete the paranoid +Document+ from the database completely.
+    #
+    # @example Hard delete the document.
+    #   document.delete!
+    #
+    # @return [ true, false ] If the operation succeeded.
+    #
+    # @since 1.0.0
+    def delete!
+      remove_without_paranoia
+    end
 
     # Determines if this document is destroyed.
     #
@@ -82,6 +87,10 @@ module Mongoid
     end
     alias :deleted? :destroyed?
 
+    def persisted?
+      !new_record? && !(@destroyed ||= false)
+    end
+
     # Restores a previously soft-deleted document. Handles this by removing the
     # deleted_at flag.
     #

data/lib/mongoid/paranoia/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Paranoia
-    VERSION = '0.3.0'
+    VERSION = '1.0.0.beta1'
   end
 end

data/mongoid-paranoia.gemspec

@@ -13,6 +13,6 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.require_path  = 'lib'
 
-  gem.add_dependency 'activesupport', '>= 3.0'
-  gem.add_dependency 'mongoid', '>= 3.1.4'
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'mongoid', '4.0.0.beta1'
 end

data/spec/app/models/account.rb

@@ -18,10 +18,6 @@ class Account
   has_and_belongs_to_many :agents
   has_one :comment, validate: false
 
-  attr_accessible :nickname, as: [ :default, :admin ]
-  attr_accessible :name, as: [ :default, :admin ]
-  attr_accessible :balance, as: :default
-
   validates_presence_of :name
   validates_presence_of :nickname, on: :upsert
   validates_length_of :name, maximum: 10, on: :create

data/spec/app/models/acolyte.rb

@@ -6,7 +6,7 @@ class Acolyte
   embeds_many :versions, as: :memorable
   belongs_to :church
 
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
   scope :active, ->{ where(status: "active") }
   scope :named, ->{ where(:name.exists => true) }
 

data/spec/app/models/address.rb

@@ -38,8 +38,8 @@ 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" }
     end

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/article.rb

@@ -5,9 +5,6 @@ class Article
   field :is_rss, type: Boolean, default: false
   field :user_login, type: String
 
-  attr_accessible :title, as: [:default, :parser]
-  attr_accessible :is_rss, as: :parser
-  attr_accessible :user_login
   has_and_belongs_to_many :tags, validate: false
   has_and_belongs_to_many :preferences, inverse_of: nil, validate: false
 end

data/spec/app/models/building.rb

@@ -1,7 +1,5 @@
 class Building
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :building_address, :contractors, as: :admin
   embeds_one :building_address
   embeds_many :contractors
 end

data/spec/app/models/building_address.rb

@@ -1,7 +1,5 @@
 class BuildingAddress
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :city, as: :admin
   embedded_in :building
   field :city, type: String
 end

data/spec/app/models/contractor.rb

@@ -1,7 +1,5 @@
 class Contractor
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :name, as: :admin
   embedded_in :building
   field :name, type: String
 end

data/spec/app/models/dog.rb

@@ -2,5 +2,5 @@ class Dog
   include Mongoid::Document
   field :name, type: String
   has_and_belongs_to_many :breeds
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/drug.rb

@@ -3,6 +3,4 @@ class Drug
   field :name, type: String
   field :generic, type: Boolean
   belongs_to :person, counter_cache: true
-  attr_accessible :name, as: [ :default, :admin ]
-  attr_accessible :person_id
 end

data/spec/app/models/event.rb

@@ -17,6 +17,6 @@ class Event
     end
   end
 
-  scope :best, where(:kind.in => [ "party", "concert" ])
+  scope :best, ->{ where(:kind.in => [ "party", "concert" ]) }
   scope :by_kind, ->(kind){ where(:kind.in => [kind]) }
 end

data/spec/app/models/game.rb

@@ -13,8 +13,6 @@ class Game
 
   validates_format_of :name, without: /\$\$\$/
 
-  attr_protected :_id
-
   set_callback(:initialize, :after) do |document|
     write_attribute("name", "Testing") unless name
   end

data/spec/app/models/house.rb

@@ -2,7 +2,6 @@ class House
   include Mongoid::Document
   field :name, type: String
   field :model, type: String
-  attr_accessible :name, as: [ :default, :admin ]
 
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/item.rb

@@ -3,10 +3,6 @@ class Item
   field :title, type: String
   field :is_rss, type: Boolean, default: false
   field :user_login, type: String
-
-  attr_protected :title, as: [:default, :parser]
-  attr_protected :is_rss, as: :parser
-  attr_protected :user_login
 end
 
 require "app/models/sub_item"

data/spec/app/models/name.rb

@@ -15,8 +15,6 @@ class Name
 
   accepts_nested_attributes_for :language
 
-  attr_protected :_id, :id
-
   def set_parent=(set = false)
     self.parent_title = namable.title if set
   end

data/spec/app/models/paranoid_post.rb

@@ -1,3 +1,5 @@
+require 'mongoid/versioning'
+
 class ParanoidPost
   include Mongoid::Document
   include Mongoid::Versioning
@@ -15,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

data/spec/app/models/person.rb

@@ -23,7 +23,7 @@ class Person
   field :owner_id, type: Integer
   field :security_code
   field :reading, type: Object
-  field :bson_id, type: Moped::BSON::ObjectId
+  field :bson_id, type: BSON::ObjectId
   field :pattern, type: Regexp
   field :override_me, type: Integer
   field :t, as: :test, type: String
@@ -41,8 +41,6 @@ class Person
 
   attr_reader :rescored
 
-  attr_protected :security_code, :owner_id, :appointments
-
   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
@@ -123,8 +121,8 @@ 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 :minor, ->{ where(:age.lt => 18) }
+  scope :without_ssn, ->{ without(:ssn) }
   scope :search, ->(query){ any_of({ title: query }) }
 
   def score_with_rescoring=(score)

data/spec/app/models/player.rb

@@ -6,13 +6,13 @@ class Player
   field :impressions, type: Integer, default: 0
   field :status
 
-  scope :active, where(active: true) do
+  scope :active, ->{ where(active: true) } do
     def extension
       "extension"
     end
   end
 
-  scope :inactive, where(active: false)
+  scope :inactive, ->{ where(active: false) }
   scope :frags_over, ->(count) { where(:frags.gt => count) }
   scope :deaths_under, ->(count) { where(:deaths.lt => count) }
   scope :deaths_over, ->(count) { where(:deaths.gt => count) }

data/spec/app/models/post.rb

@@ -13,8 +13,8 @@ class Post
   has_and_belongs_to_many :tags, before_add: :before_add_tag, after_add: :after_add_tag, before_remove: :before_remove_tag, after_remove: :after_remove_tag
   has_many :videos, validate: false
 
-  scope :recent, where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago })
-  scope :posting, where(:content.in => [ "Posting" ])
+  scope :recent, ->{ where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago }) }
+  scope :posting, ->{ where(:content.in => [ "Posting" ]) }
 
   validates_format_of :title, without: /\$\$\$/
 

data/spec/app/models/preference.rb

@@ -5,5 +5,5 @@ class Preference
   field :ranking, type: Integer
   has_and_belongs_to_many :people, validate: false
   validates_length_of :name, minimum: 2, allow_nil: true
-  scope :posting, where(:value.in => [ "Posting" ])
+  scope :posting, ->{ where(:value.in => [ "Posting" ]) }
 end

data/spec/app/models/quiz.rb

@@ -4,7 +4,4 @@ class Quiz
   field :name, type: String
   field :topic, type: String
   embeds_many :pages
-
-  attr_accessible :topic, as: [ :default, :admin ]
-  attr_accessible :name, as: :default
 end

data/spec/app/models/registry.rb

@@ -1,4 +1,4 @@
 class Registry
   include Mongoid::Document
-  field :data, type: Moped::BSON::Binary
+  field :data, type: BSON::Binary
 end

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/tree.rb

@@ -5,5 +5,5 @@ class Tree
   field :evergreen, type: Boolean
 
   scope :verdant, where(evergreen: true)
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/video.rb

@@ -9,9 +9,5 @@ class Video
   belongs_to :post
   belongs_to :game
 
-  default_scope asc(:title)
-
-  attr_accessible :title, as: [ :default, :admin ]
-  attr_accessible :year, as: [ :default ]
-  attr_accessible :person_attributes, as: [ :default ]
+  default_scope ->{ asc(:title) }
 end

data/spec/app/models/wiki_page.rb

@@ -9,8 +9,6 @@ class WikiPage
   field :description, type: String, localize: true
   max_versions 5
 
-  attr_protected :author
-
   has_many :comments, dependent: :destroy, validate: false
   has_many :child_pages, class_name: "WikiPage", dependent: :delete, inverse_of: :parent_pages
   belongs_to :parent_pages, class_name: "WikiPage", inverse_of: :child_pages

data/spec/config/mongoid.yml

@@ -4,8 +4,6 @@ test:
       database: mongoid_test
       hosts:
         - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
-      options:
-        consistency: :strong
     mongohq_single:
       database: <%=ENV["MONGOHQ_SINGLE_NAME"]%>
       username: <%=ENV["MONGOHQ_SINGLE_USER"]%>
@@ -14,7 +12,6 @@ test:
         - <%=ENV["MONGOHQ_SINGLE_URL"]%>
       options:
         safe: true
-        consistency: :strong
     mongohq_repl:
       database: <%=ENV["MONGOHQ_REPL_NAME"]%>
       username: <%=ENV["MONGOHQ_REPL_USER"]%>
@@ -23,13 +20,11 @@ test:
         - <%=ENV["MONGOHQ_REPL_1_URL"]%>
         - <%=ENV["MONGOHQ_REPL_2_URL"]%>
       options:
-        consistency: :strong
         safe: true
     mongohq_repl_uri:
       uri: <%= ENV["MONGOHQ_REPL_URI"]%>
   options:
     allow_dynamic_fields: true
-    identity_map_enabled: false
     include_root_in_json: false
     include_type_for_serialization: false
     preload_models: false

data/spec/mongoid/attributes/nested_spec.rb

@@ -0,0 +1,175 @@
+require "spec_helper"
+
+describe Mongoid::Attributes::Nested do
+
+  describe "##{name}_attributes=" do
+
+    context "when the parent document is new" do
+
+      context "when the relation is an embeds many" do
+
+        let(:person) do
+          Person.new
+        end
+
+        let(:address_one) do
+          Address.new(street: "Unter den Linden")
+        end
+
+        let(:address_two) do
+          Address.new(street: "Kurfeurstendamm")
+        end
+
+        let(:phone_one) do
+          ParanoidPhone.new(number: "1")
+        end
+
+        let(:phone_two) do
+          ParanoidPhone.new(number: "2")
+        end
+
+        context "when ids are passed" do
+
+          before do
+            person.addresses << [ address_one, address_two ]
+          end
+
+          context "when destroy attributes are passed" do
+
+            context "when the ids match" do
+
+              context "when allow_destroy is true" do
+
+                context "when the child has defaults" do
+
+                  before(:all) do
+                    Person.accepts_nested_attributes_for :appointments, allow_destroy: true
+                  end
+
+                  after(:all) do
+                    Person.send(:undef_method, :appointments_attributes=)
+                  end
+
+                  context "when the parent is persisted" do
+
+                    let!(:persisted) do
+                      Person.create(age: 42)
+                    end
+
+                    context "when the child returns false in a before callback" do
+
+                      context "when the child is paranoid" do
+
+                        before(:all) do
+                          Person.accepts_nested_attributes_for :paranoid_phones, allow_destroy: true
+                        end
+
+                        after(:all) do
+                          Person.send(:undef_method, :paranoid_phones=)
+                          Person.accepts_nested_attributes_for :paranoid_phones
+                        end
+
+                        let!(:phone) do
+                          persisted.paranoid_phones.create
+                        end
+
+                        before do
+                          persisted.paranoid_phones_attributes =
+                            { "foo" => { "id" => phone.id, "number" => 42, "_destroy" => true }}
+                        end
+
+                        it "does not destroy the child" do
+                          persisted.reload.paranoid_phones.should_not be_empty
+                        end
+                      end
+                    end
+                  end
+                end
+
+                context "when the child is paranoid" do
+
+                  before(:all) do
+                    Person.send(:undef_method, :paranoid_phones_attributes=)
+                    Person.accepts_nested_attributes_for :paranoid_phones,
+                      allow_destroy: true
+                  end
+
+                  after(:all) do
+                    Person.send(:undef_method, :paranoid_phones_attributes=)
+                    Person.accepts_nested_attributes_for :paranoid_phones
+                  end
+
+                  [ 1, "1", true, "true" ].each do |truth|
+
+                    context "when passed a #{truth} with destroy" do
+
+                      context "when the parent is persisted" do
+
+                        let!(:persisted) do
+                          Person.create do |p|
+                            p.paranoid_phones << [ phone_one, phone_two ]
+                          end
+                        end
+
+                        context "when setting, pulling, and pushing in one op" do
+
+                          before do
+                            persisted.paranoid_phones_attributes =
+                              {
+                                "bar" => { "id" => phone_one.id, "_destroy" => truth },
+                                "foo" => { "id" => phone_two.id, "number" => "3" },
+                                "baz" => { "number" => "4" }
+                              }
+                          end
+
+                          it "removes the first document from the relation" do
+                            persisted.paranoid_phones.size.should eq(2)
+                          end
+
+                          it "does not delete the unmarked document" do
+                            persisted.paranoid_phones.first.number.should eq("3")
+                          end
+
+                          it "adds the new document to the relation" do
+                            persisted.paranoid_phones.last.number.should eq("4")
+                          end
+
+                          it "has the proper persisted count" do
+                            persisted.paranoid_phones.count.should eq(1)
+                          end
+
+                          it "soft deletes the removed document" do
+                            phone_one.should be_destroyed
+                          end
+
+                          context "when saving the parent" do
+
+                            before do
+                              persisted.with(safe: true).save
+                            end
+
+                            it "deletes the marked document from the relation" do
+                              persisted.reload.paranoid_phones.count.should eq(2)
+                            end
+
+                            it "does not delete the unmarked document" do
+                              persisted.reload.paranoid_phones.first.number.should eq("3")
+                            end
+
+                            it "persists the new document to the relation" do
+                              persisted.reload.paranoid_phones.last.number.should eq("4")
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/criteria/scopable_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+describe Mongoid::Criteria::Scopable do
+
+  context "when the document is paranoid" do
+
+    context "when calling a class method" do
+
+      let(:criteria) do
+        Fish.fresh
+      end
+
+      it "includes the deleted_at criteria in the selector" do
+        criteria.selector.should eq({
+          "deleted_at" => nil, "fresh" => true
+        })
+      end
+    end
+
+    context "when chaining a class method to unscoped" do
+
+      let(:criteria) do
+        Fish.unscoped.fresh
+      end
+
+      it "does not include the deleted_at in the selector" do
+        criteria.selector.should eq({ "fresh" => true })
+      end
+    end
+
+    context "when chaining a class method to deleted" do
+
+      let(:criteria) do
+        Fish.deleted.fresh
+      end
+
+      it "includes the deleted_at $ne criteria in the selector" do
+        criteria.selector.should eq({
+          "deleted_at" => { "$ne" => nil }, "fresh" => true
+        })
+      end
+    end
+
+    context "when chaining a where to unscoped" do
+
+      let(:criteria) do
+        Fish.unscoped.where(fresh: true)
+      end
+
+      it "includes no default scoping information in the selector" do
+        criteria.selector.should eq({ "fresh" => true })
+      end
+    end
+  end
+end

data/spec/mongoid/paranoia_spec.rb

@@ -46,7 +46,7 @@ describe Mongoid::Paranoia do
       end
 
       it "returns the deleted documents" do
-        person.paranoid_phones.deleted.should eq([ phone ])
+        person.paranoid_phones.deleted.to_a.should eq([ phone ])
       end
 
       it "returns the correct count" do
@@ -480,11 +480,7 @@ describe Mongoid::Paranoia do
       end
 
       it "clears out the persistence options" do
-        Mongoid::Threaded.persistence_options(ParanoidPost).should be_nil
-      end
-
-      it "clears out the identity map" do
-        Mongoid::IdentityMap.should be_empty
+        ParanoidPost.persistence_options.should be_nil
       end
     end
 
@@ -657,7 +653,7 @@ describe Mongoid::Paranoia do
     end
 
     before do
-      post.set(:deleted_at, time)
+      post.set(deleted_at: time)
     end
 
     it "persists the change" do

data/spec/mongoid/scoping_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+describe Mongoid::Criteria::Scopable do
+
+  context "when the document is paranoid" do
+
+    context "when calling a class method" do
+
+      let(:criteria) do
+        Fish.fresh
+      end
+
+      it "includes the deleted_at criteria in the selector" do
+        criteria.selector.should eq({
+          "deleted_at" => nil, "fresh" => true
+        })
+      end
+    end
+
+    context "when chaining a class method to unscoped" do
+
+      let(:criteria) do
+        Fish.unscoped.fresh
+      end
+
+      it "does not include the deleted_at in the selector" do
+        criteria.selector.should eq({ "fresh" => true })
+      end
+    end
+
+    context "when chaining a class method to deleted" do
+
+      let(:criteria) do
+        Fish.deleted.fresh
+      end
+
+      it "includes the deleted_at $ne criteria in the selector" do
+        criteria.selector.should eq({
+          "deleted_at" => { "$ne" => nil }, "fresh" => true
+        })
+      end
+    end
+
+    context "when chaining a where to unscoped" do
+
+      let(:criteria) do
+        Fish.unscoped.where(fresh: true)
+      end
+
+      it "includes no default scoping information in the selector" do
+        criteria.selector.should eq({ "fresh" => true })
+      end
+    end
+  end
+end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -0,0 +1,62 @@
+require "spec_helper"
+
+describe Mongoid::Validatable::UniquenessValidator do
+
+  describe "#valid?" do
+
+    context "when the document is a root document" do
+
+      context "when the document is paranoid" do
+
+        before do
+          ParanoidPost.validates_uniqueness_of :title
+        end
+
+        after do
+          ParanoidPost.reset_callbacks(:validate)
+        end
+
+        let!(:post) do
+          ParanoidPost.create(title: "testing")
+        end
+
+        context "when the field is unique" do
+
+          let(:new_post) do
+            ParanoidPost.new(title: "test")
+          end
+
+          it "returns true" do
+            new_post.should be_valid
+          end
+        end
+
+        context "when the field is unique for non soft deleted docs" do
+
+          before do
+            post.delete
+          end
+
+          let(:new_post) do
+            ParanoidPost.new(title: "testing")
+          end
+
+          it "returns true" do
+            new_post.should be_valid
+          end
+        end
+
+        context "when the field is not unique" do
+
+          let(:new_post) do
+            ParanoidPost.new(title: "testing")
+          end
+
+          it "returns false" do
+            new_post.should_not be_valid
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -36,7 +36,7 @@ end
 
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
-  config.connect_to(database_id, consistency: :strong)
+  config.connect_to(database_id)
 end
 
 # Autoload every model for the test suite that sits in spec/app/models.
@@ -57,10 +57,9 @@ end
 
 RSpec.configure do |config|
 
-  # Drop all collections and clear the identity map before each spec.
+  # Drop all collections before each spec.
   config.before(:each) do
     Mongoid.purge!
-    Mongoid::IdentityMap.clear
   end
 
   # On travis we are creating many different databases on each test run. We

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-paranoia
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.3.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-  type: :runtime
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
-    none: false
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.4
-    none: false
+        version: 4.0.0.beta1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta1
 description: There may be times when you don't want documents to actually get deleted
   from the database, but "flagged" as deleted.
 email: uher.mario@gmail.com
@@ -50,13 +45,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - gemfiles/mongoid_master.gemfile
+- lib/mongoid/core_ext/builders/nested_attributes/many.rb
+- lib/mongoid/core_ext/relations/embedded/many.rb
+- lib/mongoid/core_ext/validatable/uniqueness.rb
 - lib/mongoid/paranoia.rb
 - lib/mongoid/paranoia/version.rb
 - mongoid-paranoia.gemspec
@@ -244,30 +242,34 @@ files:
 - spec/app/models/word_origin.rb
 - spec/app/models/writer.rb
 - spec/config/mongoid.yml
+- spec/mongoid/attributes/nested_spec.rb
+- spec/mongoid/criteria/scopable_spec.rb
 - spec/mongoid/paranoia_spec.rb
+- spec/mongoid/scoping_spec.rb
+- spec/mongoid/validatable/uniqueness_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/haihappen/mongoid-paranoia
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
-  none: false
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extraction of mongoid-paranoia into its own gem.
 test_files: []
+has_rdoc: