mongoid 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2c430462ea474d889d41fa20a7011b5ddfeeac215cddc762c2e2a4324e8ef9
-  data.tar.gz: 002a48e7013981c8c12f45edca4f5c9a5c75c9b99ac5f2fd46422532871ae775
+  metadata.gz: 9ad177a2fa24df66fa961debfa6cf72d704197aac40c03ef6159754df707133f
+  data.tar.gz: c3a391dd0d98167417b6823e6741e48a65894815c96446ffeca071d836c07239
 SHA512:
-  metadata.gz: 6985ec8a658d859e3a8f863eca20326d11aba2249488f10cff0bb6c01c8a4de759ab6726b1573e7e6a845ccf5b72213b8fe0374d699761e13608121216bafe98
-  data.tar.gz: fb681e64b86e56203d0029452b71f197bcadfb86b56ccadd514edc6bac416c68490ed708db5a09bc84cf638a43fb359d6ec977f31ca226429c0ca99de0af3120
+  metadata.gz: 337fdd906646d343a8e1c675d094d48a66f23109b8b024fb1114e09021f6f705cf67b47f2846255802fb67cd2fb4a0201c9772abbbbdad1df908a2f94ba5c43a
+  data.tar.gz: 8809e783b1c54d140498fd59580a19400368642175da05827c7f3dbd76fee0cdb77177bd29bd896594b02fc64f199e52c10faaaed012424c49226ddc0f054645

data/lib/mongoid/attributes.rb

@@ -160,6 +160,11 @@ module Mongoid
     # @since 1.0.0
     def write_attribute(name, value)
       field_name = database_field_name(name)
+
+      if attribute_missing?(field_name)
+        raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'"
+      end
+
       if attribute_writable?(field_name)
         _assigning do
           validate_attribute_value(field_name, value)
@@ -177,6 +182,8 @@ module Mongoid
           end
           typed_value
         end
+      else
+        # TODO: MONGOID-5072
       end
     end
     alias :[]= :write_attribute
@@ -294,7 +301,7 @@ module Mongoid
     def read_raw_attribute(name)
       normalized = database_field_name(name.to_s)
       if attribute_missing?(normalized)
-        raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'."
+        raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'"
       end
       if hash_dot_syntax?(normalized)
         attributes.__nested__(normalized)

data/lib/mongoid/matcher.rb

@@ -43,60 +43,36 @@ module Mongoid
         document = BSON::Document.new(document.send(:as_attributes))
       end
 
-      src = document
-      expanded = false
-      exists = true
+      current = [document]
 
       key.to_s.split('.').each do |field|
-        if (index = field.to_i).to_s == field
-          # Array indexing
-          if Array === src
-            exists = index < src.length
-            src = src[index]
-          else
-            # Trying to index something that is not an array
-            exists = false
-            src = nil
-          end
-        else
-          case src
-          when nil
-            exists = false
+        new = []
+        current.each do |doc|
+          case doc
           when Hash
-            exists = src.key?(field)
-            src = src[field]
+            if doc.key?(field)
+              new << doc[field]
+            end
           when Array
-            expanded = true
-            exists = false
-            new = []
-            src.each do |doc|
-              case doc
-              when Hash
-                if doc.key?(field)
-                  v = doc[field]
-                  case v
-                  when Array
-                    new += v
-                  else
-                    new += [v]
-                  end
-                  exists = true
+            if (index = field.to_i).to_s == field
+              if doc.length > index
+                new << doc[index]
+              end
+            end
+            doc.each do |subdoc|
+              if Hash === subdoc
+                if subdoc.key?(field)
+                  new << subdoc[field]
                 end
-              else
-                # Trying to hash index into a value that is not a hash
               end
             end
-            src = new
-          else
-            # Trying to descend into a field that is not a hash using
-            # dot notation.
-            exists = false
-            src = nil
           end
         end
+        current = new
+        break if current.empty?
       end
 
-      [exists, src, expanded]
+      current
     end
   end
 end

data/lib/mongoid/matcher/elem_match.rb

@@ -15,7 +15,8 @@ module Mongoid
           # Validate the condition is valid, even though we will never attempt
           # matching it.
           condition.each do |k, v|
-            if k.to_s.start_with?('$')
+            k = k.to_s
+            if k.start_with?('$')
               begin
                 ExpressionOperator.get(k)
               rescue Mongoid::Errors::InvalidExpressionOperator

