em-mongo 0.4.3 → 0.5.0

data/.gitignore

@@ -0,0 +1,4 @@
+Gemfile.lock
+.bundle
+*.gem
+vendor

data/CHANGELOG

@@ -0,0 +1,117 @@
+- 0.5.0
+
+ * debian packaging changes
+    (https://github.com/bcg/em-mongo/pull/53)
+ * added new 2d indexes EM::Mongo::FLAT2D, EM::Mongo::SPHERE2D
+    (https://github.com/bcg/em-mongo/pull/49)
+
+- 0.4.3
+
+ * ensure new buffers aren't created when not needed (FlockOfBirds) #40
+
+- 0.4.2
+
+ * defer_as_a instead to to_a
+ * bugger optimizations
+ * Jruby fixes
+
+- 0.4.1
+
+ * fix collection response value on success (pawelpacana)
+ * whitepsace (pawelpacana)
+
+- 0.4.0
+
+ * added a Cursor implementation
+ * replaced raw callbacks in the API with deferrables
+ * removed CRUD methods from the Connection
+ * added a variety of server side aggregation commands
+ * added support for indexes
+ * added safe update methods
+
+- 0.3.6
+
+ * dj2: fixes reconnects. (see: https://github.com/bcg/em-mongo/pull/23)
+
+- 0.3.5
+
+ * gvarela: added orderby functionality based on the mongo-ruby-driver.
+   (https://github.com/bcg/em-mongo/pull/19)
+
+- 0.3.4
+ 
+ * Silly regression issue. Added em requires to tests and so I missed it when
+   I yanked it from lib/em-mongo.rb
+ * dynamix found *another* regression in the new database code.
+   (see: https://github.com/bcg/em-mongo/pull/16)
+
+- 0.3.3
+ 
+ * Yank Bundler out lib/em-mongo.rb and push it into spec/spec_helper.rb
+ * Numerous Rakefile changes
+
+- 0.3.2
+
+ * Added spec/gem to help with release testing
+ * Added some Rakefile helpers
+
+- 0.3.1
+
+ * Added VERSION to the gem. It was breaking the new EM::Mongo::Version module.
+
+- 0.3
+
+ * Refactored test suite
+ * Followed ruby-mongo-driver's _id convention. This will BREAK your apps. 
+ See: http://twitter.com/#!/brendengrace/status/9445253316608000
+ * Split out database.rb and pulled in support.rb and conversons.rb from
+ ruby-mongo-driver
+ * Added initial authentication support to to EM::Mongo::Database
+
+- 0.2.14
+
+ * .close was reconnecting automatically so now its configureable
+
+- 0.2.12
+
+ * Use BSON::ObjectID for _id instead of String (gaffneyc).
+
+= 0.2.11
+
+ * Auto Reconnect on lost connection (dj2)
+ * Options handling on Em.connect (dj2)
+ * Bundler support (pkieltyka)
+
+= 0.2.10
+
+ * Ruby 1.8 was broken in the last set of patches pulled in.
+
+= 0.2.9
+ 
+ * Performance enhacements by merrells
+ * Cleanups by jarib
+
+= 0.2.7
+
+ * Fixes modifier issues in update. BSON would not allow '$' with key checks. (http://github.com/bcg/em-mongo/issues/3)
+
+= 0.2.6
+
+ * 'limit' was broken in find because of poor protocol parsing. (http://github.com/bcg/em-mongo/issues/1)
+
+= 0.2.5
+
+ * collection.update
+
+= 0.2.4
+
+ * Remove support for symbols, needs to be enforced still
+ * Remove lib/buffer.rb and all custom BSON parsing 
+ * Remove UUID dependency (replaced by BSON::ObjectID.new)
+ * Fixes a BufferOverflow because of misunderstood types
+
+= 0.1.1 - Initial Relase
+
+ * Rspec tests
+ * Fixes a BufferOverflow with large Hashes
+ * Fork of RMongo

data/Gemfile

@@ -0,0 +1,9 @@
+source :gemcutter
+
+gemspec
+
+group :development do
+  gem "rspec", "< 1.3"
+  gem "em-spec", :git => "https://github.com/mloughran/em-spec.git"
+end
+

data/README.rdoc

@@ -0,0 +1,255 @@
+
+    Em-mongo is no longer being maintained (hasn't been for some time). If you are interested in the commit bit
+    or want to take over the full project, please let me know!
+
+= EM-Mongo
+
+An EventMachine client for MongoDB. Originally based on RMongo, this client aims to be as api compatible
+with mongo-ruby-driver as possible. 
+
+For methods that do not retrieve data from the database the api of em-mongo should be identical (though a subset) to the mongo-ruby-driver. This includes the various update methods like insert, save and update (without the :safe flag, which is handled separately) as well as find, which returns a cursor.
+
+For operations that require IO, em-mongo always returns an EventMachine deferrable. 
+
+== Some examples
+
+  #this file can be found in the examples directory. 
+  # bundle exec examples/readme.rb
+
+  #insert a few records, then read some back using Collection#find
+
+  require 'em-mongo'
+  require 'eventmachine'
+
+  EM.run do
+    db = EM::Mongo::Connection.new('localhost').db('my_database')
+    collection = db.collection('my_collection')
+    EM.next_tick do
+      (1..10).each do |i|
+        collection.insert( { :revolution => i } )
+      end
+
+      #find returns an EM::Mongo::Cursor
+
+      cursor = collection.find 
+
+      #most cursor methods return an EM::Mongo::RequestResponse,
+      #which is an EventMachine::Deferrable
+
+      resp = cursor.defer_as_a
+
+      #when em-mongo IO methods succeed, they 
+      #will always call back with the return
+      #value you would have expected from the 
+      #synchronous version of the same method from
+      #the mongo-ruby-driver
+
+      resp.callback do |documents|
+        puts "I just got #{documents.length} documents! I'm really cool!"
+      end
+
+      #when em-mongo IO methods fail, they
+      #errback with an array in the form
+      #[ErrorClass, "error message"]
+
+      resp.errback do |err|
+        raise *err
+      end
+
+      #iterate though each result in a query
+
+      collection.find( :revolution => { "$gt" => 5 } ).limit(1).skip(1).each do |doc|
+        #unlike the mongo-ruby-driver, each returns null at the end of the cursor
+        if doc
+          puts "Revolution ##{doc['revolution']}"
+        end
+      end  
+
+      #add an index
+
+      collection.create_index [[:revolution, -1]]
+
+      #insert a document and ensure it gets written
+
+      save_resp = collection.safe_save( { :hi => "there" }, :last_error_params => {:fsync=>true} )
+      save_resp.callback { puts "Hi is there, let us give thanks" }
+      save_resp.errback { |err| puts "AAAAAAAAAAAAAAAARGH! Oh why! WHY!?!?!" }
+
+      collection.drop
+
+      EM.add_periodic_timer(1) { EM.stop }
+
+    end
+
+  end
+
+== Error handling
+
+em-mongo will present errors in two different ways. First, em-mongo will raise exceptions like any other synchronous library if an error is enountered in a method that does not need to perform IO or if an error is encountered prior to peforming IO.
+
+Errors returned by the database, or errors communicating with the database, will be delivered via standard EM::Deferrable errbacks. While it is tempting to subscribe just to a callback
+
+  my_collection.find.defer_as_a.callback {|docs| ... }
+
+in the case of an error you will never receive a response. If you are waiting for a response before your program continues, you will be waiting a very long time. A better approach would be to store the deferrable into a variable and subscribe to its callback and errback
+
+  resp = my_collection.find.defer_as_a
+  resp.callback { |docs| ... }
+  resp.errback { |err| raise *err }
+
+errback's blocks will always be called with a single argument which is a two element array containing the error class and the error message 
+
+  [EM::Mongo::OperationError, "aw snap"]
+
+== Safe Writes
+
+As you are probably aware the default behavior for the mongo-ruby-driver, and therefore em-mongo, is to send update messages to MongoDB in a fire-and-forget manner. This means that if a unique index is violated, or some other problem causes MongoDB to raise an exception and refuse to apply your changes, you'll never know about it until you go to look for that record later. For many applications such as logging this might be OK, but for many use cases like analytics you will want to know if your writes don't succeed.
+
+This is one place where em-mongo diverges substantially from the mongo-ruby-driver because an unsafe write will not receive a response from the server, whereas a safe write will receive a response from the server and requires a deferrable and a callback.
+
+  #default, unsafe write
+  my_collection.insert( {:a => "b" } )
+
+  #a safe write using em-mongo
+  insert_resp = my_collection.safe_insert( {:a => "b" } )
+  insert_resp.callback { #all ok }
+  insert_resp.errback { |err| puts '<sigh>' }
+
+em-mongo has the following safe methods:
+  safe_insert, safe_update, safe_save
+
+In addition to calling your errback if the write fails, you can provide the usual 'safety' options that you can to Database#get_last_error, such as :fsync => true or :w => 2, to control the degree of safety you want. Please the 10gen documentation on DB#get_last_error for specifics.
+
+  safe_insert( {:a=>"v"}, :last_error_params => { :fsync => true, :w => 5 } )
+
+== Documentation
+
+em-mongo now has some YARD docs. These are mostly ported directly from the mongo-ruby-driver. While they have been updated to reflect em-mongo's async API, there are probably a few errors left over in the translation. Please file an issue or submit a pull request if you notice any inaccuracies. 
+
+http://rubydoc.info/github/bcg/em-mongo/master/frames
+
+== Upgrading
+  
+**The API for em-mongo has changed since version 0.3.6.** 
+
+em-mongo methods no longer directly accept callbacks and instead return EM::Mongo::RequestResponse objects, which are EM::Deferrable(s). This means you need to convert calls like this
+
+  my_collection.first() { |doc| p doc }
+
+to this
+
+  my_collection.first().callback { |doc| p doc }
+
+EM::Mongo::Collection#find now returns a cursor, not an array, to maintain compatibility with the mongo-ruby-driver. This provides a great deal more flexibility, but requires you to select a specific cursor method to actually fetch data from the server, such as #defer_as_a or #next
+
+  my_collection.find() { |docs| ... }
+
+becomes
+
+  my_collection.find.defer_as_a.callback { |docs| ... }
+
+If for some reason you aren't ready to upgrade your project but you want to be able to use the newer gem, you can require a compatibility file that will revert the new API to the API found in 0.3.6
+
+  require 'em-mongo'
+  require 'em-mongo/prev.rb'
+
+This file will not remain in the project forever, though, so it is better to upgrade your projects sooner rather than later.
+
+== What's in the box?
+
+=== Collection
+
+CRUD operations
+  
+  #find, #find_one, #save, #safe_save, #insert, #save_insert, #update, #safe_update, #remove, #find_and_modify
+
+Index management
+  
+  #create_index, #drop_index
+
+Collection management
+  
+  #drop, #stats, #count, #name
+
+Server-side aggregations
+  
+  #map_reduce, #group, #distinct
+
+=== Database
+
+Collection management
+  
+  #collection, #collection_names, #collections, #collections_info, #create_collection, #drop_collection
+
+Index management
+  
+  #drop_index, #index_information
+
+Authentication
+  
+  #authenticate, #add_user
+
+Misc
+  
+  #get_last_error, #error?, #name, #command
+
+=== Cursor
+
+Query options
+  :selector, :order, :skip, :limit, :explain, :batch_size, :fields, :tailable, :transformer
+
+Enumerable-ish
+**EM::Mongo::Cursor does **not** use the Enumerable mixin for obvious reasons**
+  
+  #next_document, #rewind!, #has_next?, #count, #each, #to_a
+
+Misc
+  
+  #batch_size, #explain, #close, #closed?
+
+Query modifier methods
+  
+  #sort, #limit, #skip
+
+== Compatibility
+* em-mongo has been tested on Ruby 1.8.7 and 1.9.2
+* em-mongo will not run under JRuby. We'd love some help figuring out why :) 
+* Compatibility with other runtimes is unknown
+
+== Still Missing / TODO
+* Replica Sets
+* GRIDFS support
+* Connection pooling
+* PK factories
+* JRuby support
+
+== Contact
+
+* Twitter: @brendengrace
+* IRC: bcg
+* Email: brenden.grace@gmail.com
+
+== Credit
+
+Aman Gupta (tmm1) wrote the original RMongo which em-mongo is based on.
+
+== References
+
+* Rmongo: http://github.com/tmm1/rmongo
+* EM-Mongo: http://github.com/bcg/em-mongo
+* mongo-ruby-driver: http://github.com/mongodb/mongo-ruby-driver
+* Mongo Wire Protocol: http://www.mongodb.org/display/DOCS/Mongo+Wire+Protocol
+
+== License
+
+(The MIT License)
+
+Copyright © 2010 Brenden Grace
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+

data/Rakefile

@@ -0,0 +1,127 @@
+
+require 'fileutils'
+require 'tmpdir'
+
+def em_mongo_version
+  File.read("VERSION").strip
+end
+
+def root_dir
+  File.dirname(__FILE__)
+end
+
+task :default => 'spec:integration:default'
+
+class MongoRunner
+  def self.run(options={}) 
+    auth = "--auth" if options[:auth]
+    dir = Dir.tmpdir + "/em-mongo-tests-#$$"
+    FileUtils.mkdir dir
+    pidf = "#{dir}/mongod.pid"
+    logf = "#{dir}/mongo.log"
+    begin
+      system "mongod run #{auth} --fork -vvvvvvv --dbpath #{dir} --pidfilepath #{pidf} --logpath #{logf} >> /dev/null "
+      yield if block_given?
+    ensure
+      if File.exists?(pidf) and File.read(pidf).to_i != 0
+        Process.kill("KILL", File.read(pidf).to_i)
+        FileUtils.rm_r dir unless options[:noclean]
+      end
+    end
+  end
+end
+
+spec = eval(File.read('em-mongo.gemspec'))
+
+namespace :bundle do
+  task :install do
+    if `bundle check` =~ /bundle install/
+      system("bundle install --path vendor/gems")
+    end
+  end
+end
+
+namespace :gem do
+
+  desc "build gem"
+  task :build do
+    puts "Building em-mongo #{em_mongo_version}"
+    system "gem build em-mongo.gemspec -q"
+  end
+
+  desc "release gem"
+  task :release do
+    system "gem push em-mongo-#{em_mongo_version}.gem"
+  end
+
+end
+
+namespace :spec do
+  
+  namespace :gem do
+
+    desc "bundler tests"
+    task :bundler do
+      MongoRunner.run do
+        print "Testing Bundler integration ... "
+        if system "cd spec/gem && bundle install --quiet && ./bundler.rb"
+          puts "SUCCESS."
+        else
+          puts "FAILURE."
+        end
+      end
+    end
+
+    desc "rubygems tests"
+    task :rubygems do
+      MongoRunner.run do
+        print "Testing Rubygems integration ... "
+        steps =[]
+        steps << "cd spec/gem"
+        
+        if `gem list -i em-mongo` == 'true'
+          steps << "gem uninstall --force -a em-mongo >/dev/null"
+        end
+        steps << "gem install #{root_dir}/em-mongo-#{em_mongo_version}.gem >/dev/null "
+        steps << "./rubygems.rb"
+        if system steps.join(" && ")
+          puts "SUCCESS."
+        else
+          puts "FAILURE."
+        end
+      end
+    end
+
+    desc "all gem tests"
+    task :all => [:bundler, :rubygems]
+  end
+
+  namespace :integration do
+
+    desc "default tests"
+    task :default => ['bundle:install'] do
+      MongoRunner.run do
+        system "bundle exec spec #{spec.test_files.join(' ')} -t -b -fs -color"
+      end
+    end
+
+    desc "exhaustive tests"
+    task :exhaustive => ['bundle:install'] do
+      MongoRunner.run({:noclean => true}) do
+        system "bundle exec spec #{spec.test_files.join(' ')} -t -b -fs -color"
+      end
+      MongoRunner.run({:auth => true}) do
+        system "bundle exec spec #{spec.test_files.join(' ')} -t -b -fs -color"
+      end
+    end
+
+    desc "default tests, but don't start mongodb for me"
+    task :no_mongo => ['bundle:install'] do
+      system "bundle exec spec #{spec.test_files.join(' ')} -t -b -fs -color"
+    end
+
+  end
+
+  desc "release testing"
+  task :release => ['spec:integration:default','gem:build','spec:gem:bundler','spec:gem:rubygems']
+end

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/em-mongo.gemspec

@@ -0,0 +1,30 @@
+version = File.read("VERSION").strip
+
+Gem::Specification.new do |s|
+  s.name    = 'em-mongo'
+  s.version = version
+
+  s.authors = ['bcg', 'PlasticLizard']
+  s.email   = 'brenden.grace@gmail.com'
+  s.date    = "2010-12-01"
+
+  s.description = 'EventMachine driver for MongoDB.'
+  s.homepage = 'https://github.com/bcg/em-mongo'
+  s.rubyforge_project = 'em-mongo'
+
+  s.files = `git ls-files`.split("\n")
+
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.rdoc_options  = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+
+  s.rubygems_version = '1.3.6'
+
+  s.summary = 'An EventMachine driver for MongoDB.'
+
+  s.add_dependency 'eventmachine', ['>= 0.12.10']
+  s.add_dependency 'bson', ['>= 1.1.3']
+
+end

data/examples/legacy.rb

@@ -0,0 +1,38 @@
+#bundle exec ruby examples/legacy.rb
+require 'em-mongo'
+require 'em-mongo/prev.rb'
+
+require 'eventmachine'
+
+EM.run do
+  conn = EM::Mongo::Connection.new('localhost')
+  db = conn.db('my_database')
+  collection = db.collection('my_collection')
+  EM.next_tick do
+
+    (1..10).each do |i|
+      conn.insert('my_database.my_collection', { :revolution => i } )
+    end
+
+    conn.update('my_database.my_collection', {:revolution => 9}, {:revolution => 8.5})
+
+    conn.delete('my_database.my_collection', {:revolution => 1})
+
+    collection.find do |documents|
+      puts "I just got #{documents.length} documents! I'm really cool!"
+    end
+
+    #iterate though each result in a query
+    collection.find( {:revolution => { "$gt" => 5 }}, :limit =>1, :skip => 1, :order => [:revolution, -1]) do |docs|
+      docs.each do |doc|
+        puts "Revolution ##{doc['revolution']}"
+      end
+    end
+
+    collection.drop
+
+    EM.add_periodic_timer(1) { EM.stop }
+
+  end
+
+end

data/examples/readme.rb

@@ -0,0 +1,58 @@
+#bundle exec ruby examples/readme.rb
+require 'em-mongo'
+require 'eventmachine'
+
+EM.run do
+  db = EM::Mongo::Connection.new('localhost').db('my_database')
+  collection = db.collection('my_collection')
+  EM.next_tick do
+    (1..10).each do |i|
+      collection.insert( { :revolution => i } )
+    end
+
+    #find returns an EM::Mongo::Cursor
+    cursor = collection.find
+
+    #most cursor methods return an EM::Mongo::RequestResponse,
+    #which is an EventMachine::Deferrable
+    resp = cursor.to_a
+
+    #when em-mongo IO methods succeed, they
+    #will always call back with the return
+    #value you would have expected from the
+    #synchronous version of the method from
+    #the mongo-ruby-driver
+    resp.callback do |documents|
+      puts "I just got #{documents.length} documents! I'm really cool!"
+    end
+
+    #when em-mongo IO methods fail, they
+    #errback with an array in the form
+    #[ErrorClass, "error message"]
+    resp.errback do |err|
+      raise *err
+    end
+
+    #iterate though each result in a query
+    collection.find( :revolution => { "$gt" => 5 } ).limit(1).skip(1).each do |doc|
+      #unlike the mongo-ruby-driver, each returns null at the end of the cursor
+      if doc
+        puts "Revolution ##{doc['revolution']}"
+      end
+    end
+
+    #add an index
+    collection.create_index [[:revolution, -1]]
+
+    #insert a document and ensure it gets written
+    save_resp = collection.safe_save( { :hi => "there" }, :last_error_params => {:fsync=>true} )
+    save_resp.callback { puts "Hi is there, let us give thanks" }
+    save_resp.errback { |err| puts "AAAAAAAAAAAAAAAARGH! Oh why! WHY!?!?!" }
+
+    collection.drop
+
+    EM.add_periodic_timer(1) { EM.stop }
+
+  end
+
+end

data/lib/em-mongo/collection.rb

@@ -597,7 +597,10 @@ module EM::Mongo
     # @param [String, Array] spec
     #   should be either a single field name or an array of
     #   [field name, direction] pairs. Directions should be specified
-    #   as Mongo::ASCENDING, Mongo::DESCENDING, or Mongo::GEO2D.
+    #   as EM::Mongo::ASCENDING, EM::Mongo::DESCENDING, EM::Mongo::FLAT2D, EM::Mongo::SPHERE2D
+    #
+    #   Note that MongoDB 2.2 used 2d flat indexes and called them geo, MongoDB 2.4 has 2d and 2dsphere indexes
+    #   EM::Mongo::GEO2D is kept for backward compatiblity and is creating a flat 2d index
     #
     #   Note that geospatial indexing only works with versions of MongoDB >= 1.3.3+. Keep in mind, too,
     #   that in order to geo-index a given field, that field must reference either an array or a sub-object
@@ -618,10 +621,10 @@ module EM::Mongo
     # @option opts [Integer] :max (nil) specify the maximum longitude and latitude for a geo index.
     #
     # @example Creating a compound index:
-    #   @posts.create_index([['subject', Mongo::ASCENDING], ['created_at', Mongo::DESCENDING]])
+    #   @posts.create_index([['subject', EM::Mongo::ASCENDING], ['created_at', EM::Mongo::DESCENDING]])
     #
     # @example Creating a geospatial index:
-    #   @restaurants.create_index([['location', Mongo::GEO2D]])
+    #   @restaurants.create_index([['location', EM::Mongo::SPHERE2D]])
     #
     #   # Note that this will work only if 'location' represents x,y coordinates:
     #   {'location': [0, 50]}
@@ -629,7 +632,7 @@ module EM::Mongo
     #   {'location': {'latitude' => 0, 'longitude' => 50}}
     #
     # @example A geospatial index with alternate longitude and latitude:
-    #   @restaurants.create_index([['location', Mongo::GEO2D]], :min => 500, :max => 500)
+    #   @restaurants.create_index([['location', EM::Mongo::SPHERE2D]], :min => 500, :max => 500)
     #
     # @return [String] the name of the index created.
     #
@@ -770,11 +773,13 @@ module EM::Mongo
         field_spec[spec.to_s] = 1
       elsif spec.is_a?(Array) && spec.all? {|field| field.is_a?(Array) }
         spec.each do |f|
-          if [EM::Mongo::ASCENDING, EM::Mongo::DESCENDING, EM::Mongo::GEO2D].include?(f[1])
+          if [EM::Mongo::ASCENDING, EM::Mongo::DESCENDING,
+              EM::Mongo::SPHERE2D, EM::Mongo::FLAT2D, EM::Mongo::GEO2D].include?(f[1])
             field_spec[f[0].to_s] = f[1]
           else
             raise MongoArgumentError, "Invalid index field #{f[1].inspect}; " +
-              "should be one of Mongo::ASCENDING (1), Mongo::DESCENDING (-1) or Mongo::GEO2D ('2d')."
+              "should be one of EM::Mongo::ASCENDING (1), EM::Mongo::DESCENDING (-1), EM::Mongo::SPHERE2D ('2dsphere')" +
+              " or EM::Mongo::FLAT2D ('2d') (GEO2D is deprecated)"
           end
         end
       else

data/lib/em-mongo/connection.rb

@@ -23,6 +23,8 @@ module EM::Mongo
 
   ASCENDING  =  1
   DESCENDING = -1
+  FLAT2D     = '2d'
+  SPHERE2D   = '2dsphere'
   GEO2D      = '2d'
 
   DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024

data/spec/gem/Gemfile

@@ -0,0 +1,5 @@
+source :gemcutter
+
+gem 'eventmachine'
+gem 'bson'
+gem 'em-mongo', :path => '../../'

data/spec/gem/bundler.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env bundle exec ruby
+
+require "rubygems"
+require "bundler"
+Bundler.setup(:default)
+require "eventmachine"
+require "em-mongo"
+
+$return = -1
+
+EM.run do
+  @conn = EM::Mongo::Connection.new
+  EM.next_tick do
+    id = @conn.db.collection('test').insert({:hello => "world"})
+    @conn.db.collection('test').first(:_id => id) do |document|
+      $return = 0 if document
+      EM.stop
+    end
+  end
+end
+exit($return)

data/spec/gem/rubygems.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "eventmachine"
+require "em-mongo"
+
+$return = -1
+
+EM.run do
+  @conn = EM::Mongo::Connection.new
+  EM.next_tick do
+    id = @conn.db.collection('test').insert({:hello => "world"})
+    @conn.db.collection('test').first(:_id => id) do |document|
+      $return = 0 if document
+      EM.stop
+    end
+  end
+end
+exit($return)

data/spec/integration/collection_spec.rb

@@ -642,16 +642,26 @@ describe EMMongo::Collection do
       end
     end
 
-    it "should create a geospatial index" do
-      @conn, @geo = connection_and_collection('geo')
+    it "should create a flat 2d index" do
+      @conn, @geo = connection_and_collection('2d')
       @geo.save({'loc' => [-100, 100]})
-      @geo.create_index([['loc', EM::Mongo::GEO2D]])
+      @geo.create_index([['loc', EM::Mongo::FLAT2D]])
       @geo.index_information.callback do |info|
         info['loc_2d'].should_not be_nil
         done
       end
     end
 
+    it "should create a sphere 2d index" do
+      @conn, @geo = connection_and_collection('2dsphere')
+      @geo.save({'loc' => [-100, 100]})
+      @geo.create_index([['loc', EM::Mongo::SPHERE2D]])
+      @geo.index_information.callback do |info|
+        info['loc_2dsphere'].should_not be_nil
+        done
+      end
+    end
+
     it "should create a unique index" do
       @conn, @collection = connection_and_collection('test-collection')
       @collection.create_index([['a', EM::Mongo::ASCENDING]], :unique => true)

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+require "rubygems"
+require "bundler"
+Bundler.setup(:default, :development)
+require "eventmachine"
+begin
+  require "bson_ext"
+rescue LoadError
+  require "bson"
+end
+
+require File.expand_path('../lib/em-mongo', File.dirname(__FILE__))
+
+require "em-spec/rspec"
+
+def connection_and_collection(collection_name=EM::Mongo::DEFAULT_NS)
+  conn = EMMongo::Connection.new
+  return conn, collection(conn, collection_name)
+end
+
+def collection(conn, name)
+  conn.db.collection(name).remove
+  conn.db.collection(name)
+end
+
+def number_hash
+  @numbers = {
+    1 => 'one',
+    2 => 'two',
+    3 => 'three',
+    4 => 'four',
+    5 => 'five',
+    6 => 'six',
+    7 => 'seven',
+    8 => 'eight',
+    9 => 'nine'
+  }
+end

data/spec/unit/bson_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../')
+
+# This is to prove how BSON works so we can code around it where appropriate
+# BSON documents and Ruby Hashes are not the same thing afterall.
+#
+# http://www.mongodb.org/display/DOCS/BSON
+
+describe BSON do
+
+  it 'should do what it does' do
+    doc = {:_id => 12345, :foo => 'notbar', "foo" => "bar", :hello => :world  }
+    doc = BSON::BSON_CODER.deserialize(BSON::BSON_CODER.serialize(doc, false, true).to_s)
+    # 1. An ID passed as Symbol is really a String
+    doc['_id'].should == 12345
+    # 2. More to the point, all keys are Strings.
+    doc['hello'].should == :world
+    # 3. The last String/Symbol wins
+    doc['foo'].should == 'bar'
+  end
+
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-mongo
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    MC40LjM=
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -49,9 +48,19 @@ description: EventMachine driver for MongoDB.
 email: brenden.grace@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.rdoc
 files:
+- .gitignore
+- CHANGELOG
+- Gemfile
+- README.rdoc
+- Rakefile
 - VERSION
+- em-mongo.gemspec
+- examples/legacy.rb
+- examples/readme.rb
+- lib/em-mongo.rb
 - lib/em-mongo/collection.rb
 - lib/em-mongo/connection.rb
 - lib/em-mongo/conversions.rb
@@ -63,13 +72,17 @@ files:
 - lib/em-mongo/request_response.rb
 - lib/em-mongo/server_response.rb
 - lib/em-mongo/support.rb
-- lib/em-mongo.rb
+- spec/gem/Gemfile
+- spec/gem/bundler.rb
+- spec/gem/rubygems.rb
 - spec/integration/collection_spec.rb
 - spec/integration/connection_spec.rb
 - spec/integration/cursor_spec.rb
 - spec/integration/database_spec.rb
 - spec/integration/request_response_spec.rb
-homepage: http://github.com/bcg/em-mongo
+- spec/spec_helper.rb
+- spec/unit/bson_spec.rb
+homepage: https://github.com/bcg/em-mongo
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -94,9 +107,4 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An EventMachine driver for MongoDB.
-test_files:
-- spec/integration/collection_spec.rb
-- spec/integration/connection_spec.rb
-- spec/integration/cursor_spec.rb
-- spec/integration/database_spec.rb
-- spec/integration/request_response_spec.rb
+test_files: []