jnunemaker-mongomapper 0.3.2 → 0.3.3

data/test/functional/test_rails_compatibility.rb

@@ -18,9 +18,8 @@ class TestRailsCompatibility < Test::Unit::TestCase
     end
   
     should "have to_param that returns id" do
-      id = MongoID.new
-      instance = Order.create('_id' => id.to_s)
-      instance.to_param.should == id.to_s
+      instance = Order.create('_id' => 1234)
+      instance.to_param.should == '1234'
     end
 
     should "alias new to new_record?" do

data/test/models.rb

@@ -38,8 +38,12 @@ end
 
 class RealPerson
   include MongoMapper::Document
-  many :pets  
+  many :pets
   key :name, String
+
+  def realname=(n)
+    self.name = n
+  end
 end
 
 class Person
@@ -83,26 +87,26 @@ module TrModels
     include MongoMapper::EmbeddedDocument
     key :license_plate, String
   end
-  
+
   class Car < TrModels::Transport
     include MongoMapper::EmbeddedDocument
     key :model, String
     key :year, Integer
   end
-  
+
   class Bus < TrModels::Transport
     include MongoMapper::EmbeddedDocument
     key :max_passengers, Integer
   end
-  
+
   class Ambulance < TrModels::Transport
     include MongoMapper::EmbeddedDocument
     key :icu, Boolean
   end
-  
+
   class Fleet
     include MongoMapper::Document
     many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
-    key :name, String    
+    key :name, String
   end
 end

data/test/unit/serializers/test_json_serializer.rb

@@ -141,7 +141,7 @@ class JsonSerializationTest < Test::Unit::TestCase
     
     should "allow attribute filtering with except" do
       json = @contacts.to_json(:except => [:name, :preferences, :awesome, :created_at, :updated_at])
-      assert_equal %([{"id":"","age":39},{"id":"","age":14}]), json
+      assert_equal %([{"id":null,"age":39},{"id":null,"age":14}]), json
     end
   end
   

data/test/unit/test_document.rb

@@ -100,7 +100,13 @@ class DocumentTest < Test::Unit::TestCase
 
     context "new?" do
       should "be true if no id" do
-        @document.new.new?.should be(true)
+        @document.new.new?.should be_true
+      end
+      
+      should "be true if id but using custom id and not saved yet" do
+        doc = @document.new
+        doc.id = '1234'
+        doc.new?.should be_true
       end
     end
     

data/test/unit/test_embedded_document.rb

@@ -55,16 +55,28 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
-    should "work" do
+    should "work with name" do
+      key = @document.key(:name)
+      key.name.should == 'name'
+    end
+    
+    should "work with name and type" do
       key = @document.key(:name, String)
       key.name.should == 'name'
       key.type.should == String
-      key.should be_instance_of(MongoMapper::Key)
     end
     
-    should "work with options" do
+    should "work with name, type and options" do
       key = @document.key(:name, String, :required => true)
-      key.options[:required].should be(true)
+      key.name.should == 'name'
+      key.type.should == String
+      key.options[:required].should be_true
+    end
+    
+    should "work with name and options" do
+      key = @document.key(:name, :required => true)
+      key.name.should == 'name'
+      key.options[:required].should be_true
     end
     
     should "be tracked per document" do
@@ -76,11 +88,11 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @document.keys['age'].type.should == Integer
     end
     
-    should "be redefinable" do
+    should "not be redefinable" do
       @document.key(:foo, String)
       @document.keys['foo'].type.should == String
       @document.key(:foo, Integer)
-      @document.keys['foo'].type.should == Integer
+      @document.keys['foo'].type.should == String
     end
     
     should "create reader method" do
@@ -134,6 +146,53 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       Parent.subclasses.should      == [Child, OtherChild]
     end
   end
