mongo_mapper 0.6.10 → 0.7.0

data/lib/mongo_mapper/support.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 class Array
   def self.to_mongo(value)
     value = value.respond_to?(:lines) ? value.lines : value
@@ -26,11 +24,18 @@ class Binary
 end
 
 class Boolean
+  BOOLEAN_MAPPING = {
+    true => true, 'true' => true, 'TRUE' => true, 'True' => true, 't' => true, 'T' => true, '1' => true, 1 => true, 1.0 => true,
+    false => false, 'false' => false, 'FALSE' => false, 'False' => false, 'f' => false, 'F' => false, '0' => false, 0 => false, 0.0 => false, nil => false
+  }
+  
   def self.to_mongo(value)
     if value.is_a?(Boolean)
       value
     else
-      ['true', 't', '1'].include?(value.to_s.downcase)
+      v = BOOLEAN_MAPPING[value]
+      v = value.to_s.downcase == 'true' if v.nil? # Check all mixed case spellings for true
+      v
     end
   end
 
@@ -41,8 +46,12 @@ end
 
 class Date
   def self.to_mongo(value)
-    date = Date.parse(value.to_s)
-    Time.utc(date.year, date.month, date.day)
+    if value.nil? || value == ''
+      nil
+    else
+      date = value.is_a?(Date) || value.is_a?(Time) ? value : Date.parse(value.to_s)
+      Time.utc(date.year, date.month, date.day)
+    end
   rescue
     nil
   end
@@ -71,7 +80,7 @@ end
 class Integer
   def self.to_mongo(value)
     value_to_i = value.to_i
-    if value_to_i == 0
+    if value_to_i == 0 && value != value_to_i
       value.to_s =~ /^(0x|0b)?0+/ ? 0 : nil
     else
       value_to_i
@@ -154,15 +163,20 @@ class String
   end
 end
 
+class SymbolOperator
+  attr_reader :field, :operator
+
+  def initialize(field, operator, options={})
+    @field, @operator = field, operator
+  end unless method_defined?(:initialize)
+end
+
 class Symbol
-  %w{gt lt gte lte ne in nin mod size where exists}.each do |operator|
-    define_method operator do
-      MongoMapper::FinderOperator.new(self, "$#{operator}")
-    end
+  %w(gt lt gte lte ne in nin mod all size where exists asc desc).each do |operator|
+    define_method(operator) do
+      SymbolOperator.new(self, operator)
+    end unless method_defined?(operator)
   end
-  
-  def asc;  MongoMapper::OrderOperator.new(self, 'asc') end
-  def desc; MongoMapper::OrderOperator.new(self, 'desc') end
 end
 
 class Time
@@ -170,8 +184,9 @@ class Time
     if value.nil? || value == ''
       nil
     else
-      time = MongoMapper.time_class.parse(value.to_s)
-      time && time.utc
+      time = value.is_a?(Time) ? value : MongoMapper.time_class.parse(value.to_s)
+      # Convert time to milliseconds since BSON stores dates with that accurracy, but Ruby uses microseconds
+      Time.at((time.to_f * 1000).round / 1000.0).utc if time
     end
   end
   
@@ -184,9 +199,17 @@ class Time
   end
 end
 
-# TODO: Remove when patch accepted into driver
 class Mongo::ObjectID
+  alias_method :original_to_json, :to_json
+  
   def to_json(options = nil)
     %Q("#{to_s}")
   end
-end
+end
+
+module MongoMapper
+  module Support
+    autoload :DescendantAppends, 'mongo_mapper/support/descendant_appends'
+    autoload :Find,              'mongo_mapper/support/find'
+  end
+end

data/lib/mongo_mapper/support/descendant_appends.rb

@@ -0,0 +1,46 @@
+module MongoMapper
+  module Support
+    module DescendantAppends
+      def included(model)
+        extra_extensions.each { |extension| model.extend(extension) }
+        extra_inclusions.each { |inclusion| model.send(:include, inclusion) }
+        descendants << model
+      end
+
+      # @api public
+      def descendants
+        @descendants ||= Set.new
+      end
+
+      # @api public
+      def append_extensions(*extensions)
+        extra_extensions.concat extensions
+
+        # Add the extension to existing descendants
+        descendants.each do |model|
+          extensions.each { |extension| model.extend(extension) }
+        end
+      end
+
+      # @api public
+      def append_inclusions(*inclusions)
+        extra_inclusions.concat inclusions
+
+        # Add the inclusion to existing descendants
+        descendants.each do |model|
+          inclusions.each { |inclusion| model.send(:include, inclusion) }
+        end
+      end
+
+      # @api private
+      def extra_extensions
+        @extra_extensions ||= []
+      end
+
+      # @api private
+      def extra_inclusions
+        @extra_inclusions ||= []
+      end
+    end
+  end
+end

data/lib/mongo_mapper/support/find.rb

