mongoo 0.3.1 → 0.4.0

data/CHANGELOG

@@ -1,18 +1,19 @@
 == Changelog
 
-=== 0.3.0
+=== 0.4.0
 
-* refactored a bunch of connection and async related stuff. see README
+* Reverted 0.3.2 and replaced with better, more compatible improvements.
+  Major speed increases are still here but it works as it did before.
 
-=== 0.2.4
+=== 0.3.2
 
-* async mode works again, but now you have to manually require:
+* implemented some optimizations that provide some major speed improvements
+  for instantiating Mongoo::Base objects. Also added a :raw => true option
+  to finds so that you can get back a raw hash.
 
-    require "mongoo/async"
-    Mongoo.conn_opts = ["localhost", 27017, :pool_size => 5, :timeout => 5]
-    Mongoo.db_name   = "mongoo-test"
+=== 0.3.0
 
-  see test_async.rb for an example.
+* refactored a bunch of connection and async related stuff. see README
 
 === 0.2.1
 
@@ -25,24 +26,12 @@
 
 * Can no longer set Mongoo.config = {...}
 
-  Set Mongoo.conn_opts and Mongoo.db_name instead (more flexibility):
-
-    Mongoo.conn_opts = ["localhost", 27017, :pool_size => 5, :timeout => 5]
-    Mongoo.db_name   = "mongoo-test"
-
-  You can set these on a model level as well:
-
-    Person.conn    = Mongo::Connection.new("localhost", 30000, :pool_size => 5, :timeout => 5)
-    Person.db_name = "mongoo-test"
-
-
 * You can optionally set the collection name on a model now:
 
     class Person < Mongoo::Base
       collection_name "spacemen"
     end
 
-
 * There is a new Identity Map feature available. It will only work when using find_one to
   find a specific id. You need to manually turn it on:
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/mongoo/base.rb

@@ -1,30 +1,30 @@
 module Mongoo
   class UnknownAttributeError < Exception; end
-  
+
   class Base
-    
+
     include Mongoo::Changelog
     include Mongoo::Persistence
     include Mongoo::Modifiers
-    
+
     include ActiveModel::Validations
-    
+
     extend ActiveModel::Callbacks
     extend ActiveModel::Naming
-    
+
     define_model_callbacks :insert, :update, :remove
-    
+
     def self.attribute(name, opts={})
       raise ArgumentError.new("missing :type") unless opts[:type]
       self.attributes[name.to_s] = opts
       define_attribute_methods
       true
     end
-    
+
     def self.attributes
       Mongoo::ATTRIBUTE_META[self.to_s] ||= {}
     end
-    
+
     def self.attributes_tree
       tree = {}
       self.attributes.each do |name, opts|
@@ -41,7 +41,7 @@ module Mongoo
       end
       tree
     end
-    
+
     def self.define_attribute_methods
       define_method("id") do
         get("_id")
@@ -49,7 +49,7 @@ module Mongoo
       define_method("id=") do |val|
         set("_id", val)
       end
-      
+
       self.attributes_tree.each do |name, val|
         if val.is_a?(Hash)
           define_method(name) do
@@ -65,17 +65,17 @@ module Mongoo
         end
       end
     end
-    
+
     def self.known_attribute?(k)
       k == "_id" || self.attributes[k.to_s]
     end
-    
+
     def initialize(hash={}, persisted=false)
       @persisted = persisted
       init_from_hash(hash)
-      set_persisted_mongohash((persisted? ? mongohash.deep_clone : nil))
+      set_persisted_mongohash((persisted? ? mongohash : nil))
     end
-    
+
     def ==(val)
       if val.class.to_s == self.class.to_s
         if val.persisted?
@@ -85,15 +85,15 @@ module Mongoo
         end
       end
     end
-    
+
     def known_attribute?(k)
       self.class.known_attribute?(k)
     end
-    
+
     def read_attribute_for_validation(key)
       get_attribute(key)
     end
-    
+
     def get_attribute(k)
       unless known_attribute?(k)
         raise UnknownAttributeError, k
@@ -102,7 +102,7 @@ module Mongoo
     end
     alias :get :get_attribute
     alias :g   :get_attribute
-    
+
     def set_attribute(k,v)
       unless known_attribute?(k)
         if self.respond_to?("#{k}=")
@@ -119,36 +119,36 @@ module Mongoo
     end
     alias :set :set_attribute
     alias :s   :set_attribute
-    
+
     def unset_attribute(k)
       mongohash.dot_delete(k); true
     end
     alias :unset :unset_attribute
     alias :u :unset_attribute
