mongoid 4.0.2 → 5.0.0.beta

data/lib/rails/mongoid.rb

@@ -12,10 +12,10 @@ module Rails
     #
     # @param [ Application ] app The rails application.
     def load_models(app)
-      app.config.paths["app/models"].each do |path|
+      app.config.paths["app/models"].expanded.each do |path|
         preload = ::Mongoid.preload_models
         if preload.resizable?
-          files = preload.map { |model| "#{path}/#{model}.rb" }
+          files = preload.map { |model| "#{path}/#{model.underscore}.rb" }
         else
           files = Dir.glob("#{path}/**/*.rb")
         end

data/spec/app/models/audio.rb

@@ -1,5 +1,5 @@
 class Audio
   include Mongoid::Document
   field :likes, type: Integer
-  default_scope ->{ where(:likes.gt => 100) }
+  default_scope ->{ self.or({:likes => nil}, {:likes.gt => 100}) }
 end

data/spec/app/models/band.rb

@@ -15,6 +15,7 @@ class Band
   field :sales, type: BigDecimal
   field :y, as: :years, type: Integer
   field :founded, type: Date
+  field :deleted, type: Boolean
 
   embeds_many :records, cascade_callbacks: true
   embeds_many :notes, as: :noteable, cascade_callbacks: true, validate: false

data/spec/app/models/company.rb

@@ -0,0 +1,5 @@
+class Company
+  include Mongoid::Document
+
+  embeds_many :staffs
+end

data/spec/app/models/label.rb

@@ -8,15 +8,22 @@ class Label
   field :after_update_called, type: Mongoid::Boolean, default: false
   field :after_validation_called, type: Mongoid::Boolean, default: false
 
+  field :before_save_count, type: Integer, default: 0
+
   embedded_in :artist
   embedded_in :band
 
+  before_save :before_save_stub
   after_create :after_create_stub
   after_save :after_save_stub
   after_update :after_update_stub
   after_validation :after_validation_stub
   before_validation :cleanup
 
+  def before_save_stub
+    self.before_save_count += 1
+  end
+
   def after_create_stub
     self.after_create_called = true
   end

data/spec/app/models/pub.rb

@@ -0,0 +1,6 @@
+class Pub
+  include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
+  field :location, type: Array
+  index location: "2dsphere"
+end

data/spec/app/models/staff.rb

@@ -0,0 +1,7 @@
+class Staff
+  include Mongoid::Document
+
+  embedded_in :company
+
+  field :age, type: Integer
+end

data/spec/app/models/store_as_dup_test1.rb

@@ -0,0 +1,5 @@
+class StoreAsDupTest1
+  include Mongoid::Document
+  embeds_one :store_as_dup_test2, :store_as => :t
+  field :name
+end

data/spec/app/models/store_as_dup_test2.rb

@@ -0,0 +1,5 @@
+class StoreAsDupTest2
+  include Mongoid::Document
+  embedded_in :store_as_dup_test1
+  field :name
+end

data/spec/config/mongoid.yml

@@ -1,34 +1,16 @@
 test:
-  sessions:
+  clients:
     default:
       database: mongoid_test
       hosts:
         - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
       options:
-        read: primary
-    mongohq_single:
-      database: <%=ENV["MONGOHQ_SINGLE_NAME"]%>
-      username: <%=ENV["MONGOHQ_SINGLE_USER"]%>
-      password: <%=ENV["MONGOHQ_SINGLE_PASS"]%>
-      hosts:
-        - <%=ENV["MONGOHQ_SINGLE_URL"]%>
-      options:
-        write:
-          w: 1
-        read: primary
-    mongohq_repl:
-      database: <%=ENV["MONGOHQ_REPL_NAME"]%>
-      username: <%=ENV["MONGOHQ_REPL_USER"]%>
-      password: <%=ENV["MONGOHQ_REPL_PASS"]%>
-      hosts:
-        - <%=ENV["MONGOHQ_REPL_1_URL"]%>
-        - <%=ENV["MONGOHQ_REPL_2_URL"]%>
-      options:
-        read: primary
-        write:
-          w: majority
-    mongohq_repl_uri:
-      uri: <%= ENV["MONGOHQ_REPL_URI"]%>
+        user: "mongoid-user"
+        password: "password"
+        auth_source: "admin"
+        read:
+          mode: primary
+        max_pool_size: 1
   options:
     include_root_in_json: false
     include_type_for_serialization: false

data/spec/mongoid/atomic/paths_spec.rb

@@ -111,9 +111,7 @@ describe Mongoid::Atomic::Paths do
       end
 
       it "returns the association with id.atomic_selector" do
-        expect(address.atomic_selector).to eq(
-          { "_id" => person.id, "addresses._id" => address.id }
-        )
+        expect(address.atomic_selector).to eq({ "_id" => person.id })
       end
     end
 
