mongoid 4.0.2 → 5.0.0

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -1,62 +1,101 @@
 development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
     default:
       # Defines the name of the default database that Mongoid can connect to.
       # (required).
       database: <%= database_name || app_name %>_development
-      # Provides the hosts the default session can connect to. Must be an array
+      # Provides the hosts the default client can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:
         - localhost:27017
       options:
         # Change the default write concern. (default = { w: 1 })
         # write:
-        # w: 1
-
-        # Change the default consistency model to primary, secondary.
-        # 'secondary' will send reads to secondaries, 'primary' sends everything
-        # to master. (default: primary)
-        # read: secondary_preferred
-
-        # How many times Moped should attempt to retry an operation after
-        # failure. (default: The number of nodes in the cluster)
-        # max_retries: 20
-
-        # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 0.25)
-        # retry_interval: 0.25
-        
-        # The connection pool size per-node.  This should match or exceed the
-        # number of threads for a multi-threaded application. (default: 5)
-        # pool_size: 5
-        
-        # The time in seconds that Moped should wait for the pool to provide
-        # an available connection.  This number should probably remain at the 
-        # default, unless for some reason you absolutely need to limit the
-        # pool_size, as this wait is only used when the pool is saturated.
-        # (default: 0.5)
-        # pool_timeout: 0.5
-
-        # The time in seconds before Moped will timeout connection and node
-        # operations. (default: 5)
-        # timeout: 5
-        
-        # The amount of time in seconds between forced refreshes of node 
-        # information including the discovery of new peers. (default: 300)
-        # refresh_interval: 300
-        
-        # The amount of time in seconds that a node will be flagged as down.
-        # (default: 30) 
-        # down_interval: 30
-        
-        # Whether connections should use SSL. (default: nil/false)
-        # ssl: false
-        
-        # Whether Moped will use the existing seeds/nodes to find other peers.
-        # (default: true)
-        # auto_discover: true
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
+        # on 2.4 and 2.6 is :plain)
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against. (default: admin)
+        # auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 5)
+        # local_threshold: 5
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
+
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 5)
+        # connect_timeout: 5
+
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether or not to do peer certification validation. (default: false)
+        # ssl_verify: true
+
+        # The file containing a set of concatenated certification authority certifications
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
 
 
   # Configure Mongoid specific options. (optional)
@@ -71,9 +110,6 @@ development:
     # inheritance. (default: false)
     # preload_models: false
 
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
     # Raise an error when performing a #find and the document is not found.
     # (default: true)
     # raise_not_found_error: true
@@ -88,14 +124,12 @@ development:
     # Ensure all times are UTC in the app side. (default: false)
     # use_utc: false
 test:
-  sessions:
+  clients:
     default:
       database: <%= database_name || app_name %>_test
       hosts:
         - localhost:27017
       options:
-        read: primary
-        # In the test environment we lower the retries and retry interval to
-        # low amounts for fast failures.
-        max_retries: 1
-        retry_interval: 0
+        read:
+          mode: primary
+        max_pool_size: 1

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

@@ -2,4 +2,10 @@ class Code
   include Mongoid::Document
   field :name, type: String
   embedded_in :address
+  embeds_one :deepest
+end
+
+class Deepest
+  include Mongoid::Document
+  embedded_in :code
 end

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