-    
+
     def set_attributes(k_v_pairs)
       k_v_pairs.each do |k,v|
         set_attribute(k,v)
       end
     end
     alias :sets :set_attributes
-    
+
     def get_attributes(keys)
       found = {}
       keys.each { |k| found[k.to_s] = get_attribute(k) }
       found
     end
     alias :gets :get_attributes
-    
+
     def unset_attributes(keys)
       keys.each { |k| unset_attribute(k) }; true
     end
     alias :unsets :unset_attributes
-    
+
     def attributes
       mongohash.to_key_value
     end
-    
+
     def merge!(hash)
       if hash.is_a?(Mongoo::Mongohash)
         hash = hash.raw_hash
@@ -158,36 +158,37 @@ module Mongoo
       set_mongohash( Mongoo::Mongohash.new(hash) )
       mongohash
     end
-        
+
     def init_from_hash(hash)
       unless hash.is_a?(Mongoo::Mongohash)
         hash = Mongoo::Mongohash.new(hash)
       end
-      verify_attributes_in_mongohash(hash)
       set_mongohash hash
     end
     protected :init_from_hash
-    
+
     def set_mongohash(mongohash)
       @mongohash = mongohash
     end
     protected :set_mongohash
-    
+
     def mongohash
       @mongohash
     end
-    
+
     def set_persisted_mongohash(hash)
-      @persisted_mongohash = hash
+      @serialized_persisted_mongohash = Marshal.dump(hash)
+      @persisted_mongohash = nil
+      true
     end
     protected :set_persisted_mongohash
-    
+
     def persisted_mongohash
-      @persisted_mongohash
+      @persisted_mongohash ||= begin
+        if @serialized_persisted_mongohash
+          Marshal.load(@serialized_persisted_mongohash)
+        end
+      end
     end
-    
-    def verify_attributes_in_mongohash(hash)
-      true
-    end # verify_attributes_in_mongohash
   end
 end

data/lib/mongoo/cursor.rb

@@ -11,9 +11,7 @@ module Mongoo
 
     def next_document
       if doc = @mongo_cursor.next_document
-        obj = @obj_class.new(doc, true)
-        Mongoo::IdentityMap.write(obj) if Mongoo::IdentityMap.on?
-        obj
+        obj_from_doc(doc)
       end
     end
 
@@ -21,17 +19,12 @@ module Mongoo
 
     def each
       @mongo_cursor.each do |doc|
-        obj = @obj_class.new(doc, true)
-        Mongoo::IdentityMap.write(obj) if Mongoo::IdentityMap.on?
-        yield obj
+        yield obj_from_doc(doc)
       end
     end
 
     def to_a
-      arr = @mongo_cursor.to_a.collect { |doc| @obj_class.new(doc, true) }
-      if Mongoo::IdentityMap.on?
-        arr.each { |obj| Mongoo::IdentityMap.write(obj) }
-      end; arr
+      @mongo_cursor.to_a.collect { |doc| obj_from_doc(doc) }
     end
 
     def count
@@ -65,6 +58,18 @@ module Mongoo
         super
       end
     end
+  
+    def obj_from_doc(doc)
+      obj = nil
+      if Mongoo::IdentityMap.on?
+        if obj = Mongoo::IdentityMap.read(doc["_id"])
+          obj.merge!(doc)
+        end
+      end
+      obj ||= @obj_class.new(doc, true)
+      Mongoo::IdentityMap.write(obj) if Mongoo::IdentityMap.on?
+      obj
+    end
 
   end
 end

data/lib/mongoo/hash_ext.rb

@@ -1,9 +1,6 @@
 module Mongoo
   module HashExt
-    def deep_stringify_keys
-      deep_clone.deep_stringify_keys!
-    end
-    
+
     def deep_stringify_keys!
       keys.each do |key|
         self[key.to_s] = delete(key)
@@ -13,10 +10,7 @@ module Mongoo
       end
       self
     end
-    
-    def deep_clone
-      Marshal.load(Marshal.dump(self))
-    end
+
   end
 end
 

data/lib/mongoo/identity_map.rb

@@ -48,7 +48,7 @@ module Mongoo
       end
 
       def write(doc)
-        if store
+        if store && !store.has_key?(doc.id.to_s)
           store[doc.id.to_s] = doc
         end
       end

data/lib/mongoo/mongohash.rb

@@ -1,24 +1,20 @@
 module Mongoo
   class Mongohash
     extend Forwardable
