mongo_mapper 0.15.1 → 0.15.5

data/spec/functional/associations/belongs_to_proxy_spec.rb

@@ -269,4 +269,37 @@ 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
+
+    it "should reset parent when foreign key is changed from nil" do
+      post = @post_class.create!
+      comment = @comment_class.create!(post: nil)
+
+      comment.post.should == nil
+
+      comment.post_id = post.id
+
+      comment.post.should == 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/keys_spec.rb

@@ -352,6 +352,19 @@ describe "Keys" do
     it 'should remove the key' do
       DocWithRemovedKey.keys.should_not have_key "_something"
     end
+  end
+
+  describe "default with no type" do
+    it "should work (regression)" do
+      doc = Doc do
+        key :a_num, default: 0
+      end
 
+      instance = doc.new
+      instance.a_num.should == 0
+
+      instance = doc.new(a_num: 10)
+      instance.a_num.should == 10
+    end
   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/functional/shardable_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe 'Shardable' do
+  let(:sharded_model) {
+    Doc do
+      key :first_name, String
+      key :last_name, String
+      shard_key :first_name, :last_name
+    end
+  }
+
+  describe 'shard_key_fields' do
+    it 'returns declared field names' do
+      sharded_model.shard_key_fields.should == ['first_name', 'last_name']
+    end
+  end
+
+  describe 'shard_key_filter' do
+    context 'new record' do
+      let(:document) { sharded_model.new(first_name: 'John', last_name: 'Smith') }
+
+      it 'returns current values' do
+        document.shard_key_filter.should == { 'first_name' => 'John', 'last_name' => 'Smith' }
+      end
+    end
+
+    context 'persisted record' do
+      let(:document) { sharded_model.create!(first_name: 'John', last_name: 'Smith') }
+
+      before do
+        document.first_name = 'William'
+      end
+
+      it 'returns persisted values' do
+        document.shard_key_filter.should == { 'first_name' => 'John', 'last_name' => 'Smith' }
+      end
+    end
+  end
+
+  context 'creating new document' do
+    let(:document) { sharded_model.new(first_name: 'John', last_name: 'Smith') }
+
+    it 'inserts new document' do
+      lambda { document.save! }.should change { sharded_model.count }.by(1)
+
+      persisted = sharded_model.find(document.id)
+      persisted.first_name.should == 'John'
+      persisted.last_name.should == 'Smith'
+    end
+  end
+
+  context 'updating persisted document' do
+    let(:document) { sharded_model.create!(first_name: 'John', last_name: 'Smith') }
+
+    before do
+      document.first_name = 'William'
+    end
+
+    it 'updates persisted document' do
+      lambda { document.save! }.should_not change { sharded_model.count }
+
+      persisted = sharded_model.find(document.id)
+      persisted.first_name.should == 'William'
+      persisted.last_name.should == 'Smith'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,13 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'rubygems'
 require 'bundler/setup'
+
+# workaround for https://github.com/jruby/jruby/issues/6547
+if RUBY_PLATFORM == 'java'
+  require 'i18n/backend'
+  require 'i18n/backend/simple'
+end
+
 Bundler.require(:default)
 require 'fileutils'
 require 'timecop'

data/spec/unit/associations/proxy_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 class FakeNilProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; nil end
+  def load_target; @target ||= nil end
 end
 
 class FakeBlankProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; '' end
+  def load_target; @target ||= '' end
 end
 
 class FakeNumberProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; 17 end
+  def load_target; @target ||= 17 end
 end
 
 class FakeProxy < MongoMapper::Plugins::Associations::Proxy
-  def find_target; [1, 2] end
+  def load_target; @target ||= [1, 2] end
 end
 
 describe "Proxy" do
@@ -32,7 +32,7 @@ describe "Proxy" do
   end
 
   it "should be able to inspect the proxy" do
-    @proxy.inspect.should == '[1, 2]'
+    @proxy.inspect.should == "#<FakeProxy:#{@proxy.object_id} [1, 2]>"
   end
 
   context "nil?" do
@@ -95,5 +95,30 @@ 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
+
+  context "hash" do
+    it "should return the same value for the same proxy" do
+      proxy_a = FakeProxy.new(@owner, @association)
+      proxy_b = FakeProxy.new(@owner, @association)
+
+      proxy_a.hash.should == proxy_b.hash
+    end
+
+    it "should return different values for different proxies" do
+      @proxy.hash.should_not == @nil_proxy.hash
+    end
   end
 end

data/spec/unit/extensions_spec.rb

@@ -192,15 +192,21 @@ describe "Support" do
     end
   end
 
-  context "NilClass#from_mongo" do
+  context "NilClass.from_mongo" do
     it "should return nil" do
