monga 0.0.6 → 0.0.7

data/README.md

@@ -143,7 +143,11 @@ puts "We have got #{docs.size} documents in this pretty array"
 * [ ] check maxBsonSize / validate
 * [x] cmd
 * [x] eval
-* [ ] aggregation
+* [x] aggregate
+* [x] distinct
+* [x] group
+* [x] mapReduce
+* [x] text
 * [ ] gridfs?
 
 ### Collection

data/benchmarks/inserts.rb

@@ -1,86 +1,191 @@
 require 'benchmark'
-require 'mongo'
-require 'moped'
-require File.expand_path('../../lib/monga', __FILE__)
 
-include Mongo
+TOTAL_INSERTS = 10000
+TOTAL_READS = 50
 
-Benchmark.bm do |x|
-  total = 10000
-  fetch = 50
-  mongo_collection = MongoClient.new.db("dbTest").collection("testCollection")
-  monga_collection = Monga::Client.new(type: :block).get_database("dbTest").get_collection("testCollection")
-  Monga.logger.level = Logger::ERROR
-  moped_session = Moped::Session.new([ "127.0.0.1:27017" ])
-  moped_session.use "dbTest"
+chars = ('a'..'z').to_a
+DOCS = [10, 100, 1000, 10000].map do |size|
+  doc = {}
+  doc[:title] = "Title"
+  doc[:body] = size.times.map{ chars.sample }.join
+  [size, doc]
+end
 
-  document = {}
-  document[:title] = "Some title"
-  chars = ('a'..'z').to_a
-  document[:body] = 100.times.map{ chars.sample } * ""
+# Mongo Ruby Driver
 
-  sleep 0.5
+fork do
+  require 'mongo'
+  include Mongo
 
-  GC.start
+  Benchmark.bm do |x|
+    collection = MongoClient.new.db("dbTest").collection("testCollection")
 
-  x.report("Inserting with mongo") do
-    total.times do |i|
-      mongo_collection.insert(document.dup)
-    end
-  end
+    DOCS.each do |size, doc|
+      GC.start
+      x.report("Mongo: Inserting #{size}b document") do
+        TOTAL_INSERTS.times do
+          collection.insert(doc.dup)
+        end
+      end
 
-  GC.start
+      GC.start
+      x.report("Mongo: Reading #{size}b documents") do
+        TOTAL_READS.times do
+          collection.find.to_a
+        end
+      end
 
-  x.report("Fetching with mongo") do
-    fetch.times do
-      mongo_collection.find.to_a
+      collection.drop
     end
   end
-  mongo_collection.drop
+end
 
-  sleep 0.5
+Process.waitall
+puts "---"*5
 
-  GC.start
+# Monga Driver (blocking mode)
 
-  x.report("Inserting with monga") do
-    total.times do |i|
-      monga_collection.safe_insert(document.dup)
-    end
-  end
+fork do
+  require File.expand_path('../../lib/monga', __FILE__)
+
+  Benchmark.bm do |x|
+    collection = Monga::Client.new.get_database("dbTest").get_collection("testCollection")
+
+    DOCS.each do |size, doc|
+      GC.start
+      x.report("Monga: Inserting #{size}b document") do
+        TOTAL_INSERTS.times do
+          collection.safe_insert(doc)
+        end
+      end
 
-  GC.start
+      GC.start
+      x.report("Monga: Reading #{size}b documents") do
+        TOTAL_READS.times do
+          collection.find.all
+        end
+      end
 
-  x.report("Fetching with monga") do
-    fetch.times do
-      monga_collection.find.all
+      collection.drop
     end
   end
+end
 
-  monga_collection.drop
+Process.waitall
+puts "---"*5
 
-  sleep 0.5
+# Moped
 
-  GC.start
+fork do
+  require 'moped'
 
-  x.report("Inserting with moped") do
-    moped_session.with(safe: true) do |safe|
-      total.times do |i|
-        safe[:testCollection].insert(document)
+  Benchmark.bm do |x|
+    session = Moped::Session.new([ "127.0.0.1:27017" ])
+    session.use("dbTest")
+
+    DOCS.each do |size, doc|
+      GC.start
+      x.report("Moped: Inserting #{size}b document") do
+        session.with(safe: true) do |safe|
+          TOTAL_INSERTS.times do
+            safe[:testCollection].insert(doc)
+          end
+        end
       end
-    end
-  end
 
