monga 0.0.2 → 0.0.3

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

@@ -1,4 +1,4 @@
-module Monga::Requests
+module Monga::Protocol
   class Update < Monga::Request
     op_name :update
 

data/lib/monga/request.rb

@@ -1,6 +1,6 @@
 module Monga
   class Request
-    attr_reader :request_id
+    attr_reader :request_id, :connection
 
     OP_CODES = {
       reply:           1,
@@ -14,12 +14,13 @@ module Monga
       kill_cursors: 2007,
     }
 
-    def initialize(db, collection_name, options = {})
-      @db = db
+    def initialize(connection, db_name, collection_name, options = {})
+      @connection = connection
+      @db_name = db_name
       @collection_name = collection_name
       @options = options
+
       @request_id = self.class.request_id
-      @connection = @db.client.aquire_connection
     end
 
     def command
@@ -37,23 +38,25 @@ module Monga
 
     # Fire and Forget
     def perform
-      @connection.send_command(command)
-      @request_id
+      @connection.send_command(command, @request_id)
+      self
     end
 
     # Fire and wait
     def callback_perform
-      Monga::Response.surround do |response|
-        @connection.send_command(command, @request_id) do |data|
-          resp = parse_response(data)
-          Exception === resp ? response.fail(resp) : response.succeed(resp)
+      @connection.send_command(command, @request_id) do |data|
+        err, resp = parse_response(data)
+        if block_given?
+          yield(err, resp)
+        else
+          err ? raise(err) : resp
         end
       end
     end
 
     def parse_response(data)
       if Exception === data
-        data
+        [data, nil]
       else
         flags = data[4]
         number = data[7]
@@ -66,7 +69,7 @@ module Monga
         elsif docs.first && (docs.first["err"] || docs.first["errmsg"])
           Monga::Exceptions::QueryFailure.new(docs.first)
         else
-          data
+          [nil, data]
         end
       end
     end
@@ -90,7 +93,7 @@ module Monga
     end
 
     def full_name
-      [@db.name, @collection_name] * "."
+      [@db_name, @collection_name] * "."
     end
 
     def op_code
@@ -98,13 +101,14 @@ module Monga
     end
 
     def command_length
-      HEADER_SIZE + body.size
+      Monga::HEADER_SIZE + body.size
     end
 
     def self.request_id
-      @request_id ||= 0
-      @request_id += 1
-      @request_id >= 2**32 ? @request_id = 1 : @request_id
+      @@request_id ||= 0
+      @@request_id += 1
+      @@request_id >= 2**32 ? @@request_id = 1 : @@request_id
+      @@request_id
     end
 
     def self.op_name(op = nil)
@@ -114,9 +118,9 @@ module Monga
 end
 
 
-require File.expand_path("../requests/query", __FILE__)
-require File.expand_path("../requests/insert", __FILE__)
-require File.expand_path("../requests/delete", __FILE__)
-require File.expand_path("../requests/update", __FILE__)
-require File.expand_path("../requests/get_more", __FILE__)
-require File.expand_path("../requests/kill_cursors", __FILE__)
+require File.expand_path("../protocol/query", __FILE__)
+require File.expand_path("../protocol/insert", __FILE__)
+require File.expand_path("../protocol/delete", __FILE__)
+require File.expand_path("../protocol/update", __FILE__)
+require File.expand_path("../protocol/get_more", __FILE__)
+require File.expand_path("../protocol/kill_cursors", __FILE__)

data/lib/monga/utils/constants.rb

@@ -0,0 +1,5 @@
+module Monga
+  DEFAULT_HOST = "127.0.0.1"
+  DEFAULT_PORT = 27017
+  HEADER_SIZE  = 16
+end

data/lib/monga/utils/exceptions.rb

@@ -0,0 +1,11 @@
+module Monga::Exceptions
+  class InvalidClientOption < StandardError; end
+  class UndefinedSocketType < StandardError; end
+  class WrongConnectionType < StandardError; end
+  class Disconnected < StandardError; end
+  class CouldNotConnect < StandardError; end
+  class CouldNotReconnect < StandardError; end
+  class QueryFailure < StandardError; end
+  class CursorNotFound < StandardError; end
+  class ClosedCursor < StandardError; end
+end

