mongoid 4.0.0.alpha1 → 4.0.0.alpha2

data/spec/mongoid/validatable/presence_spec.rb

@@ -136,7 +136,7 @@ describe Mongoid::Validatable::PresenceValidator do
           end
 
           it "adds no errors" do
-            product.errors[:sku].should be_empty
+            expect(product.errors[:sku]).to be_empty
           end
         end
 
@@ -147,7 +147,7 @@ describe Mongoid::Validatable::PresenceValidator do
           end
 
           it "adds errors" do
-            product.errors[:sku].should eq(["can't be blank"])
+            expect(product.errors[:sku]).to eq(["can't be blank"])
           end
         end
       end
@@ -161,7 +161,7 @@ describe Mongoid::Validatable::PresenceValidator do
           end
 
           it "adds no errors" do
-            product.errors[:stock_keeping_unit].should be_empty
+            expect(product.errors[:stock_keeping_unit]).to be_empty
           end
         end
 
@@ -172,7 +172,7 @@ describe Mongoid::Validatable::PresenceValidator do
           end
 
           it "adds errors" do
-            product.errors[:stock_keeping_unit].should eq(["can't be blank"])
+            expect(product.errors[:stock_keeping_unit]).to eq(["can't be blank"])
           end
         end
       end
@@ -186,7 +186,7 @@ describe Mongoid::Validatable::PresenceValidator do
           end
 
           it "adds no errors" do
-            product.errors[:tagline].should be_empty
+            expect(product.errors[:tagline]).to be_empty
           end
         end
 
@@ -200,7 +200,7 @@ describe Mongoid::Validatable::PresenceValidator do
           end
 
           it "adds errors" do
-            product.errors[:tagline].should eq(["can't be blank in fr"])
+            expect(product.errors[:tagline]).to eq(["can't be blank in fr"])
           end
         end
       end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -458,7 +458,7 @@ describe Mongoid::Validatable::UniquenessValidator do
                 end
 
                 it "does not touch the database" do
-                  Dictionary.should_receive(:where).never
+                  expect(Dictionary).to receive(:where).never
                   from_db.valid?
                 end
               end
@@ -470,11 +470,11 @@ describe Mongoid::Validatable::UniquenessValidator do
 
           before do
             Dictionary.validates_uniqueness_of :name
-            Dictionary.default_scope(Dictionary.where(year: 1990))
+            Dictionary.default_scope(->{ Dictionary.where(year: 1990) })
           end
 
           after do
-            Dictionary.send(:strip_default_scope, Dictionary.where(year: 1990))
+            Dictionary.default_scoping = nil
             Dictionary.reset_callbacks(:validate)
           end
 
@@ -1483,7 +1483,48 @@ describe Mongoid::Validatable::UniquenessValidator do
           end
 
         end
+      end
+
+      context "when conditions is set" do
+
+        before do
+          Band.validates_uniqueness_of :name, conditions: ->{ Band.where(active: true) }
+        end
+
+        after do
+          Band.reset_callbacks(:validate)
+        end
+
+        context "when the attribute is unique" do
+
+          before do
+            Band.create(name: 'Foo', active: false)
+          end
+
+          let(:unique_band) do
+            Band.new(name: 'Foo')
+          end
 
+          it "returns true" do
+            expect(unique_band).to be_valid
+          end
+
+        end
+
+        context "when the attribute is not unique" do
+
+          before do
+            Band.create(name: 'Foo')
+          end
+
+          let(:non_unique_band) do
+            Band.new(name: 'Foo')
+          end
+
+          it "returns false" do
+            expect(non_unique_band).to_not be_valid
+          end
+        end
       end
     end
   end

data/spec/rails/mongoid_spec.rb

@@ -30,7 +30,7 @@ describe "Rails::Mongoid" do
     context "with ordinary Rails models" do
 
       it "creates the indexes for the models" do
-        klass.should_receive(:create_indexes).once
+        expect(klass).to receive(:create_indexes).once
         indexes
       end
     end
@@ -42,7 +42,7 @@ describe "Rails::Mongoid" do
       end
 
       it "does nothing" do
