mongoid 7.0.6 → 7.0.12

data/lib/mongoid/validatable/uniqueness.rb

@@ -148,7 +148,7 @@ module Mongoid
       #
       # @since 2.3.0
       def filter(value)
-        !case_sensitive? && value ? /\A#{Regexp.escape(value.to_s)}$/i : value
+        !case_sensitive? && value ? /\A#{Regexp.escape(value.to_s)}\z/i : value
       end
 
       # Scope the criteria to the scope options provided.

data/lib/mongoid/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.0.6"
+  VERSION = "7.0.12"
 end

data/lib/rails/generators/mongoid/model/templates/model.rb.tt

@@ -13,7 +13,7 @@ class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent]
   field :<%= attribute.name %>, type: <%= attribute.type_class %>
 <% end -%>
 <% attributes.select{|attr| attr.reference? }.each do |attribute| -%>
-  embedded_in :<%= attribute.name%>
+  belongs_to :<%= attribute.name%>
 <% end -%>
 end
 <% end -%>

data/spec/app/models/customer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Customer
+  include Mongoid::Document
+
+  field :name
+
+  embeds_one :home_address, class_name: 'CustomerAddress', as: :addressable
+  embeds_one :work_address, class_name: 'CustomerAddress', as: :addressable
+end

data/spec/app/models/customer_address.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class CustomerAddress
+  include Mongoid::Document
+
+  field :street, type: String
+  field :city, type: String
+  field :state, type: String
+
+  embedded_in :addressable, polymorphic: true
+end

data/spec/app/models/delegating_patient.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class DelegatingPatient
+  include Mongoid::Document
+
+  embeds_one :email
+
+  # Instance level delegation
+  delegate :address, to: :email
+
+  class << self
+    # Class level delegation
+    delegate :default_client, to: ::Mongoid
+  end
+end

data/spec/integration/app_spec.rb

@@ -0,0 +1,192 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+BASE = File.join(File.dirname(__FILE__), '../..')
+TMP_BASE = File.join(BASE, 'tmp')
+
+describe 'Mongoid application tests' do
+  before(:all) do
+    unless SpecConfig.instance.app_tests?
+      skip 'Set APP_TESTS=1 in environment to run application tests'
+    end
+
+    require 'fileutils'
+    require 'support/child_process_helper'
+    require 'open-uri'
+
+    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
+          # 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
+
+        resp.should == []
+
+        status.should == 0
+      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
+
+            resp.should == []
+
+            # 143 = 128 + 15
+            [0, 15, 143].should include(status)
+          end
+        end
+      end
+    end
+  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
+          ChildProcessHelper.check_call(%w(gem uni rails -a))
+          ChildProcessHelper.check_call(%w(gem install rails --no-document -v) + [rails_version])
+
+          Dir.chdir(TMP_BASE) do
+            FileUtils.rm_rf('mongoid-test')
+            ChildProcessHelper.check_call(%w(rails new mongoid-test --skip-spring), env: clean_env)
+
+            Dir.chdir('mongoid-test') do
+              adjust_app_gemfile
+              ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
+
+              ChildProcessHelper.check_call(%w(rails g model post), env: clean_env)
+              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
+      end
+    end
+  end
+
+  def clone_application(repo_url, subdir: nil, rails_version: nil)
+    Dir.chdir(TMP_BASE) do
+      FileUtils.rm_rf(File.basename(repo_url))
+      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)
+        ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
+        puts `git diff`
+
+        config = {'development' => {'clients' => {'default' => {'uri' => SpecConfig.instance.uri_str}}}}
+        File.open('config/mongoid.yml', 'w') do |f|
+          f << YAML.dump(config)
+        end
+
+        yield
+      end
+    end
+  end
+
+  def adjust_app_gemfile(rails_version: nil)
+    lock_lines = IO.readlines('Gemfile.lock')
+    # Get rid of the bundled with line so that whatever bundler is installed
+    # on the system is usable with the application.
+    if i = lock_lines.index("BUNDLED WITH\n")
+      lock_lines.slice!(i, 2)
+      File.open('Gemfile.lock', 'w') do |f|
+        f << lock_lines.join
+      end
+    end
+
+    gemfile_lines = IO.readlines('Gemfile')
+    gemfile_lines.delete_if do |line|
+      line =~ /mongoid/
+    end
+    gemfile_lines << "gem 'mongoid', path: '#{File.expand_path(BASE)}'\n"
+    if rails_version
+      gemfile_lines.delete_if do |line|
+        line =~ /rails/
+      end
+      gemfile_lines << "gem 'rails', '#{rails_version}'\n"
+    end
+    File.open('Gemfile', 'w') do |f|
+      f << gemfile_lines.join
+    end
+  end
+
+  def remove_spring
+    # Spring produces this error in Evergreen:
+    # /data/mci/280eb2ecf4fd69208e2106cd3af526f1/src/rubies/ruby-2.7.0/lib/ruby/gems/2.7.0/gems/spring-2.1.0/lib/spring/client/run.rb:26:
+    # in `initialize': too long unix socket path (126bytes given but 108bytes max) (ArgumentError)
+    # Is it trying to create unix sockets in current directory?
+    # https://stackoverflow.com/questions/30302021/rails-runner-without-spring
+    ChildProcessHelper.check_call(%w(bin/spring binstub --remove --all), env: clean_env)
+  end
+
+  def clean_env
+    @clean_env ||= Hash[ENV.keys.grep(/BUNDLE|RUBYOPT/).map { |k| [k, nil ] }]
+  end
+
+  def wait_for_port(port, timeout)
+    deadline = Time.now + timeout
+    loop do
+      begin
+        Socket.tcp('localhost', port, nil, nil, connect_timeout: 0.5) do |socket|
+          return
+        end
+      rescue IOError, SystemCallError
+        if Time.now > deadline
+          raise
+        end
+      end
+    end
+  end
+end