data/lib/monga.rb

@@ -1,12 +1,9 @@
-require "eventmachine"
+require "em-synchrony"
 require "bson"
 require "logger"
+require "forwardable"
 
 module Monga
-  DEFAULT_HOST = "127.0.0.1"
-  DEFAULT_PORT = 27017
-  HEADER_SIZE  = 16
-  
   extend self
 
   def logger
@@ -18,13 +15,24 @@ module Monga
   end
 end
 
+# It is strange, but cursor should be required befor fibered_connection
+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/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__)
 require File.expand_path("../monga/connection", __FILE__)
 require File.expand_path("../monga/connection_pool", __FILE__)
-require File.expand_path("../monga/client", __FILE__)
 require File.expand_path("../monga/database", __FILE__)
 require File.expand_path("../monga/collection", __FILE__)
-require File.expand_path("../monga/miner", __FILE__)
-require File.expand_path("../monga/cursor", __FILE__)
-require File.expand_path("../monga/exceptions", __FILE__)
-require File.expand_path("../monga/response", __FILE__)
-require File.expand_path("../monga/request", __FILE__)
+require File.expand_path("../monga/request", __FILE__)
+require File.expand_path("../monga/utils/exceptions", __FILE__)
+require File.expand_path("../monga/utils/constants", __FILE__)

data/monga.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "monga"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Petr Yanovich"]
   spec.email         = ["fl00r@yandex.ru"]
   spec.description   = %q{MongoDB Ruby Evented Driver on EventMachine}
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "em-synchrony"
 
-  spec.add_dependency "eventmachine"
   spec.add_dependency "bson"
   spec.add_dependency "bson_ext"
 end

data/spec/helpers/mongodb.rb

@@ -1,59 +1,136 @@
-module Mongodb
-  MONGOD_PATH = "mongod"
-
-  class Instance
-    def initialize(opts)
-      @opts = opts
-      @cmd = [MONGOD_PATH]
-      opts.each do |k,v|
-        @cmd << "--#{k}"
-        @cmd << v.to_s
-      end
-      clean_lock
-      shtdwn
-      start
+module Fake
+
+  # Fake Response.
+  # It could be `ok`, or `primary?` reply.
+  class Response
+    def initialize(data, primary)
+      @data = data
+      @primary = primary
+    end
+
+    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)
+
+      header(b) + b.to_s
+    end
+
+    def primary?
+      doc = { ismaster: @primary }
+      ok(doc)
+    end
+
+    private
+
+    def header(body)
+      length = 16 + body.to_s.bytesize
+      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
+    end
+
+    def response_to
+      @data.unpack("LLLL")[1]
     end
 
-    def clean_lock
-      lock = @opts[:dbpath] + "/mongod.lock"
-      File.rm(lock)
-    rescue
-      # ok
+    def flags; 0; end
+    def cursor_id; 0; end
+    def starting_from; 0; end
+    def number_returned; 1; end
+  end
+
+  # Fake MongoDB server.
+  # Replies with `ok` message for all 2004 op queries instead `isMaster`.
+  # For other ops it sends no answer.
+  class Node < EM::Connection
+    def initialize(si)
+      @si = si
+      @si.server = self
     end
 
-    def shtdwn
-      system "#{@cmd * ' '} --shutdown"
+    def primary
+      @si.rs.primary == @si if @si.rs
+    end
+
+    def receive_data(data)
+      begin
+        length, req_id, resp_to, op_code = data.unpack("LLLL")
+        piece = data.slice!(0, length)
+        if op_code == 2004
+          if piece["isMaster"]
+            send_data Fake::Response.new(piece, primary).primary?
+          else
+            send_data Fake::Response.new(piece, primary).ok
+          end
+        end
+      end while data != ""
+    end
+  end
+
+  # Single instance binded on one port.
+  # Could be stopped or started.
+  class SingleInstance
+    attr_reader :rs
+    attr_accessor :server
+
+    def initialize(port, rs=nil)
+      @rs = rs
+      @port = port
     end
 
     def start
