mongo_odm 0.2.5 → 0.2.6

data/Gemfile

@@ -1,10 +1,10 @@
 # Use `bundle install` in order to install these gems
 source 'http://rubygems.org'
 
-gem "activesupport", "~>3.0.3"
-gem "activemodel", "~>3.0.3"
-gem "mongo", "~>1.2.0"
-gem "bson_ext", "~>1.2.0"
+gem "activesupport", "~>3.0.4"
+gem "activemodel", "~>3.0.4"
+gem "mongo", "~>1.2.2"
+gem "bson_ext", "~>1.2.2"
 gem "tzinfo", "~>0.3.24"
 
 group :development do

data/Gemfile.lock

@@ -1,14 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    ZenTest (4.4.2)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activesupport (3.0.3)
-    bson (1.2.0)
-    bson_ext (1.2.0)
+    activesupport (3.0.4)
+    archive-tar-minitar (0.5.2)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    bson (1.2.2)
+    bson_ext (1.2.2)
     builder (2.1.2)
+    columnize (0.3.2)
+    database_cleaner (0.6.3)
     diff-lcs (1.1.2)
     git (1.2.5)
     i18n (0.5.0)
@@ -16,8 +22,10 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mongo (1.2.0)
-      bson (>= 1.2.0)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    mongo (1.2.2)
+      bson (>= 1.2.2)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.4.0)
@@ -28,6 +36,16 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     tzinfo (0.3.24)
     watchr (0.7)
     yard (0.6.4)
@@ -36,13 +54,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.3)
-  activesupport (~> 3.0.3)
-  bson_ext (~> 1.2.0)
+  activemodel (~> 3.0.4)
+  activesupport (~> 3.0.4)
+  autotest
+  bson_ext (~> 1.2.2)
+  database_cleaner
   jeweler (~> 1.5.2)
-  mongo (~> 1.2.0)
+  mongo (~> 1.2.2)
   rcov (~> 0.9.9)
   rspec (= 2.4.0)
+  ruby-debug19
   tzinfo (~> 0.3.24)
   watchr (~> 0.7)
   yard (~> 0.6.4)

data/lib/mongo_odm/collection.rb

@@ -9,13 +9,12 @@ module MongoODM
       limit  = opts.delete(:limit) || 0
       sort   = opts.delete(:sort)
       hint   = opts.delete(:hint)
-      snapshot = opts.delete(:snapshot)
+      snapshot   = opts.delete(:snapshot)
       batch_size = opts.delete(:batch_size)
+      timeout    = (opts.delete(:timeout) == false) ? false : true
 
-      if opts[:timeout] == false && !block_given?
-        raise ArgumentError, "Timeout can be set to false only when #find is invoked with a block."
-      else
-        timeout = opts.delete(:timeout) || false
+      if timeout == false && !block_given?
+        raise ArgumentError, "Collection#find must be invoked with a block when timeout is disabled."
       end
 
       if hint
@@ -27,7 +26,8 @@ module MongoODM
       raise RuntimeError, "Unknown options [#{opts.inspect}]" unless opts.empty?
 
       cursor = MongoODM::Cursor.new(self, :selector => selector, :fields => fields, :skip => skip, :limit => limit,
-                          :order => sort, :hint => hint, :snapshot => snapshot, :timeout => timeout, :batch_size => batch_size)
+        :order => sort, :hint => hint, :snapshot => snapshot, :timeout => timeout, :batch_size => batch_size)
+
       if block_given?
         yield cursor
         cursor.close()
@@ -37,7 +37,7 @@ module MongoODM
       end
     end
     
-    def find_and_modify(opts = {})
+    def find_and_modify(*args)
       MongoODM.instanciate(super)
     end
     

data/lib/mongo_odm/criteria.rb

@@ -2,53 +2,53 @@
 module MongoODM
 
   class Criteria
-    delegate :inspect, :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a
-    
+
+    delegate :inspect, :to_xml, :to_yaml, :to_json, :include?, :to => :to_a
+
     def initialize(klass, selector = {}, opts = {})
       @klass, @selector, @opts = klass, selector, opts
-      @loaded = false
-    end
-    
-    def find(selector = {}, opts = {})
-      _merge_criteria(selector, opts)
-    end
-    
-    def loaded?
-      @loaded
+      _set_cursor
     end
+    attr_reader :selector, :opts, :cursor
     
     def ==(other)
       case other
       when Criteria
         other.instance_variable_get("@selector") == @selector &&
         other.instance_variable_get("@opts")     == @opts
-      when Array
+      else
         to_a == other.to_a
       end
     end
     
-    def method_missing(method_name, *args, &block)
-      if Array.method_defined?(method_name)
-        to_a.send(method_name, *args, &block)
-      elsif @klass.methods.include?(method_name)
-        result = @klass.send(method_name, *args, &block)
-        if result.is_a?(Criteria)
-          selector = result.instance_variable_get("@selector")
-          opts = result.instance_variable_get("@opts")
-          _merge_criteria(selector, opts)
-        else
-          result
-        end
-      else
-        @klass.collection.find(@selector, @opts).send(method_name, *args)
-      end
+    def to_a
+      @cursor.to_a
+    end
+    
+    def _set_cursor
+      @cursor = @klass.collection.find(@selector, @opts)
     end
     
     def _merge_criteria(selector, opts)
       @selector.merge!(selector)
       @opts.merge!(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)
+        result.is_a?(Criteria) ? _merge_criteria(result.selector, result.opts) : result
+      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
+        super
+      end
+    end
+
   end
 
 end

data/lib/mongo_odm/document/persistence.rb

@@ -69,7 +69,7 @@ module MongoODM
           @collection ||= if self.superclass.included_modules.include?(MongoODM::Document)
                             self.superclass.collection
                           else
-                            MongoODM::Collection.new(MongoODM.database, name.tableize)
+                            MongoODM::Collection.new(name.tableize, MongoODM.database)
                           end
         end
       
@@ -78,14 +78,20 @@ module MongoODM
                         when MongoODM::Collection
                           name_or_collection
                         when String, Symbol
-                          MongoODM::Collection.new(MongoODM.database, name_or_collection)
+                          MongoODM::Collection.new(name_or_collection, MongoODM.database)
                         else
                           raise "MongoODM::Collection instance or valid collection name required"
                         end
         end
         
         def find(*args)
-          MongoODM::Criteria.new(self, *args)
+          if args.size == 1 && args.first.is_a?(String)
+            MongoODM::Criteria.new(self, :_id => BSON::ObjectId.from_string(args.first))
+          elsif args.size == 1 && args.first.is_a?(BSON::ObjectId)
+            MongoODM::Criteria.new(self, :_id => args.first)
+          else
+            MongoODM::Criteria.new(self, *args)
+          end
         end
         
         def destroy_all(*args)

data/lib/mongo_odm/version.rb

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

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_odm
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -14,306 +10,228 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 24
         version: 0.3.24
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
         version: 0.9.9
   type: :development
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
+  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: watchr
-  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
         version: "0.7"
   type: :development
+  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mongo
-  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
+  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
+  prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 24
         version: 0.3.24
   type: :runtime
+  prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
+  prerelease: false
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: yard
-  prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
   type: :development
+  prerelease: false
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
         version: 0.9.9
   type: :development
+  prerelease: false
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
+  prerelease: false
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: watchr
-  prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
         version: "0.7"
   type: :development
+  prerelease: false
   version_requirements: *id020
 description: mongo_odm is a flexible persistence module for any Ruby class to MongoDB.
 email: carlos@evolve.st
@@ -392,21 +310,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: mongo_odm is a flexible persistence module for any Ruby class to MongoDB.