-  GC.start
+      GC.start
+      x.report("Moped: Reading #{size}b documents") do
+        TOTAL_READS.times do
+          session[:testCollection].find.to_a
+        end
+      end
 
-  x.report("Fetching with moped") do
-    fetch.times do
-      moped_session[:testCollection].find.to_a
+      session[:testCollection].drop
     end
   end
-
-  monga_collection.drop
 end
 
+Process.waitall
+
+# # require 'moped'
+
+# # include Mongo
+
+# Benchmark.bm do |x|
+#   total = 1000
+#   fetch = 50
+#   # mongo_collection = MongoClient.new.db("dbTest").collection("testCollection")
+#   monga_collection = Monga::Client.new(type: :block).get_database("dbTest").get_collection("testCollection")
+#   Monga.logger.level = Logger::ERROR
+#   # moped_session = Moped::Session.new([ "127.0.0.1:27017" ])
+#   # moped_session.use "dbTest"
+
+#   document = {}
+#   document[:title] = "Some title"
+#   document[:body] = 10000.times.map{ chars.sample } * ""
+
+#   # sleep 0.5
+
+#   # GC.start
+
+#   # x.report("Inserting with mongo") do
+#   #   total.times do |i|
+#   #     mongo_collection.insert(document.dup)
+#   #   end
+#   # end
+
+#   # GC.start
+
+#   # x.report("Fetching with mongo") do
+#   #   fetch.times do
+#   #     mongo_collection.find.to_a
+#   #   end
+#   # end
+#   # mongo_collection.drop
+
+#   # sleep 0.5
+
+#   # GC.start
+
+#   x.report("Inserting with monga") do
+#     total.times do |i|
+#       monga_collection.safe_insert(document)
+#     end
+#   end
+
+#   GC.start
+
+#   x.report("Fetching with monga") do
+#     fetch.times do
+#       monga_collection.find.all
+#     end
+#   end
+
+#   monga_collection.drop
+
+#   # sleep 0.5
+
+#   # GC.start
+
+#   # x.report("Inserting with moped") do
+#   #   moped_session.with(safe: true) do |safe|
+#   #     total.times do |i|
+#   #       safe[:testCollection].insert(document)
+#   #     end
+#   #   end
+#   # end
+
+#   # GC.start
+
+#   # x.report("Fetching with moped") do
+#   #   fetch.times do
+#   #     moped_session[:testCollection].find.to_a
+#   #   end
+#   # end
+
+#   # monga_collection.drop
+# end
+
 
 
 

data/lib/monga/collection.rb

@@ -8,7 +8,7 @@ module Monga
     end
 
     # Querying database. It returns cursor.
-    # Alias to collection#query is colleciotn#find
+    # Alias to collection#query is collection#find
     #
     #   cursor = collection.find(title: "Madonna")
     #   # choose fields to return
@@ -132,6 +132,62 @@ module Monga
       end
     end
 
+    def map_reduce(opts, &blk)
+      @db.map_reduce(@collection_name, opts) do |err, resp|
+        if block_given?
+          yield(err, resp)
+        else
+          raise err if err
+          return resp
+        end
+      end
+    end
+
+    def aggregate(pipeline, &blk)
+      @db.aggregate(@collection_name, pipeline) do |err, resp|
+        if block_given?
+          yield(err, resp)
+        else
+          raise err if err
+          return resp
+        end
+      end
+    end
+
+    def distinct(opts, &blk)
+      @db.distinct(collection_name, opts) do |err, resp|
+        if block_given?
+          yield(err, resp)
+        else
+          raise err if err
+          return resp
+        end
+      end
+    end
+
+    def group(opts, &blk)
+      @db.group(collection_name, opts) do |err, resp|
+        if block_given?
+          yield(err, resp)
+        else
+          raise err if err
+          return resp
+        end
+      end
+    end
+
+    def text(search, opts = {}, &blk)
+      opts[:search] = search
+      @db.text(collection_name, opts) do |err, resp|
+        if block_given?
+          yield(err, resp)
+        else
+          raise err if err
+          return resp
+        end
+      end
+    end
+
     # Safe methods
     [:update, :insert, :delete, :remove, :ensure_index].each do |meth|
       class_eval <<-EOS

data/lib/monga/connection.rb

@@ -6,17 +6,6 @@ module Monga
 
     attr_reader :type
 