-      return @pid if @pid
-      @pid = spawn(*@cmd, out: "/dev/null")
-      sleep(1)
+      @connected = true
+      @sign = EM.start_server '127.0.0.1', @port, Fake::Node, self
     end
 
     def stop
-      return unless @pid
-      Process.kill("SIGINT", @pid)
-      Process.waitpid(@pid)
-      @pid = nil
+      @server.close_connection
+      EM.stop_server @sign
+      @connected = false
+    end
+
+    def connected?
+      @connected
     end
   end
 
+  # Fake Replica set with a number of Single Instances.
+  # You could stop/start primary/secondary.
   class ReplicaSet
-    def initialize(ports, opts={})
-      opts[:replSet] ||= "rs1"
-      opts[:dbpath] ||= "/tmp/mongodb/rs0"
-      @instances = {}
-      ports.each.with_index do |prt, i|
-        dbpath = opts[:dbpath] + "-#{i}"
-        o = opts.merge({ port: prt[:port], dbpath: dbpath })
-        @instances[prt[:port]] = Instance.new(o)
+    def initialize(ports)
+      @instances = ports.map do |port|
+        SingleInstance.new(port, self)
       end
     end
 
+    def start_all
+      @instances.each(&:start)
+    end
+
+    def vote
+      @primary = @instances.select{|inst| inst.connected? }.sample
+    end
+
     def primary
-      pr = RS_CLIENT.primary
-      @instances[pr.aquire_connection.port] if pr
+      @primary ||= begin
+        @instances.select{|inst| inst.connected? }.sample
+      end
+    end
+
+    def secondaries
+      @instances - [@primary]
     end
   end
 end

data/spec/monga/block/collection_spec.rb

