mongo_record 0.4.4 → 0.5

data/Rakefile

@@ -23,9 +23,9 @@ namespace :gem do
   desc "Install the gem locally"
   task :install do
     sh <<EOS
-gem build mongo-activerecord-ruby.gemspec &&
-    sudo gem install mongo_record*.gem &&
-    rm mongo_record-*.gem
+gem build mongo-record.gemspec &&
+    gem install mongo_record*.gem &&
+    rm mongo_record*.gem
 EOS
   end
 

data/lib/mongo_record/base.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,26 +13,8 @@
 # limitations under the License.
 
 require 'rubygems'
-require 'mongo/types/objectid'
-require 'mongo/types/code'
-require 'mongo/cursor'
-require 'mongo_record/convert'
+require 'mongo_record/core_ext'
 require 'mongo_record/sql'
-#require 'active_support/core_ext' # symbolize_keys!
-
-class String
-  # Convert this String to an ObjectID.
-  def to_oid
-    Mongo::ObjectID.legal?(self) ? Mongo::ObjectID.from_string(self) : self
-  end
-end
-
-class Mongo::ObjectID
-  # Convert this object to an ObjectID.
-  def to_oid
-    self
-  end
-end
 
 module MongoRecord
 
@@ -40,7 +22,7 @@ module MongoRecord
     def create_pk(row)
       return row if row[:_id]
       row.delete(:_id)          # in case it is nil
-      row['_id'] ||= Mongo::ObjectID.new
+      row['_id'] ||= BSON::ObjectID.new
       row
     end
   end
@@ -152,9 +134,8 @@ module MongoRecord
       # or an array of fields ([:title, :author, :date])
       # or an array of a field name and direction ([:title, :asc] or [:title, :desc])
       # or an array of field names and directions ([[:title, :asc], [:author, :desc]])
-      # +unique+ should be true or false and indicates whether this index
-      # should enforce a uniqueness constraint.
-      def index(fields, unique = false)
+      # +options+ Same as options for create index in the ruby driver
+      def index(fields, options={})
         fields = Array(fields)
 
         if fields.length == 2 &&
@@ -169,7 +150,7 @@ module MongoRecord
           field
         end
 
-        collection.create_index(fields, unique)
+        collection.create_index(fields, options)
       end
 
       # Returns list of indexes for model, unless fields are passed.
@@ -321,9 +302,6 @@ module MongoRecord
       #   Person.find(:all, :offset => 10, :limit => 10, :order => :created_on)
       # is the same as
       #   Person.find(:all).skip(10).limit(10).sort({:created_on => 1})
-      #
-
-
       def find(*args)
         options = extract_options_from_args!(args)
         options.symbolize_keys!
@@ -525,7 +503,7 @@ module MongoRecord
         cursor = find_every(options)
         one = cursor.detect {|c| c}
         cursor.close
-        one
+        one.nil? ? nil : new(one)
       end
 
       def find_every(options)
@@ -534,14 +512,15 @@ module MongoRecord
 
         find_options = {}
         find_options[:fields] = fields_from(options[:select]) if options[:select]
-        find_options[:limit] = options[:limit].to_i if options[:limit]
+        find_options[:limit]  = options[:limit].to_i if options[:limit]
         find_options[:offset] = options[:offset].to_i if options[:offset]
-        find_options[:sort] = sort_by_from(options[:order]) if options[:order]
+        find_options[:hint]   = options[:hint] if options[:hint]
+        find_options[:sort]   = sort_by_from(options[:order]) if options[:order]
 
         cursor = collection.find(criteria, find_options)
 
         # Override cursor.next_object so it returns a new instance of this class
-        eval "def cursor.next_object; #{self.name}.new(super()); end"
+        eval "def cursor.next_document; #{self.name}.new(super()); end"
         cursor
       end
 
@@ -670,7 +649,7 @@ module MongoRecord
       # +func+ must be +nil+ or a JavaScript expression or function in a
       # string.
       def where_func(func)    # :nodoc:
-        func ? {'$where' => Mongo::Code.new(func)} : {}
+        func ? {'$where' => BSON::Code.new(func)} : {}
       end
 
       def replace_named_bind_variables(str, h) # :nodoc:
@@ -870,11 +849,11 @@ module MongoRecord
       key_names.each {|key|
         value = instance_variable_get("@#{key}").to_mongo_value
         if value.instance_of? Hash and value["_ns"]
-          value = Mongo::DBRef.new(value["_ns"], value["_id"])
+          value = BSON::DBRef.new(value["_ns"], value["_id"])
         elsif value.instance_of? Array
           value = value.map {|v|
             if v.instance_of? Hash and v["_ns"]
-              Mongo::DBRef.new(v["_ns"], v["_id"])
+              BSON::DBRef.new(v["_ns"], v["_id"])
             else
               v
             end
@@ -1011,7 +990,7 @@ module MongoRecord
     def init_ivar(ivar_name, val)
       sym = ivar_name[1..-1].to_sym
       if self.class.subobjects.keys.include?(sym)
-        if val.instance_of? Mongo::DBRef
+        if val.instance_of? BSON::DBRef
           val = self.class.collection.db.dereference(val)
         end
         instance_variable_set(ivar_name, self.class.subobjects[sym].new(val))
@@ -1019,7 +998,7 @@ module MongoRecord
         klazz = self.class.arrays[sym]
         val = [val] unless val.kind_of?(Array)
         instance_variable_set(ivar_name, val.collect {|v|
-                                if v.instance_of? Mongo::DBRef
+                                if v.instance_of? BSON::DBRef
                                   v = self.class.collection.db.dereference(v)
                                 end
                                 v.kind_of?(MongoRecord::Base) ? v : klazz.new(v)

data/lib/mongo_record/{convert.rb → core_ext.rb}

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -62,3 +62,19 @@ class Hash
     self.replace(self.symbolize_keys)
   end
 end
+
+class String
+
+  # Convert this String to an ObjectID.
+  def to_oid
+    BSON::ObjectID.legal?(self) ? BSON::ObjectID.from_string(self) : self
+  end
+end
+
+class BSON::ObjectID
+
+  # Convert this object to an ObjectID.
+  def to_oid
+    self
+  end
+end

data/lib/mongo_record/log_device.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo_record/sql.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo_record/subobject.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo_record.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/{mongo-activerecord-ruby.gemspec → mongo-record.gemspec}

@@ -1,22 +1,22 @@
 Gem::Specification.new do |s|
   s.name = 'mongo_record'
-  s.version = '0.4.4'
+  s.version = '0.5'
   s.platform = Gem::Platform::RUBY
-  s.summary = 'ActiveRecord-like models for the MongoDB'
-  s.description = 'MongoRecord is an ActiveRecord-like framework for MongoDB. For more information about Mongo, see http://www.mongodb.org.'
+  s.summary = 'ActiveRecord-like models for MongoDB'
+  s.description = 'MongoRecord is an ActiveRecord-like framework for MongoDB. For more information about MongoDB, see http://www.mongodb.org.'
 
-  s.add_dependency('mongo', ['>= 0.15.1'])
+  s.add_dependency('mongo', ['>= 0.20.1'])
 
   s.require_paths = ['lib']
 
   s.files = ['examples/tracks.rb', 'lib/mongo_record.rb',
              'lib/mongo_record/base.rb',
-             'lib/mongo_record/convert.rb',
+             'lib/mongo_record/core_ext.rb',
              'lib/mongo_record/log_device.rb',
              'lib/mongo_record/sql.rb',
              'lib/mongo_record/subobject.rb',
              'README.rdoc', 'Rakefile',
-             'mongo-activerecord-ruby.gemspec',
+             'mongo-record.gemspec',
              'LICENSE']
   s.test_files = ['tests/address.rb',
                   'tests/course.rb',

data/tests/test_log_device.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/tests/test_mongo.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,13 +65,13 @@ class MongoTest < Test::Unit::TestCase
     @@playlists.remove
 
     # Manually insert data without using MongoRecord::Base
-    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
-    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
-    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
-    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
-    @mayor_id = Mongo::ObjectID.new
+    @@tracks.insert({:_id => BSON::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'})
+    @@tracks.insert({:_id => BSON::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'Budapest by Blimp'})
+    @@tracks.insert({:_id => BSON::ObjectID.new, :artist => 'Thomas Dolby', :album => 'The Golden Age of Wireless', :song => 'Europa and the Pirate Twins'})
+    @@tracks.insert({:_id => BSON::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'Garden Of Earthly Delights', :track => 1})
+    @mayor_id = BSON::ObjectID.new
     @@tracks.insert({:_id => @mayor_id, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'The Mayor Of Simpleton', :track => 2})
-    @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'King For A Day', :track => 3})
+    @@tracks.insert({:_id => BSON::ObjectID.new, :artist => 'XTC', :album => 'Oranges & Lemons', :song => 'King For A Day', :track => 3})
 
     @mayor_str = "artist: XTC, album: Oranges & Lemons, song: The Mayor Of Simpleton, track: 2"
     @mayor_song = 'The Mayor Of Simpleton'
@@ -323,6 +323,16 @@ class MongoTest < Test::Unit::TestCase
     assert_equal(x.id, z.id)
   end
 
+  def test_find_with_hint
+    @@tracks.create_index([['artist', 1]])
+    assert_equal "BtreeCursor artist_1",
+      Track.find(:all, :conditions => {:artist => 'XTC'}).explain["cursor"]
+
+    assert_equal "BasicCursor",
+      Track.find(:all, :hint => {'$natural' => 1},
+                 :conditions => {:artist => 'XTC'}).explain["cursor"]
+  end
+
   def test_find_or_create_but_already_exists
     assert_equal("artist: Thomas Dolby, album: Aliens Ate My Buick, song: The Ability to Swing, track: ",
                  Track.find_or_create_by_song('The Ability to Swing', :artist => 'ignored because song found').to_s)
@@ -404,7 +414,6 @@ class MongoTest < Test::Unit::TestCase
     assert_no_match(/song: Budapest by Blimp/, Track.all.inject('') { |str, t| str + t.to_s })
 
     assert_equal 6, Track.count
-    Track.index [:song, :desc], true  # reindex
   end
 
   def test_delete_all
@@ -447,9 +456,8 @@ class MongoTest < Test::Unit::TestCase
     t = Track.find_by_song('King For A Day')
     tid = t._id
     # first is string id, second is ObjectID
-    str = Track.find([@mayor_id, tid]).inject('') { |str, t| str + t.to_s }
-    assert str.include?(@mayor_str)
-    assert str.include?('King For A Day')
+    records = Track.find([@mayor_id, tid]).to_a
+    assert_equal 2, records.size
   end
 
   def test_find_one_using_id
@@ -890,7 +898,7 @@ class MongoTest < Test::Unit::TestCase
   def test_indexing
     Track.index :artist
     Track.index [:artist, :created_at]
-    Track.index [:song, :desc], true
+    Track.index [:song, :desc], :unique => true
     Track.index [:artist, [:album, :desc]]
     Track.index [:created_at, Mongo::ASCENDING]
 

data/tests/test_sql.rb

@@ -1,4 +1,4 @@
-# Copyright 2009 10gen, Inc.
+# Copyright 2009-2010 10gen, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_record
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,20 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2010-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.15.1
-    version: 
-description: MongoRecord is an ActiveRecord-like framework for MongoDB. For more information about Mongo, see http://www.mongodb.org.
+        segments: 
+        - 0
+        - 20
+        - 1
+        version: 0.20.1
+  type: :runtime
+  version_requirements: *id001
+description: MongoRecord is an ActiveRecord-like framework for MongoDB. For more information about MongoDB, see http://www.mongodb.org.
 email: mongodb-user@googlegroups.com
 executables: []
 
@@ -35,13 +43,13 @@ files:
 - examples/tracks.rb
 - lib/mongo_record.rb
 - lib/mongo_record/base.rb
-- lib/mongo_record/convert.rb
+- lib/mongo_record/core_ext.rb
 - lib/mongo_record/log_device.rb
 - lib/mongo_record/sql.rb
 - lib/mongo_record/subobject.rb
 - README.rdoc
 - Rakefile
-- mongo-activerecord-ruby.gemspec
+- mongo-record.gemspec
 - LICENSE
 has_rdoc: true
 homepage: http://www.mongodb.org
@@ -58,21 +66,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: ActiveRecord-like models for the MongoDB
+summary: ActiveRecord-like models for MongoDB
 test_files: 
 - tests/address.rb
 - tests/course.rb