monga 0.0.2 → 0.0.3

data/lib/monga/cursor.rb

@@ -1,69 +1,63 @@
 module Monga
-  class Cursor < EM::DefaultDeferrable
+  class Cursor
     attr_reader :cursor_id
 
+    def self.create(connection, db_name, collection_name, options = {}, flags = {})
+      if connection.type == :em
+        CallbackCursor.new(connection, db_name, collection_name, options, flags)
+      else
+        BlockCursor.new(connection, db_name, collection_name, options, flags)
+      end
+    end
+
     CURSORS = {}
     CLOSED_CURSOR = 0
     # Batch kill cursors marked to be killed each CLOSE_TIMEOUT seconds
     CLOSE_TIMEOUT = 1
 
-    def initialize(db, collection_name, options = {}, flags = {})
-      @keep_alive = true if flags.delete :keep_alive
-
-      @db = db
-      @connection = @db.client.aquire_connection
+    def initialize(connection, db_name, collection_name, options = {}, flags = {})
+      @connection = connection
+      @db_name = db_name
       @collection_name = collection_name
       @options = options
       @options.merge!(flags)
 
       @fetched_docs = []
       @count = 0
-      @total_count = 0
-      @limit = @options[:limit] ||= 0
-      @batch_size = @options[:batch_size]
+
+      @options[:limit] ||= 0
     end
 
-    def next_document
-      Monga::Response.surround do |resp|
-        if doc = @fetched_docs.shift
-          resp.succeed doc
-        else
-          req = next_batch
-          req.callback do |docs|
-            @fetched_docs = docs
-            if doc = @fetched_docs.shift
-              @count =+ 1
-              resp.succeed doc
-            end
-          end
-          req.errback{ |err| resp.fail err }
-        end
-      end
+    def flag(opt)
+      @options.merge!(opt) and self
     end
 
-    def each_doc(&blk)
-      if more?
-        req = next_batch
-        req.callback do |batch|
-          if batch.any?
-            batch.each do |doc|
-              @count += 1
-              blk.call(doc)
-            end
-            each_doc(&blk)
-          else
-            succeed
-          end
-        end
-        req.errback{ |err| fail err }
-      else
-        succeed
-      end
-      self
+    def limit(val)
+      @options[:limit] = val and self
+    end
+
+    def skip(val)
+      @options[:skip] = val and self
+    end
+
+    def batch_size(val)
+      @options[:batch_size] = val and self
+    end
+
+    def explain
+      @options[:explain] = true and self
+    end
+
+    def hint
+      @options[:hint] = true and self
+    end
+
+    def sort(val)
+      @options[:sort] = val and self
     end
 
     def kill
-      return unless @cursor_id > 0
+      return if @cursor_id == CLOSED_CURSOR
       self.class.kill_cursors(@connection, @cursor_id)
       CURSORS.delete @cursor_id
       @cursor_id = 0
@@ -75,7 +69,7 @@ module Monga
       if cursor_ids.any?
         Monga.logger.debug("Following cursors are going to be deleted: #{cursor_ids}")
         kill_cursors(conn, cursor_ids)
-        CURSORS.delete_if{|k,v| cursor_ids.include?(k) }
+        cursor_ids.each{ |id| CURSORS.delete id }
       end
     end
 
@@ -85,56 +79,36 @@ module Monga
       @cursor_id = 0
     end
 
-    # Cursor is alive and we need more minerals
-    def more?
-      alive? && !satisfied?
-    end
-
     private
 
-    def get_more(batch_size)
-      Monga::Response.surround do |resp|
-        req = if @cursor_id
-          opts = { cursor_id: @cursor_id, batch_size: batch_size }
-          Monga::Requests::GetMore.new(@db, @collection_name, opts).callback_perform
+    def get_more(batch_size, &block)
+      blk = proc do |err, data|
+        if err
+          mark_to_kill
+          block.call(err)
         else
-          Monga::Requests::Query.new(@db, @collection_name, @options).callback_perform
-        end
-        req.callback do |data|
           @cursor_id = data[5]
           fetched_docs = data.last