data/lib/mongoid/matcher/expression.rb

@@ -15,22 +15,13 @@ module Mongoid
           if k.start_with?('$')
             ExpressionOperator.get(k).matches?(document, expr_v)
           else
-            exists, value, expanded = Matcher.extract_attribute(document, k)
-            # The value may have been expanded into an array, but then
-            # array may have been shrunk back to a scalar (or hash) when
-            # path contained a numeric position.
-            # Do not treat a hash as an array here (both are iterable).
-            if expanded && Array === value
-              if value == []
-                # Empty array is technically equivalent to exists: false.
-                FieldExpression.matches?(false, nil, expr_v)
-              else
-                value.any? do |v|
-                  FieldExpression.matches?(true, v, expr_v)
-                end
+            values = Matcher.extract_attribute(document, k)
+            if values.length > 0
+              values.any? do |v|
+                FieldExpression.matches?(true, v, expr_v)
               end
             else
-              FieldExpression.matches?(exists, value, expr_v)
+              FieldExpression.matches?(false, nil, expr_v)
             end
           end
         end

data/lib/mongoid/matcher/field_expression.rb

@@ -36,14 +36,13 @@ module Mongoid
                 FieldOperator.get(k).matches?(exists, value, cond_v)
               end
             elsif Hash === value
-              sub_exists, sub_value, expanded =
-                Matcher.extract_attribute(value, k)
-              if expanded
-                sub_value.any? do |sub_v|
+              sub_values = Matcher.extract_attribute(value, k)
+              if sub_values.length > 0
+                sub_values.any? do |sub_v|
                   Eq.matches?(true, sub_v, cond_v)
                 end
               else
-                Eq.matches?(sub_exists, sub_value, cond_v)
+                Eq.matches?(false, nil, cond_v)
               end
             else
               false

data/lib/mongoid/reloadable.rb

@@ -21,6 +21,11 @@ module Mongoid
     #
     # @since 1.0.0
     def reload
+      if @atomic_selector
+        # Clear atomic_selector cache for sharded clusters. MONGOID-5076
+        remove_instance_variable('@atomic_selector')
+      end
+
       reloaded = _reload
       if Mongoid.raise_not_found_error && reloaded.empty?
         raise Errors::DocumentNotFound.new(self.class, _id, _id)

data/lib/mongoid/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.2.1"
+  VERSION = "7.2.2"
 end

data/lib/rails/generators/mongoid/config/config_generator.rb

@@ -15,7 +15,14 @@ module Mongoid
       end
 
       def app_name
-        Rails::Application.subclasses.first.parent.to_s.underscore
+        app_cls = Rails.application.class
+        parent = begin
+          # Rails 6.1+
+          app_cls.module_parent_name
+        rescue NoMethodError
+          app_cls.parent.to_s
+        end
+        parent.underscore
       end
 
       def create_config_file

data/spec/integration/app_spec.rb

@@ -19,103 +19,125 @@ describe 'Mongoid application tests' do
     FileUtils.mkdir_p(TMP_BASE)
   end
 
-  context 'demo application - sinatra' do
-    it 'runs' do
-      clone_application(
-        'https://github.com/mongoid/mongoid-demo',
-        subdir: 'sinatra-minimal',
-      ) do
-
-        process = ChildProcess.build(*%w(bundle exec ruby app.rb))
-        process.environment.update(clean_env)
-        process.io.inherit!
-        process.start
-
-        begin
+  context 'demo application' do
+    context 'sinatra' do
+      it 'runs' do
+        clone_application(
+          'https://github.com/mongoid/mongoid-demo',
+          subdir: 'sinatra-minimal',
+        ) do
+
           # JRuby needs a long timeout
-          wait_for_port(4567, 20)
-          sleep 1
-
-          uri = URI.parse('http://localhost:4567/posts')
-          resp = JSON.parse(uri.open.read)
-        ensure
-          Process.kill('TERM', process.pid)
-          status = process.wait
-        end
+          start_app(%w(bundle exec ruby app.rb), 4567, 40) do |port|
+            uri = URI.parse('http://localhost:4567/posts')
+            resp = JSON.parse(uri.open.read)
 
-        resp.should == []
+            resp.should == []
 
-        status.should == 0
+          end
+        end
       end
     end
