mongo_mapper 0.15.1 → 0.15.2

data/spec/functional/associations/belongs_to_proxy_spec.rb

@@ -269,4 +269,22 @@ describe "BelongsToProxy" do
       end.should_not raise_error
     end
   end
+
+  context "foreign_key=" do
+    it "should reset parent when foreign key is changed" do
+      post = @post_class.create!
+      comment = @comment_class.create!(post: post)
+      another_post = @post_class.create!
+
+      comment.post.should == post
+
+      comment.post_id = another_post.id
+
+      comment.post.should == another_post
+
+      comment.post_id = nil
+
+      comment.post.should == nil
+    end
+  end
 end

data/spec/functional/associations/one_embedded_proxy_spec.rb

@@ -97,4 +97,32 @@ describe "OneEmbeddedProxy" do
     post.author.address.id.should_not be_nil
   end
 
+  it "should keep the reference to assigned document" do
+    @post_class.one(:author, :class => @author_class)
+    post = @post_class.new
+    new_author = @author_class.new
+    post.author = new_author
+    new_author.name = 'Frank'
+
+    post.author.name.should == 'Frank'
+  end
+
+  it "should update references for parent and root" do
+    @post_class.key(:author_name, String)
+    @post_class.one(:author, :class => @author_class)
+    @post_class.before_save do
+      self.author_name = author.name
+    end
+
+    author = @author_class.new
+    @post_class.create!(author: author)
+    author.save!
+
+    post = @post_class.create!(author: author)
+    post.author.name = 'Frank'
+    post.author.save!
+
+    post.author.name.should == 'Frank'
+    post.author_name.should == 'Frank'
+  end
 end

data/spec/functional/associations/one_proxy_spec.rb

@@ -403,4 +403,14 @@ describe "OneProxy" do
       article.paper_id.should == @paper.id
     end
   end
-end
+
+  it "should keep the reference to assigned document" do
+    @post_class.one(:author, :class => @author_class)
+    post = @post_class.new
+    new_author = @author_class.new
+    post.author = new_author
+    new_author.name = 'Frank'
+
+    post.author.name.should == 'Frank'
+  end
+end

data/spec/functional/dirty_spec.rb

@@ -280,6 +280,27 @@ describe "Dirty" do
     end
   end
 
+  context "Document having Array key with typecast option" do
+    before do
+      @author_id = BSON::ObjectId.new
+      @doc = Doc('Book') { key :author_ids, Array, typecast: "ObjectId" }
+      @doc.plugin MongoMapper::Plugins::Dirty
+      @book = @doc.create!(author_ids: [@author_id])
+    end
+
+    context "changed" do
+      it "should be empty if assigned the same array" do
+        @book.author_ids = [@author_id]
+        @book.changed.should be_empty
+      end
+
+      it "should be empty if assigned the same but before-typecasted array" do
+        @book.author_ids = [@author_id.to_s]
+        @book.changed.should be_empty
+      end
+    end
+  end
+
   context "Embedded documents" do
     before do
       @edoc = EDoc('Duck') { key :name, String }

data/spec/functional/dirty_with_callbacks_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'DirtyWithCallbacks' do
+  it 'should update its changes/previous_changes before after_create/after_update callbacks' do
+    history = {}
+
+    document = Doc {
+      key :x, String
+
+      after_save {
+        history[:after_save] = {
+          changes: changes,
+          previous_changes: previous_changes,
+        }
+      }
+      after_create {
+        history[:after_create] = {
+          changes: changes,
+          previous_changes: previous_changes,
+        }
+      }
+      after_update {
+        history[:after_update] = {
+          changes: changes,
+          previous_changes: previous_changes,
+        }
+      }
+    }
+
+    d = document.new(x: 'hello')
+    d.save
+
+    history.should == {
+      after_save: {
+        changes: {},
+        previous_changes: {'x' => [nil, 'hello']},
+      },
+      after_create: {
+        changes: {},
+        previous_changes: {'x' => [nil, 'hello']},
+      },
+    }
+    history.clear
+
+    d.x = 'world'
+    d.save!
+
+    history.should == {
+      after_save: {
+        changes: {},
+        previous_changes: {'x' => ['hello', 'world']},
+      },
+      after_update: {
+        changes: {},
+        previous_changes: {'x' => ['hello', 'world']},
+      },
+    }
+  end
+end

data/spec/functional/scopes_spec.rb

@@ -200,6 +200,19 @@ describe "Scopes" do
         Blog.scopes.keys.map(&:to_s).should =~ %w(by_slug by_title published)
       end
     end
+
+    context 'with predefined class method name' do
+      it 'should raise ArgumentError' do
+        bad_names = %i(private public protected allocate new name parent superclass reload)
+        bad_names.each do |bad_name|
+          -> {
+            Doc() do
+              scope bad_name, -> {}
+            end
+          }.should raise_error(ArgumentError, /You tried to define a scope named "#{bad_name}"/)
+        end
+      end
+    end
   end
 
   describe "with_scope" do
@@ -434,4 +447,79 @@ describe "Scopes" do
       @klass.unsent.sorted.all.should == [two_days_ago, one_day_ago]
     end
   end
+
+  describe "thread safety" do
+    before do
+      @klass = Doc do
+        key :name, String
+      end
+
+      @threads = []
+    end
+
+    after do
+      @threads.each do |thread|
+        thread.kill
+      end
+    end
+
+    def make_thread(&block)
+      Thread.new(&block).tap do |thread|
+        @threads << thread
+      end
+    end
+
+    def wait_for_threads!
+      @threads.each { |t| t.join }
+    end
+
+    it "should not taint another thread's active scopes" do
+      count_active_scopes = nil
+      second_thread_run = false
+
+      make_thread do
+        @klass.with_scope(name: 'foo') do
+          loop do
+            sleep Float::EPSILON
+            break if second_thread_run
+          end
+        end
+      end
+
+      make_thread do
+        count_active_scopes = @klass.active_scopes.length
+        second_thread_run = true
+      end
+
+      wait_for_threads!
+
+      count_active_scopes.should == 0
+    end
+
+    it "should not taint another thread's count method" do
+      @klass.create!(name: 'foo')
+      @klass.create!(name: 'bar')
+
+      klass_count = nil
+      second_thread_run = false
+
+      make_thread do
+        @klass.with_scope(name: 'foo') do
+          loop do
+            sleep Float::EPSILON
+            break if second_thread_run
+          end
+        end
+      end
+
+      make_thread do
+        klass_count = @klass.count
+        second_thread_run = true
+      end
+
+      wait_for_threads!
+
+      klass_count.should == 2
+    end
+  end
 end

data/spec/unit/associations/proxy_spec.rb

@@ -95,5 +95,17 @@ describe "Proxy" do
       p = Proc.new {|x| x+1}
       @proxy.send(:collect, &p).should == [2,3]
     end
+
+    it "should not respond to private method" do
+      @proxy.reload # To load @proxy.target
+      @proxy.target.extend(Module.new do
+        private
+
+          def private_foo
+          end
+      end)
+
+      lambda { @proxy.private_foo }.should raise_error(NoMethodError, /private method `private_foo' called/)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - John Nunemaker
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -224,6 +224,7 @@ files:
 - spec/functional/callbacks_spec.rb
 - spec/functional/counter_cache_spec.rb
 - spec/functional/dirty_spec.rb
+- spec/functional/dirty_with_callbacks_spec.rb
 - spec/functional/document_spec.rb
 - spec/functional/dumpable_spec.rb
 - spec/functional/dynamic_querying_spec.rb