mongomodel 0.5.5 → 0.5.6

data/lib/mongomodel/document/scopes.rb

@@ -2,39 +2,39 @@ module MongoModel
   module DocumentExtensions
     module Scopes
       extend ActiveSupport::Concern
-      
+
       delegate :current_scope, :to => "self.class"
-      
+
       def initialize(*)
         self.attributes = current_scope.options_for_create if respond_to?(:attributes=)
         super
       end
-      
+
       module ClassMethods
         delegate :find, :first, :last, :all, :exists?, :count, :to => :scoped
         delegate :update, :update_all, :delete, :delete_all, :destroy, :destroy_all, :to => :scoped
         delegate :select, :order, :where, :limit, :offset, :from, :paginate, :in_batches, :to => :scoped
-        
+
         def unscoped
           @unscoped ||= MongoModel::Scope.new(self)
         end
-        
+
         def scoped
           current_scope.clone
         end
-        
+
         def scope(name, scope)
           name = name.to_sym
-          
+
           if !scopes[name] && respond_to?(name, true)
             logger.warn "Creating scope :#{name}. " \
                         "Overwriting existing method #{self.name}.#{name}."
           end
-          
+
           scopes[name] = lambda do |*args|
             scope.is_a?(Proc) ? scope.call(*args) : scope
           end
-          
+
           singleton_class.class_eval do
             define_method(name) do |*args|
               s = scopes[name].call(*args)
@@ -42,55 +42,55 @@ module MongoModel
             end
           end
         end
-        
+
         def default_scope(scope)
           reset_current_scopes
           previous_scope = default_scoping.last || unscoped
           default_scoping << previous_scope.merge(scope)
         end
-        
+
         def current_scope
           current_scopes.last || unscoped
         end
-        
+
         def scopes
           @_scopes ||= {}
         end
-        
+
         def scopes=(scopes)
           @_scopes = scopes
         end
-        
+
         def default_scoping
           @_default_scoping ||= []
         end
-        
+
         def default_scoping=(scoping)
           @_default_scoping = scoping
         end
-        
+
         def inherited(subclass)
           super
           subclass.scopes = scopes.dup
           subclass.default_scoping = default_scoping.dup
         end
-      
+
       protected
         def with_scope(scope, &block)
           current_scopes << current_scope.merge(scope)
-          
+
           begin
             yield
           ensure
             current_scopes.pop
           end
         end
-        
+
       private
         def current_scopes
           Thread.current[:"#{self}_scopes"] ||= default_scoping.dup
         end
-        
+
         def reset_current_scopes
           Thread.current[:"#{self}_scopes"] = nil
         end

data/lib/mongomodel/document/validations.rb

@@ -6,12 +6,12 @@ module MongoModel
       module ClassMethods
         def property(name, *args, &block) #:nodoc:
           property = super
-          
+
           validates_uniqueness_of(name) if property.options[:unique]
-          
+
           property
         end
-        
+
         # Creates an object just like Document.create but calls save! instead of save
         # so an exception is raised if the document is invalid.
         def create!(attributes={}, &block)
@@ -24,7 +24,7 @@ module MongoModel
           end
         end
       end
-    
+
       # The validation process on save can be skipped by passing <tt>:validate => false</tt>. The regular Document#save method is
       # replaced with this when the validations module is mixed in, which it is by default.
       def save(options={})
@@ -39,7 +39,7 @@ module MongoModel
           false
         end
       end
-    
+
       # Attempts to save the document just like Document#save but will raise a DocumentInvalid exception
       # instead of returning false if the document is not valid.
       def save!(options={})
@@ -53,7 +53,7 @@ module MongoModel
           raise DocumentInvalid.new(self)
         end
       end
-    
+
     protected
       def perform_validation(options={})
         perform_validation = options != false && options[:validate] != false

data/lib/mongomodel/document/validations/uniqueness.rb

@@ -6,40 +6,40 @@ module MongoModel
       class UniquenessValidator < ActiveModel::EachValidator
         def initialize(options)
           options = options.reverse_merge(:case_sensitive => true)
-          
+
           ActiveSupport::Deprecation.silence { super }
           setup!(options[:class]) if options[:class] && !@klass
         end
-        
+
         def setup(klass)
           setup!(klass)
         end
-        
+
         def validate_each(record, attribute, value)
           finder_class = find_finder_class_for(record)
           unique_scope = finder_class.scoped
-          
+
           if options[:case_sensitive] || !value.is_a?(String)
             unique_scope = unique_scope.where(attribute => value)
           else
             unique_scope = unique_scope.where("_lowercase_#{attribute}" => value.downcase)
           end
-          
+
           Array.wrap(options[:scope]).each do |scope|
             unique_scope = unique_scope.where(scope => record.send(scope))
           end
-          
+
           unique_scope = unique_scope.where(:id.ne => record.id) unless record.new_record?
-          
+
           if unique_scope.any?
             record.errors.add(attribute, :taken, :message => options[:message], :value => value)
           end
         end
-      
+
       private
         def setup!(klass)
           @klass = klass
-          
+
           unless options[:index] == false
             # Create unique indexes to deal with race condition
             attributes.each do |attr_name|
@@ -53,7 +53,7 @@ module MongoModel
             end
           end
         end
-        
+
         # The check for an existing value should be run from a class that
         # isn't abstract. This means working down from the current class
         # (self), to the first non-abstract class. Since classes don't know
@@ -69,7 +69,7 @@ module MongoModel
           class_hierarchy.detect { |klass| !klass.abstract_class? }
         end
       end
-      
+
       module ClassMethods
         # Validates whether the value of the specified attributes are unique across the system. Useful for making sure that only one user
         # can be named "davidhh".

data/lib/mongomodel/embedded_document.rb

@@ -3,17 +3,17 @@ module MongoModel
     def ==(other)
       self.class == other.class && attributes == other.attributes
     end
-    
+
     include Attributes
     include Properties
-    
+
     include Translation
     include Validations
     include Callbacks
     include Observing if defined?(ActiveModel::Observing)
-    
+
     include Associations
-    
+
     include AttributeMethods
     include AttributeMethods::Read
     include AttributeMethods::Write
@@ -24,29 +24,29 @@ module MongoModel
     include AttributeMethods::Nested
     include AttributeMethods::MultiParameterAssignment
     include AttributeMethods::Forbidden if defined?(ActiveModel::ForbiddenAttributesProtection)
-    
+
     include Logging
-    include RecordStatus
+    prepend RecordStatus
     include ActiveModelCompatibility
     include Serialization
     include Timestamps
     include PrettyInspect
     include AbstractClass
     include DocumentParent
-    
+
     # Allow Collection class to be used in property definitions
     Collection = MongoModel::Collection
     extend Collection::PropertyDefaults
-    
+
     # Allow Map class to be used in property definitions
     Map = MongoModel::Map
     extend Map::PropertyDefaults
-    
+
     undef_method :type if method_defined?(:type)
     property :type, String, :as => '_type', :default => lambda { |doc| doc.class.name }, :protected => true
-    
+
     self.abstract_class = true
   end
 end
 
-ActiveSupport::run_load_hooks(:mongomodel, MongoModel::EmbeddedDocument)
+ActiveSupport::run_load_hooks(:mongomodel, MongoModel::EmbeddedDocument)

data/lib/mongomodel/locale/en.yml

@@ -52,4 +52,3 @@ en:
           #   user:
           #     login: "Handle"
           # will translate User attribute "login" as "Handle"
-          

data/lib/mongomodel/log_subscriber.rb

@@ -17,24 +17,24 @@ module MongoModel
       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

data/lib/mongomodel/railtie.rb

@@ -3,44 +3,44 @@ module MongoModel
     def self.rescue_responses
       { 'MongoModel::DocumentNotFound' => :not_found }
     end
-    
+
     if config.action_dispatch.rescue_responses
       config.action_dispatch.rescue_responses.merge!(rescue_responses)
     end
-    
-    config.app_generators.orm :mongo_model, :migration => false    
+
+    config.app_generators.orm :mongo_model, :migration => false
 
     config.mongomodel = ActiveSupport::OrderedOptions.new
 
     rake_tasks do
       load "mongomodel/tasks/database.rake"
     end
-    
+
     console do
       MongoModel.logger = Logger.new(STDERR)
     end
-    
+
     initializer "mongomodel.logger" do
       MongoModel.logger ||= ::Rails.logger
     end
-    
+
     initializer "mongomodel.rescue_responses" do
       unless config.action_dispatch.rescue_responses
         ActionDispatch::ShowExceptions.rescue_responses.update(self.class.rescue_responses)
       end
     end
-    
+
     initializer "mongomodel.database_configuration" do |app|
       require 'erb'