@@ -124,14 +122,8 @@ describe Mongoid::Atomic::Paths do
         person.addresses << address
       end
 
-      it "returns the JSON notation to the document with ids" do
-        expect(location.atomic_selector).to eq(
-          {
-            "_id" => person.id,
-            "addresses._id" => address.id,
-            "addresses.locations._id" => location.id
-          }
-        )
+      it "returns the JSON notation to the document with id" do
+        expect(location.atomic_selector).to eq({ "_id" => person.id })
       end
     end
   end

data/spec/mongoid/attributes/nested_spec.rb

@@ -2936,11 +2936,11 @@ describe Mongoid::Attributes::Nested do
               context "when reloading the document" do
 
                 it "updates the first existing document" do
-                  expect(person.posts(true).first.title).to eq("First")
+                  expect(person.posts(true)[0].title).to eq("First")
                 end
 
                 it "updates the second existing document" do
-                  expect(person.posts(true).last.title).to eq("Second")
+                  expect(person.posts(true)[1].title).to eq("Second")
                 end
 
                 it "does not add new documents" do
@@ -3094,11 +3094,11 @@ describe Mongoid::Attributes::Nested do
                     context "when reloading the document" do
 
                       it "does not ignore the marked document" do
-                        expect(person.posts(true).first.title).to eq("Another Title")
+                        expect(person.posts(true)[0].title).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.posts(true).last.title).to eq("New Title")
+                        expect(person.posts(true)[1].title).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
@@ -3127,7 +3127,7 @@ describe Mongoid::Attributes::Nested do
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.posts(true).last.title).to eq("New Title")
+                        expect(person.posts(true)[1].title).to eq("New Title")
                       end
                     end
                   end
@@ -3198,7 +3198,7 @@ describe Mongoid::Attributes::Nested do
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.posts(true).last.title).to eq("New Title")
+                        expect(person.posts(true)[1].title).to eq("New Title")
                       end
                     end
                   end
@@ -3224,15 +3224,15 @@ describe Mongoid::Attributes::Nested do
               end
 
               it "builds a new first document" do
-                expect(person.posts.first.title).to eq("First")
+                expect(person.posts[0].title).to eq("First")
               end
 
               it "builds a new second document" do
-                expect(person.posts.second.title).to eq("Second")
+                expect(person.posts[1].title).to eq("Second")
               end
 
               it "builds a new third document" do
-                expect(person.posts.third.title).to eq("Third")
+                expect(person.posts[2].title).to eq("Third")
               end
 
               it "does not add extra documents" do
@@ -3776,7 +3776,7 @@ describe Mongoid::Attributes::Nested do
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.preferences(true).last.name).to eq("My Blog")
+                        expect(person.preferences(true)[1].name).to eq("My Blog")
                       end
                     end
                   end
@@ -3811,11 +3811,11 @@ describe Mongoid::Attributes::Nested do
                     context "when reloading the document" do
 
                       it "does not ignore the marked document" do
-                        expect(person.preferences(true).first.name).to eq("Another Title")
+                        expect(person.preferences(true)[0].name).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.preferences(true).last.name).to eq("New Title")
+                        expect(person.preferences(true)[1].name).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
@@ -3844,7 +3844,7 @@ describe Mongoid::Attributes::Nested do
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.preferences(true).last.name).to eq("New Title")
+                        expect(person.preferences(true)[1].name).to eq("New Title")
                       end
                     end
                   end
@@ -3874,11 +3874,11 @@ describe Mongoid::Attributes::Nested do
                     context "when reloading" do
 
                       it "does not ignore the marked document" do
-                        expect(person.preferences(true).first.name).to eq("Another Title")
+                        expect(person.preferences(true)[0].name).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.preferences(true).last.name).to eq("New Title")
+                        expect(person.preferences(true)[1].name).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
@@ -3907,7 +3907,7 @@ describe Mongoid::Attributes::Nested do
                       end
 
                       it "does not delete the unmarked document" do
-                        expect(person.preferences(true).last.name).to eq("New Title")
+                        expect(person.preferences(true)[1].name).to eq("New Title")
                       end
                     end
                   end

data/spec/mongoid/attributes/readonly_spec.rb

@@ -19,6 +19,17 @@ describe Mongoid::Attributes::Readonly do
       end
     end
 
+    context "when providing a field alias" do
+
+      before do
+        Person.attr_readonly :aliased_timestamp
+      end
+
+      it "adds the database field name to readonly attributes" do
+        expect(Person.readonly_attributes.to_a).to eq([ "at" ])
+      end
+    end
+
     context "when providing multiple fields" do
 
       before do
@@ -33,54 +44,71 @@ describe Mongoid::Attributes::Readonly do
     context "when creating a new document with a readonly field" do
 
       before do
