em-synchrony-moped 0.9.4 → 1.0.0.beta.1

data/spec/lib/em-synchrony/moped/node_spec.rb

@@ -0,0 +1,138 @@
+# encoding: utf-8
+require 'spec_helper'
+
+require 'moped'
+require 'em-synchrony/moped'
+
+describe Moped::Node do
+  let(:mongod_options) { {} }
+  let(:server) { FakeMongodServer.new(mongod_options) }
+  let(:server_port) { server.port }
+  after { server.stop }
+
+  let(:node_options) { {} }
+  let(:node) do
+    options = node_options.merge(timeout: 1)
+    host = options.delete(:host) || 'localhost'
+    Moped::Node.new("#{host}:#{server_port}", options)
+  end
+
+  shared_context 'common node' do
+    context 'with a running server' do
+      it 'should connect' do
+        node.refresh
+        node.should be_primary
+        node.should be_connected
+      end
+
+      it 'should detect a disconnect' do
+        node.refresh
+        node.should be_primary
+        node.should be_connected
+        server.stop
+        expect do
+          node.command('admin', ismaster: 1)
+        end.to raise_error(
+          Moped::Errors::ConnectionFailure # TODO: check the message
+        )
+        node.should_not be_connected
+      end
+    end
+
+    context 'with an unpresponsive host' do
+      # 127.0.0.2 seems to timeout for my tests...
+      let(:node_options) { { host: '127.0.0.2' } }
+      it 'should raise a timeout error' do
+        expect { node.refresh }.to raise_error(
+          Moped::Errors::ConnectionFailure,
+          /^Timed out connection to Mongo on/)
+      end
+    end
+
+    context 'with an unknown host' do
+      let(:node_options) { { host: 'this.host-could-not-possibly-exist.com' } }
+      it 'should raise an error' do
+        # FIXME: this can't be right...
+        expect { node.refresh }.not_to raise_error
+      end
+    end
+
+    context 'without a server' do
+      it 'should raise a connection error on connection refused' do
+        server.stop
+        expect { node.refresh }.to raise_error(
+          Moped::Errors::ConnectionFailure, /ECONNREFUSED/)
+      end
+    end
+  end
+
+  shared_context 'common node ssl' do
+    context 'with ssl server' do
+      let(:mongod_options) do
+        {
+          ssl: {
+            private_key_file: "#{SSL_DIR}/server.key",
+            cert_chain_file: "#{SSL_DIR}/server.crt",
+            verify_peer: false
+          }
+        }
+      end
+
+      context 'without verifying peer' do
+        let(:node_options) { { ssl: { verify_peer: false } } }
+        it 'should connect' do
+          node.refresh
+          node.should be_primary
+        end
+      end
+
+      context 'when verifying peer' do
+        let(:node_options) do
+          { ssl: {
+              verify_peer: true,
+              verify_cert: "#{SSL_DIR}/ca_cert.pem",
+              verify_host: 'localhost'
+            }
+          }
+        end
+        it 'should connect' do
+          node.refresh
+          node.should be_primary
+        end
+
+        context 'with untrusted key on server' do
+          let(:mongod_options) do
+            {
+              ssl: {
+                private_key_file: "#{SSL_DIR}/untrusted.key",
+                cert_chain_file: "#{SSL_DIR}/untrusted.crt",
+                verify_peer: false
+              }
+            }
+          end
+
+          it 'should connect and fail to verify peer' do
+            expect do
+              node.refresh
+              node.should be_primary
+            end.to raise_error(
+              Moped::Errors::ConnectionFailure,
+              /Failed to verify SSL certificate of peer/
+            )
+          end
+        end
+      end
+    end
+  end
+
+  context 'evented' do
+    include_context 'with em-synchrony'
+    include_context 'common node'
+    include_context 'common node ssl'
+  end
+  context 'threaded' do
+    include_context 'without em-synchrony'
+    include_context 'common node'
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,15 +1,43 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+# encoding: UTF-8
 
-require "rspec"
+require 'rubygems'
+require 'spork'
+# uncomment the following line to use spork with the debugger
+# require 'spork/ext/ruby-debug'
 