-    CONNECTIONS = {
-      em: Monga::Connections::EMConnection,
-      sync: Monga::Connections::FiberedConnection,
-      block: Monga::Connections::KGIOConnection,
-    }
-    PROXY_CONNECTIONS = {
-      em: Monga::Connections::EMProxyConnection,
-      sync: Monga::Connections::FiberedProxyConnection,
-      block: Monga::Connections::ProxyConnection,
-    }
-
     # Simple connection wrapper.
     # Accpets 
     # * host/port or server
@@ -35,15 +24,36 @@ module Monga
       end
       timeout = opts[:timeout]
 
-      conn_type = CONNECTIONS[@type]
-      raise Monga::Exceptions::WrongConnectionType, "Connection type `#{opts[:type]}` is non valid, choose one of: :em, :sync, or :block" unless conn_type
-      @connection = conn_type.connect(host, port, timeout)
+      @connection = case @type
+      when :em
+        require File.expand_path("../connections/em_connection", __FILE__)
+        Monga::Connections::EMConnection.connect(host, port, timeout)
+      when :sync
+        require File.expand_path("../connections/em_connection", __FILE__)
+        require File.expand_path("../connections/fibered_connection", __FILE__)
+        Monga::Connections::FiberedConnection.connect(host, port, timeout)
+      when :block
+        require File.expand_path("../connections/kgio_connection", __FILE__)
+        Monga::Connections::KGIOConnection.connect(host, port, timeout)
+      else
+        raise Monga::Exceptions::WrongConnectionType, "Connection type `#{opts[:type]}` is non valid, choose one of: :em, :sync, or :block" unless conn_type
+      end
     end
-
+    
     # Returns name of proxy_connection class
     def self.proxy_connection_class(type, client)
-      conn_class = PROXY_CONNECTIONS[type]
-      conn_class.new(client) if conn_class
+      case type
+      when :em
+        require File.expand_path("../connections/em_proxy_connection", __FILE__)
+        Monga::Connections::EMProxyConnection.new(client)
+      when :sync
+        require File.expand_path("../connections/em_proxy_connection", __FILE__)
+        require File.expand_path("../connections/fibered_proxy_connection", __FILE__)
+        Monga::Connections::FiberedProxyConnection.new(client)
+      when :block
+        require File.expand_path("../connections/proxy_connection", __FILE__)
+        Monga::Connections::ProxyConnection.new(client)
+      end
     end
   end
 end

data/lib/monga/connections/buffer.rb

@@ -1,33 +1,54 @@
 module Monga::Connections
   class Buffer
-    # include Enumerable
+    include Enumerable
+    EMPTY = ""
 
-    attr_reader :buffer, :responses
+    attr_reader :buffer, :buffer_size
 
     def initialize
       @buffer = ""
       @position = 0
-      @docs = []
-      @responses = []
+      @buffer_size = 0
+      @response = []
     end
 
     def append(data)
       @buffer << data
-      @buffer_size = @buffer.bytesize
-      parse
-      @buffer
+      @buffer_size += data.bytesize
+    end
+
+    def each
+      while doc = parse_buffer
+        yield doc
+      end
     end
 
-    def parse
-      begin
-        more = parse_meta  if @position == 0
-        parse_doc  if @position > 0
-      end while more && @position == 0
+    def parse_buffer
+      return if @buffer_size == 0
+
+      if @position == 0
+        parse_doc if parse_meta
+      else
+        parse_doc 
+      end
+
+      if @number_returned == 0
+        if @buffer_size == @position
+          @buffer.clear
+          @buffer_size = 0
+        else
+          @buffer = @buffer[@position, @buffer_size-@position]
+          @buffer_size -= @position
+        end
+        @position = 0
+
+        @response
+      end
     end
 
     def parse_meta
       return  if @buffer_size < 36
-      @response = []
+      @response.clear
       @response << ::BinUtils.get_int32_le(@buffer, @position)
       @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
       @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
@@ -35,43 +56,36 @@ module Monga::Connections
       @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
       @response << ::BinUtils.get_int64_le(@buffer, @position += 4)
       @response << ::BinUtils.get_int32_le(@buffer, @position += 8)
-      @response << (@number_returned = ::BinUtils.get_int32_le(@buffer, @position += 4))
+      @number_returned = ::BinUtils.get_int32_le(@buffer, @position += 4)
+      @response << @number_returned
+      @position += 4
       @response << []
 
-      @position += 4
     end
 
     def parse_doc