+  
+  context "Applying default values for keys" do
+    setup do
+      @document = Class.new do
+        include MongoMapper::EmbeddedDocument
+        
+        key :name,      String,   :default => 'foo'
+        key :age,       Integer,  :default => 20
+        key :net_worth, Float,    :default => 100.00
+        key :active,    Boolean,  :default => true
+        key :smart,     Boolean,  :default => false
+        key :skills,    Array,    :default => [1]
+        key :options,   Hash,     :default => {'foo' => 'bar'}
+      end
+      
+      @doc = @document.new
+    end
+    
+    should "work for strings" do
+      @doc.name.should == 'foo'
+    end
+    
+    should "work for integers" do
+      @doc.age.should == 20
+    end
+    
+    should "work for floats" do
+      @doc.net_worth.should == 100.00
+    end
+    
+    should "work for booleans" do
+      @doc.active.should == true
+      @doc.smart.should == false
+    end
+    
+    should "work for arrays" do
+      @doc.skills.should == [1]
+      @doc.skills << 2
+      @doc.skills.should == [1, 2]
+    end
+    
+    should "work for hashes" do
+      @doc.options['foo'].should == 'bar'
+      @doc.options['baz'] = 'wick'
+      @doc.options['baz'].should == 'wick'
+    end
+  end
 
   context "An instance of an embedded document" do
     setup do
@@ -149,16 +208,23 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @document.keys.keys.should include('_id')
     end
     
-    should "have id method that is string representation of _id" do
+    should "have id method that sets _id" do
       doc = @document.new
       doc.id.should == doc._id.to_s
     end
     
-    should "be able to set _id using id=" do
-      id = MongoID.new
-      doc = @document.new(:id => id.to_s)
-      doc._id.should == id
-      doc.id.should == id.to_s
+    context "setting custom id" do
+      should "set _id" do
+        doc = @document.new(:id => '1234')
+        doc._id.should == '1234'
+      end
+      
+      should "know that custom id is set" do
+        doc = @document.new
+        doc.using_custom_id?.should be_false
+        doc.id = '1234'
+        doc.using_custom_id?.should be_true
+      end
     end
 
     context "being initialized" do
@@ -168,6 +234,12 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc.attributes['name'].should == 'John'
         doc.attributes['age'].should == 23
       end