-require 'em-synchrony'
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
 
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
+  require 'rspec'
+  require 'simplecov'
+  SimpleCov.start do
+    add_group 'Lib', 'lib'
+    add_filter '/spec/'
+  end
 
-SSL_DIR = File.expand_path("../ssl", __FILE__)
+  Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
-RSpec.configure do |config|
+  SSL_DIR = File.expand_path('../ssl', __FILE__)
 
+  RSpec.configure do |config|
+    config.treat_symbols_as_metadata_keys_with_true_values = true
+    config.run_all_when_everything_filtered = true
+    config.filter_run :focus
+
+    # Run specs in random order to surface order dependencies. If you find an
+    # order dependency and want to debug it, you can fix the order by providing
+    # the seed, which is printed after each run.
+    #     --seed 1234
+    config.order = 'random'
+
+    # config.before { $stderr.reopen("/dev/null") }
+  end
+
+end
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
 
 end

data/spec/support/contexts.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+shared_context 'with em-synchrony' do
+  around(:each) do |example|
+    require 'em-synchrony'
+    EventMachine.error_handler do |e|
+      puts "Error in Eventmachine: #{e.inspect}"
+      EM.stop
+    end
+    EventMachine.synchrony do
+      example.run
+      EM.stop if EM.reactor_running?
+    end
+  end
+end
+
+shared_context 'without em-synchrony' do
+  before(:each) do
+    EventMachine.error_handler do |e|
+      puts "Error in Eventmachine: #{e.inspect}"
+      EM.stop
+    end
+    queue = Queue.new
+    @em_thread = Thread.new { EventMachine.run { queue << true } }
+    queue.pop
+  end
+
+  after(:each) do
+    EM.stop
+    @em_thread.join
+  end
+end

data/spec/support/simulated_mongod.rb

@@ -1,13 +1,15 @@
+# encoding: utf-8
 require 'eventmachine'
 
+# Load order here is important.  Message must be loaded so we can
+# add deserialization support to moped/protocol/query
 require 'moped/protocol/message'
+
 module Moped
   module Protocol
-
     # This patch is so we can parse a query as a server
     module Message
       module ClassMethods