-      while true
-        break  if done
-        break  if @buffer_size < @position + 4
-        doc_length = ::BinUtils.get_int32_le(@buffer, @position)
-        break  if @buffer_size < @position + doc_length
+      @str_io = nil  if @number_returned == @response[7]
 
-        doc = @buffer[@position, doc_length]
-        @response[-1] << CBson.deserialize(doc)
-        @position += doc_length
+      current_pos = @position
+      while (l = @buffer_size - @position) > 4    
+        doc_length = ::BinUtils.get_int32_le(@buffer, @position)
+        break if l < doc_length
         @number_returned -= 1
+        @position += doc_length
       end
-    end
 
-    def each
-      while resp = @responses.shift
-        yield resp
+      if @str_io
+        @str_io << @buffer[current_pos..@position]
+      else
+        @str_io = StringIO.new @buffer[current_pos..@position]
       end
-    end
 
-    def done
-      return false  if @number_returned > 0
-      @responses << @response
-      @response = nil
-      if @buffer_size == @position
-        @buffer.clear
-      else
-        @buffer = @buffer[@position, @buffer_size-@position]
+      if @number_returned == 0
+        @str_io.rewind
+        @response[7].times do
+          @response[-1] << BSON::Document.from_bson(@str_io)
+        end
       end
-      @buffer_size = @buffer.bytesize
-      @position = 0
     end
   end
 end

data/lib/monga/connections/em_connection.rb

@@ -1,3 +1,5 @@
+require "eventmachine"
+
 module Monga::Connections
   class EMConnection < EM::Connection
     include EM::Deferrable

data/lib/monga/connections/kgio_connection.rb

@@ -1,7 +1,10 @@
 require 'kgio'
-require 'io/nonblock' # ha?
+
+# Toy blocking connection over TCP
 module Monga::Connections
   class KGIOConnection
+    TO_RECV = 512
+
     def self.connect(host, port, timeout)
       new(host, port, timeout)
     end
@@ -10,6 +13,7 @@ module Monga::Connections
       @host, @port, @timout = host, port, timeout
       @connected = true
       @buffer = Buffer.new
+      @tmp = ""
     end
 
     def connected?
@@ -20,10 +24,10 @@ module Monga::Connections
     def socket
       @socket ||= begin
         sock = Kgio::TCPSocket.new(@host, @port)
+        # MacOS doesn't support autopush
         sock.kgio_autopush = true unless RUBY_PLATFORM['darwin']
         # check connection
         sock.kgio_write ""
-        # Macos doesn't support autopush
         @connected = true
         sock
       end
@@ -31,18 +35,19 @@ module Monga::Connections
       nil
     end
 
-    # Fake answer, as far as we are blocking
+    # Fake answer, as far as we are blocking,
+    # but we should support API
     def responses
       0
     end
 
     def send_command(msg, request_id=nil, &cb)
       raise Errno::ECONNREFUSED, "Connection Refused" unless socket
-      socket.kgio_write msg.to_s
+      socket.kgio_write msg
       if cb
         read_socket
 
-        message = @buffer.responses.shift
+        message = @buffer.first
         rid = message[2]
 
         fail "Returned Request Id is not equal to sended one (#{rid} != #{request_id}), #{message}" if rid != request_id
@@ -58,19 +63,24 @@ module Monga::Connections
     end
 
     def read_socket
-      torecv = 512
-      length = nil
-      buf = ''.force_encoding('ASCII-8BIT')
-      tmp = ''
-      while torecv > 0
-        resp = socket.kgio_read(torecv, tmp)
-        raise Errno::ECONNREFUSED.new "Nil was return. Closing connection" unless resp
-        buf << resp
-        size = buf.bytesize
-        length ||= ::BinUtils.get_int32_le(buf) if size > 4
-        torecv = length - size if length
+      while @buffer.buffer_size < 4
+        unless socket.kgio_read(TO_RECV, @tmp)
+          raise Errno::ECONNREFUSED.new "Nil was return. Closing connection"
+        end
+
+        @buffer.append(@tmp)
+
+        size = @buffer.buffer_size
+        if size >= 4
+          length = ::BinUtils.get_int32_le(@buffer.buffer)  
+
+          torecv = length - size
+          if torecv > 0
+            socket.read(torecv, @tmp)
+            @buffer.append(@tmp)
+          end
+        end
       end
-      @buffer.append(buf)
     end
 
     def primary?