@@ -0,0 +1,172 @@
+require 'spec_helper'
+
+describe Monga::Collection do
+  before do
+    @client = Monga::Client.new(type: :block, pool_size: 10)
+    @db = @client["dbTest"]
+    @collection = @db["testCollection"]
+    @collection.safe_remove
+    docs = []
+    10.times do |i|
+      docs << { artist: "Madonna", title: "Track #{i+1}" }
+      docs << { artist: "Radiohead", title: "Track #{i+1}" }
+    end
+    @collection.safe_insert(docs)
+  end
+
+  # QUERY
+
+  describe "query" do
+    it "should fetch all documents" do
+      docs = @collection.find.all
+      docs.size.must_equal 20
+    end
+
+    it "should fetch all docs with skip and limit" do
+      docs = @collection.find.skip(10).limit(4).all
+      docs.size.must_equal 4
+    end
+
+    it "should fetch first" do
+      doc = @collection.first
+      doc.keys.must_equal ["_id", "artist", "title"]
+    end
+  end
+
+  # INSERT
+
+  describe "insert" do
+    before do
+      @collection.safe_ensure_index({ "personal_id" => 1 }, { unique: true, sparse: true })
+    end
+
+    after do
+      @collection.drop_index( personal_id: 1 )
+    end
+
+    it "should insert single doc" do
+      doc = { name: "Peter", age: 18 }
+      @collection.safe_insert(doc)
+      resp = @collection.find(name: "Peter").all
+      resp.size.must_equal 1
+      resp.first["age"].must_equal 18
+    end
+
+    it "should insert batch of docs" do
+      docs = [{ name: "Peter", age: 18 }, {name: "Jhon", age: 18}]
+      @collection.safe_insert(docs)
+      resp = @collection.find(age: 18).all
+      resp.size.must_equal 2
+    end
+
+    it "should fail on uniq index" do
+      docs = [{ name: "Peter", age: 18, personal_id: 20 }, {name: "Jhon", age: 18, personal_id: 20}, {name: "Rebeca", age: 21, personal_id: 5}]
+      proc{ @collection.safe_insert(docs) }.must_raise Monga::Exceptions::QueryFailure
+      @collection.count.must_equal 21
+    end
+
+    it "should continue_on_error" do
+      docs = [{ name: "Peter", age: 18, personal_id: 20 }, {name: "Jhon", age: 18, personal_id: 20}, {name: "Rebeca", age: 21, personal_id: 5}]
+      proc{ @collection.safe_insert(docs, continue_on_error: true) }.must_raise Monga::Exceptions::QueryFailure
+      @collection.count.must_equal 22
+    end
+  end
+
+  # UPDATE
+
+  describe "update" do
+    it "should make simple update (first matching)" do
+      @collection.safe_update({ artist: "Madonna" }, { "$set" => { country: "USA" } })
+      @collection.count( query: { artist: "Madonna", country: "USA" }).must_equal 1
+    end
+
+    it "should create non existing item (upsert)" do
+      @collection.safe_update({ artist: "Bjork" }, { "$set" => { country: "Iceland" } }, { upsert: true }) 
+      @collection.count(query: { artist: "Bjork" }).must_equal 1
+    end
+
+    it "should update all matching data (multi_update)" do
+      @collection.safe_update({ artist: "Madonna" }, { "$set" => { country: "USA" } }, {multi_update: true})
+      docs = @collection.find(artist: "Madonna").all
+      docs.each{ |d| d["country"].must_equal "USA" }
+    end
+  end
+
+  # REMOVE
+
+  describe "remove" do
+    it "should delete all matching docs" do
+      @collection.safe_delete(artist: "Madonna")
+      @collection.count(query: { artist: "Madonna" }).must_equal 0
+    end
+
+    it "should delete first matching doc (single_remove)" do
+      @collection.safe_delete({ artist: "Madonna" }, single_remove: true)
+      @collection.count(query: { artist: "Madonna" }).must_equal 9
+    end
+  end
+
+  # COUNT
+
+  describe "count" do
+    it "should count all docs" do
+      @collection.count.must_equal 20
+    end
+
+    it "should count all docs with query" do
+      @collection.count(query: { artist: "Madonna" }).must_equal 10
+    end
+
+    it "should count all docs with limit" do
+      @collection.count(query: { artist: "Madonna" }, limit: 5).must_equal 5
+    end
+
+    it "should count all docs with limit and skip" do
+      @collection.count(query: { artist: "Madonna" }, limit: 5, skip: 6).must_equal 4
+    end
+  end
+
+  # ENSURE/DROP INDEX
+
+  describe "ensure_index" do
+    before do
+      @collection.drop_indexes
+    end
+
+    it "should create index" do
+      @collection.safe_ensure_index(title: 1)
+      docs = @collection.get_indexes
+      docs.any?{ |doc| doc["key"] == {"title" => 1}}.must_equal true
+    end
+
+    it "should create sparse index" do
+      @collection.safe_ensure_index({ title: 1 }, sparse: true)
+      docs = @collection.get_indexes
+      docs.any?{ |doc| doc["key"] == {"title" => 1} && doc["sparse"] == true }.must_equal true
+    end
+
+    it "should create unique index" do
+      @collection.safe_ensure_index({ some_field: 1 }, unique: true, sparse: true)
+      docs = @collection.get_indexes
+      docs.any?{ |doc| doc["key"] == {"some_field" => 1} && doc["unique"] == true }.must_equal true
+    end
+
+    it "should drop single index" do
+      @collection.safe_ensure_index(title: 1)
+      docs = @collection.get_indexes
+      docs.any?{ |doc| doc["key"] == {"title" => 1}}.must_equal true
+      @collection.drop_index(title: 1)
+      docs = @collection.get_indexes
+      docs.any?{ |doc| doc["key"] == {"title" => 1}}.must_equal false
+    end
+
+    it "should drop all indexes (except primary on _id)" do
+      @collection.safe_ensure_index(title: 1)
+      docs = @collection.get_indexes
+      docs.any?{ |doc| doc["key"] == {"title" => 1}}.must_equal true
+      @collection.drop_indexes
+      docs = @collection.get_indexes
+      docs.select{ |d| d["ns"] == "dbTest.testCollection" }.size.must_equal 1
+    end
+  end
+end