-      
+
     def_delegators :@raw_hash, :==, :[], :[], :[]=, :clear, :default, :default=, :default_proc, :delete, :delete_if,
                    :each, :each_key, :each_pair, :each_value, :empty?, :fetch, :has_key?, :has_value?, :include?,
                    :index, :indexes, :indices, :initialize_copy, :inspect, :invert, :key?, :keys, :length, :member?,
                    :merge, :merge!, :pretty_print, :pretty_print_cycle, :rehash, :reject, :reject!, :replace, :select,
                    :shift, :size, :sort, :store, :to_a, :to_hash, :to_s, :update, :value?, :values, :values_at
-    
+
     attr_reader :raw_hash
-    
+
     def initialize(hash={})
       hash = hash.to_hash unless hash.class.to_s == "Hash"
-      @raw_hash = hash.deep_stringify_keys
+      @raw_hash = hash.deep_stringify_keys!
     end
 
-    def deep_clone
-      Mongoo::Mongohash.new(self.raw_hash.deep_clone)
-    end
-    
     def dot_set(k,v)
       parts    = k.to_s.split(".")
       curr_val = to_hash
@@ -33,7 +29,7 @@ module Mongoo
       end
       true
     end
-    
+
     def dot_get(k)
       parts    = k.to_s.split(".")
       curr_val = to_hash
@@ -44,7 +40,7 @@ module Mongoo
       end
       curr_val
     end
-    
+
     def dot_delete(k)
       parts    = k.to_s.split(".")
       curr_val = to_hash
@@ -59,7 +55,7 @@ module Mongoo
       end
       false
     end
-    
+
     def dot_list(curr_hash=self.to_hash, path=[])
       list = []
       curr_hash.each do |k,v|
@@ -71,7 +67,7 @@ module Mongoo
       end
       list
     end
-    
+
     def to_key_value
       kv = {}; dot_list.collect { |k| kv[k] = dot_get(k) }; kv
     end

data/lib/mongoo/persistence.rb

@@ -74,11 +74,7 @@ module Mongoo
         end
 
         if doc = collection.find_one(query, opts)
-          doc = new(doc, true)
-          Mongoo::IdentityMap.write(doc) if id_map_on && is_simple_query
-          doc
-        else
-          nil
+          Mongoo::Cursor.new(self, nil).obj_from_doc(doc)
         end
       end
 
@@ -155,13 +151,13 @@ module Mongoo
             return false
           end
         end
-        ret = self.collection.insert(mongohash.deep_clone, opts)
+        ret = self.collection.insert(mongohash, opts)
         unless ret.is_a?(BSON::ObjectId)
           raise InsertError, "not an object: #{ret.inspect}"
         end
         set("_id", ret)
         @persisted = true
-        set_persisted_mongohash(mongohash.deep_clone)
+        set_persisted_mongohash(mongohash)
         ret
       end
       Mongoo::IdentityMap.write(self) if Mongoo::IdentityMap.on?
@@ -194,7 +190,7 @@ module Mongoo
         end
         ret = self.collection.update(update_query_hash.merge({"_id" => get("_id")}), update_hash, opts)
         if !ret.is_a?(Hash) || (ret["updatedExisting"] && ret["n"] == 1)
-          set_persisted_mongohash(mongohash.deep_clone)
+          set_persisted_mongohash(mongohash)
           @persisted = true
           true
         else
@@ -242,7 +238,7 @@ module Mongoo
     def reload
       init_from_hash(collection.find_one(get("_id")))
       @persisted = true
-      set_persisted_mongohash(mongohash.deep_clone)
+      set_persisted_mongohash(mongohash)
       true
     end
 

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-05-17}
+  s.date = %q{2011-05-27}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [

data/test/test_identity_map.rb

@@ -8,6 +8,22 @@ class TestIdentityMap < Test::Unit::TestCase
       obj.create_indexes
     end
   end
+  
+  should "be performant" do
+    1.upto(1000) do |i|
+      p = Person.new("name" => "Ben#{i}")
+      p.insert!
+    end
+    
+    Mongoo::IdentityMap.on!
+    
+    all = Person.find.to_a
+    
+    p = Person.find(name: "Ben5").next
+    assert_equal p.object_id, all[all.index(p)].object_id
+    
+    Mongoo::IdentityMap.off!
+  end
 
   should "set and get attributes" do
     p = Person.new("name" => "Ben")

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ben Myles
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2907379497624021949
+      hash: 2193445635464889624
       segments: 
       - 0
       version: "0"