-      
+
       config = Rails.root.join("config", "mongomodel.yml")
-      
+
       if File.exists?(config)
         mongomodel_configuration = YAML::load(ERB.new(IO.read(config)).result)
         MongoModel.configuration = mongomodel_configuration[Rails.env]
       end
     end
-    
+
     # Expose database runtime to controller for logging.
     initializer "mongomodel.log_runtime" do |app|
       require "mongomodel/railties/controller_runtime"
@@ -48,7 +48,7 @@ module MongoModel
         include MongoModel::Railties::ControllerRuntime
       end
     end
-    
+
     initializer "mongomodel.passenger_forking" do |app|
       if defined?(PhusionPassenger)
         PhusionPassenger.on_event(:starting_worker_process) do |forked|
@@ -56,13 +56,13 @@ module MongoModel
         end
       end
     end
-    
+
     initializer "mongomodel.observers" do |app|
       if defined?(ActiveModel::Observing)
         MongoModel::EmbeddedDocument.observers = app.config.mongomodel.observers || []
       end
     end
-    
+
     # Initialize observer instances if available
     ActiveSupport.on_load(:mongomodel) do
       if respond_to?(:instantiate_observers)

data/lib/mongomodel/support/collection.rb

@@ -5,84 +5,84 @@ module MongoModel
     module PropertyDefaults
       def property(name, *args, &block) #:nodoc:
         property = super(name, *args, &block)
-        
+
         if property.type <= Collection
           property.options[:default] ||= lambda { property.type.new }
         end
-        
+
         property
       end
     end
-    
+
     ARRAY_CONVERTER = Types.converter_for(Array)
-    
+
     class_attribute :type
     self.type = Object
-    
+
     include DocumentParent
-    
+
     def initialize(array=[])
       super(array.map { |i| convert_for_add(i) })
     end
-    
+
     def []=(index, value)
       super(index, convert_for_add(value))
     end
-    
+
     def <<(value)
       super(convert_for_add(value))
     end
-    
+
     def build(value={})
       value = convert(value)
       self << value
       value
     end
-    
+
     def +(other)
       self.class.new(super(other))
     end
-    
+
     def concat(values)
       super(values.map { |v| convert_for_add(v) })
     end
-    
+
     def delete(value)
       super(convert(value))
     end
-    
+
     def include?(value)
       super(convert(value))
     end
-    
+
     def index(value)
       super(convert(value))
     end
-    
+
     def insert(index, value)
       super(index, convert_for_add(value))
     end
-    
+
     def push(*values)
       super(*values.map { |v| convert_for_add(v) })
     end
-    
+
     def rindex(value)
       super(convert(value))
     end
-    
+
     def unshift(*values)
       super(*values.map { |v| convert_for_add(v) })
     end
-    
+
     def to_mongo
       ARRAY_CONVERTER.to_mongo(self)
     end
-    
+
     def embedded_documents
       select { |item| item.is_a?(EmbeddedDocument) }
     end
-    
+
     class << self
       def inspect
         if type == Object
@@ -91,14 +91,14 @@ module MongoModel
           "Collection[#{type}]"
         end
       end
-      
+
       # Create a new MongoModel::Collection class with the type set to the specified class.
       # This allows you declare arrays of embedded documents like:
       #
       #   class Thing < MongoModel::EmbeddedDocument
       #     property :name, String
       #   end
-      #   
+      #
       #   class MyModel < MongoModel::Document
       #     property :things, Collection[Thing]
       #   end
@@ -124,9 +124,9 @@ module MongoModel
           collection
         end
       end
-      
+
       alias of []
-      
+
       def cast(value)
         case value
         when Array
@@ -138,7 +138,7 @@ module MongoModel
           new(Array(value))
         end
       end
-      
+
       def from_mongo(value)
         case value
         when Array
@@ -147,11 +147,11 @@ module MongoModel
           from_mongo([value])
         end
       end
-    
+
       def converter
         @converter ||= Types.converter_for(type)
       end
-    
+
     private
       def instantiate(item)
         if item.is_a?(Hash) && item['_type']
@@ -161,18 +161,18 @@ module MongoModel
         end
       end
     end
-  
+
   private
     def convert(value)
       converter.cast(value)
     end
-    
+
     def convert_for_add(value)
       result = convert(value)
       result.parent_document = lambda { parent_document } if result.respond_to?(:parent_document=)
       result
     end
-    
+
     def converter
       self.class.converter
     end