mongo_mapper-unstable 2009.11.8 → 2009.11.18

data/lib/mongo_mapper/serializers/json_serializer.rb

@@ -51,7 +51,7 @@ module MongoMapper #:nodoc:
     #         "permalink": "1-konata-izumi"}
     def to_json(options={})
       apply_to_json_defaults(options)
-      
+
       if include_root_in_json
         "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
       else
@@ -75,7 +75,7 @@ module MongoMapper #:nodoc:
         @json_class_name ||= name.demodulize.underscore.inspect
       end
     end
-    
+
     private
       def apply_to_json_defaults(options)
         unless options[:only]

data/lib/mongo_mapper/support.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 class BasicObject #:nodoc:
   instance_methods.each { |m| undef_method m unless m =~ /(^__|instance_eval)/ }
 end unless defined?(BasicObject)
@@ -13,34 +15,6 @@ class Array
   end
 end
 
-class Binary
-  def self.to_mongo(value)
-    if value.is_a?(ByteBuffer)
-      value
-    else
-      value.nil? ? nil : ByteBuffer.new(value)
-    end
-  end
-  
-  def self.from_mongo(value)
-    value
-  end
-end
-
-class Boolean
-  def self.to_mongo(value)
-    if value.is_a?(Boolean)
-      value
-    else
-      ['true', 't', '1'].include?(value.to_s.downcase)
-    end
-  end
-  
-  def self.from_mongo(value)
-    !!value
-  end
-end
-
 class Date
   def self.to_mongo(value)
     date = Date.parse(value.to_s)
@@ -120,6 +94,16 @@ class Object
   end
 end
 
+class Set
+  def self.to_mongo(value)
+    value.to_a
+  end
+  
+  def self.from_mongo(value)
+    Set.new(value || [])
+  end
+end
+
 class String
   def self.to_mongo(value)
     value.nil? ? nil : value.to_s
@@ -138,33 +122,21 @@ class Symbol
   end
 end
 
-class Time
+class Time  
   def self.to_mongo(value)
     if value.nil? || value == ''
       nil
     else
-      to_utc_time(value)
+      time = MongoMapper.time_class.parse(value.to_s)
+      time && time.utc
     end
   end
   
   def self.from_mongo(value)
-    if Time.respond_to?(:zone) && Time.zone && value.present?
+    if MongoMapper.use_time_zone? && value.present?
       value.in_time_zone(Time.zone)
     else
       value
     end
   end
-  
-  def self.to_utc_time(value)
-    to_local_time(value).try(:utc)
-  end
-  
-  # make sure we have a time and that it is local
-  def self.to_local_time(value)
-    if Time.respond_to?(:zone) && Time.zone
-      Time.zone.parse(value.to_s)
-    else
-      Time.parse(value.to_s)
-    end
-  end
 end

data/lib/mongo_mapper/types.rb

@@ -0,0 +1,64 @@
+module MongoMapper
+  module Types
+    class Binary
+      def self.to_mongo(value)
+        if value.is_a?(ByteBuffer)
+          value
+        else
+          value.nil? ? nil : ByteBuffer.new(value)
+        end
+      end
+
+      def self.from_mongo(value)
+        value
+      end
+    end
+    
+    class Boolean
+      def self.to_mongo(value)
+        if value.is_a?(Boolean)
+          value
+        else
+          ['true', 't', '1'].include?(value.to_s.downcase)
+        end
+      end
+
+      def self.from_mongo(value)
+        !!value
+      end
+    end
+    
+    class ObjectId
+      def self.to_mongo(value)
+        if value.nil?
+          nil
+        elsif value.is_a?(Mongo::ObjectID)
+          value
+        else
+          Mongo::ObjectID.from_string(value.to_s)
+        end
+      end
+      
+      def self.from_mongo(value)
+        value
+      end
+    end
+    
+    # This allows using just Boolean when defining 
+    # keys instead of MongoMapper::Types::Boolean
+    module Lookup
+      def const_missing(name)
+        if MongoMapper::Types.const_defined?(name)
+          MongoMapper::Types.const_get(name)
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+# This was required to get in front of ActiveSupports Class#const_missing
+Class.instance_eval do
+  include MongoMapper::Types::Lookup
+end

data/lib/mongo_mapper/validations.rb

@@ -15,7 +15,7 @@ module MongoMapper
         return true if allow_blank && value.blank?
         base_conditions = case_sensitive ? {self.attribute => value} : {}
         doc = instance.class.first(base_conditions.merge(scope_conditions(instance)).merge(where_conditions(instance)))
-        doc.nil? || instance.id == doc.id
+        doc.nil? || instance._id == doc._id
       end
 
       def message(instance)

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.5.8"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-11-17}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
      "lib/mongo_mapper/serialization.rb",
      "lib/mongo_mapper/serializers/json_serializer.rb",
      "lib/mongo_mapper/support.rb",