-          @total_count += fetched_docs.count
-          mark_to_kill unless cursor_more?
-
-          resp.succeed fetched_docs
-        end
-        req.errback do |err|
-          mark_to_kill
-          resp.fail err
+          @count += fetched_docs.count
+          mark_to_kill unless more?
+          block.call(nil, fetched_docs, more?)
         end
       end
-    end
-
-    def next_batch
-      Monga::Response.surround do |resp|
-        if more?
-          batch_size = get_batch_size
-          req = get_more(batch_size)
-          req.callback{ |res| resp.succeed res }
-          req.errback{ |err| resp.fail err }
+      if @cursor_id
+        if @cursor_id == CLOSED_CURSOR
+          err = Monga::Exceptions::ClosedCursor.new "You are trying to use closed cursor"
+          block.call(err)
         else
-          mark_to_kill
-          if !alive?
-            resp.fail Monga::Exceptions::CursorIsClosed.new("Cursor is already closed. Check `cursor.more?` before calling cursor")
-          elsif satisfied?
-            resp.fail Monga::Exceptions::CursorLimit.new("You've already fetched #{@limit} docs you asked. Check `cursor.more?` before calling cursor")
-          end
+          opts = @options.merge(cursor_id: @cursor_id, batch_size: batch_size)
+          Monga::Protocol::GetMore.new(@connection, @db_name, @collection_name, opts).callback_perform(&blk)
         end
+      else
+        Monga::Protocol::Query.new(@connection, @db_name, @collection_name, @options).callback_perform(&blk)
       end
     end
 
-    def cursor_more?
-      alive? && !cursor_satisfied?
+    def more?
+      alive? && !satisfied?
     end
 
     # If cursor_id is not setted, or if isn't CLOSED_CURSOR - cursor is alive
@@ -146,30 +120,158 @@ module Monga
     # we will be satisfied when we will get limit amount of documents.
     # Otherwise we are not satisfied untill crsor is alive
     def satisfied?
-      @limit > 0 && @count >= @limit
-    end
-
-    def cursor_satisfied?
-      @limit > 0 && @total_count >= @limit
+      @options[:limit] > 0 && @count >= @options[:limit]
     end
 
     # How many docs should be returned
     def rest
-      @limit - @count if @limit > 0
+      @options[:limit] - @count if @options[:limit] > 0
     end
 
     # Cursor will get exact amount of docs as user passed with `limit` opr
     def get_batch_size
-      if @limit > 0 && @batch_size
-        rest < @batch_size ? rest : @batch_size
-      else @batch_size
-        @batch_size
+      if @options[:limit] > 0 && @options[:batch_size]
+        rest < @options[:batch_size] ? rest : @options[:batch_size]
+      else @options[:batch_size]
+        @options[:batch_size]
       end
     end
 
     def self.kill_cursors(connection, cursor_ids)
-      Monga::Requests::KillCursors.new(connection, cursor_ids: [*cursor_ids]).perform
+      Monga::Protocol::KillCursors.new(connection, cursor_ids: [*cursor_ids]).perform
+    end
+  end
+
+  class CallbackCursor < Cursor
+    def next_batch
+      get_more(get_batch_size) do |err, batch, more|
+        if block_given?
+          yield(err, batch, more)
+        else
+          err ? raise(err) : [batch, more]
+        end
+      end
+    end
+
+    def each_batch(&blk)
+      iterator = Proc.new do
+        next_batch do |err, batch, more|
+          more ? blk.call(err, batch, iterator) : blk.call(err, batch)
+        end
+      end
+      class << iterator
+        alias :next :call
+      end
+      iterator.next
+    end
+
+    def next_doc
+      if doc = @fetched_docs.shift
+        block_given? ? yield(nil, doc, more?) : [doc, more?]
+      else
+        get_more(get_batch_size) do |err, batch, more|
+          if err
+            block_given? ? yield(err, nil, false) : raise(err)
+          else
+            @fetched_docs = batch
+            doc = @fetched_docs.shift
+            m = more || @fetched_docs.any?
+            block_given? ? yield(err, doc, m) : [doc, m]
+          end
+        end
+      end
+    end
+    alias :next_document :next_doc
+
+    def each_doc(&blk)
+      iterator = Proc.new do
+        next_doc do |err, doc, more|
+          more ? blk.call(err, doc, iterator) : blk.call(err, doc)
+        end
+      end
+      class << iterator
+        alias :next :call
+      end
+      iterator.next
+    end
+    alias :each_document :each_doc
+
+    def all
+      documents = []
+      each_batch do |err, batch, iter|
+        if err
+          block_given? ? yield(err) : raise(err)
+        else
+          documents += batch
+          if iter
+            iter.next
+          else
+            block_given? ? yield(nil, documents) : documents
+          end
+        end
+      end
     end
 