@@ -83,7 +93,7 @@ module Monga::Connections
       request_id = req.request_id
       socket.kgio_write command
       read_socket
-      message = @buffer.responses.shift
+      message = @buffer.first
       @primary = message.last.first["ismaster"]
       yield @primary ? :primary : :secondary
     rescue => e

data/lib/monga/database.rb

@@ -146,12 +146,79 @@ module Monga
       run_cmd(cmd, blk)
     end
 
-    def map_reduce
-      
+    # Run mapReduce command.
+    # Available options:
+    #   
+    #   * map - A JavaScript function that associates or “maps” a value with a key and emits the key and value pair.
+    #   * reduce - A JavaScript function that “reduces” to a single object all the values associated with a particular key.
+    #   * out - Specifies the location of the result of the map-reduce operation.
+    #   * query - Specifies the selection criteria.
+    #   * sort - Sorts the input documents.
+    #   * limit - Specifies a maximum number of documents to return from the collection
+    #   * finalize
+    #   * scope
+    #   * jsMode
+    #   * verbose
+    # 
+    # Inline response returned by default.
+    #
+    def map_reduce(collection_name, opts, &blk)
+      cmd = {}
+      cmd[:mapReduce] = collection_name
+      cmd.merge! opts
+      cmd[:out] ||= { inline: 1 }
+      run_cmd(cmd, blk)
     end
 
-    def aggregate
-      
+    # Run aggregate command.
+    # 
+    def aggregate(collection_name, pipeline, &blk)
+      cmd = {}
+      cmd[:aggregate] = collection_name
+      cmd[:pipeline] = pipeline
+      run_cmd(cmd, blk)
+    end
+
+    # Run distinct command.
+    # You should pass collection_name and key.
+    # Query option is optional.
+    # 
+    def distinct(collection_name, opts, &blk)
+      cmd = {}
+      cmd[:distinct] = collection_name
+      cmd.merge! opts
+      run_cmd(cmd, blk)
+    end
+
+    # Run group command.
+    # Available options are:
+    #   key – Specifies one or more document fields to group
+    #   $reduce – Specifies an aggregation function that operates on the documents during the grouping operation
+    #   initial – Initializes the aggregation result document
+    #   $keyf – Specifies a function that creates a “key object” for use as the grouping key
+    #   cond – Specifies the selection criteria to determine which documents in the collection to process
+    #   finalize – Specifies a function that runs each item in the result
+    #
+    def group(collection_name, opts, &blk)
+      cmd = {}
+      cmd[:group] = opts
+      cmd[:group][:ns] ||= collection_name
+      run_cmd(cmd, blk)
+    end
+
+    # Run text command.
+    # Available options are:
+    #   search (string) – A string of terms that MongoDB parses and uses to query the text index
+    #   filter (document) – A query document to further limit the results of the query using another database field
+    #   project (document) – Allows you to limit the fields returned by the query to only those specified.
+    #   limit (number) – Specify the maximum number of documents to include in the response
+    #   language (string) – Specify the language that determines for the search the list of stop words and the rules for the stemmer and tokenizer
+    #   
+    def text(collection_name, opts, &blk)
+      cmd = {}
+      cmd[:text] = collection_name
+      cmd.merge! opts
+      run_cmd(cmd, blk)
     end
 
     # Just helper to show all list of collections

data/lib/monga/protocol/delete.rb

@@ -13,7 +13,7 @@ module Monga::Protocol
         msg = ::BinUtils.append_int32_le!(nil, 0)
         msg << full_name << Monga::NULL_BYTE
         ::BinUtils.append_int32_le!(msg, flags)
-        msg << BSON::BSON_C.serialize(query).to_s
+        msg << query.to_bson
         msg
       end
     end

data/lib/monga/protocol/insert.rb

@@ -15,10 +15,11 @@ module Monga::Protocol
         case documents
         when Array
           documents.each do |doc|
-            msg << BSON::BSON_C.serialize(doc).to_s
+            msg << doc.to_bson
           end
         when Hash
-          msg << BSON::BSON_C.serialize(documents).to_s
+          # msg << BSON::BSON_C.serialize(documents).to_s
+          msg << documents.to_bson
         end
         msg
       end

data/lib/monga/protocol/query.rb

@@ -26,8 +26,8 @@ module Monga::Protocol
         msg = ::BinUtils.append_int32_le!(nil, flags)
         msg << full_name << Monga::NULL_BYTE
         ::BinUtils.append_int32_le!(msg, skip, limit)
