mongomodel 0.5.5 → 0.5.6

data/lib/mongomodel/concerns/timestamps.rb

@@ -3,12 +3,12 @@ module MongoModel
   # named created_at/created_on or updated_at/updated_on.
   module Timestamps #:nodoc:
     extend ActiveSupport::Concern
-    
+
     included do
       before_save   :set_update_timestamps
       before_create :set_create_timestamps
     end
-    
+
     module ClassMethods
       # Defines timestamp properties created_at and updated_at.
       # When the document is created or updated, these properties will be respectively updated.
@@ -17,13 +17,13 @@ module MongoModel
         property :updated_at, Time
       end
     end
-  
+
   private
     def set_update_timestamps
       write_attribute(:updated_at, Time.now) if properties.include?(:updated_at)
       write_attribute(:updated_on, Time.now) if properties.include?(:updated_on)
     end
-    
+
     def set_create_timestamps
       write_attribute(:created_at, Time.now) if properties.include?(:created_at) && !query_attribute(:created_at)
       write_attribute(:created_on, Time.now) if properties.include?(:created_on) && !query_attribute(:created_on)

data/lib/mongomodel/concerns/translation.rb

@@ -1,10 +1,10 @@
 module MongoModel
   module Translation
     extend ActiveSupport::Concern
-    
+
     module ClassMethods
       include ActiveModel::Translation
-      
+
       # Set the i18n scope to overwrite ActiveModel.
       def i18n_scope #:nodoc:
         :mongomodel

data/lib/mongomodel/concerns/validations.rb

@@ -1,23 +1,23 @@
 module MongoModel
   module Validations
     extend ActiveSupport::Concern
-    
+
     include ActiveModel::Validations
-    
+
     module ClassMethods
       def property(name, *args, &block) #:nodoc:
         property = super
-        
+
         if property.validate?
           validates_associated(name) if property.embeddable?
           validates_presence_of(name) if property.options[:required]
           validates_format_of(name, property.options[:format]) if property.options[:format]
         end
-        
+
         property
       end
     end
-    
+
     def valid?(context=nil)
       context ||= new_record? ? :create : :update
       super

data/lib/mongomodel/concerns/validations/associated.rb

@@ -6,7 +6,7 @@ module MongoModel
         record.errors.add(attribute, :invalid, options.merge(:value => value))
       end
     end
-    
+
     module ClassMethods
       # Validates whether the associated object or objects are all valid themselves. Works with any kind of association.
       #

data/lib/mongomodel/document.rb

@@ -8,20 +8,20 @@ module MongoModel
     def ==(other)
       self.class == other.class && id == other.id
     end
-    
+
     include DocumentExtensions::Persistence
     include DocumentExtensions::OptimisticLocking
     include DocumentExtensions::CollectionModifiers
-    
+
     extend  DocumentExtensions::DynamicFinders
     include DocumentExtensions::Indexes
-    
+
     include DocumentExtensions::Scopes
     include DocumentExtensions::Validations
-    include DocumentExtensions::Callbacks
-    
+    prepend DocumentExtensions::Callbacks
+
     self.abstract_class = true
-    
+
     class_attribute :per_page
     self.per_page = 20
   end

data/lib/mongomodel/document/callbacks.rb

@@ -2,43 +2,37 @@ module MongoModel
   module DocumentExtensions
     module Callbacks
       extend ActiveSupport::Concern
-      
-      included do
-        [:instantiate, :create_or_update, :create, :update, :destroy].each do |method|
-          alias_method_chain method, :callbacks
-        end
-      end
-      
-      def instantiate_with_callbacks(*args) #:nodoc:
-        instantiate_without_callbacks(*args)
+
+      def instantiate(*) #:nodoc:
+        super
         run_callbacks_with_embedded(:find)
       end
-      private :instantiate_with_callbacks
+      private :instantiate
 
-      def create_or_update_with_callbacks #:nodoc:
+      def create_or_update #:nodoc:
         run_callbacks_with_embedded(:save) do
-          create_or_update_without_callbacks
+          super
         end
       end
-      private :create_or_update_with_callbacks
+      private :create_or_update
 
-      def create_with_callbacks #:nodoc:
+      def create #:nodoc:
         run_callbacks_with_embedded(:create) do