-        Person.attr_readonly :title, :terms
+        Person.attr_readonly :title, :terms, :aliased_timestamp
       end
 
       let(:person) do
-        Person.create(title: "sir", terms: true)
+        Person.create(title: "sir", terms: true, aliased_timestamp: Time.at(42))
       end
 
       it "sets the first readonly value" do
         expect(person.title).to eq("sir")
       end
 
-      it "sets subsequent readonly values" do
+      it "sets the second readonly value" do
         expect(person.terms).to be true
       end
 
+      it "sets the third readonly value" do
+        expect(person.aliased_timestamp).to eq(Time.at(42))
+      end
+
       it "persists the first readonly value" do
         expect(person.reload.title).to eq("sir")
       end
 
-      it "persists subsequent readonly values" do
+      it "persists the second readonly value" do
         expect(person.reload.terms).to be true
       end
+
+      it "persists the third readonly value" do
+        expect(person.reload.aliased_timestamp).to eq(Time.at(42))
+      end
     end
 
     context "when updating an existing readonly field" do
 
       before do
-        Person.attr_readonly :title, :terms, :score
+        Person.attr_readonly :title, :terms, :score, :aliased_timestamp
       end
 
       let(:person) do
-        Person.create(title: "sir", terms: true, score: 1)
+        Person.create(title: "sir", terms: true, score: 1, aliased_timestamp: Time.at(42))
       end
 
       context "when updating via the setter" do
 
         before do
           person.title = "mr"
+          person.aliased_timestamp = Time.at(43)
           person.save
         end
 
-        it "does not update the field" do
+        it "does not update the first field" do
           expect(person.title).to eq("sir")
         end
 
-        it "does not persist the changes" do
+        it "does not update the second field" do
+          expect(person.aliased_timestamp).to eq(Time.at(42))
+        end
+
+        it "does not persist the first field" do
           expect(person.reload.title).to eq("sir")
         end
+
+        it "does not persist the second field" do
+          expect(person.reload.aliased_timestamp).to eq(Time.at(42))
+        end
       end
 
       context "when updating via inc" do
@@ -127,64 +155,98 @@ describe Mongoid::Attributes::Readonly do
 
         before do
           person[:title] = "mr"
+          person[:aliased_timestamp] = Time.at(43)
           person.save
         end
 
-        it "does not update the field" do
+        it "does not update the first field" do
           expect(person.title).to eq("sir")
         end
 
-        it "does not persist the changes" do
+        it "does not update the second field" do
+          expect(person.aliased_timestamp).to eq(Time.at(42))
+        end
+
+        it "does not persist the first field" do
           expect(person.reload.title).to eq("sir")
         end
+
+        it "does not persist the second field" do
+          expect(person.reload.aliased_timestamp).to eq(Time.at(42))
+        end
       end
 
       context "when updating via write_attribute" do
 
         before do
           person.write_attribute(:title, "mr")
+          person.write_attribute(:aliased_timestamp, Time.at(43))
           person.save
         end
 
-        it "does not update the field" do
+        it "does not update the first field" do
           expect(person.title).to eq("sir")
         end
 
-        it "does not persist the changes" do
+        it "does not update the second field" do
+          expect(person.aliased_timestamp).to eq(Time.at(42))
+        end
+
+        it "does not persist the first field" do
           expect(person.reload.title).to eq("sir")
         end
+
+        it "does not persist the second field" do
+          expect(person.reload.aliased_timestamp).to eq(Time.at(42))
+        end
       end
 
       context "when updating via update_attributes" do
 
         before do
-          person.update_attributes(title: "mr")
+          person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
           person.save
         end
 
-        it "does not update the field" do
+        it "does not update the first field" do
           expect(person.title).to eq("sir")
         end
 
-        it "does not persist the changes" do
+        it "does not update the second field" do
+          expect(person.aliased_timestamp).to eq(Time.at(42))
+        end
+
+        it "does not persist the first field" do
           expect(person.reload.title).to eq("sir")
         end
+
+        it "does not persist the second field" do
+          expect(person.reload.aliased_timestamp).to eq(Time.at(42))
+        end
       end
 
       context "when updating via update_attributes!" do
 
         before do
-          person.update_attributes!(title: "mr")
+          person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
           person.save
         end
 
-        it "does not update the field" do
+        it "does not update the first field" do
           expect(person.title).to eq("sir")
         end
 
-        it "does not persist the changes" do
+        it "does not update the second field" do
+          expect(person.aliased_timestamp).to eq(Time.at(42))
+        end
+
+        it "does not persist the first field" do
           expect(person.reload.title).to eq("sir")
         end
+
+        it "does not persist the second field" do
+          expect(person.reload.aliased_timestamp).to eq(Time.at(42))
+        end
       end
 
       context "when updating via update_attribute" do