-        msg << BSON::BSON_C.serialize(query).to_s
-        msg << BSON::BSON_C.serialize(selector).to_s if selector.any?
+        msg << query.to_bson
+        msg << selector.to_bson if selector.any?
         msg
       end
     end

data/lib/monga/protocol/update.rb

@@ -15,8 +15,8 @@ module Monga::Protocol
         msg = ::BinUtils.append_int32_le!(nil, 0)
         msg << full_name << Monga::NULL_BYTE
         ::BinUtils.append_int32_le!(msg, flags)
-        msg << BSON::BSON_C.serialize(query).to_s
-        msg << BSON::BSON_C.serialize(update).to_s
+        msg << query.to_bson
+        msg << update.to_bson
         msg
       end
     end

data/lib/monga.rb

@@ -1,4 +1,4 @@
-require "em-synchrony"
+gem "bson", "2.0.0.beta"
 require "bson"
 require "bin_utils"
 require "logger"
@@ -21,13 +21,6 @@ require File.expand_path("../monga/cursor", __FILE__)
 
 require File.expand_path("../monga/clients/single_instance_client", __FILE__)
 require File.expand_path("../monga/clients/replica_set_client", __FILE__)
-require File.expand_path("../monga/connections/em_connection", __FILE__)
-require File.expand_path("../monga/connections/fibered_connection", __FILE__)
-require File.expand_path("../monga/connections/tcp_connection", __FILE__)
-require File.expand_path("../monga/connections/kgio_connection", __FILE__)
-require File.expand_path("../monga/connections/em_proxy_connection", __FILE__)
-require File.expand_path("../monga/connections/fibered_proxy_connection", __FILE__)
-require File.expand_path("../monga/connections/proxy_connection", __FILE__)
 require File.expand_path("../monga/connections/buffer", __FILE__)
 
 require File.expand_path("../monga/client", __FILE__)

data/monga.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "monga"
-  spec.version       = "0.0.6"
+  spec.version       = "0.0.7"
   spec.authors       = ["Petr Yanovich"]
   spec.email         = ["fl00r@yandex.ru"]
-  spec.description   = %q{MongoDB Ruby Evented Driver on EventMachine}
-  spec.summary       = %q{MongoDB Ruby Evented Driver on EventMachine}
+  spec.description   = %q{Yet another MongoDB Ruby Client}
+  spec.summary       = %q{Yet another MongoDB Ruby Client}
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "kgio"
   spec.add_development_dependency "em-synchrony"
 
-  spec.add_dependency "bson"
-  spec.add_dependency "bson_ext"
+  spec.add_dependency "bson", ["~> 2.0.0.beta"]
+  # spec.add_dependency "bson"
+  # spec.add_dependency "bson_ext"
   spec.add_dependency "bin_utils"
 end

data/spec/helpers/mongodb.rb

@@ -1,5 +1,6 @@
-module Fake
+require 'eventmachine'
 
+module Fake
   # Fake Response.
   # It could be `ok`, or `primary?` reply.
   class Response
@@ -11,12 +12,10 @@ module Fake
     def ok(doc = nil)
       document = doc || { ok: 1.0 }
       [flags, cursor_id, starting_from, number_returned].pack("LQLL")
-      b = BSON::ByteBuffer.new
-      b.put_int(flags)
-      b.put_long(cursor_id)
-      b.put_int(starting_from)
-      b.put_int(number_returned)
-      b.append!(BSON::BSON_C.serialize(document).to_s)
+      b = ::BinUtils.append_int32_le!(nil, flags)
+      ::BinUtils.append_int64_le!(b, cursor_id)
+      ::BinUtils.append_int32_le!(b, starting_from, number_returned)
+      b << document.to_bson
 
       header(b) + b.to_s
     end
@@ -33,12 +32,7 @@ module Fake
       request_id = 0
       op_code = 0
 
-      h = BSON::ByteBuffer.new
-      h.put_int(length)
-      h.put_int(request_id)
-      h.put_int(response_to)
-      h.put_int(op_code)
-      h.to_s
+      h = ::BinUtils.append_int32_le!(nil, flags, request_id, response_to, op_code)
     end
 
     def response_to

data/spec/monga/block/collection_spec.rb

@@ -169,4 +169,48 @@ describe Monga::Collection do
       docs.select{ |d| d["ns"] == "dbTest.testCollection" }.size.must_equal 1
     end
   end
