mongomodel 0.2.20 → 0.3.0

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 gemspec
-gem "bson_ext", '~> 1.1.5'
+gem "bson_ext", '~> 1.2.0'

data/bin/console

@@ -12,6 +12,8 @@ require 'irb/completion'
 
 require 'mongomodel'
 
+MongoModel.logger = ActiveSupport::BufferedLogger.new(STDERR)
+
 IRB.setup(nil)
 
 IRB.conf[:USE_READLINE] = true

data/lib/mongomodel.rb

@@ -5,6 +5,7 @@ require 'mongo'
 
 require 'mongomodel/support/core_extensions'
 require 'mongomodel/support/exceptions'
+require 'mongomodel/log_subscriber'
 
 require 'active_support/core_ext/module/attribute_accessors'
 
@@ -38,6 +39,7 @@ module MongoModel
   autoload :Types,            'mongomodel/support/types'
   autoload :Configuration,    'mongomodel/support/configuration'
   autoload :DynamicFinder,    'mongomodel/support/dynamic_finder'
+  autoload :InstrumentedCollection, 'mongomodel/support/instrumented_collection'
   
   autoload :Collection,       'mongomodel/support/collection'
   autoload :Map,              'mongomodel/support/map'
@@ -72,13 +74,14 @@ module MongoModel
   end
   
   module DocumentExtensions
-    autoload :Persistence,       'mongomodel/document/persistence'
-    autoload :OptimisticLocking, 'mongomodel/document/optimistic_locking'
-    autoload :DynamicFinders,    'mongomodel/document/dynamic_finders'
-    autoload :Indexes,           'mongomodel/document/indexes'
-    autoload :Scopes,            'mongomodel/document/scopes'
-    autoload :Validations,       'mongomodel/document/validations'
-    autoload :Callbacks,         'mongomodel/document/callbacks'
+    autoload :Persistence,         'mongomodel/document/persistence'
+    autoload :OptimisticLocking,   'mongomodel/document/optimistic_locking'
+    autoload :DynamicFinders,      'mongomodel/document/dynamic_finders'
+    autoload :Indexes,             'mongomodel/document/indexes'
+    autoload :Scopes,              'mongomodel/document/scopes'
+    autoload :Validations,         'mongomodel/document/validations'
+    autoload :Callbacks,           'mongomodel/document/callbacks'
+    autoload :CollectionModifiers, 'mongomodel/document/collection_modifiers'
   end
   
   mattr_accessor :logger

data/lib/mongomodel/attributes/mongo.rb

@@ -26,10 +26,11 @@ module MongoModel
           
           if property
             child = store(property.name, property.from_mongo(v))
-            child.parent_document = instance if child.respond_to?(:parent_document=)
           else
-            self[k.to_sym] = v
+            child = store(k.to_sym, v)
           end
+          
+          child.parent_document = instance if child.respond_to?(:parent_document=)
         end
       end
     

data/lib/mongomodel/attributes/typecasting.rb

@@ -27,10 +27,15 @@ module MongoModel
       end
       
       def before_type_cast(key)
-        values_before_typecast[key].presence || self[key]
+        values_before_typecast[key]
       end
     
     private
+      def store(key, value)
+        values_before_typecast[key] = value
+        super(key, value)
+      end
+    
       def typecast(key, value)
         unless value.nil?
           property = properties[key]

data/lib/mongomodel/concerns/associations.rb

@@ -40,64 +40,3 @@ module MongoModel
     end
   end
 end
-
-
-
-#
-# belongs_to :user
-#    => property :user_id
-# belongs_to :author, :class_name => 'User'
-#    => property :author_id
-# belongs_to :commentable, :polymorphic => true
-#    => property :commentable_id
-#    => property :commentable_type
-#
-
-#
-# has_many :contributors, :class_name => 'User', :foreign_key => :publication_id
-# has_many :comments, :as => :commentable
-# has_many :roles
-#
-
-
-
-
-#
-# Documents and EmbeddedDocuments can:
-#   - belong to any Document
-#   - have many Documents by ids
-#
-# Documents can also:
-#   - have many Documents by foreign key
-#
-
-# class Author < Document; end
-# 
-# class Comment < Document
-#   # Creates properties :commentable_id and :commentable_type
-#   belongs_to :commentable, :polymorphic => true
-# end
-# 
-# class Page < EmbeddedDocument
-#   # Creates property :editor_id
-#   belongs_to :editor, :class => 'Author'
-#   
-#   # Creates property :related_article_ids
-#   has_many :related_articles, :class => 'Article'
-#   
-#   # Polymorphic association, uses commentable_id/commentable_type on Comment class
-#   has_many :comments, :as => :commentable
-# end
-# 
-# class Article < Document
-#   # Creates property :author_id
-#   belongs_to :author
-#   
-#   # Creates property :recommended_by_ids
-#   has_many :recommended_by, :by => :ids, :class => 'Author'
-#   
-#   # Creates property :parent_article_id
-#   belongs_to :parent_article, :class => 'Article'
-#   # Uses parent_article_id property on referenced class
-#   has_many :child_articles, :by => :foreign_key, :foreign_key => :parent_article_id, :class => 'Article'
-# end

