mongoid_paranoia 0.1.2 → 0.2.0

data/spec/mongoid/scoping_spec.rb

@@ -1,55 +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
-        expect(criteria.selector).to 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
-        expect(criteria.selector).to 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
-        expect(criteria.selector).to 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
-        expect(criteria.selector).to eq({ "fresh" => true })
-      end
-    end
-  end
-end
+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
+        expect(criteria.selector).to 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
+        expect(criteria.selector).to 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
+        expect(criteria.selector).to 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
+        expect(criteria.selector).to eq({ "fresh" => true })
+      end
+    end
+  end
+end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -1,74 +1,74 @@
-require "spec_helper"
-
-describe "Paranoia uniqueness scoped validator" do
-  describe "#valid?" do
-    context "when the document is a root document" do
-      context "when the document is paranoid" do
-        before do
-          ParanoidPost.validates(:title, uniqueness: { conditions: -> { ParanoidPost.where(deleted_at: nil) } })
-        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
-            expect(new_post).to 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
-            expect(new_post).to be_valid
-          end
-        end
-
-        context "when the field is not unique for soft deleted docs" do
-
-          before do
-            post = ParanoidPost.create(title: "test")
-            post.delete
-          end
-
-          let(:new_post) do
-            ParanoidPost.new(title: "test")
-          end
-
-          it "returns true" do
-            expect(new_post).to 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
-            expect(new_post).not_to be_valid
-          end
-        end
-      end
-    end
-  end
-end
+require "spec_helper"
+
+describe "Paranoia uniqueness scoped validator" do
+  describe "#valid?" do
+    context "when the document is a root document" do
+      context "when the document is paranoid" do
+        before do
+          ParanoidPost.validates(:title, uniqueness: { conditions: -> { ParanoidPost.where(deleted_at: nil) } })
+        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
+            expect(new_post).to 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
+            expect(new_post).to be_valid
+          end
+        end
+
+        context "when the field is not unique for soft deleted docs" do
+
+          before do
+            post = ParanoidPost.create(title: "test")
+            post.delete
+          end
+
+          let(:new_post) do
+            ParanoidPost.new(title: "test")
+          end
+
+          it "returns true" do
+            expect(new_post).to 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
+            expect(new_post).not_to be_valid
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,80 +1,73 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
-MODELS = File.join(File.dirname(__FILE__), "app/models")
-$LOAD_PATH.unshift(MODELS)
-
-require "mongoid"
-require "mongoid/paranoia"
-require "rspec"
-
-# These environment variables can be set if wanting to test against a database
-# that is not on the local machine.
-ENV["MONGOID_SPEC_HOST"] ||= "localhost"
-ENV["MONGOID_SPEC_PORT"] ||= "27017"
-
-# These are used when creating any connection in the test suite.
-HOST = ENV["MONGOID_SPEC_HOST"]
-PORT = ENV["MONGOID_SPEC_PORT"].to_i
-
-# Moped.logger.level = Logger::DEBUG
-# Mongoid.logger.level = Logger::DEBUG
-
-# When testing locally we use the database named mongoid_test. However when
-# tests are running in parallel on Travis we need to use different database
-# names for each process running since we do not have transactions and want a
-# clean slate before each spec run.
-def database_id
-  "mongoid_test"
-end
-
-# Can we connect to MongoHQ from this box?
-def mongohq_connectable?
-  ENV["MONGOHQ_REPL_PASS"].present?
-end
-
-# Set the database that the spec suite connects to.
-Mongoid.configure do |config|
-  config.connect_to(database_id)
-end
-
-# Autoload every model for the test suite that sits in spec/app/models.
-Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
-  name = File.basename(file, ".rb")
-  autoload name.camelize.to_sym, name
-end
-
-module Rails
-  class Application
-  end
-end
-
-module MyApp
-  class Application < Rails::Application
-  end
-end
-
-RSpec.configure do |config|
-
-  # Drop all collections
-  config.before(:each) do
-    Mongoid.purge!
-  end
-
-  # On travis we are creating many different databases on each test run. We
-  # drop the database after the suite.
-  config.after(:suite) do
-    if ENV["CI"]
-      Mongoid::Threaded.sessions[:default].drop
-    end
-  end
-
-  # Filter out MongoHQ specs if we can't connect to it.
-  config.filter_run_excluding(config: ->(value){
-    return true if value == :mongohq && !mongohq_connectable?
-  })
-end
-
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.singular("address_components", "address_component")
-end
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$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.
+ENV["MONGOID_SPEC_HOST"] ||= "localhost"
+ENV["MONGOID_SPEC_PORT"] ||= "27017"
+
+# These are used when creating any connection in the test suite.
+HOST = ENV["MONGOID_SPEC_HOST"]
+PORT = ENV["MONGOID_SPEC_PORT"].to_i
+
+# Moped.logger.level = Logger::DEBUG
+# Mongoid.logger.level = Logger::DEBUG
+
+# When testing locally we use the database named mongoid_test. However when
+# tests are running in parallel on Travis we need to use different database
+# names for each process running since we do not have transactions and want a
+# clean slate before each spec run.
+def database_id
+  "mongoid_test"
+end
+
+# Can we connect to MongoHQ from this box?
+def mongohq_connectable?
+  ENV["MONGOHQ_REPL_PASS"].present?
+end
+
+# Set the database that the spec suite connects to.
+Mongoid.configure do |config|
+  config.connect_to(database_id)
+end
+
+module Rails
+  class Application
+  end
+end
+
+module MyApp
+  class Application < Rails::Application
+  end
+end
+
+RSpec.configure do |config|
+
+  # Drop all collections
+  config.before(:each) do
+    Mongoid.purge!
+  end
+
+  config.before(:all) do
+    Mongoid.logger.level = Logger::INFO
+    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5?
+  end
+
+  config.after(:all) do
+    Mongoid.purge!
+  end
+
+  # Filter out MongoHQ specs if we can't connect to it.
+  config.filter_run_excluding(config: ->(value){
+    return true if value == :mongohq && !mongohq_connectable?
+  })
+end
+
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.singular("address_components", "address_component")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_paranoia
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,22 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        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'
 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.
