mongomodel 0.5.5 → 0.5.6

data/lib/mongomodel/concerns/attribute_methods/write.rb

@@ -2,23 +2,23 @@ module MongoModel
   module AttributeMethods
     module Write
       extend ActiveSupport::Concern
-      
+
       included do
         attribute_method_suffix "="
       end
-      
+
       # Updates the attribute identified by <tt>name</tt> with the specified +value+.
       # Values are typecast to the appropriate type determined by the property.
       def write_attribute(name, value)
         attributes[name.to_sym] = value
       end
-      
+
       # Updates the attribute identified by <tt>name</tt> with the specified +value+.
       # (Alias for the protected write_attribute method).
       def []=(name, value)
         write_attribute(name, value)
       end
-      
+
     private
       # Handle *= for method_missing.
       def attribute=(attribute_name, value)

data/lib/mongomodel/concerns/attributes.rb

@@ -3,19 +3,19 @@ require 'active_support/core_ext/module/aliasing'
 module MongoModel
   module Attributes
     extend ActiveSupport::Concern
-    
+
     def initialize(attrs={}, options={})
       assign_attributes(attrs || {}, options)
       yield self if block_given?
     end
-    
+
     def attributes
       @attributes ||= Attributes::Store.new(self)
     end
-    
+
     def assign_attributes(attrs, options={})
       return unless attrs
-      
+
       attrs.each do |attr, value|
         if respond_to?("#{attr}=")
           send("#{attr}=", value)
@@ -24,51 +24,51 @@ module MongoModel
         end
       end
     end
-    
+
     def attributes=(attrs)
       assign_attributes(attrs)
     end
-    
+
     def freeze
       attributes.freeze; self
     end
-    
+
     def frozen?
       attributes.frozen?
     end
-    
+
     # Returns duplicated record with unfreezed attributes.
     def dup
       obj = super
       obj.instance_variable_set('@attributes', instance_variable_get('@attributes').dup)
       obj
     end
-    
+
     def to_mongo
       attributes.to_mongo
     end
-    
+
     def embedded_documents
       docs = []
-      
+
       docs.concat attributes.values.select { |attr| attr.is_a?(EmbeddedDocument) }
-      
+
       attributes.values.select { |attr| attr.is_a?(Collection) }.each do |collection|
         docs.concat collection.embedded_documents
       end
-      
+
       attributes.values.select { |attr| attr.is_a?(Map) && attr.to <= EmbeddedDocument }.each do |map|
         docs.concat map.values
       end
-      
+
       docs
     end
-  
+
   protected
     def sanitize_for_mass_assignment(attrs, options={})
       attrs
     end
-    
+
     module ClassMethods
       def from_mongo(hash)
         if hash
@@ -77,11 +77,11 @@ module MongoModel
           doc
         end
       end
-    
+
     private
       def class_for_type(type)
         klass = type.constantize
-        
+
         if klass.ancestors.include?(self)
           klass
         else

data/lib/mongomodel/concerns/callbacks.rb

@@ -20,7 +20,7 @@ module MongoModel
   # * (6) <tt>after_save</tt>
   #
   # That's a total of eight callbacks, which gives you immense power to react and prepare for each state in the
-  # MongoModel lifecycle. The sequence for calling <tt>Document#save</tt> for an existing record is similar, except that each 
+  # MongoModel lifecycle. The sequence for calling <tt>Document#save</tt> for an existing record is similar, except that each
   # <tt>_on_create</tt> callback is replaced by the corresponding <tt>_on_update</tt> callback.
   #
   # Examples:
@@ -199,23 +199,23 @@ module MongoModel
       :after_create, :before_update, :around_update, :after_update,
       :before_destroy, :around_destroy, :after_destroy
     ]
-    
+
     module ClassMethods
       include ActiveModel::Callbacks
     end
-    
+
     included do
       include ActiveModel::Validations::Callbacks
-      
+
       define_model_callbacks :initialize, :find, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
     end
-    
+
     def initialize(*args, &block) #:nodoc:
       super
       run_callbacks_with_embedded(:initialize)
     end
-    
+
     def run_callbacks_with_embedded(kind, *args, &block)
       if block_given?
         embedded_callbacks = nest_embedded_callbacks(kind, *args, &block)
@@ -225,7 +225,7 @@ module MongoModel
         embedded_documents.each { |doc| doc.run_callbacks(kind, *args) } unless kind == :initialize
       end
     end
-  
+
   private
     def nest_embedded_callbacks(kind, *args, &block)
       embedded_documents.inject(block) do |callback, doc|

data/lib/mongomodel/concerns/document_parent.rb

@@ -1,7 +1,7 @@
 module MongoModel
   module DocumentParent
     extend ActiveSupport::Concern
-    
+
     def parent_document
       if @_parent_document.is_a?(Proc)
         case @_parent_document.arity
@@ -12,7 +12,7 @@ module MongoModel
         @_parent_document
       end
     end
-    
+
     def parent_document=(doc)
       @_parent_document = doc
     end

data/lib/mongomodel/concerns/logging.rb

@@ -1,13 +1,13 @@
 module MongoModel
   module Logging
     extend ActiveSupport::Concern
-    
+
     module ClassMethods
       def logger
         MongoModel.logger
       end
     end
-    
+
     def logger
       self.class.logger
     end

data/lib/mongomodel/concerns/map_reduce.rb

@@ -1,45 +1,45 @@
 module MongoModel::MapReduce
   extend ActiveSupport::Concern