+     "lib/mongo_mapper/types.rb",
      "lib/mongo_mapper/validations.rb",
      "mongo_mapper.gemspec",
      "specs.watchr",
@@ -70,6 +71,7 @@ Gem::Specification.new do |s|
      "test/functional/test_logger.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_string_id_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
      "test/support/custom_matchers.rb",
@@ -82,7 +84,7 @@ Gem::Specification.new do |s|
      "test/unit/test_embedded_document.rb",
      "test/unit/test_finder_options.rb",
      "test/unit/test_key.rb",
-     "test/unit/test_mongomapper.rb",
+     "test/unit/test_mongo_mapper.rb",
      "test/unit/test_observing.rb",
      "test/unit/test_pagination.rb",
      "test/unit/test_rails_compatibility.rb",
@@ -113,6 +115,7 @@ Gem::Specification.new do |s|
      "test/functional/test_logger.rb",
      "test/functional/test_pagination.rb",
      "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_string_id_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
      "test/support/custom_matchers.rb",
@@ -125,7 +128,7 @@ Gem::Specification.new do |s|
      "test/unit/test_embedded_document.rb",
      "test/unit/test_finder_options.rb",
      "test/unit/test_key.rb",
-     "test/unit/test_mongomapper.rb",
+     "test/unit/test_mongo_mapper.rb",
      "test/unit/test_observing.rb",
      "test/unit/test_pagination.rb",
      "test/unit/test_rails_compatibility.rb",
