mongo_mapper 0.15.3 → 0.15.4

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/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

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.3
+  version: 0.15.4
 platform: ruby
 authors:
 - John Nunemaker
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-06-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
@@ -304,7 +318,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