+      
+      should "be able to assign keys dynamically" do
+        doc = @document.new(:name => 'John', :skills => ['ruby', 'rails'])
+        doc.name.should == 'John'
+        doc.skills.should == ['ruby', 'rails']
+      end
 
       should "not throw error if initialized with nil" do
         lambda {
@@ -191,13 +263,6 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc.attributes[:age].should == 10
       end
 
-      should "raise undefined method if no key exists" do
-        doc = @document.new(:name => 'foobar', :age => 10)
-        lambda {
-          doc.attributes = {:name => 'new value', :foobar => 'baz'}
-        }.should raise_error(NoMethodError)
-      end
-
       should "not ignore keys that have methods defined" do
         @document.class_eval do
           attr_writer :password
@@ -237,10 +302,19 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc[:name].should == 'string'
       end
       
-      should "be able to write key value with []=" do
-        doc = @document.new
-        doc[:name] = 'string'
-        doc[:name].should == 'string'
+      context "[]=" do
+        should "write key value for existing key" do
+          doc = @document.new
+          doc[:name] = 'string'
+          doc[:name].should == 'string'
+        end
+        
+        should "create key and write value for missing key" do
+          doc = @document.new
+          doc[:foo] = 'string'
+          @document.keys.keys.include?('foo').should be_true
+          doc[:foo].should == 'string'
+        end
       end
     end
     
@@ -273,6 +347,23 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc = @document.new(:name => 'John', :age => 27)
         doc.name_and_age.should == 'John (27)'
       end
+      
+      should "set instance variable" do
+        @document.key :foo, Array
+        doc = @document.new
+        doc.instance_variable_get("@foo").should be_nil
+        doc.foo
+        doc.instance_variable_get("@foo").should == []
+      end
+      
+      should "not set instance variable if frozen" do
+        @document.key :foo, Array
+        doc = @document.new
+        doc.instance_variable_get("@foo").should be_nil
+        doc.freeze
+        doc.foo
+        doc.instance_variable_get("@foo").should be_nil
+      end
     end
 
     context "reading an attribute before typcasting" do
@@ -367,4 +458,4 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
   end # instance of a embedded document
-end
+end

data/test/unit/test_finder_options.rb

@@ -28,7 +28,6 @@ class FinderOptionsTest < Test::Unit::TestCase
     end
   end
   
-  
   context "Converting conditions to criteria" do
     should "work with simple criteria" do
       FinderOptions.to_mongo_criteria(:foo => 'bar').should == {
@@ -47,53 +46,23 @@ class FinderOptionsTest < Test::Unit::TestCase
       }
     end
     
-    should "not use $in for arrays if already using array modifier" do
+    should "not use $in for arrays if already using array operator" do
       FinderOptions.to_mongo_criteria(:foo => {'$all' => [1,2,3]}).should == {
         :foo => {'$all' => [1,2,3]}
       }
+
+      FinderOptions.to_mongo_criteria(:foo => {'$any' => [1,2,3]}).should == {
+        :foo => {'$any' => [1,2,3]}
+      }
     end
     
     should "work arbitrarily deep" do
       FinderOptions.to_mongo_criteria(:foo => {:bar => [1,2,3]}).should == {
         :foo => {:bar => {'$in' => [1,2,3]}}
       }
-    end
-    
-    should "convert string _ids to objectid automatically" do
-      id = XGen::Mongo::Driver::ObjectID.new
-      
-      FinderOptions.to_mongo_criteria(:_id => id.to_s).should == {
-        :_id => id
-      }
-    end
-    
-    should "leave objectid _ids alone" do
-      id = XGen::Mongo::Driver::ObjectID.new
-      
-      FinderOptions.to_mongo_criteria(:_id => id).should == {
-        :_id => id
-      }
-    end
-    
-    should "convert array of string _ids to object ids" do
-      id1 = XGen::Mongo::Driver::ObjectID.new
-      id2 = XGen::Mongo::Driver::ObjectID.new
-      
-      FinderOptions.to_mongo_criteria(:_id => [id1.to_s, id2.to_s]).should == {
-        :_id => {'$in' => [id1, id2]}
-      }
-    end
-    
-    should "convert array of string _ids when using mongo array stuff" do
-      id1 = XGen::Mongo::Driver::ObjectID.new
-      id2 = XGen::Mongo::Driver::ObjectID.new
-      
-      FinderOptions.to_mongo_criteria(:_id => {'$all' => [id1.to_s, id2.to_s]}).should == {
-        :_id => {'$all' => [id1, id2]}
-      }
       
-      FinderOptions.to_mongo_criteria(:_id => {'$any' => [id1.to_s, id2.to_s]}).should == {
-        :_id => {'$any' => [id1, id2]}
+      FinderOptions.to_mongo_criteria(:foo => {:bar => {'$any' => [1,2,3]}}).should == {
+        :foo => {:bar => {'$any' => [1,2,3]}}
       }
     end
   end

data/test/unit/test_key.rb

@@ -14,7 +14,7 @@ class KeyTest < Test::Unit::TestCase
 
   context "The Key Class" do
     should "have the native types defined" do
-      Key::NativeTypes.should == [String, Float, Time, Integer, Boolean, Array, Hash, MongoID]
+      Key::NativeTypes.should == [String, Float, Time, Integer, Boolean, Array, Hash]
     end
   end
 
@@ -30,7 +30,7 @@ class KeyTest < Test::Unit::TestCase
     should "allow setting options" do
       Key.new(:foo, Integer, :required => true).options[:required].should be(true)
     end
-    
+
     should "default options to {}" do
       Key.new(:foo, Integer, nil).options.should == {}
     end
@@ -38,6 +38,30 @@ class KeyTest < Test::Unit::TestCase
     should "symbolize option keys" do
       Key.new(:foo, Integer, 'required' => true).options[:required].should be(true)
     end
+    
+    should "work with just name" do
+      key = Key.new(:foo)
+      key.name.should == 'foo'
+    end
+    
+    should "work with name and type" do
+      key = Key.new(:foo, String)
+      key.name.should == 'foo'
+      key.type.should == String
+    end
+    
+    should "work with name, type, and options" do
+      key = Key.new(:foo, String, :required => true)
+      key.name.should == 'foo'
+      key.type.should == String
+      key.options[:required].should be_true
+    end
+    
+    should "work with name and options" do
+      key = Key.new(:foo, :required => true)
+      key.name.should == 'foo'
+      key.options[:required].should be_true
+    end
   end
 
   context "A key" do
@@ -52,14 +76,19 @@ class KeyTest < Test::Unit::TestCase
     should "not be equal to another key with different type" do
       Key.new(:name, String).should_not == Key.new(:name, Integer)
     end
-
-    should "know if it is native" do
-      Key.new(:name, String).native?.should be_true
-    end
-
-    should "know if it is not native" do
-      klass = Class.new
-      Key.new(:name, klass).native?.should be_false
+    
+    context "native?" do
+      should "be true if native type" do
+        Key.new(:name, String).native?.should be_true
+      end
+      
+      should "be true if no type" do
+        Key.new(:name).native?.should be_true
+      end
+      
+      should "be false if not native" do
+        Key.new(:name, Class.new).native?.should be_false
+      end
     end
 
     should "know if it is a embedded_document" do
@@ -75,14 +104,6 @@ class KeyTest < Test::Unit::TestCase
   end
 
   context "setting a value" do
-    should "correctly typecast MongoIDs" do
-      key = Key.new(:_id, MongoID)
-      id = MongoID.new
-      [id, id.to_s].each do |a|
-        key.set(a).should == id
-      end
-    end
-    
     should "correctly typecast Strings" do
       key = Key.new(:foo, String)
       [21, '21'].each do |a|
@@ -114,11 +135,6 @@ class KeyTest < Test::Unit::TestCase
       key.set('2000-01-01 01:01:01.123456').zone.should == "UTC"
     end
 
-    should_eventually "correctly typecast Dates" do
-      key = Key.new(:foo, Date)
-      key.set('2000-01-01').should == Date.new(2000, 1, 1)
-    end
-
     should "correctly typecast Boolean" do
       key = Key.new(:foo, Boolean)
       ['false', false, 'f', '0', 0].each do |b|
@@ -151,6 +167,13 @@ class KeyTest < Test::Unit::TestCase
       key = Key.new(:foo, String)
       key.get('bar').should == 'bar'
     end
+    
+    should "work without type" do
+      key = Key.new(:foo)
+      key.get([1,"2"]).should == [1, "2"]
+      key.get(false).should   == false
+      key.get({}).should      == {}
+    end
 
     context "for a key with a default value set" do
       setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.11.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -92,6 +92,7 @@ files:
 - lib/mongomapper/associations/proxy.rb
 - lib/mongomapper/callbacks.rb
 - lib/mongomapper/document.rb
+- lib/mongomapper/dynamic_finder.rb
 - lib/mongomapper/embedded_document.rb
 - lib/mongomapper/finder_options.rb
 - lib/mongomapper/key.rb
@@ -102,6 +103,7 @@ files:
 - lib/mongomapper/save_with_validation.rb
 - lib/mongomapper/serialization.rb
 - lib/mongomapper/serializers/json_serializer.rb
+- lib/mongomapper/support.rb
 - lib/mongomapper/validations.rb
 - mongomapper.gemspec
 - test/NOTE_ON_TESTING
@@ -125,14 +127,13 @@ files:
 - test/unit/test_embedded_document.rb
 - test/unit/test_finder_options.rb
 - test/unit/test_key.rb
-- test/unit/test_mongo_id.rb
 - test/unit/test_mongomapper.rb
 - test/unit/test_observing.rb
 - test/unit/test_pagination.rb
 - test/unit/test_rails_compatibility.rb
 - test/unit/test_serializations.rb
 - test/unit/test_validations.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/jnunemaker/mongomapper
 licenses: 
 post_install_message: 
@@ -157,7 +158,7 @@ requirements: []
 rubyforge_project: mongomapper
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
@@ -180,7 +181,6 @@ test_files:
 - test/unit/test_embedded_document.rb
 - test/unit/test_finder_options.rb
 - test/unit/test_key.rb
-- test/unit/test_mongo_id.rb
 - test/unit/test_mongomapper.rb
 - test/unit/test_observing.rb
 - test/unit/test_pagination.rb

data/test/unit/test_mongo_id.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-
-class MongoIDTest < Test::Unit::TestCase
-  PhonyError = Class.new(StandardError)
-  
-  class Phony
-    def to_s
-      raise PhonyError
-    end
-  end
-  
-  context "mm_typecast" do
-    should "return value if object id" do
-      id = XGen::Mongo::Driver::ObjectID.new
-      MongoID.mm_typecast(id).should == id
-    end
-    
-    should "return object id if string" do
-      id = XGen::Mongo::Driver::ObjectID.new
-      MongoID.mm_typecast(id.to_s).should == id
-    end
-    
-    should "raise MongoMapper::IllegalID if invalid id" do
-      lambda {
-        MongoID.mm_typecast(1234)
-      }.should raise_error(MongoMapper::IllegalID)
-    end
-    
-    should "raise exception if message does not match illegal object id" do
-      lambda {
-        MongoID.mm_typecast(Phony.new)
-      }.should raise_error(PhonyError)
-    end
-  end
-end