-        
         alias_method :_old_cstring, :cstring
         def cstring(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -22,7 +24,7 @@ module Moped
           RUBY
           _old_cstring(name)
         end
-        
+
         alias_method :_old_document, :document
         def document(name, options = {})
           if options[:optional]
@@ -42,8 +44,9 @@ module Moped
         end
       end
     end
-    
-    # now that the class DSL is patched, load the message classes we need to patch further
+
+    # now that the class DSL is patched, load the message classes we need to
+    # patch further
 
     # This patch is so we can parse a query as a server
     require 'moped/protocol/query'
@@ -58,8 +61,7 @@ module Moped
         end
       end
     end
-    
-    
+
     # This patch is so we can create a Reply object as a server
     require 'moped/protocol/reply'
     class Reply
@@ -72,71 +74,98 @@ module Moped
         @op_code              = 1
       end
     end
-    
-    
   end
 end
 
-
+# Eventmachine connection for FakeMongod
 class FakeMongod < EventMachine::Connection
-  def initialize(options)
-    @options = options
+  def initialize(options, server)
+    @options = {
+      master: 1
+    }.merge(options)
+    @server = server
     @request_id = 0
   end
-  
+
   def post_init
-    if @options[:ssl]
-      start_tls(@options[:ssl])
-    end
+    @server.add_connection(self)
+    start_tls(@options[:ssl]) if @options[:ssl]
   end
-  
+
   def receive_data(data)
     query = Moped::Protocol::Query.deserialize(StringIO.new(data))
     if query.full_collection_name == 'admin.$cmd'
-      if query.selector == {'ismaster' => 1}
-        send_reply(query,
-          :ok => 1,
-          :ismaster => 1
-        )
-      elsif query.selector == {'listDatabases' => 1}
-        send_reply(query,
-          :ok => 1,
-          :databases => [{
-            :name => 'test_db'
-          }]
-        )
+      if query.selector == { 'ismaster' => 1 }
+        if @options[:master] == 1
+          send_reply(query, ok: 1, ismaster: 1)
+        else
+          send_reply(query, ok: 1, secondary: 1)
+        end
+      elsif query.selector == { 'listDatabases' => 1 }
+        send_reply(query, ok: 1, databases: [{ name: 'test_db' }])
       end
     end
   end
-  
+
   def send_reply(query, *documents)
     @request_id += 1
     reply =  Moped::Protocol::Reply.new(
       documents,
-      :request_id => @request_ud,
-      :response_to => query.request_id
+      request_id: @request_ud,
+      response_to: query.request_id
     )
     send_data reply.serialize
   end
-  
+
+  def unbind
+    @server.remove_connection(self)
+  end
 end
 
-module FakeMongodHelper
-  
-  BASE_PORT = 37017
-  
-  def start_mongod(options={})
-    @server = EventMachine.start_server('127.0.0.1', BASE_PORT, FakeMongod, options)
+class FakeMongodServer
+  attr_reader :port, :host, :options
+
+  def initialize(options = {})
+    @options = {
+      host: '127.0.0.1'
+    }.merge(options)
+    @host = @options.delete(:host)
+    @connections = []
+    ensure_reactor do
+      @server = EventMachine.start_server(
+        @host, 0, FakeMongod, @options, self)
+      @port = Socket.unpack_sockaddr_in(EM.get_sockname(@server))[0]
+    end
   end
 
+  def stop
+    return unless @server
+    ensure_reactor do
+      EventMachine.stop_server(@server)
+      # stopping the server only stops the listener. We must now stop
+      # all current connections
+      @connections.each { |c| c.close_connection }
+      @server = nil
+    end
+  end
 
-  def stop_mongod
-    EventMachine.stop_server(@server)
+  def add_connection(connection)
+    @connections << connection
   end
-  
-end
 
-RSpec.configure do |config|
-  config.include FakeMongodHelper
+  def remove_connection(connection)
+    @connections.delete(connection)
+  end
+
+  private
 
-end
+  def ensure_reactor(&block)
+    if EventMachine.reactor_thread?
+      block.call
+    elsif EventMachine.reactor_running?
+      queue = Queue.new
+      EventMachine.next_tick { queue << block.call }
+      queue.pop
+    end
+  end
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony-moped
 version: !ruby/object:Gem::Version
-  version: 0.9.4
-  prerelease: 
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Adam Lebsack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,11 +76,108 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: spork
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EM-Synchrony-Moped is a Moped driver patch for EM-Synchtony, allowing
   your asynchronous application use non-blocking connections to MongoDB.  Moped is
   the MongoDB driver for the Mongoid ORM.
@@ -101,49 +188,58 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - em-synchrony-moped.gemspec
 - lib/em-synchrony/moped.rb
-- spec/moped_spec.rb
+- lib/em-synchrony/moped/cluster.rb
+- lib/em-synchrony/moped/connection.rb
+- lib/em-synchrony/moped/node.rb
+- spec/lib/em-synchrony/moped/cluster_spec.rb
+- spec/lib/em-synchrony/moped/connection_spec.rb
+- spec/lib/em-synchrony/moped/node_spec.rb
 - spec/spec_helper.rb
 - spec/ssl/ca_cert.pem
 - spec/ssl/server.crt
 - spec/ssl/server.key
 - spec/ssl/untrusted.crt
 - spec/ssl/untrusted.key
+- spec/support/contexts.rb
 - spec/support/simulated_mongod.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Moped driver for EM-Synchrony
 test_files:
-- spec/moped_spec.rb
+- spec/lib/em-synchrony/moped/cluster_spec.rb
+- spec/lib/em-synchrony/moped/connection_spec.rb
+- spec/lib/em-synchrony/moped/node_spec.rb
 - spec/spec_helper.rb
 - spec/ssl/ca_cert.pem
 - spec/ssl/server.crt
 - spec/ssl/server.key
 - spec/ssl/untrusted.crt
 - spec/ssl/untrusted.key
+- spec/support/contexts.rb
 - spec/support/simulated_mongod.rb
 has_rdoc: