mongomodel 0.5.5 → 0.5.6

data/lib/mongomodel/support/mongo_operator.rb

@@ -1,27 +1,27 @@
 module MongoModel
   class MongoOperator
     attr_reader :field, :operator
-    
+
     def initialize(field, operator)
       @field, @operator = field, operator
     end
-    
+
     def to_mongo_selector(value)
       { "$#{operator}" => value }
     end
-    
+
     def inspect
       "#{field.inspect}.#{operator}"
     end
-    
+
     def ==(other)
       other.is_a?(self.class) && field == other.field && operator == other.operator
     end
-    
+
     def hash
       field.hash ^ operator.hash
     end
-    
+
     def eql?(other)
       self == other
     end

data/lib/mongomodel/support/mongo_options.rb

@@ -3,33 +3,33 @@ require 'active_support/core_ext/class/subclasses'
 module MongoModel
   class MongoOptions
     ValidKeys = [ :conditions, :select, :offset, :limit, :order ]
-    
+
     attr_reader :selector, :options
-    
+
     def initialize(model, options={})
       options.assert_valid_keys(ValidKeys)
-      
+
       @model = model
-      
+
       @selector = extract_conditions(options)
       @options  = extract_options(options)
-      
+
       add_type_to_selector
     end
-    
+
     def to_a
       [selector, options]
     end
-  
+
   private
     def extract_conditions(options)
       result = {}
-      
+
       (options[:conditions] || {}).each do |k, v|
         k = k.to_mongo_operator if k.respond_to?(:to_mongo_operator)
-        
+
         key = k.respond_to?(:field) ? k.field : k
-        
+
         if @model.respond_to?(:properties) && property = @model.properties[key]
           key = property.as
           value = v.is_a?(Array) ? v.map { |i| property.to_query(i) } : property.to_query(v);
@@ -39,7 +39,7 @@ module MongoModel
 
         if k.respond_to?(:to_mongo_selector)
           selector = k.to_mongo_selector(value)
-          
+
           if result[key].is_a?(Hash)
             result[key].merge!(selector)
           else
@@ -49,33 +49,33 @@ module MongoModel
           result[key] = value
         end
       end
-      
+
       result
     end
-    
+
     def extract_options(options)
       result = {}
-      
+
       result[:fields] = convert_select(options[:select]) if options[:select]
       result[:skip]   = options[:offset] if options[:offset]
       result[:limit]  = options[:limit]  if options[:limit]
       result[:sort]   = MongoOrder.parse(options[:order]).to_sort(@model) if options[:order]
-      
+
       result
     end
-    
+
     def convert_select(fields)
       fields.map do |key|
         (@model.properties[key.to_sym].try(:as) || key).to_sym
       end
     end
-    
+
     def add_type_to_selector
       if use_type_selector?
         selector['_type'] = { '$in' => @model.type_selector }
       end
     end
-    
+
     def use_type_selector?
       @model.respond_to?(:use_type_selector?) && @model.use_type_selector? && selector['_type'].nil?
     end

data/lib/mongomodel/support/mongo_order.rb

@@ -1,36 +1,36 @@
 module MongoModel
   class MongoOrder
     attr_reader :clauses
-    
+
     def initialize(*clauses)
       @clauses = clauses
     end
-    
+
     def to_a
       clauses
     end
-    
+
     def to_s
       clauses.map { |c| c.to_s }.join(', ')
     end
-    
+
     def to_sort(model)
       clauses.map { |c| c.to_sort(model.respond_to?(:properties) ? model.properties[c.field] : nil) }
     end
-    
+
     def ==(other)
       other.is_a?(self.class) && clauses == other.clauses
     end
     alias eql? ==
-    
+
     def hash
       clauses.hash
     end
-    
+
     def reverse
       self.class.new(*clauses.map { |c| c.reverse })
     end
-    
+
     def self.parse(order)
       case order
       when MongoOrder
@@ -47,35 +47,35 @@ module MongoModel
         new(order.to_mongo_order_clause) if order.respond_to?(:to_mongo_order_clause)
       end
     end
-    
+
     class Clause
       attr_reader :field, :order
-      
+
       def initialize(field, order=:ascending)
         @field, @order = field.to_sym, order.to_sym
       end
-      
+
       def to_s
         "#{field} #{order}"
       end
-      
+
       def to_sort(property)
         [property ? property.as : field.to_s, order]
       end
-      
+
       def reverse
         self.class.new(field, order == :ascending ? :descending : :ascending)
       end
-      
+
       def ==(other)
         other.is_a?(self.class) && field == other.field && order == other.order
       end
       alias eql? ==
-      
+
       def hash
         [field, order].hash
       end
-      
+
       def self.parse(clause)
         case clause
         when Clause

data/lib/mongomodel/support/paginator.rb

@@ -1,13 +1,13 @@
 module MongoModel
   class Paginator < Array
     attr_reader :current_page, :per_page, :total_entries
-    
+
     def initialize(scope, page, per_page)
       @current_page = page.to_i
       @per_page = per_page.to_i
-      
+
       super(scope.offset(offset).limit(per_page))
-      
+
       # Try to autodetect total entries
       if total_entries.nil? && size < per_page && (current_page == 1 or size > 0)
         @total_entries = offset + size
@@ -15,23 +15,23 @@ module MongoModel
         @total_entries = scope.count
       end
     end
-    
+
     def total_pages
       total_entries.zero? ? 1 : (total_entries / per_page.to_f).ceil
     end
-    
+
     def previous_page
       current_page > 1 ? (current_page - 1) : nil
     end
-    
+
     def next_page
       current_page < total_pages ? (current_page + 1) : nil
     end
-    
+
     def out_of_bounds?
       current_page > total_pages
     end
-    
+
     def offset
       (current_page - 1) * per_page
     end

data/lib/mongomodel/support/reference.rb

@@ -1,29 +1,29 @@
 module MongoModel
   class Reference
     attr_reader :id
-    
+
     def initialize(id)
       @id = id
     end
-    
+
     def to_s
       id.to_s
     end
-    
+
     alias :to_str :to_s
-    
+
     def hash
       id.hash
     end
-    
+
     def as_json(*)
       to_s
     end
-    
+
     def blank?
       id.blank?
     end
-    
+
     def eql?(other)
       case other
       when Reference
@@ -33,11 +33,11 @@ module MongoModel
       end
     end
     alias_method :==, :eql?
-    
+
     def to_mongo
       id.blank? ? nil : id
     end
-    
+
     def self.cast(value)
       case value
       when BSON::ObjectId
@@ -50,7 +50,7 @@ module MongoModel
         end
       end
     end
-    
+
     def self.from_mongo(value)
       cast(value)
     end

data/lib/mongomodel/support/scope.rb

@@ -4,7 +4,7 @@ module MongoModel
   class Scope
     MULTI_VALUE_METHODS = [ :select, :order, :where ]
     SINGLE_VALUE_METHODS = [ :limit, :offset, :from ]
-    
+
     autoload :ArrayMethods,   'mongomodel/support/scope/array_methods'
     autoload :SpawnMethods,   'mongomodel/support/scope/spawn_methods'
     autoload :QueryMethods,   'mongomodel/support/scope/query_methods'
@@ -13,72 +13,72 @@ module MongoModel
     autoload :DynamicFinders, 'mongomodel/support/scope/dynamic_finders'
     autoload :Pagination,     'mongomodel/support/scope/pagination'
     autoload :Batches,        'mongomodel/support/scope/batches'
-    
+
     include Batches, Pagination, DynamicFinders, LoadMethods, FinderMethods, ArrayMethods, QueryMethods, SpawnMethods
-    
+
     delegate :inspect, :as_json, :to => :to_a
-    
+
     attr_reader :klass
-    
+
     def initialize(klass)
       super
-      
+
       @klass = klass
-      
+
       @loaded = false
       @documents = []
     end
-    
+
     def initialize_copy(other)
       reset
     end
-    
+
     def build(*args, &block)
       new(*args, &block)
     end
-    
+
     def to_a
       return @documents if loaded?
-      
+
       @documents = _find_and_instantiate
       @loaded = true
-      
+
       @documents
     end
-    
+
     def size
       loaded? ? @documents.size : count
     end
-    
+
     def empty?
       loaded? ? @documents.empty? : count.zero?
     end
-    
+
     def count
       _find.count
     end
-    
+
     def destroy_all
       to_a.each { |doc| doc.destroy }
       reset
     end
-    
+
     def destroy(*ids)
       where(ids_to_conditions(ids)).destroy_all
       reset
     end
-    
+
     def delete_all
       selector = MongoOptions.new(klass, :conditions => finder_conditions).selector
       collection.remove(selector, {})
       reset
     end
-    
+
     def delete(*ids)
       where(ids_to_conditions(ids)).delete_all
       reset
     end
-    
+
     def update_all(updates)
       if updates.any?
         selector = MongoOptions.new(klass, :conditions => finder_conditions).selector
@@ -88,22 +88,22 @@ module MongoModel
         self
       end
     end
-    
+
     def update(ids, updates)
       where(ids_to_conditions(ids)).update_all(updates)
       reset
     end
-    
+
     def loaded?
       @loaded
     end
-    
+
     def reload
       reset
       to_a
       self
     end
-    
+
     def reset
       @loaded = nil
       @documents = []
@@ -111,7 +111,7 @@ module MongoModel
       @options_for_create = nil
       self
     end
-    
+
     def ==(other)
       case other
       when Scope
@@ -122,11 +122,11 @@ module MongoModel
         to_a == other.to_a
       end
     end
-    
+
     def collection
       from_value || klass.collection
     end
-    
+
     def finder_options
       @finder_options ||= {}.tap do |result|
         result[:conditions] = finder_conditions if where_values.any?
@@ -136,15 +136,15 @@ module MongoModel
         result[:offset]     = offset_value      if offset_value.present?
       end
     end
-    
+
     def options_for_create
       @options_for_create ||= finder_conditions.reject { |k, v| k.is_a?(MongoModel::MongoOperator) || k.respond_to?(:to_mongo_operator) }
     end
-    
+
     def respond_to?(method, include_private = false)
       Array.method_defined?(method) || klass.respond_to?(method, include_private) || super
     end
-  
+
   protected
     def method_missing(method, *args, &block)
       if Array.method_defined?(method)
@@ -157,14 +157,14 @@ module MongoModel
         super
       end
     end
-  
+
   private
     def _find
       ensure_indexes!
       selector, options = MongoOptions.new(klass, finder_options).to_a
       collection.find(selector, options)
     end
-    
+
     def _find_and_instantiate
       _find.to_a.map { |doc|
         klass.from_mongo(doc).tap { |instance|
@@ -172,25 +172,25 @@ module MongoModel
         }
       }
     end
-    
+
     def finder_conditions
       where_values.inject({}) { |conditions, v| conditions.merge(v) }
     end
-    
+
     def with_scope(&block)
       klass.send(:with_scope, self, &block)
     end
-    
+
     def ids_to_conditions(ids)
       ids = Array.wrap(ids).flatten
-      
+
       if ids.size == 1
         { :id => ids.first.to_s }
       else
         { :id.in => ids.map { |id| id.to_s } }
       end
     end
-    
+
     def ensure_indexes!
       if klass.respond_to?(:indexes_initialized?) && !klass.indexes_initialized?
         klass.ensure_indexes!