+    def first
+      limit(1).all do |err, resp|
+        if err
+          block_given? ? yield(err) : raise(err)
+        else
+          block_given? ? yield(nil, resp.first) : resp.first
+        end
+      end
+    end
+  end
+
+  class BlockCursor < Cursor
+    def next_batch
+      get_more(get_batch_size) do |err, batch, more|
+        raise(err) if err
+        return [batch, more]
+      end
+    end
+
+    def each_batch(&blk)
+      begin
+        batch, more = next_batch
+        yield batch
+      end while more
+    end
+
+    def next_doc
+      if doc = @fetched_docs.shift
+        [doc, more?]
+      else
+        get_more(get_batch_size) do |err, batch, more|
+          raise(err) if err
+          @fetched_docs = batch
+          doc = @fetched_docs.shift
+          m = more || @fetched_docs.any?
+          return [doc, m]
+        end
+      end
+    end
+    alias :next_document :next_doc
+
+    def each_doc
+      begin
+        doc, more = next_doc
+        yield doc
+      end while more
+    end
+    alias :each_document :each_doc
+
+    def all
+      documents = []
+      each_batch do |batch|
+        documents += batch
+      end
+      documents
+    end
+
+    def first
+      resp = limit(1).all
+      resp.first
+    end
   end
 end

data/lib/monga/database.rb

@@ -7,90 +7,205 @@ module Monga
       @name = name
     end
 
-    def [](collection_name)
+    # Choose collection to work
+    #
+    #   client = Monga:::Client.new
+    #   db = client.get_db("dbTest")
+    #   collection = db.get_collection("testCollection")
+    #   # same as
+    #   collection = db["testCollection"]
+    #
+    def get_collection(collection_name)
       Monga::Collection.new(self, collection_name)
     end
+    alias :[] :get_collection
 
-    def cmd(cmd, opts={})
-      options = {}
-      options[:query] = cmd
-      options.merge! opts
-      Monga::Miner.new(self, "$cmd", options).limit(1)
+    # Run some command
+    #
+    #   cmd = { getLastError: 1 }
+    #   db.cmd(cmd){ |err, resp| ... }
+    #
+    def cmd(cmd, resp_blk = nil, &ret_blk)
+      if resp_blk
+        run_cmd(cmd, ret_blk, &resp_blk)
+      else
+        run_cmd(cmd, ret_blk)
+      end
     end
 
-    def eval(js)
-      with_response do
-        cmd(eval: js)
-      end
+    # Evaluate some raw javascript
+    #
+    #   db.eval("return('Hello World!')") do |err, resp|
+    #     # processing
+    #   end
+    #
+    def eval(js, &blk)
+      cmd = {}
+      cmd[:eval] = js
+      run_cmd(cmd, blk)
     end
 