-        klass.should_receive(:create_indexes).never
+        expect(klass).to receive(:create_indexes).never
         indexes
       end
     end
@@ -50,7 +50,7 @@ describe "Rails::Mongoid" do
     context "when an exception is raised" do
 
       it "is not swallowed" do
-        klass.should_receive(:create_indexes).and_raise(ArgumentError)
+        expect(klass).to receive(:create_indexes).and_raise(ArgumentError)
         expect { indexes }.to raise_error(ArgumentError)
       end
     end
@@ -66,7 +66,7 @@ describe "Rails::Mongoid" do
       end
 
       it "does nothing, but logging" do
-        klass.should_receive(:create_indexes).never
+        expect(klass).to receive(:create_indexes).never
         indexes
       end
     end
@@ -228,7 +228,7 @@ describe "Rails::Mongoid" do
       end
 
       before do
-        logger.should_receive(:info)
+        expect(logger).to receive(:info)
       end
 
       it "returns nil" do
@@ -256,7 +256,7 @@ describe "Rails::Mongoid" do
         end
 
         it "logs the class without an error" do
-          logger.should_receive(:info)
+          expect(logger).to receive(:info)
           expect {
             expect(model).to be_nil
           }.not_to raise_error
@@ -273,7 +273,7 @@ describe "Rails::Mongoid" do
         end
 
         it "returns klass" do
-          logger.should_receive(:info)
+          expect(logger).to receive(:info)
           expect(model).to eq(klass)
         end
       end
@@ -353,8 +353,8 @@ describe "Rails::Mongoid" do
       end
 
       it "does not load any models" do
-        Dir.stub(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        Rails::Mongoid.should_receive(:load_model).never
+        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
+        expect(Rails::Mongoid).to receive(:load_model).never
         Rails::Mongoid.preload_models(app)
       end
     end
@@ -375,12 +375,12 @@ describe "Rails::Mongoid" do
         end
 
         before do
-          Dir.should_receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
+          expect(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
         end
 
         it "requires the models by basename" do
-          Rails::Mongoid.should_receive(:load_model).with("address")
-          Rails::Mongoid.should_receive(:load_model).with("user")
+          expect(Rails::Mongoid).to receive(:load_model).with("address")
+          expect(Rails::Mongoid).to receive(:load_model).with("user")
           Rails::Mongoid.preload_models(app)
         end
       end
@@ -392,11 +392,11 @@ describe "Rails::Mongoid" do
         end
 
         before do
-          Dir.should_receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
+          expect(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
         end
 
         it "requires the models by subdirectory and basename" do
-          Rails::Mongoid.should_receive(:load_model).with("mongoid/behaviour")
+          expect(Rails::Mongoid).to receive(:load_model).with("mongoid/behaviour")
           Rails::Mongoid.preload_models(app)
         end
       end
@@ -431,9 +431,9 @@ describe "Rails::Mongoid" do
       end
 
       it "loads all models" do
-        Dir.stub(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        Rails::Mongoid.should_receive(:load_model).with("address")
-        Rails::Mongoid.should_receive(:load_model).with("user")
+        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
+        expect(Rails::Mongoid).to receive(:load_model).with("address")
+        expect(Rails::Mongoid).to receive(:load_model).with("user")
         Rails::Mongoid.load_models(app)
       end
     end
@@ -452,9 +452,9 @@ describe "Rails::Mongoid" do
       end
 
       it "loads selected models only" do
-        Dir.stub(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        Rails::Mongoid.should_receive(:load_model).with("user")
-        Rails::Mongoid.should_receive(:load_model).with("address").never
+        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
+        expect(Rails::Mongoid).to receive(:load_model).with("user")
+        expect(Rails::Mongoid).to receive(:load_model).with("address").never
         Rails::Mongoid.load_models(app)
       end
     end

data/spec/spec_helper.rb

@@ -89,6 +89,7 @@ end
 
 RSpec.configure do |config|
   config.include Mongoid::SpecHelpers
+  config.raise_errors_for_deprecations!
 
   # Drop all collections and clear the identity map before each spec.
   config.before(:each) do

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha1
+  version: 4.0.0.alpha2
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.37
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta4
+        version: 2.0.beta5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta4
+        version: 2.0.beta5
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -74,27 +74,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- Rakefile
 - lib/config/locales/en.yml
+- lib/mongoid.rb
+- lib/mongoid/atomic.rb
 - lib/mongoid/atomic/modifiers.rb
+- lib/mongoid/atomic/paths.rb
+- lib/mongoid/atomic/paths/embedded.rb
 - lib/mongoid/atomic/paths/embedded/many.rb
 - lib/mongoid/atomic/paths/embedded/one.rb
-- lib/mongoid/atomic/paths/embedded.rb
 - lib/mongoid/atomic/paths/root.rb
-- lib/mongoid/atomic/paths.rb
-- lib/mongoid/atomic.rb
+- lib/mongoid/attributes.rb
 - lib/mongoid/attributes/dynamic.rb
 - lib/mongoid/attributes/nested.rb
 - lib/mongoid/attributes/processing.rb
 - lib/mongoid/attributes/readonly.rb
-- lib/mongoid/attributes.rb
 - lib/mongoid/changeable.rb
 - lib/mongoid/composable.rb
+- lib/mongoid/config.rb
 - lib/mongoid/config/environment.rb
 - lib/mongoid/config/options.rb
+- lib/mongoid/config/validators.rb
 - lib/mongoid/config/validators/option.rb
 - lib/mongoid/config/validators/session.rb
-- lib/mongoid/config/validators.rb
-- lib/mongoid/config.rb
+- lib/mongoid/contextual.rb
 - lib/mongoid/contextual/aggregable/memory.rb
 - lib/mongoid/contextual/aggregable/mongo.rb
 - lib/mongoid/contextual/atomic.rb
@@ -104,18 +110,19 @@ files:
 - lib/mongoid/contextual/map_reduce.rb
 - lib/mongoid/contextual/memory.rb
 - lib/mongoid/contextual/mongo.rb
+- lib/mongoid/contextual/none.rb
 - lib/mongoid/contextual/queryable.rb
 - lib/mongoid/contextual/text_search.rb
-- lib/mongoid/contextual.rb
 - lib/mongoid/copyable.rb
+- lib/mongoid/criteria.rb
 - lib/mongoid/criteria/findable.rb
 - lib/mongoid/criteria/inspectable.rb
 - lib/mongoid/criteria/marshalable.rb
 - lib/mongoid/criteria/modifiable.rb
 - lib/mongoid/criteria/scopable.rb
-- lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
 - lib/mongoid/equality.rb
+- lib/mongoid/errors.rb
 - lib/mongoid/errors/ambiguous_relationship.rb
 - lib/mongoid/errors/callback.rb
 - lib/mongoid/errors/delete_restriction.rb
@@ -156,8 +163,8 @@ files:
 - lib/mongoid/errors/unsaved_document.rb
 - lib/mongoid/errors/unsupported_javascript.rb
 - lib/mongoid/errors/validations.rb
-- lib/mongoid/errors.rb
 - lib/mongoid/evolvable.rb
+- lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array.rb
 - lib/mongoid/extensions/big_decimal.rb
 - lib/mongoid/extensions/boolean.rb
@@ -179,22 +186,22 @@ files:
 - lib/mongoid/extensions/time.rb
 - lib/mongoid/extensions/time_with_zone.rb
 - lib/mongoid/extensions/true_class.rb
-- lib/mongoid/extensions.rb
 - lib/mongoid/factory.rb
+- lib/mongoid/fields.rb
 - lib/mongoid/fields/foreign_key.rb
 - lib/mongoid/fields/localized.rb
 - lib/mongoid/fields/standard.rb
-- lib/mongoid/fields/validators/macro.rb
 - lib/mongoid/fields/validators.rb
-- lib/mongoid/fields.rb
+- lib/mongoid/fields/validators/macro.rb
 - lib/mongoid/findable.rb
+- lib/mongoid/indexable.rb
 - lib/mongoid/indexable/specification.rb
 - lib/mongoid/indexable/validators/options.rb
-- lib/mongoid/indexable.rb
 - lib/mongoid/inspectable.rb
 - lib/mongoid/interceptable.rb
 - lib/mongoid/log_subscriber.rb
 - lib/mongoid/loggable.rb
+- lib/mongoid/matchable.rb
 - lib/mongoid/matchable/all.rb
 - lib/mongoid/matchable/and.rb
 - lib/mongoid/matchable/default.rb
@@ -208,7 +215,7 @@ files:
 - lib/mongoid/matchable/nin.rb
 - lib/mongoid/matchable/or.rb
 - lib/mongoid/matchable/size.rb
-- lib/mongoid/matchable.rb
+- lib/mongoid/persistable.rb
 - lib/mongoid/persistable/creatable.rb
 - lib/mongoid/persistable/deletable.rb
 - lib/mongoid/persistable/destroyable.rb
@@ -223,14 +230,15 @@ files:
 - lib/mongoid/persistable/unsettable.rb
 - lib/mongoid/persistable/updatable.rb
 - lib/mongoid/persistable/upsertable.rb
-- lib/mongoid/persistable.rb
 - lib/mongoid/positional.rb
 - lib/mongoid/railtie.rb
 - lib/mongoid/railties/database.rake
 - lib/mongoid/railties/document.rb
+- lib/mongoid/relations.rb
 - lib/mongoid/relations/accessors.rb
 - lib/mongoid/relations/auto_save.rb
 - lib/mongoid/relations/binding.rb
+- lib/mongoid/relations/bindings.rb
 - lib/mongoid/relations/bindings/embedded/in.rb
 - lib/mongoid/relations/bindings/embedded/many.rb
 - lib/mongoid/relations/bindings/embedded/one.rb
@@ -238,8 +246,8 @@ files:
 - lib/mongoid/relations/bindings/referenced/many.rb
 - lib/mongoid/relations/bindings/referenced/many_to_many.rb
 - lib/mongoid/relations/bindings/referenced/one.rb
-- lib/mongoid/relations/bindings.rb
 - lib/mongoid/relations/builder.rb
+- lib/mongoid/relations/builders.rb
 - lib/mongoid/relations/builders/embedded/in.rb
 - lib/mongoid/relations/builders/embedded/many.rb
 - lib/mongoid/relations/builders/embedded/one.rb
@@ -249,22 +257,21 @@ files:
 - lib/mongoid/relations/builders/referenced/many.rb
 - lib/mongoid/relations/builders/referenced/many_to_many.rb
 - lib/mongoid/relations/builders/referenced/one.rb
-- lib/mongoid/relations/builders.rb
+- lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/cascading/delete.rb
 - lib/mongoid/relations/cascading/destroy.rb
 - lib/mongoid/relations/cascading/nullify.rb
 - lib/mongoid/relations/cascading/restrict.rb
-- lib/mongoid/relations/cascading.rb
 - lib/mongoid/relations/constraint.rb
 - lib/mongoid/relations/conversions.rb
 - lib/mongoid/relations/counter_cache.rb
 - lib/mongoid/relations/cyclic.rb
+- lib/mongoid/relations/eager.rb
 - lib/mongoid/relations/eager/base.rb
 - lib/mongoid/relations/eager/belongs_to.rb
 - lib/mongoid/relations/eager/has_and_belongs_to_many.rb
 - lib/mongoid/relations/eager/has_many.rb
 - lib/mongoid/relations/eager/has_one.rb
-- lib/mongoid/relations/eager.rb
 - lib/mongoid/relations/embedded/batchable.rb
 - lib/mongoid/relations/embedded/in.rb
 - lib/mongoid/relations/embedded/many.rb
@@ -284,35 +291,35 @@ files:
 - lib/mongoid/relations/referenced/one.rb
 - lib/mongoid/relations/reflections.rb
 - lib/mongoid/relations/synchronization.rb
-- lib/mongoid/relations/targets/enumerable.rb
 - lib/mongoid/relations/targets.rb
+- lib/mongoid/relations/targets/enumerable.rb
 - lib/mongoid/relations/touchable.rb
-- lib/mongoid/relations.rb
 - lib/mongoid/reloadable.rb
 - lib/mongoid/scopable.rb
 - lib/mongoid/selectable.rb
 - lib/mongoid/serializable.rb
+- lib/mongoid/sessions.rb
 - lib/mongoid/sessions/factory.rb
 - lib/mongoid/sessions/mongo_uri.rb
 - lib/mongoid/sessions/options.rb
 - lib/mongoid/sessions/storage_options.rb
 - lib/mongoid/sessions/thread_options.rb
-- lib/mongoid/sessions/validators/storage.rb
 - lib/mongoid/sessions/validators.rb
-- lib/mongoid/sessions.rb
+- lib/mongoid/sessions/validators/storage.rb
 - lib/mongoid/shardable.rb
 - lib/mongoid/state.rb
 - lib/mongoid/support/query_counter.rb
-- lib/mongoid/threaded/lifecycle.rb
 - lib/mongoid/threaded.rb
-- lib/mongoid/timestamps/created/short.rb
+- lib/mongoid/threaded/lifecycle.rb
+- lib/mongoid/timestamps.rb
 - lib/mongoid/timestamps/created.rb
+- lib/mongoid/timestamps/created/short.rb
 - lib/mongoid/timestamps/short.rb
 - lib/mongoid/timestamps/timeless.rb
-- lib/mongoid/timestamps/updated/short.rb
 - lib/mongoid/timestamps/updated.rb
-- lib/mongoid/timestamps.rb
+- lib/mongoid/timestamps/updated/short.rb
 - lib/mongoid/traversable.rb
+- lib/mongoid/validatable.rb
 - lib/mongoid/validatable/associated.rb
 - lib/mongoid/validatable/format.rb
 - lib/mongoid/validatable/length.rb
@@ -321,9 +328,7 @@ files:
 - lib/mongoid/validatable/presence.rb
 - lib/mongoid/validatable/queryable.rb
 - lib/mongoid/validatable/uniqueness.rb
-- lib/mongoid/validatable.rb
 - lib/mongoid/version.rb
-- lib/mongoid.rb
 - lib/rails/generators/mongoid/config/config_generator.rb
 - lib/rails/generators/mongoid/config/templates/mongoid.yml
 - lib/rails/generators/mongoid/model/model_generator.rb
@@ -331,10 +336,6 @@ files:
 - lib/rails/generators/mongoid_generator.rb
 - lib/rails/mongoid.rb
 - lib/support/ruby_version.rb
-- CHANGELOG.md
-- LICENSE
-- README.md
-- Rakefile
 - spec/app/models/account.rb
 - spec/app/models/acolyte.rb
 - spec/app/models/actor.rb
@@ -433,6 +434,7 @@ files:
 - spec/app/models/manufacturer.rb
 - spec/app/models/meat.rb
 - spec/app/models/membership.rb
+- spec/app/models/message.rb
 - spec/app/models/mixed_drink.rb
 - spec/app/models/movie.rb
 - spec/app/models/my_hash.rb
@@ -546,6 +548,7 @@ files:
 - spec/mongoid/contextual/map_reduce_spec.rb
 - spec/mongoid/contextual/memory_spec.rb
 - spec/mongoid/contextual/mongo_spec.rb
+- spec/mongoid/contextual/none_spec.rb
 - spec/mongoid/contextual/text_search_spec.rb
 - spec/mongoid/copyable_spec.rb
 - spec/mongoid/criteria/findable_spec.rb
@@ -751,17 +754,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Elegant Persistance in Ruby for MongoDB.
@@ -864,6 +867,7 @@ test_files:
 - spec/app/models/manufacturer.rb
 - spec/app/models/meat.rb
 - spec/app/models/membership.rb
+- spec/app/models/message.rb
 - spec/app/models/mixed_drink.rb
 - spec/app/models/movie.rb
 - spec/app/models/my_hash.rb
@@ -977,6 +981,7 @@ test_files:
 - spec/mongoid/contextual/map_reduce_spec.rb
 - spec/mongoid/contextual/memory_spec.rb
 - spec/mongoid/contextual/mongo_spec.rb
+- spec/mongoid/contextual/none_spec.rb
 - spec/mongoid/contextual/text_search_spec.rb
 - spec/mongoid/copyable_spec.rb
 - spec/mongoid/criteria/findable_spec.rb