mongo_odm 0.2.11 → 0.2.13

data/CONTRIBUTORS

@@ -1,5 +1,15 @@
-Steve Sloan
+Steve Sloan (CodeMonkeySteve)
 
   * Config class, railtie to load config from YAML file
   * Timestamps module
-  * BSON::DBRef ideas
+  * BSON::DBRef ideas
+
+Dusty Doris (dusty)
+
+  * Bug fix
+  * before_validate callback
+
+Nikita Baksalyar (nbaksalyar)
+
+  * Bug fixes
+  * orm_adapter compatibility

data/lib/mongo_odm/core_ext/hash_recursive_merge.rb

@@ -0,0 +1,14 @@
+class Hash
+  def rmerge!(other_hash)
+    merge!(other_hash) do |key, old_value, new_value| 
+      old_value.class == self.class ? old_value.rmerge!(new_value) : new_value
+    end
+  end
+  
+  def rmerge(other_hash)
+    result = {}
+    merge(other_hash)  do |key, old_value, new_value| 
+      result[key] = old_value.class == self.class ? old_value.rmerge(new_value) : new_value
+    end
+  end
+end

data/lib/mongo_odm/criteria.rb

@@ -1,65 +1,56 @@
 # encoding: utf-8
+require 'mongo_odm/core_ext/hash_recursive_merge'
+
 module MongoODM
 
   class Criteria
 
     delegate :inspect, :to_xml, :to_yaml, :to_json, :include?, :to => :to_a
 
-    def initialize(klass, options = {})
-      @klass    = klass
-      @selector = options[:selector] || {}
-      @opts     = options[:opts]     || {}
-      @sort     = options[:sort]     || []
-      @limit    = options[:limit]    || nil
-      @skip     = options[:skip]     || nil
+    def initialize(klass, selector = {}, opts = {})
+      @_klass    = klass
+      @_selector = selector
+      @_opts     = opts
       _set_cursor
     end
+    attr_reader :_klass, :_selector, :_opts
     
     def ==(other)
       case other
       when Criteria
-        other.instance_variable_get(:@selector) == @selector &&
-        other.instance_variable_get(:@opts)     == @opts     &&
-        other.instance_variable_get(:@sort)     == @sort    &&
-        other.instance_variable_get(:@limit)    == @limit    &&
-        other.instance_variable_get(:@skip)     == @skip
+        other._klass    == @_klass &&
+        other._selector == @_selector &&
+        other._opts     == @_opts
       else
         to_a == other.to_a
       end
     end
     
     def to_a
-      @cursor.to_a
+      @_result ||= @_cursor.rewind! && @_cursor.to_a
     end
     
     def to_cursor
-      @cursor
+      @_cursor
     end
     
     def _set_cursor
-      @cursor = @klass.collection.find(@selector, @opts)
-      @cursor = @cursor.sort(@sort)   unless @sort.blank?
-      @cursor = @cursor.limit(@limit) unless @limit.blank?
-      @cursor = @cursor.skip(@skip)   unless @skip.blank?
-      @cursor
+      @_cursor ||= @_klass.collection.find(@_selector, @_opts.dup)
     end
     
     def _merge_criteria(criteria)
-      @selector.merge!(criteria.instance_variable_get(:@selector))
-      @opts.merge!(criteria.instance_variable_get(:@opts))
-      @sort  << criteria.instance_variable_get(:@sort) unless criteria.instance_variable_get(:@sort).blank?
-      @limit = criteria.instance_variable_get(:@limit) unless criteria.instance_variable_get(:@limit).blank?
-      @skip  = criteria.instance_variable_get(:@skip)  unless criteria.instance_variable_get(:@skip).blank?
+      @_selector.rmerge!(criteria._selector)
+      @_opts.rmerge!(criteria._opts)
       _set_cursor
       self
     end
     
     def method_missing(method_name, *args, &block)
-      if @klass.respond_to?(method_name)
-        result = @klass.send(method_name, *args, &block)
+      if @_klass.respond_to?(method_name)
+        result = @_klass.send(method_name, *args, &block)
         result.is_a?(Criteria) ? _merge_criteria(result) : result
-      elsif @cursor.respond_to?(method_name)
-        @cursor.send(method_name, *args, &block)
+      elsif @_cursor.respond_to?(method_name)
+        @_cursor.send(method_name, *args, &block)
       elsif [].respond_to?(method_name)
         to_a.send(method_name, *args, &block)
       else

data/lib/mongo_odm/document/persistence.rb

@@ -90,25 +90,25 @@ module MongoODM
         
         def find(selector = {}, opts = {})
           if opts.blank? && selector.is_a?(String)
-            MongoODM::Criteria.new(self, :selector => {:_id => BSON::ObjectId.from_string(selector)})
+            MongoODM::Criteria.new(self, {:_id => BSON::ObjectId.from_string(selector)})
           elsif opts.blank? && selector.is_a?(BSON::ObjectId)
-            MongoODM::Criteria.new(self, :selector => {:_id => selector})
+            MongoODM::Criteria.new(self, {:_id => selector})
           else
-            MongoODM::Criteria.new(self, :selector => selector, :opts => opts)
+            MongoODM::Criteria.new(self, selector, opts)
           end
         end
         
         def sort(key_or_list, direction = nil)
           order = key_or_list.is_a?(Array) ? key_or_list : direction.nil? ? [key_or_list, :asc] : [key_or_list, direction]
-          MongoODM::Criteria.new(self, :sort => order)
+          MongoODM::Criteria.new(self, {}, {:sort => order})
         end
         
         def skip(number_to_skip = nil)
-          MongoODM::Criteria.new(self, :skip => number_to_skip)
+          MongoODM::Criteria.new(self, {}, {:skip => number_to_skip})
         end
         
         def limit(number_to_return = nil)
-          MongoODM::Criteria.new(self, :limit => number_to_return)
+          MongoODM::Criteria.new(self, {}, {:limit => number_to_return})
         end
         
         def cursor

data/lib/mongo_odm/version.rb

@@ -2,6 +2,6 @@
 module MongoODM
   VERSION_MAJOR = "0"
   VERSION_MINOR = "2"
-  VERSION_BUILD = "11"
+  VERSION_BUILD = "13"
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_BUILD}"
 end

metadata

@@ -2,7 +2,7 @@
 name: mongo_odm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +01:00
+date: 2011-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -253,6 +253,7 @@ files:
 - lib/mongo_odm/collection.rb
 - lib/mongo_odm/config.rb
 - lib/mongo_odm/core_ext/conversions.rb
+- lib/mongo_odm/core_ext/hash_recursive_merge.rb
 - lib/mongo_odm/criteria.rb
 - lib/mongo_odm/cursor.rb
 - lib/mongo_odm/document.rb