-  end
 
-  context 'demo application - rails-api' do
-    ['~> 6.0.0'].each do |rails_version|
-      context "with rails #{rails_version}" do
-        it 'runs' do
-          clone_application(
-            'https://github.com/mongoid/mongoid-demo',
-            subdir: 'rails-api',
-            rails_version: rails_version,
-          ) do
-
-            process = ChildProcess.build(*%w(bundle exec rails s))
-            process.environment.update(clean_env)
-            process.io.inherit!
-            process.start
-
-            begin
-              # JRuby needs a long timeout
-              wait_for_port(3000, 30)
-              sleep 1
-
-              uri = URI.parse('http://localhost:3000/posts')
-              resp = JSON.parse(uri.open.read)
-            ensure
-              Process.kill('TERM', process.pid)
-              status = process.wait
-            end
+    context 'rails-api' do
+      it 'runs' do
+        clone_application(
+          'https://github.com/mongoid/mongoid-demo',
+          subdir: 'rails-api',
+        ) do
 
-            resp.should == []
+          # JRuby needs a long timeout
+          start_app(%w(bundle exec rails s), 3000, 50) do |port|
+            uri = URI.parse('http://localhost:3000/posts')
+            resp = JSON.parse(uri.open.read)
 
-            # 143 = 128 + 15
-            [0, 15, 143].should include(status)
+            resp.should == []
           end
         end
       end
     end
   end
 
+  def start_app(cmd, port, timeout)
+    process = ChildProcess.build(*cmd)
+    process.environment.update(clean_env)
+    process.io.inherit!
+    process.start
+
+    begin
+      wait_for_port(port, timeout, process)
+      sleep 1
+
+      rv = yield port
+    ensure
+      # The process may have already died (due to an error exit) -
+      # in this case killing it will raise an exception.
+      Process.kill('TERM', process.pid) rescue nil
+      status = process.wait
+    end
+
+    # Exit should be either success or SIGTERM
+    [0, 15, 128 + 15].should include(status)
+
+    rv
+  end
+
   context 'new application - rails' do
-    ['~> 5.1.0', '~> 5.2.0', '~> 6.0.0'].each do |rails_version|
-      context "with rails #{rails_version}" do
-        it 'creates' do
-          Mrss::ChildProcessHelper.check_call(%w(gem uni rails -a))
-          Mrss::ChildProcessHelper.check_call(%w(gem install rails --no-document -v) + [rails_version])
-
-          Dir.chdir(TMP_BASE) do
-            FileUtils.rm_rf('mongoid-test')
-            Mrss::ChildProcessHelper.check_call(%w(rails new mongoid-test --skip-spring --skip-active-record), env: clean_env)
-
-            Dir.chdir('mongoid-test') do
-              adjust_app_gemfile
-              Mrss::ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
-
-              Mrss::ChildProcessHelper.check_call(%w(rails g model post), env: clean_env)
-              Mrss::ChildProcessHelper.check_call(%w(rails g model comment post:belongs_to), env: clean_env)
-
-              # https://jira.mongodb.org/browse/MONGOID-4885
-              comment_text = File.read('app/models/comment.rb')
-              comment_text.should =~ /belongs_to :post/
-              comment_text.should_not =~ /embedded_in :post/
-            end
-          end
+    it 'creates' do
+      install_rails
+
+      Dir.chdir(TMP_BASE) do
+        FileUtils.rm_rf('mongoid-test')
+        Mrss::ChildProcessHelper.check_call(%w(rails new mongoid-test --skip-spring --skip-active-record), env: clean_env)
+
+        Dir.chdir('mongoid-test') do
+          adjust_app_gemfile
+          Mrss::ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
+
+          Mrss::ChildProcessHelper.check_call(%w(rails g model post), env: clean_env)
+          Mrss::ChildProcessHelper.check_call(%w(rails g model comment post:belongs_to), env: clean_env)
+
+          # https://jira.mongodb.org/browse/MONGOID-4885
+          comment_text = File.read('app/models/comment.rb')
+          comment_text.should =~ /belongs_to :post/
+          comment_text.should_not =~ /embedded_in :post/
+        end
+      end
+    end
+
+    it 'generates Mongoid config' do
+      install_rails
+
+      Dir.chdir(TMP_BASE) do
+        FileUtils.rm_rf('mongoid-test-config')
+        Mrss::ChildProcessHelper.check_call(%w(rails new mongoid-test-config --skip-spring --skip-active-record), env: clean_env)
+
+        Dir.chdir('mongoid-test-config') do
+          adjust_app_gemfile
+          Mrss::ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
+
+          mongoid_config_file = File.join(TMP_BASE,'mongoid-test-config/config/mongoid.yml')
+
+          File.exist?(mongoid_config_file).should be false
+          Mrss::ChildProcessHelper.check_call(%w(rails g mongoid:config), env: clean_env)
+          File.exist?(mongoid_config_file).should be true
+
+          config_text = File.read(mongoid_config_file)
+          config_text.should =~ /mongoid_test_config_development/
+          config_text.should =~ /mongoid_test_config_test/
         end
       end
     end
   end
 
