mongo_mapper-unstable 2009.11.18 → 2009.12.4

data/Rakefile

@@ -12,7 +12,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors     = ["John Nunemaker"]
   
   gem.add_dependency('activesupport', '>= 2.3')
-  gem.add_dependency('mongo', '0.17.1')
+  gem.add_dependency('mongo', '0.18')
   gem.add_dependency('jnunemaker-validatable', '1.8.1')
   
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')

data/VERSION

@@ -1 +1 @@
-2009.11.18
+2009.12.04

data/lib/mongo_mapper.rb

@@ -108,7 +108,6 @@ module MongoMapper
 end
 
 require 'mongo_mapper/support'
-require 'mongo_mapper/types'
 require 'mongo_mapper/associations'
 require 'mongo_mapper/associations/base'
 require 'mongo_mapper/associations/proxy'

data/lib/mongo_mapper/associations/many_embedded_proxy.rb

@@ -16,7 +16,7 @@ module MongoMapper
       # TODO: test that both string and oid version work
       def find(id)
         load_target
-        @target.detect { |item| item.id == id || item._id == id }
+        @target.detect { |item| item.id.to_s == id || item.id == id }
       end
 
       def <<(*docs)

data/lib/mongo_mapper/embedded_document.rb

@@ -219,7 +219,7 @@ module MongoMapper
       end
       
       def to_param
-        id
+        id.to_s
       end
 
       def attributes=(attrs)
@@ -292,7 +292,7 @@ module MongoMapper
       end
 
       def id
-        read_attribute(:_id).to_s
+        read_attribute(:_id)
       end
 
       def id=(value)

data/lib/mongo_mapper/finder_options.rb

@@ -14,8 +14,7 @@ module MongoMapper
 
     def initialize(model, options)
       raise ArgumentError, "Options must be a hash" unless options.is_a?(Hash)
-      options = options.clone
-      options.symbolize_keys!
+      options = options.symbolize_keys
 
       @model      = model
       @options    = {}
@@ -41,12 +40,10 @@ module MongoMapper
     
     # @return [Hash] Mongo compatible options
     def options
-      options = @options.dup
-
-      fields = options.delete(:fields) || options.delete(:select)
-      skip   = options.delete(:skip)   || options.delete(:offset) || 0
-      limit  = options.delete(:limit)  || 0
-      sort   = options.delete(:sort)   || convert_order_to_sort(options.delete(:order))
+      fields = @options.delete(:fields) || @options.delete(:select)
+      skip   = @options.delete(:skip)   || @options.delete(:offset) || 0
+      limit  = @options.delete(:limit)  || 0
+      sort   = @options.delete(:sort)   || convert_order_to_sort(@options.delete(:order))
 
       {:fields => to_mongo_fields(fields), :skip => skip.to_i, :limit => limit.to_i, :sort => sort}
     end
@@ -74,7 +71,6 @@ module MongoMapper
           
           case value
             when Array
-              operator_present = field.to_s =~ /^\$/
               criteria[field] = operator?(field) ? value : {'$in' => value}
             when Hash
               criteria[field] = to_mongo_criteria(value, field)

data/lib/mongo_mapper/support.rb

@@ -15,6 +15,34 @@ 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)
@@ -94,6 +122,22 @@ class Object
   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
+
 class Set
   def self.to_mongo(value)
     value.to_a
@@ -139,4 +183,11 @@ class Time
       value
     end
   end
+end
+
+# TODO: Remove when patch accepted into driver
+class Mongo::ObjectID
+  def to_json(options = nil)
+    to_s
+  end
 end

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.1"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-12-01}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -50,7 +50,6 @@ 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",
@@ -144,7 +143,7 @@ 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.17.1"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18"])
       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"])
@@ -152,7 +151,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.17.1"])
+      s.add_dependency(%q<mongo>, ["= 0.18"])
       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"])
@@ -161,7 +160,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.17.1"])
+    s.add_dependency(%q<mongo>, ["= 0.18"])
     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"])

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -138,8 +138,10 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
   
   should "allow finding by id" do
     sparky = Pet.new(:name => "Sparky", :species => "Dog")
-    meg = Person.new(:name => "Meg", :pets => [sparky])
-    meg.pets.find(sparky._id).should == sparky
+    meg    = Person.new(:name => "Meg", :pets => [sparky])
+    
+    meg.pets.find(sparky._id).should     == sparky  # oid
+    meg.pets.find(sparky.id.to_s).should == sparky  # string
   end
   
   context "extending the association" do

data/test/functional/associations/test_many_proxy.rb

@@ -365,7 +365,11 @@ class ManyProxyTest < Test::Unit::TestCase
       status3 = Status.new(:name => "Closed")
       project.statuses = [status1, status2, status3]
       project.save
-      project.statuses.open.should == [status1, status2]
+      
+      open_statuses = project.statuses.open
+      open_statuses.should include(status1)
+      open_statuses.should include(status2)
+      open_statuses.should_not include(status3)
     end
   
     should "work using many's :extend option" do

data/test/functional/test_document.rb

@@ -172,9 +172,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "automatically set id" do
-        @doc_instance.id.should_not be_nil
-        @doc_instance.id.size.should == 24
-        @doc_instance.id.should be_instance_of(String)
+        @doc_instance.id.should be_instance_of(Mongo::ObjectID)
         @doc_instance._id.should be_instance_of(Mongo::ObjectID)
       end
 
@@ -777,8 +775,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should_not be(nil)
-      @doc.id.size.should == 24
+      @doc.id.should be_instance_of(Mongo::ObjectID)
     end
 
     should "save attributes" do
@@ -858,8 +855,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "assign an id for the document" do
-      @doc.id.should_not be(nil)
-      @doc.id.size.should == 24
+      @doc.id.should be_instance_of(Mongo::ObjectID)
     end
 
     should "save attributes" do

data/test/unit/test_embedded_document.rb

@@ -307,9 +307,9 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
-    should "have to_param that is id" do
+    should "have to_param that is string representation of id" do
       doc = @document.new
-      doc.to_param.should == doc.id
+      doc.to_param.should == doc.id.to_s
       doc.to_param.should be_instance_of(String)
     end
     
@@ -323,9 +323,10 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @document.keys.keys.should include('_id')
     end
     
-    should "have id method that sets _id" do
-      doc = @document.new
-      doc.id.should == doc._id.to_s
+    should "have id method returns _id" do
+      id = Mongo::ObjectID.new
+      doc = @document.new(:_id => id)
+      doc.id.should == id
     end
     
     context "assigning id with _id ObjectId type" do
@@ -338,18 +339,13 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       
       should "convert string object id to mongo object id" do
         id = Mongo::ObjectID.new
-        doc = @document.new
-        doc.id = id.to_s
+        doc = @document.new(:id => id.to_s)
         doc._id.should == id
-        doc.id.should == id.to_s
+        doc.id.should == id
         doc.using_custom_id?.should be_false
       end
     end
 
-    should "have a nil _root_document" do
-      @document.new._root_document.should be_nil
-    end
-
     context "setting custom id" do
       should "set _id" do
         @document.key :_id, String
@@ -366,6 +362,10 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
 
+    should "have a nil _root_document" do
+      @document.new._root_document.should be_nil
+    end
+
     context "being initialized" do
       should "accept a hash that sets keys and values" do
         doc = @document.new(:name => 'John', :age => 23)

data/test/unit/test_support.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 
 class SupportTest < Test::Unit::TestCase
-  include MongoMapper::Types
-  
   context "Array#to_mongo" do
     should "convert value to_a" do
       Array.to_mongo([1, 2, 3, 4]).should == [1, 2, 3, 4]
@@ -333,4 +331,12 @@ class SupportTest < Test::Unit::TestCase
       Time.zone = nil
     end
   end
+  
+  context "Mongo::ObjectID.to_json" do
+    should "convert object id to string" do
+      id = Mongo::ObjectID.new
+      id.to_json.should == id.to_s
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2009.11.18
+  version: 2009.12.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -05:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.17.1
+        version: "0.18"
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -124,7 +124,6 @@ files:
 - 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

data/lib/mongo_mapper/types.rb

@@ -1,64 +0,0 @@
-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