@@ -141,29 +144,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.16"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.17.1"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
-      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.16"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
+      s.add_dependency(%q<mongo>, ["= 0.17.1"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_dependency(%q<timecop>, ["= 0.3.1"])
-      s.add_dependency(%q<mocha>, ["= 0.9.4"])
+      s.add_dependency(%q<mocha>, ["= 0.9.8"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.16"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
+    s.add_dependency(%q<mongo>, ["= 0.17.1"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])
     s.add_dependency(%q<timecop>, ["= 0.3.1"])
-    s.add_dependency(%q<mocha>, ["= 0.9.4"])
+    s.add_dependency(%q<mocha>, ["= 0.9.8"])
   end
 end
 

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -19,11 +19,11 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target = project
     status.save.should be_true
 
-    from_db = Status.find(status.id)
-    from_db.target.nil?.should be_false
-    from_db.target_id.should == project.id
-    from_db.target_type.should == "Project"
-    from_db.target.name.should == "mongomapper"
+    status = status.reload
+    status.target.nil?.should be_false
+    status.target_id.should == project._id
+    status.target_type.should == "Project"
+    status.target.name.should == "mongomapper"
   end
 
   should "unset the association" do
@@ -32,11 +32,11 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.target = project
     status.save.should be_true
 
-    from_db = Status.find(status.id)
-    from_db.target = nil
-    from_db.target_type.nil?.should be_true
-    from_db.target_id.nil?.should be_true
-    from_db.target.nil?.should be_true
+    status = status.reload
+    status.target = nil
+    status.target_type.nil?.should be_true
+    status.target_id.nil?.should be_true
+    status.target.nil?.should be_true
   end
   
   context "association id set but document not found" do

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -42,6 +42,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   end
   
   should "return nil if id set but document not found" do
-    @comment_class.new(:name => 'Foo', :post_id => '1234').post.nil?.should be_true
+    id = Mongo::ObjectID.new
+    @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
   end
 end

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -35,19 +35,20 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
         PostComment.new(:body => 'baz')
       ]
     }.should change { PostComment.count }.by(3)
-
-    from_db = Post.find(post.id)
-    from_db.comments.size.should == 3
-    from_db.comments[0].body.should == 'foo'
-    from_db.comments[1].body.should == 'bar'
-    from_db.comments[2].body.should == 'baz'
+    
+    post = post.reload
+    post.comments.size.should == 3
+    bodies = post.comments.collect(&:body)
+    bodies.should include('foo')
+    bodies.should include('bar')
+    bodies.should include('baz')
   end
 
   context "build" do
     should "assign foreign key" do
       post = Post.new
       comment = post.comments.build
-      comment.commentable_id.should == post.id
+      comment.commentable_id.should == post._id
     end
 
     should "assign _type" do
@@ -67,7 +68,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
     should "assign foreign key" do
       post = Post.new
       comment = post.comments.create
-      comment.commentable_id.should == post.id
+      comment.commentable_id.should == post._id
     end
 
     should "assign _type" do
@@ -166,25 +167,25 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
 
     context "with one id" do
       should "work for id in association" do
-        @post.comments.find(@comment2.id).should == @comment2
+        @post.comments.find(@comment2._id).should == @comment2
       end
 
       should "not work for id not in association" do
         lambda {
-          @post.comments.find!(@comment5.id)
+          @post.comments.find!(@comment5._id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
     context "with multiple ids" do
       should "work for ids in association" do
-        posts = @post.comments.find!(@comment1.id, @comment2.id)
+        posts = @post.comments.find!(@comment1._id, @comment2._id)
         posts.should == [@comment1, @comment2]
       end
 
       should "not work for ids not in association" do
         lambda {
-          @post.comments.find!(@comment1.id, @comment2.id, @comment4.id)
+          @post.comments.find!(@comment1._id, @comment2._id, @comment4._id)
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end

data/test/functional/associations/test_many_embedded_polymorphic_proxy.rb

@@ -24,9 +24,9 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
     catalog.medias = [Video.new("file" => "video.mpg", "length" => 3600)]
     catalog.save.should be_true
 
-    from_db = Catalog.find(catalog.id)
-    from_db.medias.size.should == 1
-    from_db.medias[0].file.should == "video.mpg"
+    catalog = catalog.reload
+    catalog.medias.size.should == 1
+    catalog.medias[0].file.should == "video.mpg"
   end
 
   should "store different associations" do      
@@ -38,15 +38,15 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
     ]
     catalog.save.should be_true
     
-    from_db = Catalog.find(catalog.id)
-    from_db.medias.size.should == 3
-    from_db.medias[0].file.should == "video.mpg"
-    from_db.medias[0].length.should == 3600
-    from_db.medias[1].file.should == "music.mp3"
-    from_db.medias[1].bitrate.should == "128kbps"
-    from_db.medias[2].file.should == "image.png"
-    from_db.medias[2].width.should == 800
-    from_db.medias[2].height.should == 600
+    catalog = catalog.reload
+    catalog.medias.size.should == 3
+    catalog.medias[0].file.should == "video.mpg"
+    catalog.medias[0].length.should == 3600
+    catalog.medias[1].file.should == "music.mp3"
+    catalog.medias[1].bitrate.should == "128kbps"
+    catalog.medias[2].file.should == "image.png"
+    catalog.medias[2].width.should == 800
+    catalog.medias[2].height.should == 600
   end
   
   context "With modularized models" do
@@ -75,16 +75,16 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
       fleet.transports[2].year.should == 2008      
       fleet.save.should be_true
       
-      from_db = TrModels::Fleet.find(fleet.id)
-      from_db.transports.size.should == 3
-      from_db.transports[0].license_plate.should == "GGG123"
-      from_db.transports[0].icu.should be_true
-      from_db.transports[1].license_plate.should == "ABC123"
-      from_db.transports[1].model.should == "VW Golf"
-      from_db.transports[1].year.should == 2001
-      from_db.transports[2].license_plate.should == "DEF123"
-      from_db.transports[2].model.should == "Honda Accord"
-      from_db.transports[2].year.should == 2008      
+      fleet = fleet.reload
+      fleet.transports.size.should == 3
+      fleet.transports[0].license_plate.should == "GGG123"
+      fleet.transports[0].icu.should be_true
+      fleet.transports[1].license_plate.should == "ABC123"
+      fleet.transports[1].model.should == "VW Golf"
+      fleet.transports[1].year.should == 2001
+      fleet.transports[2].license_plate.should == "DEF123"
+      fleet.transports[2].model.should == "Honda Accord"
+      fleet.transports[2].year.should == 2008      
     end
     
     should "default reader to empty array" do
@@ -104,9 +104,9 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
       fleet.transports = [TrModels::Car.new("license_plate" => "DCU2013", "model" => "Honda Civic")]
       fleet.save.should be_true
     
-      from_db = TrModels::Fleet.find(fleet.id)
-      from_db.transports.size.should == 1
-      from_db.transports[0].license_plate.should == "DCU2013"
+      fleet = fleet.reload
+      fleet.transports.size.should == 1
+      fleet.transports[0].license_plate.should == "DCU2013"
     end
     
     should "store different associations" do
@@ -118,15 +118,15 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase
       ]
       fleet.save.should be_true
     
-      from_db = TrModels::Fleet.find(fleet.id)
-      from_db.transports.size.should == 3
-      from_db.transports[0].license_plate.should == "ABC1223"
-      from_db.transports[0].model.should == "Honda Civic"
-      from_db.transports[0].year.should == 2003
-      from_db.transports[1].license_plate.should == "XYZ9090"
-      from_db.transports[1].max_passengers.should == 51
-      from_db.transports[2].license_plate.should == "HDD3030"
-      from_db.transports[2].icu.should == true
+      fleet = fleet.reload
+      fleet.transports.size.should == 3
+      fleet.transports[0].license_plate.should == "ABC1223"
+      fleet.transports[0].model.should == "Honda Civic"
+      fleet.transports[0].year.should == 2003
+      fleet.transports[1].license_plate.should == "XYZ9090"
+      fleet.transports[1].max_passengers.should == 51
+      fleet.transports[2].license_plate.should == "HDD3030"
+      fleet.transports[2].icu.should == true
     end
   end