+  def install_rails
+    Mrss::ChildProcessHelper.check_call(%w(gem uni rails -a))
+    if (rails_version = SpecConfig.instance.rails_version) == 'master'
+    else
+      Mrss::ChildProcessHelper.check_call(%w(gem install rails --no-document -v) + [rails_version])
+    end
+  end
+
   context 'local test applications' do
     let(:client) { Mongoid.default_client }
 
@@ -165,12 +187,13 @@ describe 'Mongoid application tests' do
     end
   end
 
-  def clone_application(repo_url, subdir: nil, rails_version: nil)
+  def clone_application(repo_url, subdir: nil)
     Dir.chdir(TMP_BASE) do
       FileUtils.rm_rf(File.basename(repo_url))
       Mrss::ChildProcessHelper.check_call(%w(git clone) + [repo_url])
       Dir.chdir(File.join(*[File.basename(repo_url), subdir].compact)) do
-        adjust_app_gemfile(rails_version: rails_version)
+        adjust_app_gemfile
+        adjust_rails_defaults
         Mrss::ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
         puts `git diff`
 
@@ -226,7 +249,7 @@ describe 'Mongoid application tests' do
     end
   end
 
-  def adjust_app_gemfile(rails_version: nil)
+  def adjust_app_gemfile(rails_version: SpecConfig.instance.rails_version)
     remove_bundler_req
 
     gemfile_lines = IO.readlines('Gemfile')
@@ -238,13 +261,41 @@ describe 'Mongoid application tests' do
       gemfile_lines.delete_if do |line|
         line =~ /rails/
       end
-      gemfile_lines << "gem 'rails', '#{rails_version}'\n"
+      if rails_version == 'master'
+        gemfile_lines << "gem 'rails', git: 'https://github.com/rails/rails'\n"
+      else
+        gemfile_lines << "gem 'rails', '~> #{rails_version}.0'\n"
+      end
     end
     File.open('Gemfile', 'w') do |f|
       f << gemfile_lines.join
     end
   end
 
+  def adjust_rails_defaults(rails_version: SpecConfig.instance.rails_version)
+    if File.exist?('config/application.rb')
+      lines = IO.readlines('config/application.rb')
+      lines.each do |line|
+        line.gsub!(/config.load_defaults \d\.\d/, "config.load_defaults #{rails_version}")
+      end
+      File.open('config/application.rb', 'w') do |f|
+        f << lines.join
+      end
+    end
+
+    if rails_version == '5.1'
+      secrets = {
+        'development' => {
+          'secret_key_base' => 'abracadabra',
+          'my_secret_token' => 'very_secret',
+        },
+      }
+      File.open('config/secrets.yml', 'w') do |f|
+        f << YAML.dump(secrets)
+      end
+    end
+  end
+
   def remove_bundler_req
     lock_lines = IO.readlines('Gemfile.lock')
     # Get rid of the bundled with line so that whatever bundler is installed
@@ -270,7 +321,7 @@ describe 'Mongoid application tests' do
     @clean_env ||= Hash[ENV.keys.grep(/BUNDLE|RUBYOPT/).map { |k| [k, nil ] }]
   end
 
-  def wait_for_port(port, timeout)
+  def wait_for_port(port, timeout, process)
     deadline = Time.now + timeout
     loop do
       begin
@@ -278,6 +329,9 @@ describe 'Mongoid application tests' do
           return
         end
       rescue IOError, SystemCallError
+        unless process.alive?
+          raise "Process #{process} died while waiting for port #{port}"
+        end
         if Time.now > deadline
           raise
         end