-    # Be carefull with using get_last_error with connection pool.
-    # In most cases you need to use #safe methods 
-    # and don't access to #get_last_error directky
-    def get_last_error
-      with_response do
-        cmd(getLastError: 1)
-      end
+    # You should be cearfull with this method 'cause it is importaint to know 
+    # in wich connection you are trying to get last error information.
+    # So be happy to use safe_* methods and it will choose right connection for you.
+    # Or, if you really want to do it mannually:
+    #
+    #   request = collection.insert({ title: "Test" })
+    #   conn = request.connection
+    #   db.get_last_error(conn){ |err, resp| ... }
+    #   db.get_last_error(conn){ |err, resp| ... }
+    #   # you should pass following options:
+    #   db.get_last_error(
+    #     conn, 
+    #     j: true, 
+    #     w: 2, 
+    #     fsync: true, 
+    #     wtimout: 100){ |err, resp| ... }
+    #
+    def get_last_error(connection, opts = {}, &blk)
+      raise_last_error(connection, opts, &blk)
+    rescue => e
+      return e
     end
 
-    def drop_collection(collection_name)
-      with_response do
-        cmd(drop: collection_name)
-      end
+    # Instead of get_last_eror this one will actually raise it.
+    # It is usefull for safe_* methods who should raise an error if something goes wrong
+    #
+    def raise_last_error(connection, opts = {}, &blk)
+      cmd = {}
+      cmd[:getLastError] = 1
+      cmd[:connection] = connection
+      cmd.merge!(opts)
+      run_cmd(cmd, blk)
     end
 
-    def create_collection(collection_name, opts = {})
-      with_response do
-        cmd({create: collection_name}.merge(opts))
-      end
+    # Obviously dropping collection
+    # There is collection#drop helper exists
+    #
+    #   db.drop_collection("testCollection"){ |err, resp| ... }
+    #   # same as
+    #   collection = db["testCollection"]
+    #   collection.drop{ |err, resp| ... }
+    #
+    def drop_collection(collection_name, &blk)
+      cmd = {}
+      cmd[:drop] = collection_name
+      run_cmd(cmd, blk)
     end
 
-    def count(collection_name)
-      Monga::Response.surround do |resp|
-        req = with_response do
-          cmd(count: collection_name)
-        end
-        req.callback do |data|
-          cnt = data.first["n"].to_i
-          resp.succeed cnt
-        end
-        req.errback{ |err| resp.fail err }
+    # Create collection.
+    #
+    #   db.create_collection("myCollection"){ |err, resp| ... }
+    #   db.create_collection("myCappedCollection", capped: true, size: 1024*10){ |err, resp| ... }
+    #
+    def create_collection(collection_name, opts = {}, &blk)
+      cmd = {}
+      cmd[:create] = collection_name
+      cmd.merge!(opts)
+      run_cmd(cmd, blk)
+    end
+
+    # Counts amount of documents in collection
+    #
+    #   db.count("myCollection"){ |err, cnt| ... }
+    #   # same as
+    #   collection = db["myCollection"]
+    #   collection.count{ |err, cnt| ... }
+    #
+    def count(collection_name, opts = {}, &blk)
+      cmd = {}
+      cmd[:count] = collection_name
+      cmd.merge!(opts)
+      run_cmd(cmd, blk) do |resp|
+        resp["n"].to_i
       end
     end
 
-    def drop_indexes(collection_name, indexes)
-      with_response do
-        cmd(dropIndexes: collection_name, index: indexes)
+    # Drop choosen indexes.
+    # There is collection#drop_index and collection#drop_indexes methods available
+    # 
+    #   db.drop_indexes("myCollection", { title: 1 })
+    #   db.drop_indexes("myCollection", [{ title: 1 }, { author: 1 }])
+    #   # drop all indexes
+    #   db.drop_indexes("myCollection", "*")
+    #   # same as
+    #   collection = db["myCollection"]
+    #   collection.drop_index(title: 1)
+    #   # drop all indexes
+    #   collection.drop_indexes
+    #
+    def drop_indexes(collection_name, indexes, &blk)
+      cmd = {}
+      cmd[:dropIndexes] = collection_name
+      cmd[:index] = indexes
+      run_cmd(cmd, blk)
+    end
+
+    def map_reduce
+      
+    end
+
+    def aggregate
+      
+    end
+
+    # Just helper to show all list of collections
+    #
+    #   db.list_collections{ |err, list| ... }
+    #
+    def list_collections(&blk)
+      eval("db.getCollectionNames()", &blk)
+    end
+
+    private
+
+    # Underlying command sending
+    #
+    def run_cmd(cmd, ret_blk, &resp_blk)
+      connection = cmd.delete :connection
+      connection ||= @client.aquire_connection
+
+      options = {}
+      options[:query] = cmd
+
+      Monga::CallbackCursor.new(connection, name, "$cmd", options).first do |err, resp|
+        res = make_response(err, resp, ret_blk, resp_blk)
+        return res unless ret_blk
       end
     end
 