-  
+
   include MongoModel::DocumentExtensions::Scopes
-  
+
   included do
     class_attribute :parent_collection
   end
-  
+
   module ClassMethods
     def from_mongo(attrs)
       new(attrs['_id'], attrs['value'])
     end
-    
+
     def cached
       from(collection_name)
     end
-    
+
     def database
       parent_collection.db
     end
-    
+
     def collection
       parent_collection.map_reduce(map_function, reduce_function, map_reduce_options)
     end
-    
+
     def collection_name
       @_collection_name || default_collection_name
     end
-    
+
     def collection_name=(name)
       @_collection_name = name
     end
-    
+
     def default_collection_name
       [parent_collection.name, name.demodulize.tableize.gsub(/\//, '.')].join("._")
     end
-    
+
     def map_function
       raise NotImplementedError, "map_function is not implemented"
     end
-    
+
     def reduce_function
       raise NotImplementedError, "reduce_function is not implemented"
     end

data/lib/mongomodel/concerns/pretty_inspect.rb

@@ -1,7 +1,7 @@
 module MongoModel
   module PrettyInspect
     extend ActiveSupport::Concern
-  
+
     module ClassMethods
       # Returns a string like 'Post(title:String, body:String)'
       def inspect
@@ -13,12 +13,12 @@ module MongoModel
         end
       end
     end
-  
+
     # Returns the contents of the document as a nicely formatted string.
     def inspect
       "#<#{self.class.name} #{attributes_for_inspect}>"
     end
-  
+
   private
     def attributes_for_inspect
       attrs = self.class.model_properties.map { |name, property| "#{name}: #{send(name).inspect}" }

data/lib/mongomodel/concerns/properties.rb

@@ -6,57 +6,57 @@ require 'active_support/core_ext/hash/except'
 module MongoModel
   module Properties
     extend ActiveSupport::Concern
-    
+
     def properties
       self.class.properties
     end
-    
+
     module ClassMethods
       def property(name, type, options={})
         properties[name.to_sym] = Property.new(name, type, options).tap do |property|
           include type.mongomodel_accessors(property) if type.respond_to?(:mongomodel_accessors)
         end
       end
-      
+
       def properties
         @properties ||= ActiveSupport::OrderedHash.new
       end
-      
+
       def properties=(properties)
         @properties = properties
       end
-      
+
       def model_properties
         properties.reject { |k, p| p.internal? }
       end
-      
+
       def internal_properties
         properties.select { |k, p| p.internal? }.map { |k, p| p }
       end
-      
+
       def inherited(subclass)
         super
         subclass.properties = properties.dup
       end
     end
-  
+
     class Property
       delegate :cast, :boolean, :to_mongo, :from_mongo, :to_query, :to => :type_converter
-      
+
       attr_reader :name, :type, :options
-    
+
       def initialize(name, type, options={})
         @name, @type, @options = name.to_sym, type, options
       end
-    
+
       def as
         options[:as] || name.to_s
       end
-    
+
       def default(instance)
         if options.key?(:default)
           default = options[:default]
-          
+
           if default.is_a?(Proc)
             case default.arity
             when 0 then instance.instance_exec(&default)
@@ -69,23 +69,23 @@ module MongoModel
           type.mongomodel_default(instance)
         end
       end
-    
+
       def ==(other)
         other.is_a?(self.class) && name == other.name && type == other.type && options == other.options
       end
-      
+
       def embeddable?
         type.ancestors.include?(EmbeddedDocument)
       end
-      
+
       def internal?
         as =~ /^_/ || options[:internal]
       end
-      
+
       def validate?
         options[:validate] != false
       end
-      
+
     private
       def type_converter
         @type_converter ||= Types.converter_for(type)

data/lib/mongomodel/concerns/record_status.rb

@@ -3,35 +3,31 @@ require 'active_support/core_ext/module/aliasing'
 module MongoModel
   module RecordStatus
     extend ActiveSupport::Concern
-    
-    included do
-      alias_method_chain :initialize, :record_status
-    end
-    
+
     def new_record?
       @_new_record
     end
-    
+
     def destroyed?
       @_destroyed
     end
-    
-    def initialize_with_record_status(*args, &block)
+
+    def initialize(*)
       set_new_record(true)
       set_destroyed(false)
-      
-      initialize_without_record_status(*args, &block)
+
+      super
     end
-    
+
   protected
     def set_new_record(value)
       set_record_status(:new_record, value)
     end
-    
+
     def set_destroyed(value)
       set_record_status(:destroyed, value)
     end
-  
+
   private
     def set_record_status(type, value)
       instance_variable_set("@_#{type}", value)

data/lib/mongomodel/concerns/serialization.rb

@@ -1,9 +1,9 @@
 module MongoModel
   module Serialization
     extend ActiveSupport::Concern
-    
+
     include ActiveModel::Serializers::JSON
-    
+
     def serializable_hash(given_options = nil)
       options = given_options ? given_options.dup : {}
 
@@ -12,7 +12,7 @@ module MongoModel
       options[:methods] = Array.wrap(options[:methods]).map { |n| n.to_s }
 
       attribute_names = attributes_for_serialization
-      
+
       if options[:only].any?
         attribute_names &= options[:only]
       elsif options[:except].any?
@@ -29,7 +29,7 @@ module MongoModel
         hash
       }
     end
-  
+
   protected
     def attributes_for_serialization
       properties.reject { |name, property|