+
+  # MAP/REDUCE
+
+  describe "map_reduce" do
+    before do
+      @collection.safe_remove
+      5.times do |i|
+        @collection.safe_insert(title: "The Book", count: i)
+      end
+    end
+
+    it "should run map reduce" do
+      map_func = "function() {
+                    emit(this.title, this.count);
+                  };"
+      red_func = "function(docTitle, docCount) {
+                    return Array.sum(docCount);
+                  };"
+      @collection.map_reduce(map: map_func, reduce: red_func, out: {inline: 1} )["results"].first["value"].must_equal 10.0
+    end
+  end
+
+  # AGGREGATE, GROUP, DISTINCT
+
+  describe "aggregate, group, distinct" do
+
+  end
+
+  # TEXT SEARCH
+
+  # Travis.ci doesn't support text search in mongodb
+  # describe "text search" do
+  #   before do
+  #     @collection.safe_ensure_index(author: "text")
+  #     @collection.safe_insert(author: "Lady Gaga", track: "No. 1")
+  #     @collection.safe_insert(author: "Lady Gaga", track: "No. 2")
+  #     @collection.safe_insert(author: "Madonna", track: "No. 1")
+  #   end
+
+  #   it "should find some tracks" do
+  #     @collection.text("Lady")["results"].map{ |r| r["obj"]["track"] }.sort.must_equal ["No. 1", "No. 2"]
+  #     @collection.text("Madonna")["results"].map{ |r| r["obj"]["track"] }.sort.must_equal ["No. 1"]
+  #   end
+  # end
 end

data/spec/monga/em/collection_spec.rb

@@ -305,4 +305,74 @@ describe Monga::Collection do
       end
     end
   end
+
+  # MAP/REDUCE
+
+  describe "map_reduce" do
+    before do
+      EM.run do
+        @collection.safe_remove do
+          docs = []
+          5.times do |i|
+            docs << { title: "The Book", count: i }
+          end
+          @collection.safe_insert(docs) do
+            EM.stop
+          end
+        end
+      end
+    end
+
+    it "should run map reduce" do
+      EM.run do
+        map_func = "function() {
+                      emit(this.title, this.count);
+                    };"
+        red_func = "function(docTitle, docCount) {
+                      return Array.sum(docCount);
+                    };"
+        @collection.map_reduce(map: map_func, reduce: red_func, out: {inline: 1} ) do |err, res|
+          res["results"].first["value"].must_equal 10.0
+          EM.stop
+        end
+      end
+    end
+  end
+
+  # AGGREGATE, GROUP, DISTINCT
+
+  describe "aggregate, group, distinct" do
+
+  end
+
+  # TEXT SEARCH
+
+  # Travis.ci doesn't support text search in mongodb
+  # describe "text search" do
+  #   before do
+  #     EM.run do
+  #       @collection.safe_ensure_index(author: "text") do
+  #         @collection.safe_insert([
+  #           { author: "Lady Gaga", track: "No. 1" },
+  #           { author: "Lady Gaga", track: "No. 2" },
+  #           { author: "Madonna", track: "No. 1" }
+  #         ]) do
+  #           EM.stop
+  #         end
+  #       end
+  #     end
+  #   end
+
+  #   it "should find some tracks" do
+  #     EM.run do
+  #       @collection.text("Lady") do |err, res|
+  #         res["results"].map{ |r| r["obj"]["track"] }.sort.must_equal ["No. 1", "No. 2"]
+  #         @collection.text("Madonna") do |err, res|
+  #           res["results"].map{ |r| r["obj"]["track"] }.sort.must_equal ["No. 1"]
+  #           EM.stop
+  #         end
+  #       end
+  #     end
+  #   end
+  # end
 end

data/spec/monga/sync/collection_spec.rb

@@ -244,4 +244,60 @@ describe Monga::Collection do
       end
     end
   end
