em-mongo 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/em-mongo/collection.rb

@@ -14,8 +14,9 @@ module EM::Mongo
 
       skip  = opts.delete(:skip) || 0
       limit = opts.delete(:limit) || 0
+      order = opts.delete(:order)
 
-      @connection.find(@name, skip, limit, selector, nil, &blk)
+      @connection.find(@name, skip, limit, order, selector, nil, &blk)
     end
 
     def first(selector={}, opts={}, &blk)

data/lib/em-mongo/connection.rb

@@ -99,12 +99,13 @@ module EM::Mongo
       send_command(message.to_s, req_id)
     end
 
-    def find(collection_name, skip, limit, query, fields, &blk)
+    def find(collection_name, skip, limit, order, query, fields, &blk)
       message = BSON::ByteBuffer.new
       message.put_int(RESERVED) # query options
       BSON::BSON_RUBY.serialize_cstr(message, collection_name)
       message.put_int(skip)
       message.put_int(limit)
+      query = order.nil? ? query : construct_query_spec(query, order)
       message.put_array(BSON::BSON_CODER.serialize(query, false).to_a)
       message.put_array(BSON::BSON_CODER.serialize(fields, false).to_a) if fields
       req_id = new_request_id
@@ -112,6 +113,13 @@ module EM::Mongo
       send_command(message.to_s, req_id, &blk)
     end
 
+    def construct_query_spec(query, order)
+      spec = BSON::OrderedHash.new
+      spec['$query']    = query
+      spec['$orderby']  = Mongo::Support.format_order_clause(order) if order
+      spec
+    end
+
     # EM hooks
     def initialize(options={})
       @request_id    = 0

data/lib/em-mongo/exceptions.rb

@@ -0,0 +1,72 @@
+
+# encoding: UTF-8
+
+#
+# --
+# Copyright (C) 2008-2011 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+module Mongo
+  # Generic Mongo Ruby Driver exception class.
+  class MongoRubyError < StandardError; end
+
+  # Raised when MongoDB itself has returned an error.
+  class MongoDBError < RuntimeError; end
+
+  # Raised when configuration options cause connections, queries, etc., to fail.
+  class ConfigurationError < MongoRubyError; end
+
+  # Raised on fatal errors to GridFS.
+  class GridError < MongoRubyError; end
+
+  # Raised on fatal errors to GridFS.
+  class GridFileNotFound < GridError; end
+
+  # Raised on fatal errors to GridFS.
+  class GridMD5Failure < GridError; end
+
+  # Raised when invalid arguments are sent to Mongo Ruby methods.
+  class MongoArgumentError < MongoRubyError; end
+
+  # Raised on failures in connection to the database server.
+  class ConnectionError < MongoRubyError; end
+
+  # Raised on failures in connection to the database server.
+  class ReplicaSetConnectionError < ConnectionError; end
+
+  # Raised on failures in connection to the database server.
+  class ConnectionTimeoutError < MongoRubyError; end
+
+  # Raised when a connection operation fails.
+  class ConnectionFailure < MongoDBError; end
+
+  # Raised when authentication fails.
+  class AuthenticationError < MongoDBError; end
+
+  # Raised when a database operation fails.
+  class OperationFailure < MongoDBError; end
+
+  # Raised when a socket read operation times out.
+  class OperationTimeout < ::Timeout::Error; end
+
+  # Raised when a client attempts to perform an invalid operation.
+  class InvalidOperation < MongoDBError; end
+
+  # Raised when an invalid collection or database name is used (invalid namespace name).
+  class InvalidNSName < RuntimeError; end
+
+  # Raised when the client supplies an invalid value to sort by.
+  class InvalidSortValueError < MongoRubyError; end
+end

data/spec/integration/collection_spec.rb

@@ -26,7 +26,7 @@ describe EMMongo::Collection do
 
   it 'should find an object by attribute' do
     @conn, @coll = connection_and_collection
-    
+
     @coll.insert("hello" => 'world')
     @coll.find({"hello" => "world"},{}) do |res|
       res.size.should >= 1
@@ -40,7 +40,7 @@ describe EMMongo::Collection do
 
     obj = @coll.insert({:_id => 1234, 'foo' => 'bar', :hello => 'world'})
     @coll.first({:_id => 1234},{}) do |res|
-      res['hello'].should == 'world' 
+      res['hello'].should == 'world'
       res['foo'].should == 'bar'
       done
     end
@@ -48,7 +48,7 @@ describe EMMongo::Collection do
 
   it 'should find an object by symbol' do
     @conn, @coll = connection_and_collection
-    
+
     @coll.insert('hello' => 'world')
     @coll.find({:hello => "world"},{}) do |res|
       res.size.should >= 1
@@ -59,7 +59,7 @@ describe EMMongo::Collection do
 
   it 'should find an object by id' do
     @conn, @coll = connection_and_collection
-    
+
     id = @coll.insert('hello' => 'world')
     @coll.find({:_id => id},{}) do |res|
       res.size.should >= 1
@@ -79,9 +79,31 @@ describe EMMongo::Collection do
     end
   end
 
+  it 'should find objects and sort by the order field' do
+    @conn, @coll = connection_and_collection
+
+    @coll.insert(:name => 'one', :position => 0)
+    @coll.insert(:name => 'three', :position => 2)
+    @coll.insert(:name => 'two', :position => 1)
+
+    @coll.find({}, {:order => 'position'}) do |res|
+      res[0]["name"].should == 'one'
+      res[1]["name"].should == 'two'
+      res[2]["name"].should == 'three'
+      done
+    end
+
+    @coll.find({}, {:order => [:position, :desc]}) do |res|
+      res[0]["name"].should == 'three'
+      res[1]["name"].should == 'two'
+      res[2]["name"].should == 'one'
+      done
+    end
+  end
+
   it 'should find large sets of objects' do
     @conn, @coll = connection_and_collection
-    
+
     (0..1500).each { |n| @coll.insert({n.to_s => n.to_s}) }
     @coll.find do |res|
       res.size.should == EM::Mongo::DEFAULT_QUERY_DOCS
@@ -175,7 +197,7 @@ describe EMMongo::Collection do
 
   it 'should find an object using nested properties' do
     @conn, @coll = connection_and_collection
-    
+
     @coll.insert({
       'name' => 'Google',
       'address' => {
@@ -205,7 +227,7 @@ describe EMMongo::Collection do
 
   it 'should find objects greater than something' do
     @conn, @coll = connection_and_collection
-  
+
     number_hash.each do |num, word|
       @coll.insert('num' => num, 'word' => word)
     end
@@ -219,7 +241,7 @@ describe EMMongo::Collection do
 
   it 'should handle multiple pending queries' do
     @conn, @coll = connection_and_collection
-    
+
     id = @coll.insert("foo" => "bar")
     received = 0
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - bcg
@@ -76,6 +76,7 @@ files:
 - lib/em-mongo/connection.rb
 - lib/em-mongo/conversions.rb
 - lib/em-mongo/database.rb
+- lib/em-mongo/exceptions.rb
 - lib/em-mongo/support.rb
 - lib/em-mongo.rb
 - spec/integration/collection_spec.rb