-          create_without_callbacks
+          super
         end
       end
-      private :create_with_callbacks
+      private :create
 
-      def update_with_callbacks(*args) #:nodoc:
+      def update(*) #:nodoc:
         run_callbacks_with_embedded(:update) do
-          update_without_callbacks(*args)
+          super
         end
       end
-      private :update_with_callbacks
+      private :update
 
-      def destroy_with_callbacks #:nodoc:
+      def destroy #:nodoc:
         run_callbacks_with_embedded(:destroy) do
-          destroy_without_callbacks
+          super
         end
       end
     end

data/lib/mongomodel/document/collection_modifiers.rb

@@ -2,21 +2,21 @@ module MongoModel
   module DocumentExtensions
     module CollectionModifiers
       extend ActiveSupport::Concern
-      
+
       METHODS = [ :increment!, :increase!, :set!, :unset!, :push!, :push_all!, :add_to_set!, :pull!, :pull_all!, :pop!, :shift!, :rename! ]
-      
+
       # Define methods manually rather than use Module#delegate as it raises false deprecation warnings.
       METHODS.each do |modifier|
         define_method(modifier) do |*args|
           instance_scope.send(modifier, *args)
         end
       end
-      
+
     private
       def instance_scope
         self.class.where(:id => id)
       end
-      
+
       module ClassMethods
         # Post.increment!(:hits => 1, :available => -1)
         # This method is also aliased as increase!
@@ -45,7 +45,7 @@ module MongoModel
         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)

data/lib/mongomodel/document/dynamic_finders.rb

@@ -8,7 +8,7 @@ module MongoModel
           super
         end
       end
-      
+
       def method_missing(method_id, *args, &block)
         if finder = DynamicFinder.match(scoped, method_id)
           finder.execute(*args)

data/lib/mongomodel/document/indexes.rb

@@ -4,26 +4,26 @@ module MongoModel
   module DocumentExtensions
     module Indexes
       extend ActiveSupport::Concern
-      
+
       included do
         index :_type
       end
-      
+
       module ClassMethods
         def property(name, *args, &block) #:nodoc:
           property = super
           index(name) if property.options[:index]
           property
         end
-        
+
         def indexes
           @_indexes ||= []
         end
-        
+
         def indexes=(indexes)
           @_indexes = indexes
         end
-        
+
         def index(*args)
           index = Index.new(*args)
           self.indexes << index
@@ -42,7 +42,7 @@ module MongoModel
 
           @_indexes_initialized = true
         end
-        
+
         def inherited(subclass)
           super
           subclass.indexes = indexes.dup
@@ -50,41 +50,41 @@ module MongoModel
       end
     end
   end
-  
+
   class Index
     def initialize(*keys)
       options = keys.extract_options!
-      
+
       @name   = options.delete(:name)
       @unique = options.delete(:unique)
       @min    = options.delete(:min)
       @max    = options.delete(:max)
-      
+
       keys.each do |key|
         self.keys[key.to_sym] = :ascending
       end
-      
+
       options.each do |key, order|
         self.keys[key.to_sym] = order
       end
     end
-    
+
     def keys
       @keys ||= ActiveSupport::OrderedHash.new
     end
-    
+
     def unique?
       @unique
     end
-    
+
     def geo2d?
       @geo2d ||= keys.size == 1 && keys.values.first == :geo2d
     end
-    
+
     def to_args
       args = []
       options = {}
-      
+
       if geo2d?
         args << [[keys.keys.first, Mongo::GEO2D]]
       elsif keys.size == 1 && keys.values.first == :ascending
@@ -92,19 +92,19 @@ module MongoModel
       else
         args << keys.map { |k, o| [k, o == :ascending ? Mongo::ASCENDING : Mongo::DESCENDING] }.sort_by { |k| k.first.to_s }
       end
-      
+
       if geo2d? && @min && @max
         options[:min] = @min
         options[:max] = @max
       end
-      
+
       options[:unique] = true if unique?
       options[:name] = @name if @name
-      
+
       args << options if options.any?
       args
     end
-    
+
     def ==(other)
       other.is_a?(Index) && to_args == other.to_args
     end

data/lib/mongomodel/document/optimistic_locking.rb

@@ -2,12 +2,12 @@ module MongoModel
   module DocumentExtensions
     module OptimisticLocking
       extend ActiveSupport::Concern