+
+  # MAP/REDUCE
+
+  describe "map_reduce" do
+    before do
+      EM.synchrony do
+        @collection.safe_remove
+        5.times do |i|
+          @collection.safe_insert(title: "The Book", count: i)
+        end
+        EM.stop
+      end
+    end
+
+    it "should run map reduce" do
+      EM.synchrony do
+        map_func = "function() {
+                      emit(this.title, this.count);
+                    };"
+        red_func = "function(docTitle, docCount) {
+                      return Array.sum(docCount);
+                    };"
+        @collection.map_reduce(map: map_func, reduce: red_func, out: {inline: 1} )["results"].first["value"].must_equal 10.0
+        EM.stop
+      end
+    end
+  end
+
+  # AGGREGATE, GROUP, DISTINCT
+
+  describe "aggregate, group, distinct" do
+
+  end
+
+  # TEXT SEARCH
+
+  # Travis.ci doesn't support text search in mongodb
+  # describe "text search" do
+  #   before do
+  #     EM.synchrony do
+  #       @collection.safe_ensure_index(author: "text")
+  #       @collection.safe_insert(author: "Lady Gaga", track: "No. 1")
+  #       @collection.safe_insert(author: "Lady Gaga", track: "No. 2")
+  #       @collection.safe_insert(author: "Madonna", track: "No. 1")
+  #       EM.stop
+  #     end
+  #   end
+
+  #   it "should find some tracks" do
+  #     EM.synchrony do
+  #       @collection.text("Lady")["results"].map{ |r| r["obj"]["track"] }.sort.must_equal ["No. 1", "No. 2"]
+  #       @collection.text("Madonna")["results"].map{ |r| r["obj"]["track"] }.sort.must_equal ["No. 1"]
+  #       EM.stop
+  #     end
+  #   end
+  # end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require LIB_PATH
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'minitest/reporters'
+require 'em-synchrony'
+
 MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 
 Monga.logger.level = Logger::ERROR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monga
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -78,35 +78,19 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.beta
     none: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.beta
     none: false
   prerelease: false
   name: bson
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
-  name: bson_ext
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -123,7 +107,7 @@ dependencies:
     none: false
   prerelease: false
   name: bin_utils
-description: MongoDB Ruby Evented Driver on EventMachine
+description: Yet another MongoDB Ruby Client
 email:
 - fl00r@yandex.ru
 executables: []
@@ -153,7 +137,6 @@ files:
 - lib/monga/connections/fibered_proxy_connection.rb
 - lib/monga/connections/kgio_connection.rb
 - lib/monga/connections/proxy_connection.rb
-- lib/monga/connections/tcp_connection.rb
 - lib/monga/cursor.rb
 - lib/monga/database.rb
 - lib/monga/protocol/delete.rb
@@ -194,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3962526029351115610
+      hash: -862637376897312253
       version: '0'
       segments:
       - 0
@@ -203,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3962526029351115610
+      hash: -862637376897312253
       version: '0'
       segments:
       - 0
@@ -213,7 +196,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: MongoDB Ruby Evented Driver on EventMachine
+summary: Yet another MongoDB Ruby Client
 test_files:
 - spec/helpers/mongodb.rb
 - spec/monga/block/collection_spec.rb

data/lib/monga/connections/tcp_connection.rb

@@ -1,59 +0,0 @@
-require 'socket'
-
-# Currently blocking mode is very poor.
-# It is working as is.
-# Going to support reconnecting and timouts later.
-# Use it for tests and prototyping. Not the best choice for production.
-
-module Monga::Connections
-  class TCPConnection
-    def self.connect(host, port, timeout)
-      new(host, port, timeout)
-    end
-
-    def initialize(host, port, timeout)
-      @host, @port, @timout = host, port, timeout
-      @connected = true
-      @buffer = Buffer.new
-    end
-
-    def connected?
-      @connected
-    end
-
-    def socket
-      @socket ||= begin
-        TCPSocket.new(@host, @port)
-      end
-    end
-
-    # Fake answer, as far as we are blocking
-    def responses
-      0
-    end
-
-    def send_command(msg, request_id=nil, &cb)
-      socket.send msg.to_s, 0
-      if cb
-        length = socket.read(4)
-        raise Errno::ECONNREFUSED, "Socket returns nothing like it would be closed." unless length
-        @buffer.append(length)
-        l = length.unpack("L").first
-        rest = socket.read(l-4)
-        @buffer.append(rest)
-        @buffer.each do |message|
-          rid = message[2]
-          fail "Returned Request Id is not equal to sended one" if rid != request_id
-          cb.call(message)
-        end
-      end
-    rescue Errno::ECONNREFUSED, Errno::EPIPE => e
-      @connected = false
-      @socket = nil
-      if cb
-        err = Monga::Exceptions::Disconnected.new("Disconnected from #{@host}:#{@port}, #{e.message}")
-        cb.call(err)
-      end
-    end
-  end
-end