@@ -0,0 +1,77 @@
+module MongoMapper
+  module Support
+    # @api private
+    module Find
+      def dynamic_find(finder, args)
+        attributes = {}
+
+        finder.attributes.each_with_index do |attr, index|
+          attributes[attr] = args[index]
+        end
+
+        options = args.extract_options!.merge(attributes)
+
+        if result = send(finder.finder, options)
+          result
+        else
+          if finder.raise?
+            raise DocumentNotFound, "Couldn't find Document with #{attributes.inspect} in collection named #{collection.name}"
+          end
+
+          if finder.instantiator
+            self.send(finder.instantiator, attributes)
+          end
+        end
+      end
+
+      class DynamicFinder
+        attr_reader :method, :attributes, :finder, :bang, :instantiator
+
+        def initialize(method)
+          @method = method
+          @finder = :first
+          @bang   = false
+          match
+        end
+
+        def found?
+          @finder.present?
+        end
+
+        def raise?
+          bang == true
+        end
+
+        protected
+          def match
+            case method.to_s
+              when /^find_(all_by|by)_([_a-zA-Z]\w*)$/
+                @finder = :all if $1 == 'all_by'
+                names = $2
+              when /^find_by_([_a-zA-Z]\w*)\!$/
+                @bang = true
+                names = $1
+              when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
+                @instantiator = $1 == 'initialize' ? :new : :create
+                names = $2
+              else
+                @finder = nil
+            end
+
+            @attributes = names && names.split('_and_')
+          end
+      end
+
+      protected
+        def method_missing(method, *args, &block)
+          finder = DynamicFinder.new(method)
+
+          if finder.found?
+            dynamic_find(finder, args)
+          else
+            super
+          end
+        end
+    end
+  end
+end

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.6.10"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-02-10}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -25,35 +25,44 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/mmconsole",
      "lib/mongo_mapper.rb",
-     "lib/mongo_mapper/associations.rb",
-     "lib/mongo_mapper/associations/base.rb",
-     "lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/belongs_to_proxy.rb",
-     "lib/mongo_mapper/associations/collection.rb",
-     "lib/mongo_mapper/associations/in_array_proxy.rb",
-     "lib/mongo_mapper/associations/many_documents_as_proxy.rb",
-     "lib/mongo_mapper/associations/many_documents_proxy.rb",
-     "lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/many_embedded_proxy.rb",
-     "lib/mongo_mapper/associations/many_polymorphic_proxy.rb",
-     "lib/mongo_mapper/associations/one_proxy.rb",
-     "lib/mongo_mapper/associations/proxy.rb",
-     "lib/mongo_mapper/callbacks.rb",
-     "lib/mongo_mapper/dirty.rb",
      "lib/mongo_mapper/document.rb",
-     "lib/mongo_mapper/dynamic_finder.rb",
      "lib/mongo_mapper/embedded_document.rb",
-     "lib/mongo_mapper/finder_options.rb",
-     "lib/mongo_mapper/key.rb",
-     "lib/mongo_mapper/mongo_mapper.rb",
-     "lib/mongo_mapper/pagination.rb",
-     "lib/mongo_mapper/rails_compatibility/document.rb",
-     "lib/mongo_mapper/rails_compatibility/embedded_document.rb",
-     "lib/mongo_mapper/serialization.rb",
-     "lib/mongo_mapper/serializers/json_serializer.rb",
+     "lib/mongo_mapper/plugins.rb",
+     "lib/mongo_mapper/plugins/associations.rb",
+     "lib/mongo_mapper/plugins/associations/base.rb",
+     "lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/collection.rb",
+     "lib/mongo_mapper/plugins/associations/embedded_collection.rb",
+     "lib/mongo_mapper/plugins/associations/in_array_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_documents_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/one_proxy.rb",
+     "lib/mongo_mapper/plugins/associations/proxy.rb",
+     "lib/mongo_mapper/plugins/callbacks.rb",
+     "lib/mongo_mapper/plugins/clone.rb",
+     "lib/mongo_mapper/plugins/descendants.rb",
+     "lib/mongo_mapper/plugins/dirty.rb",
+     "lib/mongo_mapper/plugins/equality.rb",
+     "lib/mongo_mapper/plugins/identity_map.rb",
+     "lib/mongo_mapper/plugins/inspect.rb",
+     "lib/mongo_mapper/plugins/keys.rb",
+     "lib/mongo_mapper/plugins/logger.rb",
+     "lib/mongo_mapper/plugins/pagination.rb",
+     "lib/mongo_mapper/plugins/pagination/proxy.rb",
+     "lib/mongo_mapper/plugins/protected.rb",
+     "lib/mongo_mapper/plugins/rails.rb",
+     "lib/mongo_mapper/plugins/serialization.rb",
+     "lib/mongo_mapper/plugins/validations.rb",
+     "lib/mongo_mapper/query.rb",
      "lib/mongo_mapper/support.rb",
-     "lib/mongo_mapper/validations.rb",
+     "lib/mongo_mapper/support/descendant_appends.rb",
+     "lib/mongo_mapper/support/find.rb",
      "mongo_mapper.gemspec",
+     "performance/read_write.rb",
      "specs.watchr",
      "test/NOTE_ON_TESTING",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
@@ -71,10 +80,11 @@ Gem::Specification.new do |s|
      "test/functional/test_dirty.rb",
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
+     "test/functional/test_identity_map.rb",
      "test/functional/test_logger.rb",
      "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
-     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_protected.rb",
      "test/functional/test_string_id_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
@@ -84,15 +94,18 @@ Gem::Specification.new do |s|
      "test/unit/associations/test_base.rb",
      "test/unit/associations/test_proxy.rb",
      "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_descendant_appends.rb",
      "test/unit/test_document.rb",
      "test/unit/test_dynamic_finder.rb",
      "test/unit/test_embedded_document.rb",
-     "test/unit/test_finder_options.rb",
-     "test/unit/test_key.rb",
+     "test/unit/test_keys.rb",
      "test/unit/test_mongo_mapper.rb",
      "test/unit/test_pagination.rb",
+     "test/unit/test_plugins.rb",
+     "test/unit/test_query.rb",
+     "test/unit/test_rails.rb",
      "test/unit/test_rails_compatibility.rb",
-     "test/unit/test_serializations.rb",
+     "test/unit/test_serialization.rb",
      "test/unit/test_support.rb",
      "test/unit/test_time_zones.rb",
      "test/unit/test_validations.rb"
@@ -118,10 +131,11 @@ Gem::Specification.new do |s|
      "test/functional/test_dirty.rb",
      "test/functional/test_document.rb",
      "test/functional/test_embedded_document.rb",
+     "test/functional/test_identity_map.rb",
      "test/functional/test_logger.rb",
      "test/functional/test_modifiers.rb",
      "test/functional/test_pagination.rb",
-     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_protected.rb",
      "test/functional/test_string_id_compatibility.rb",
      "test/functional/test_validations.rb",
      "test/models.rb",
@@ -131,15 +145,18 @@ Gem::Specification.new do |s|
      "test/unit/associations/test_base.rb",
      "test/unit/associations/test_proxy.rb",
      "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_descendant_appends.rb",
      "test/unit/test_document.rb",
      "test/unit/test_dynamic_finder.rb",
      "test/unit/test_embedded_document.rb",
-     "test/unit/test_finder_options.rb",
-     "test/unit/test_key.rb",
+     "test/unit/test_keys.rb",
      "test/unit/test_mongo_mapper.rb",
      "test/unit/test_pagination.rb",
+     "test/unit/test_plugins.rb",
+     "test/unit/test_query.rb",
+     "test/unit/test_rails.rb",
      "test/unit/test_rails_compatibility.rb",
-     "test/unit/test_serializations.rb",
+     "test/unit/test_serialization.rb",
      "test/unit/test_support.rb",
      "test/unit/test_time_zones.rb",
      "test/unit/test_validations.rb"
@@ -151,7 +168,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.18.2"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.18.3"])
       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"])
@@ -159,7 +176,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.18.2"])
+      s.add_dependency(%q<mongo>, ["= 0.18.3"])
       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"])
@@ -168,7 +185,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18.2"])
+    s.add_dependency(%q<mongo>, ["= 0.18.3"])
     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/performance/read_write.rb

@@ -0,0 +1,52 @@
+# The purpose of this is to check finding, initializing, 
+# and creating objects (typecasting times/dates and booleans).
+
+require 'pp'
+require 'benchmark'
+require 'rubygems'
+
+# to test with slow version just do this:
+# gem 'mongo_mapper', '0.6.10'
+# and comment out this:
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'mongo_mapper'
+
+MongoMapper.database = 'testing'
+ 
+class Foo
+  include MongoMapper::Document
+  key :approved, Boolean
+  key :count, Integer
+  key :approved_at, Time
+  key :expire_on, Date
+  timestamps!
+end
+Foo.collection.remove
+
+Benchmark.bm(5) do |x|
+  ids = []
+  x.report("write") do
+    1000.times { |i| ids << Foo.create(:count => 0, :approved => true, :approved_at => Time.now, :expire_on => Date.today).id }
+  end
+
+  x.report("read ") do
+    ids.each { |id| Foo.first(:id => id) }
+  end
+end
+
+# I was get something like this on my puny macbook air:
+#            user     system      total        real
+# write  4.810000   0.090000   4.900000 (  5.039949)
+# read   2.730000   0.070000   2.800000 (  2.990749)
+#
+#
+# After these commits:
+#
+#   * http://github.com/jnunemaker/mongomapper/commit/e5091fa140d5fae2721017b53027092233694ee5
+#   * http://github.com/jnunemaker/mongomapper/commit/c22bbde4fa1cfbc310d79cb0e50203310ffb03d1
+#
+# I'm now getting something like this:
+#            user     system      total        real
+# write  1.660000   0.050000   1.710000 (  1.752676)
+# read   1.060000   0.050000   1.110000 (  1.263429)