-      
+
       module ClassMethods
         def locking_enabled?
           properties.include?(:_lock_version)
         end
-        
+
         def lock_optimistically=(value)
           if value == true
             property :_lock_version, Integer, :default => 0, :internal => true, :protected => true
@@ -17,24 +17,24 @@ module MongoModel
           end
         end
       end
-      
+
       def locking_enabled?
         self.class.locking_enabled?
       end
-    
+
     private
       def increment_lock_version
         self._lock_version += 1
       end
-      
+
       def save_to_collection
         if locking_enabled? && _lock_version > 1
           begin
             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
-            
+
             success
           rescue Mongo::OperationFailure => e
             false

data/lib/mongomodel/document/persistence.rb

@@ -2,24 +2,24 @@ module MongoModel
   module DocumentExtensions
     module Persistence
       extend ActiveSupport::Concern
-      
+
       included do
         undef_method :id if method_defined?(:id)
         property :id, MongoModel::Reference, :as => '_id', :default => lambda { |doc| doc.generate_id }
       end
-      
+
       # Reload the document from the database. If the document
       # hasn't been saved, this method will raise an error.
       def reload
         reloaded = self.class.unscoped.find(id)
-        
+
         attributes.clear
         attributes.load!(reloaded.attributes.to_mongo)
-        
+
         associations.values.each do |association|
           association.proxy.reset
         end
-        
+
         self
       end
 
@@ -32,7 +32,7 @@ module MongoModel
       def save!(*)
         create_or_update || raise(DocumentNotSaved)
       end
-      
+
       def delete
         self.class.unscoped.delete(id)
         set_destroyed(true)
@@ -43,7 +43,7 @@ module MongoModel
       def destroy
         delete
       end
-      
+
       # Updates all the attributes from the passed-in Hash and saves the document.
       # If the object is invalid, the saving will fail and false will be returned.
       #
@@ -55,35 +55,35 @@ module MongoModel
         self.assign_attributes(attributes, options)
         save
       end
-      
+
       # Updates its receiver just like +update_attributes+ but calls <tt>save!</tt> instead
       # of +save+, so an exception is raised if the docuemnt is invalid.
       def update_attributes!(attributes, options={})
         self.assign_attributes(attributes, options)
         save!
       end
-      
+
       # Updates a single attribute and saves the document without going through the normal validation procedure.
       # This is especially useful for boolean flags on existing documents.
       def update_attribute(name, value)
         send("#{name}=", value)
         save(:validate => false)
       end
-      
+
       def collection
         self.class.collection
       end
-      
+
       def database
         self.class.database
       end
-      
+
       # Generate a new BSON::ObjectId for the record.
       # Override in subclasses for custom ID generation.
       def generate_id
         ::BSON::ObjectId.new.to_s
       end
-      
+
       module ClassMethods
         def create(attributes={}, &block)
           if attributes.is_a?(Array)
@@ -100,20 +100,20 @@ module MongoModel
           instance.send(:instantiate) if instance
           instance
         end
-        
+
         def collection_name
           @_collection_name || inferred_collection_name
         end
-        
+
         def collection_name=(name)
           @_collection = nil
           @_collection_name = name
         end
-        
+
         def use_type_selector?
           !superclass.abstract_class?
         end
-        
+
         def type_selector
           [self.to_s] + descendants.map { |m| m.to_s }
         end
@@ -121,19 +121,19 @@ module MongoModel
         def collection
           @_collection ||= InstrumentedCollection.new(database.collection(collection_name))
         end
-        
+
         def database
           MongoModel.database
         end
-        
+
         def save_safely?
           defined?(@_save_safely) ? @_save_safely : true
         end
-        
+
         def save_safely=(val)
           @_save_safely = val
         end
-      
+
       protected
         def inferred_collection_name
           if superclass.abstract_class?
@@ -143,7 +143,7 @@ module MongoModel
           end
         end
       end
-    
+
     private
       def create_or_update
         result = new_record? ? create : update
@@ -157,7 +157,7 @@ module MongoModel
       def update
         save_to_collection
       end
-      
+
       def save_to_collection
         collection.save(to_mongo, :w => self.class.save_safely? ? 1 : 0)
         set_new_record(false)