data/lib/mongomodel/concerns/associations/base/association.rb

@@ -24,8 +24,7 @@ module MongoModel
         def ensure_class(value)
           raise AssociationTypeMismatch, "expected instance of #{klass} but got #{value.class}" unless value.is_a?(klass)
         end
-      
-      private
+        
         def proxy_class
           self.class.parent::Proxy rescue Base::Proxy
         end

data/lib/mongomodel/concerns/associations/belongs_to.rb

@@ -2,16 +2,16 @@ module MongoModel
   module Associations
     class BelongsTo < Base::Definition
       def foreign_key
-        :"#{name}_id"
+        @foreign_key ||= :"#{name}_id"
       end
       
       def type_key
-        :"#{name}_type"
+        @type_key ||= :"#{name}_type"
       end
       
       properties do |association|
         property association.foreign_key, MongoModel::Reference, :internal => true
-        property association.type_key, MongoModel::Reference, :internal => true if association.polymorphic?
+        property association.type_key, String, :internal => true if association.polymorphic?
       end
       
       methods do |association|
@@ -64,6 +64,11 @@ module MongoModel
         def find_target
           target_class.find(target_id) if target_id && target_class
         end
+      
+      protected
+        def proxy_class
+          Base::Proxy
+        end
       end
     end
   end

data/lib/mongomodel/concerns/associations/has_many_by_foreign_key.rb

@@ -2,11 +2,11 @@ module MongoModel
   module Associations
     class HasManyByForeignKey < Base::Definition
       def foreign_key
-        options[:foreign_key] || :"#{inverse_of}_id"
+        @foreign_key ||= options[:foreign_key] || :"#{inverse_of}_id"
       end
       
       def inverse_of
-        options[:inverse_of] || owner.to_s.demodulize.underscore.singularize.to_sym
+        @inverse_of ||= options[:inverse_of] || owner.to_s.demodulize.underscore.singularize.to_sym
       end
       
       def define!
@@ -88,7 +88,7 @@ module MongoModel
         end
         
         def scoped
-          definition.scope.where(foreign_key => instance.id)
+          definition.scope.where(foreign_key => instance.id).on_load { |doc| set_inverse_association(doc) }
         end
       
       protected
@@ -107,6 +107,10 @@ module MongoModel
         def ensure_class(array)
           array.is_a?(Array) ? array.each { |i| super(i) } : super
         end
+        
+        def proxy_class
+          Proxy
+        end
       end
       
       class Proxy < Base::Proxy

data/lib/mongomodel/concerns/associations/has_many_by_ids.rb

@@ -2,7 +2,7 @@ module MongoModel
   module Associations
     class HasManyByIds < Base::Definition
       def property_name
-        :"#{singular_name}_ids"
+        @property_name ||= :"#{singular_name}_ids"
       end
       
       def define!
@@ -78,6 +78,10 @@ module MongoModel
         def ensure_class(array)
           array.is_a?(Array) ? array.each { |i| super(i) } : super
         end
+        
+        def proxy_class
+          Proxy
+        end
       end
       
       class Proxy < Base::Proxy

data/lib/mongomodel/document.rb

@@ -7,6 +7,7 @@ module MongoModel
   class Document < EmbeddedDocument
     include DocumentExtensions::Persistence
     include DocumentExtensions::OptimisticLocking
+    include DocumentExtensions::CollectionModifiers
     
     extend  DocumentExtensions::DynamicFinders
     include DocumentExtensions::Indexes

data/lib/mongomodel/document/collection_modifiers.rb