-      nil.from_mongo(nil).should be_nil
+      NilClass.from_mongo(nil).should be_nil
+    end
+  end
+
+  context "NilClass.to_mongo" do
+    it "should return nil" do
+      NilClass.to_mongo(nil).should be_nil
     end
   end
 
   context "NilClass#to_mongo" do
     it "should return nil" do
-      nil.to_mongo(nil).should be_nil
+      nil.to_mongo.should be_nil
     end
   end
 

data/spec/unit/inspect_spec.rb

@@ -31,7 +31,7 @@ describe "Inspect" do
       klass.many :pets, :class => pets
 
       doc = klass.new(:pets => [{:name => "Kitten"}])
-      doc.inspect.should =~ /_id:.*, pets: \[.*_id.*, name: "Kitten".*\]/
+      doc.inspect.should =~ /_id:.*, pets: .*\[.*_id.*, name: "Kitten".*\]/
     end
 
     it "should include embedded document" do

data/spec/unit/key_spec.rb

@@ -55,6 +55,7 @@ describe "Key" do
     it "should work with name and options" do
       key = Key.new(:foo, :required => true)
       key.name.should == 'foo'
+      key.type.should be_nil
       key.options[:required].should be_truthy
     end
 
@@ -111,7 +112,12 @@ describe "Key" do
     subject { @key }
 
     it "should cast each element correctly" do
-      ids = [BSON::ObjectId.new, BSON::ObjectId.new, BSON::ObjectId.new.to_s, BSON::ObjectId.new.to_s]
+      ids = [
+        BSON::ObjectId.new,
+        BSON::ObjectId.new,
+        BSON::ObjectId.new.to_s,
+        BSON::ObjectId.new.to_s
+      ]
       subject.set(ids).should == ids.map { |id| ObjectId.to_mongo(id) }
     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.5
 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: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -82,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MongoMapper is a Object-Document Mapper for Ruby and Rails
 email:
 - nunemaker@gmail.com
@@ -137,24 +151,24 @@ files:
 - lib/mongo_mapper/plugins/associations.rb
 - lib/mongo_mapper/plugins/associations/base.rb
 - lib/mongo_mapper/plugins/associations/belongs_to_association.rb
-- lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb
-- lib/mongo_mapper/plugins/associations/collection.rb
-- lib/mongo_mapper/plugins/associations/embedded_collection.rb
-- lib/mongo_mapper/plugins/associations/in_array_proxy.rb
-- lib/mongo_mapper/plugins/associations/in_foreign_array_proxy.rb
 - lib/mongo_mapper/plugins/associations/many_association.rb
-- lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_documents_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb
-- lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_as_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_association.rb
-- lib/mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb
-- lib/mongo_mapper/plugins/associations/one_proxy.rb
-- lib/mongo_mapper/plugins/associations/proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/belongs_to_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/belongs_to_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/collection.rb
+- lib/mongo_mapper/plugins/associations/proxy/embedded_collection.rb
+- lib/mongo_mapper/plugins/associations/proxy/in_array_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/in_foreign_array_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_documents_as_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_documents_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/many_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_as_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_embedded_polymorphic_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_embedded_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/one_proxy.rb
+- lib/mongo_mapper/plugins/associations/proxy/proxy.rb
 - lib/mongo_mapper/plugins/associations/single_association.rb
 - lib/mongo_mapper/plugins/caching.rb
 - lib/mongo_mapper/plugins/callbacks.rb
@@ -188,6 +202,7 @@ files:
 - lib/mongo_mapper/plugins/sci.rb
 - lib/mongo_mapper/plugins/scopes.rb
 - lib/mongo_mapper/plugins/serialization.rb
+- lib/mongo_mapper/plugins/shardable.rb
 - lib/mongo_mapper/plugins/stats.rb
 - lib/mongo_mapper/plugins/strong_parameters.rb
 - lib/mongo_mapper/plugins/timestamps.rb
@@ -224,6 +239,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
@@ -243,6 +259,7 @@ files:
 - spec/functional/safe_spec.rb
 - spec/functional/sci_spec.rb
 - spec/functional/scopes_spec.rb
+- spec/functional/shardable_spec.rb
 - spec/functional/static_keys_spec.rb
 - spec/functional/stats_spec.rb
 - spec/functional/strong_parameters_spec.rb
@@ -303,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Ruby Object Mapper for Mongo

data/lib/mongo_mapper/plugins/associations/collection.rb

@@ -1,29 +0,0 @@
-# encoding: UTF-8
-module MongoMapper
-  module Plugins
-    module Associations
-      class Collection < Proxy
-        def to_ary
-          load_target
-          if target.is_a?(Array)
-            target.to_ary
-          else
-            Array(target)
-          end
-        end
-
-        alias_method :to_a, :to_ary
-
-        def include?(*args)
-          load_target
-          target.include?(*args)
-        end
-
-        def reset
-          super
-          target = []
-        end
-      end
-    end
-  end
-end