data/spec/integration/associations/embedded_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+require_relative '../../mongoid/association/embedded/embeds_many_models'
+require_relative '../../mongoid/association/embedded/embeds_one_models'
+
+describe 'embedded associations' do
+
+  describe 'parent association' do
+    let(:parent) do
+      parent_cls.new
+    end
+
+    context 'embeds_one' do
+
+      shared_examples 'is set' do
+        it 'is set' do
+          parent.child = child_cls.new
+          parent.child.parent.should == parent
+        end
+      end
+
+      context 'class_name set without leading ::' do
+        let(:parent_cls) { EomParent }
+        let(:child_cls) { EomChild }
+
+        it_behaves_like 'is set'
+      end
+
+      context 'class_name set with leading ::' do
+        let(:parent_cls) { EomCcParent }
+        let(:child_cls) { EomCcChild }
+
+        it_behaves_like 'is set'
+      end
+    end
+
+    context 'embeds_many' do
+
+      let(:child) { parent.legislators.new }
+
+      shared_examples 'is set' do
+        it 'is set' do
+          child.congress.should == parent
+        end
+      end
+
+      context 'class_name set without leading ::' do
+        let(:parent_cls) { EmmCongress }
+
+        it_behaves_like 'is set'
+      end
+
+      context 'class_name set with leading ::' do
+        let(:parent_cls) { EmmCcCongress }
+
+        it_behaves_like 'is set'
+      end
+    end
+  end
+end

data/spec/integration/callbacks_models.rb

@@ -0,0 +1,49 @@
+class Galaxy
+  include Mongoid::Document
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  embeds_many :stars
+
+  private
+
+  def set_age
+    self.age ||= 100_000
+  end
+end
+
+class Star
+  include Mongoid::Document
+
+  embedded_in :galaxy
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  embeds_many :planets
+
+  private
+
+  def set_age
+    self.age ||= 42_000
+  end
+end
+
+class Planet
+  include Mongoid::Document
+
+  embedded_in :star
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  private
+
+  def set_age
+    self.age ||= 2_000
+  end
+end

data/spec/integration/callbacks_spec.rb

@@ -0,0 +1,216 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+require_relative './callbacks_models'
+
+describe 'callbacks integration tests' do
+  context 'when modifying attributes in a callback' do
+
+    context 'when creating top-level document' do
+      context 'top level document' do
+        let(:instance) do
+          Galaxy.create!
+        end
+
+        it 'writes the attribute value into the model' do
+          instance.age.should == 100_000
+        end
+
+        it 'persists the attribute value' do
+          Galaxy.find(instance.id).age.should == 100_000
+        end
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          let(:instance) do
+            Galaxy.create!(stars: [Star.new])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          let(:instance) do
+            Galaxy.create!(stars: [{}])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          let(:instance) do
+            Galaxy.create!(stars: [Star.new(
+              planets: [Planet.new],
+            )])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          let(:instance) do
+            Galaxy.create!(stars: [
+              planets: [{}],
+            ])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+
+    context 'when updating top-level document via #save' do
+      let!(:instance) do
+        Galaxy.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.stars = [Star.new]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.stars = [{}]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.stars = [Star.new(planets: [Planet.new])]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.stars = [planets: [{}]]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+
+    context 'when updating top-level document via #update_attributes' do
+      let!(:instance) do
+        Galaxy.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes(stars: [Star.new])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes(stars: [{}])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            pending 'MONGOID-4476'
+
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes(stars: [Star.new(planets: [Planet.new])])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes(stars: [planets: [{}]])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+  end
+end