mongo_mapper 0.6.0 → 0.6.1

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.16')
+  gem.add_dependency('mongo', '0.17.1')
   gem.add_dependency('jnunemaker-validatable', '1.8.1')
   
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/mongo_mapper/document.rb

@@ -344,15 +344,6 @@ module MongoMapper
           instances.size == 1 ? instances[0] : instances
         end
 
-        def initialize_doc(doc)
-          begin
-            klass = doc['_type'].present? ? doc['_type'].constantize : self
-            klass.new(doc)
-          rescue NameError
-            new(doc)
-          end
-        end
-
         def find_every(options)
           criteria, options = to_finder_options(options)
           collection.find(criteria, options).to_a.map do |doc|

data/lib/mongo_mapper/embedded_document.rb

@@ -87,11 +87,20 @@ module MongoMapper
         if instance_or_hash.is_a?(self)
           instance_or_hash
         else
-          new(instance_or_hash)
+          initialize_doc(instance_or_hash)
         end
       end
       
     private
+      def initialize_doc(doc)
+        begin
+          klass = doc['_type'].present? ? doc['_type'].constantize : self
+          klass.new(doc)
+        rescue NameError
+          new(doc)
+        end
+      end
+      
       def accessors_module
         module_defined =  if method(:const_defined?).arity == 1 # Ruby 1.9 compat check
                             const_defined?('MongoMapperKeys')
@@ -195,7 +204,7 @@ module MongoMapper
           end
         end
 
-        if self.class.embeddable? 
+        if self.class.embeddable?
           if read_attribute(:_id).blank?
             write_attribute :_id, Mongo::ObjectID.new
             @new_document = true
@@ -362,7 +371,7 @@ module MongoMapper
         def write_attribute(name, value)
           key = _keys[name]
           instance_variable_set "@#{name}_before_typecast", value
-          instance_variable_set "@#{name}", key.set(value)          
+          instance_variable_set "@#{name}", key.set(value)
         end
         
         def embedded_associations

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/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/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.0"
+  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-11-14}
+  s.date = %q{2009-11-17}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -144,7 +144,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.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"])
@@ -152,7 +152,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.16"])
+      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"])
@@ -161,7 +161,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.16"])
+    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"])

data/test/functional/test_embedded_document.rb

@@ -34,6 +34,25 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
   
+  context "Instantiating single collection inherited embedded documents" do
+    setup do
+      @document = Class.new do
+        include MongoMapper::Document
+        key :message, Message
+      end
+    end
+
+    should "work" do
+      doc1 = @document.create(:message => Enter.new)
+      doc2 = @document.create(:message => Exit.new)
+      doc3 = @document.create(:message => Chat.new)
+
+      doc1.reload.message.class.should be(Enter)
+      doc2.reload.message.class.should be(Exit)
+      doc3.reload.message.class.should be(Chat)
+    end
+  end
+  
   context "new?" do
     setup do
       @document.class_eval do

data/test/models.rb

@@ -23,6 +23,12 @@ class WindowSize
   end
 end
 
+module AccountsExtensions
+  def inactive
+    all(:last_logged_in => nil)
+  end
+end
+
 class Post
   include MongoMapper::Document
 
@@ -71,10 +77,18 @@ class Enter < Message; end
 class Exit < Message;  end
 class Chat < Message;  end
 
-module AccountsExtensions
-  def inactive
-    all(:last_logged_in => nil)
+class Room
+  include MongoMapper::Document
+
+  key :name, String
+  many :messages, :polymorphic => true, :order => 'position' do
+    def older
+      all(:position => {'$gt' => 5})
+    end
   end
+  many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
+  
+  many :accounts, :polymorphic => true, :extend => AccountsExtensions
 end
 
 class Account
@@ -89,20 +103,6 @@ end
 class User < Account; end
 class Bot < Account; end
 
-class Room
-  include MongoMapper::Document
-
-  key :name, String
-  many :messages, :polymorphic => true do
-    def older
-      all(:position => {'$gt' => 5})
-    end
-  end
-  many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
-  
-  many :accounts, :polymorphic => true, :extend => AccountsExtensions
-end
-
 class Answer
   include MongoMapper::Document
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 -05:00
+date: 2009-11-18 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.16"
+        version: 0.17.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable