mongoo 0.3.0 → 0.3.1

data/Gemfile

@@ -17,4 +17,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
+  gem "perftools.rb", :require => "perftools"
+  gem "bson_ext", "~> 1.3.1"
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/mongoo/base.rb

@@ -187,23 +187,7 @@ module Mongoo
     end
     
     def verify_attributes_in_mongohash(hash)
-      known_keys = self.class.attributes.keys
-      known_keys << "_id"
-      hash.dot_list.each do |k|
-        unless known_keys.include?(k)
-          k.split(".").each do |part|
-            if opts = self.class.attributes[part]
-              if opts[:type] == :hash
-                known_keys << k
-              end
-            end
-          end
-          unless known_keys.include?(k)
-            # this is just annoying.
-            #raise Mongoo::UnknownAttributeError, k.to_s
-          end
-        end
-      end
+      true
     end # verify_attributes_in_mongohash
   end
 end

data/lib/mongoo/hash_ext.rb

@@ -1,18 +1,22 @@
 module Mongoo
   module HashExt
     def deep_stringify_keys
-      Marshal.load(Marshal.dump(self)).deep_stringify_keys!
+      deep_clone.deep_stringify_keys!
     end
     
     def deep_stringify_keys!
       keys.each do |key|
         self[key.to_s] = delete(key)
         if self[key.to_s].is_a?(Hash)
-          self[key.to_s].stringify_keys!
+          self[key.to_s].deep_stringify_keys!
         end
       end
       self
     end
+    
+    def deep_clone
+      Marshal.load(Marshal.dump(self))
+    end
   end
 end
 

data/lib/mongoo/mongohash.rb

@@ -16,7 +16,7 @@ module Mongoo
     end
 
     def deep_clone
-      Mongoo::Mongohash.new(Marshal.load(Marshal.dump self.raw_hash))
+      Mongoo::Mongohash.new(self.raw_hash.deep_clone)
     end
     
     def dot_set(k,v)

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-05-13}
+  s.date = %q{2011-05-17}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [
@@ -43,12 +43,13 @@ Gem::Specification.new do |s|
     "test/test_async.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
-    "test/test_mongoo.rb"
+    "test/test_mongoo.rb",
+    "test/test_performance.rb"
   ]
   s.homepage = %q{http://github.com/benmyles/mongoo}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Object mapper for MongoDB}
   s.test_files = [
     "test/helper.rb",
@@ -56,7 +57,8 @@ Gem::Specification.new do |s|
     "test/test_async.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
-    "test/test_mongoo.rb"
+    "test/test_mongoo.rb",
+    "test/test_performance.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -73,6 +75,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<perftools.rb>, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<i18n>, [">= 0.4.1"])
       s.add_dependency(%q<activesupport>, [">= 3.0.3"])
@@ -84,6 +88,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<perftools.rb>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, ["~> 1.3.1"])
     end
   else
     s.add_dependency(%q<i18n>, [">= 0.4.1"])
@@ -96,6 +102,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<perftools.rb>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, ["~> 1.3.1"])
   end
 end
 

data/test/test_performance.rb

@@ -0,0 +1,42 @@
+require 'helper'
+require 'perftools'
+
+class TestPerformance < Test::Unit::TestCase
+
+  def setup
+    [Person, TvShow, SearchIndex].each do |obj|
+      obj.drop
+      obj.create_indexes
+    end
+  end
+
+  should "be able to find 1000 times" do
+    p = Person.new
+    p.name = "Ben"
+    p.visits = 10
+    p.interests = ["skydiving","coding","reading","swimming"]
+    p.jobs.total = 5
+    p.jobs.professional = ["pro","fess","ion","al"]
+    p.jobs.volunteer = ["vol","un","teer"]
+    p.jobs.internships.high_school = ["one","two","three","four"]
+    p.location.city = "San Francisco"
+    p.location.demographics.crime_rate = :medium
+    p.location.demographics.education_quality = :high
+    p.misc = { "a" => "b", "c" => "d", "e" => "f", "g" => "h" }
+    1.upto(200) { |i| p.misc["i#{i}"] = "......... #{i} ........." }
+    p.insert!
+    
+    t1 = Time.now.utc.to_f
+    PerfTools::CpuProfiler.start("/tmp/mongoo_test_performance") do
+      1000.times do |i|
+        Person.find_one(p.id)
+      end
+    end
+    t2 = Time.now.utc.to_f
+    
+    out = `pprof.rb --text /tmp/mongoo_test_performance`
+    puts out
+    
+    puts "Perf: #{t2-t1}"
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ben Myles
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -07:00
+date: 2011-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: perftools.rb
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id012
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -160,6 +182,7 @@ files:
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb
+- test/test_performance.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/mongoo
 licenses: 
@@ -174,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3196476684317221338
+      hash: -2907379497624021949
       segments: 
       - 0
       version: "0"
@@ -187,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object mapper for MongoDB
@@ -198,3 +221,4 @@ test_files:
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb
+- test/test_performance.rb