@@ -39,6 +53,7 @@ files:
 - README.md
 - lib/mongoid-paranoia.rb
 - lib/mongoid/paranoia.rb
+- lib/mongoid/paranoia/configuration.rb
 - lib/mongoid/paranoia/monkey_patches.rb
 - lib/mongoid/paranoia/version.rb
 - lib/mongoid_paranoia.rb
@@ -51,8 +66,10 @@ files:
 - spec/app/models/paranoid_post.rb
 - spec/app/models/person.rb
 - spec/app/models/phone.rb
+- spec/app/models/relations.rb
 - spec/app/models/tag.rb
 - spec/app/models/title.rb
+- spec/mongoid/configuration_spec.rb
 - spec/mongoid/document_spec.rb
 - spec/mongoid/nested_attributes_spec.rb
 - spec/mongoid/paranoia_spec.rb
@@ -69,36 +86,37 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Paranoid documents
 test_files:
 - perf/scope.rb
-- spec/app/models/address.rb
-- spec/app/models/appointment.rb
 - spec/app/models/author.rb
-- spec/app/models/fish.rb
+- spec/app/models/title.rb
+- spec/app/models/appointment.rb
+- spec/app/models/address.rb
 - spec/app/models/paranoid_phone.rb
-- spec/app/models/paranoid_post.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/mongoid/document_spec.rb
-- spec/mongoid/nested_attributes_spec.rb
+- spec/app/models/relations.rb
+- spec/spec_helper.rb
 - spec/mongoid/paranoia_spec.rb
-- spec/mongoid/scoping_spec.rb
 - spec/mongoid/validatable/uniqueness_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+- spec/mongoid/nested_attributes_spec.rb
+- spec/mongoid/document_spec.rb
+- spec/mongoid/configuration_spec.rb
+- spec/mongoid/scoping_spec.rb