@@ -0,0 +1,83 @@
+module MongoModel
+  module DocumentExtensions
+    module CollectionModifiers
+      extend ActiveSupport::Concern
+      
+      module ClassMethods
+        # Post.increase!(:hits => 1, :available => -1)
+        def increase!(args)
+          collection_modifier_update('$inc', args)
+        end
+
+        # Post.set!(:hits => 0, :available => 100)
+        def set!(args)
+          collection_modifier_update('$set', args)
+        end
+
+        # Post.unset!(:hits, :available)
+        def unset!(*args)
+          values = args.each_with_object({}) { |key, hash| hash[key.to_s] = 1 }
+          collection_modifier_update('$unset', values)
+        end
+
+        # Post.push!(:tags => 'xxx')
+        def push!(args)
+          collection_modifier_update('$push', args)
+        end
+
+        # Post.push_all!(:tags => ['xxx', 'yyy', 'zzz'])
+        def push_all!(args)
+          collection_modifier_update('$pushAll', args)
+        end
+        
+        # Post.add_to_set!(:tags => 'xxx')
+        def add_to_set!(args)
+          collection_modifier_update('$addToSet', args)
+        end
+
+        # Post.pull!(:tags => 'xxx')
+        def pull!(args)
+          collection_modifier_update('$pull', args)
+        end
+
+        # Post.pull_all!(:tags => ['xxx', 'yyy', 'zzz'])
+        def pull_all!(args)
+          collection_modifier_update('$pullAll', args)
+        end
+
+        # Post.pop!(:tags)
+        def pop!(*args)
+          values = args.each_with_object({}) { |key, hash| hash[key.to_s] = 1 }
+          collection_modifier_update('$pop', values)
+        end
+
+        # Post.shift!(:tags, :data)
+        def shift!(*args)
+          values = args.each_with_object({}) { |key, hash| hash[key.to_s] = -1 }
+          collection_modifier_update('$pop', values)
+        end
+
+        # requires mongodb 1.7.2
+        # Post.rename!(:tags => :tag_collection)
+        def rename!(args)
+          collection_modifier_update('$rename', args)
+        end
+
+      private
+        def collection_modifier_update(modifier, args)
+          selector = MongoModel::MongoOptions.new(self, scoped.finder_options).selector
+          collection.update(selector, { modifier => args.stringify_keys! }, :multi => true)
+        end
+      end
+
+      module InstanceMethods
+        delegate :increase!, :set!, :unset!, :push!, :push_all!, :add_to_set!, :pull!, :pull_all!, :pop!, :shift!, :rename!, :to => :instance_scope
+        
+      private
+        def instance_scope
+          self.class.where(:id => id)
+        end
+      end
+    end
+  end
+end

data/lib/mongomodel/document/optimistic_locking.rb

@@ -30,7 +30,7 @@ module MongoModel
       def save_to_collection
         if locking_enabled? && _lock_version > 1
           begin
-            collection.update({ '_id' => id, '_lock_version' => _lock_version-1 }, to_mongo)
+            collection.update({ '_id' => id.to_mongo, '_lock_version' => _lock_version-1 }, to_mongo)
             success = database.get_last_error['updatedExisting']
             
             self._lock_version -= 1 unless success

data/lib/mongomodel/document/persistence.rb

@@ -85,9 +85,9 @@ module MongoModel
           end
         end
 
-        def from_mongo(document)
+        def from_mongo(hash)
           instance = super
-          instance.send(:instantiate, document) if instance
+          instance.send(:instantiate) if instance
           instance
         end
         
@@ -108,7 +108,7 @@ module MongoModel
         end
 
         def collection
-          @_collection ||= database.collection(collection_name)
+          @_collection ||= InstrumentedCollection.new(database.collection(collection_name))
         end
         
         def database
@@ -146,8 +146,7 @@ module MongoModel
         false
       end
 
-      def instantiate(document)
-        attributes.load!(document)
+      def instantiate
         set_new_record(false)
       end
     end

data/lib/mongomodel/log_subscriber.rb

@@ -0,0 +1,48 @@
+module MongoModel
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    def self.runtime=(value)
+      Thread.current["mongomodel_runtime"] = value
+    end
+
+    def self.runtime
+      Thread.current["mongomodel_runtime"] ||= 0
+    end
+
+    def self.reset_runtime
+      rt, self.runtime = runtime, 0
+      rt
+    end
+
+    def initialize
+      super
+      @odd_or_even = false
+    end
+    
+    def query(event)
+      self.class.runtime += event.duration
+      return unless logger.debug?
+      
+      collection = '%s (%.1fms)' % [event.payload[:collection], event.duration]
+      query      = event.payload[:query]
+      
+      if odd?
+        collection = color(collection, CYAN, true)
+        query      = color(query, nil, true)
+      else
+        collection = color(collection, MAGENTA, true)
+      end
+      
+      debug "  #{collection}  #{query}"
+    end
+    
+    def odd?
+      @odd_or_even = !@odd_or_even
+    end
+
+    def logger
+      MongoModel.logger
+    end
+  end
+end
+
+MongoModel::LogSubscriber.attach_to :mongomodel

data/lib/mongomodel/railtie.rb

@@ -26,6 +26,14 @@ module MongoModel
       end
     end
     
+    # Expose database runtime to controller for logging.
+    initializer "mongomodel.log_runtime" do |app|
+      require "mongomodel/railties/controller_runtime"
+      ActiveSupport.on_load(:action_controller) do
+        include MongoModel::Railties::ControllerRuntime
+      end
+    end
+    
     initializer "mongomodel.passenger_forking" do |app|
       if defined?(PhusionPassenger)
         PhusionPassenger.on_event(:starting_worker_process) do |forked|