-    # Just helper
-    def list_collections
-      Monga::Response.surround do |resp|
-        req = eval("db.getCollectionNames()")
-        req.callback do |data|
-          resp.succeed(data.first["retval"])
+    # Helper to choose how to return result.
+    # If callback is provided it will be passed there.
+    # Otherwise error will be raised and result will be returned with a `return`
+    #
+    def make_response(err, resp, ret_blk, resp_blk)
+      err, resp = check_response(err, resp)
+      if err
+        if ret_blk
+          ret_blk.call(err, resp)
+        else
+          raise err
         end
-        req.errback do |err|
-          resp.fail(err)
+      else
+        resp = resp_blk.call(resp) if resp_blk
+        if ret_blk
+          ret_blk.call(err, resp)
+        else
+          resp
         end
       end
     end
 
-    private
-
-    def with_response
-      Monga::Response.surround do |resp|
-        req = yield(resp)
-        req.callback do |data|
-          if data.any?
-            resp.succeed(data)
-          else
-            exception = Monga::Exceptions::QueryFailure.new("Nothing was returned for your query: #{req.options[:query]}")
-            resp.fail(exception)
-          end
-        end
-        req.errback{ |err| resp.fail err }
+    # Blank result should be interpreted as an error. Ok so.
+    # 
+    def check_response(err, data)
+      if err
+        [err, data]
+      elsif data.nil? || data.empty?
+        error = Monga::Exceptions::QueryFailure.new("Empty Response is not a valid Response")
+        [error, data]
+      else
+        [nil, data]
       end
     end
   end

data/lib/monga/{requests → protocol}/delete.rb

@@ -1,4 +1,4 @@
-module Monga::Requests
+module Monga::Protocol
   class Delete < Monga::Request
     op_name :delete
 
@@ -18,6 +18,5 @@ module Monga::Requests
         b
       end
     end
-
   end
 end

data/lib/monga/{requests → protocol}/get_more.rb

@@ -1,4 +1,4 @@
-module Monga::Requests
+module Monga::Protocol
   class GetMore < Monga::Request
     op_name :get_more
     

data/lib/monga/{requests → protocol}/insert.rb

@@ -1,4 +1,4 @@
-module Monga::Requests
+module Monga::Protocol
   class Insert < Monga::Request
     op_name :insert
 
@@ -24,6 +24,5 @@ module Monga::Requests
         b
       end
     end
-
   end
 end

data/lib/monga/{requests → protocol}/kill_cursors.rb

@@ -1,4 +1,4 @@
-module Monga::Requests
+module Monga::Protocol
   class KillCursors < Monga::Request
     op_name :kill_cursors
 

data/lib/monga/{requests → protocol}/query.rb

@@ -1,4 +1,4 @@
-module Monga::Requests
+module Monga::Protocol
   class Query < Monga::Request
     op_name :query
 
@@ -15,7 +15,7 @@ module Monga::Requests
       @body ||= begin
         skip = @options[:skip] || 0
         limit = get_limit
-        fields = @options[:fields] || {}
+        selector = @options[:selector] || {}
 
         query = {}
         query["$query"] = @options[:query] || {}
@@ -29,7 +29,7 @@ module Monga::Requests
         b.put_int(skip)
         b.put_int(limit)
         b.append!(BSON::BSON_C.serialize(query).to_s)
-        b.append!(BSON::BSON_C.serialize(fields).to_s) if fields.any?
+        b.append!(BSON::BSON_C.serialize(selector).to_s) if selector.any?
         b
       end
     end