em-synchrony-moped 1.0.0.beta.3 → 2.0.0.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQwYjRjOGM1NGY4M2ZiNzFhOWQ2NzdkMWVlNDA4OWQyNTY1MmM1Nw==
+    ODA5NjIzNDY3MzZiYzk1MTU4ODRmMGE5Mjg3MjcxMWNkYzYxNzAyOA==
   data.tar.gz: !binary |-
-    NGViOTBhMjc5M2UyZGI5YWFiODViMWEyY2IzZmI4NzdmMWQ5OTcwYw==
+    ZjM0ZTVjMTEyZmY0NWZhYTBjNTgyMTFkY2ZjNTNiODAxNmI1MjA5Yg==
 SHA512:
   metadata.gz: !binary |-
-    NzU4Nzk4YjA1NDFiMjA0NzdmYTI0MjZmNGE0NTY5MWM4ZWE3NmM2MzQ1ZDkx
-    ZGRiZDc4MDg4NzMzOWNlNWM0ZTgyMzdlNDg0MzJmNzk5NzEwZjAyNDhkNzE4
-    MmFlZDViYzNlNzExNDJkNjdkNjk1NjgyOWY4OWY3N2Y2MTMzYTI=
+    OGM1MWY4YTBjNzY3ZWIzMDhmZjI0ZjBhYWM4NTM1MTU2YzVhMzdkNmJlOWFj
+    N2IzNDk1MTFiZGMyMGYyNmUwNmRlMmJkMWUwNzMwNWUyYTEyYTczNTEzNmRh
+    YjVkNzU5YjliYzU1Zjc5OTE4YTIxMGM5M2IwZTk5NzNmYjQ0MWE=
   data.tar.gz: !binary |-
-    OGJiZjEzMWJiZWUzMGZkNDE0NDBhM2Y4ZjU3NzgzM2Q5MGNhMGFmYWIxZDJk
-    NWFhNzQwMjBkZmU3NTkyMTg1MTJkMjJiMWE4YzQ1ODJjZDFjZjVhMTE1ZDdi
-    MWFjOTQxYjkwYjFhMGE1ZjJiNzg0M2E4NTkyNDBlNzkxYjQ0ZWQ=
+    OTAzYjhhMGZmMDVkZmFiMzdhNTUzMDA4ZTkwYjM4YWM4N2ZiZDFmOGViZGY3
+    ZDQwZTNkOTAwYWVhMjNjNzM4ZDcwNTkyYmJhNGU5OWUzM2QzMmRmMzQyODgy
+    ZDY0ZTVmNTU3MDU0NDBlMDVmODc2NTIzZmE4NDdmN2U5ODE3Yzk=

data/.travis.yml

@@ -3,3 +3,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1

data/Guardfile

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-guard 'rspec' do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/em-synchrony-moped.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = 'em-synchrony-moped'
-  s.version = "1.0.0.beta.3"
+  s.version = "2.0.0.beta.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Lebsack"]
   s.email = ["alebsack@gmail.com"]
-  
+
   s.summary = 'Moped driver for EM-Synchrony'
   s.description = 'EM-Synchrony-Moped is a Moped driver patch for ' +
                   'EM-Synchrony, allowing your asynchronous application use' +
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'eventmachine',      '~> 1.0'
   s.add_runtime_dependency 'em-synchrony',      '~> 1.0.3'
-  s.add_runtime_dependency 'moped',             '~> 1.5.1'
+  s.add_runtime_dependency 'moped',             '~> 2.0.0'
   s.add_runtime_dependency 'em-resolv-replace'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'guard-bundler'

data/lib/em-synchrony/moped.rb

@@ -4,3 +4,4 @@ require 'em-synchrony'
 require 'em-synchrony/moped/cluster'
 require 'em-synchrony/moped/node'
 require 'em-synchrony/moped/connection'
+require 'em-synchrony/moped/address'

data/lib/em-synchrony/moped/address.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+module Moped
+  class Address
+
+    alias_method :super_resolve, :resolve
+    # Override to support non-blocking DNS requests
+    def resolve(node)
+      return super_resolve(node) unless EventMachine.reactor_thread?
+      em_each_address(host).each do |ip|
+        if ip =~ Resolv::IPv4::Regex
+          @ip ||= ip
+          break
+        end
+      end
+      raise Resolv::ResolvError unless @ip
+      @resolved ||= "#{ip}:#{port}"
+    rescue Timeout::Error, Resolv::ResolvError, SocketError
+      Loggable.warn("  MOPED:", "Could not resolve IP for: #{original}", "n/a")
+      node.down! and false
+    end
+
+    def em_each_address(value)
+      puts "em_each_address: #{value.inspect}"
+
+      # Lookup in /etc/hosts
+      result = []
+      @hosts ||= Resolv::Hosts.new
+      @hosts.send(:each_address, value) { |x| result << x.to_s }
+      return result unless result.empty?
+
+      # Nothing, hit DNS
+      fiber = Fiber.current
+      df = EM::DnsResolver.send(:resolve, value)
+      df.callback do |a|
+        fiber.resume(a)
+      end
+      df.errback do |*a|
+        fiber.resume(Resolv::ResolvError.new(a.inspect))
+      end
+      result = Fiber.yield
+      fail result if result.is_a?(StandardError)
+      result
+    end
+
+  end
+end

data/lib/em-synchrony/moped/connection.rb

@@ -9,102 +9,104 @@ module Moped
     def connect
       return super_connect unless EventMachine.reactor_thread?
       if !!options[:ssl]
-        @sock = Sockets::EmSSL.em_connect(host, port, timeout, options)
+        @sock = Socket::EmSSL.em_connect(host, port, timeout, options)
       else
-        @sock = Sockets::EmTCP.em_connect(host, port, timeout, options)
+        @sock = Socket::EmTCP.em_connect(host, port, timeout, options)
       end
     end
-  end
 
-  module Sockets
-    module Connectable
-      # Class methods to extend the Connectable Class
-      module ClassMethods
-        def em_connect(host, port, timeout, options)
-          socket = EventMachine.connect(host, port, self) do |c|
-            c.pending_connect_timeout = timeout
-            c.options = options
-          end
-          # In TCPSocket, new against a closed port raises Errno::ECONNREFUSED.
-          # In EM, connect against a closed port result in a call to unbind
-          # with a reason param of Errno::ECONNREFUSED as a class, not an
-          # instance.
-          unless socket.sync(:in)  # wait for connection
-            fail socket.unbind_reason.new if socket.unbind_reason.is_a? Class
-            fail SocketError, socket.unbind_reason
+    module Socket
+      module Connectable
+        # Class methods to extend the Connectable Class
+        module ClassMethods
+          def em_connect(host, port, timeout, options)
+            socket = EventMachine.connect(host, port, self) do |c|
+              c.pending_connect_timeout = timeout
+              c.options = options
+            end
+            # In TCPSocket, new against a closed port raises Errno::ECONNREFUSED.
+            # In EM, connect against a closed port result in a call to unbind
+            # with a reason param of Errno::ECONNREFUSED as a class, not an
+            # instance.
+            unless socket.sync(:in)  # wait for connection
+              fail socket.unbind_reason.new if socket.unbind_reason.is_a? Class
+              fail SocketError, socket.unbind_reason
+            end
+            socket
+          rescue Errno::ETIMEDOUT
+            raise Errors::ConnectionFailure,
+                  "Timed out connection to Mongo on #{host}:#{port}"
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE,
+                 Errno::ECONNRESET, IOError => error
+            fail Errors::ConnectionFailure,
+                 "#{host}:#{port}: #{error.class.name} (#{error.errno}): " +
+                 "#{error.message}"
+          rescue SocketError => error
+            fail Errors::ConnectionFailure,
+                 "#{host}:#{port}: #{error.class.name}: #{error.message}"
           end
-          socket
-        rescue Errno::ETIMEDOUT
-          raise Errors::ConnectionFailure,
-                "Timed out connection to Mongo on #{host}:#{port}"
-        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE,
-               Errno::ECONNRESET, IOError => error
-          fail Errors::ConnectionFailure,
-               "#{host}:#{port}: #{error.class.name} (#{error.errno}): " +
-               "#{error.message}"
-        rescue SocketError => error
-          fail Errors::ConnectionFailure,
-               "#{host}:#{port}: #{error.class.name}: #{error.message}"
         end
       end
-    end
 
-    # The EM-Synchrony flavor of Moped::Sockets::TCP
-    class EmTCP < EventMachine::Synchrony::TCPSocket
-      include Connectable
-      attr_accessor :options
-      def alive?
-        !closed?
+      # The EM-Synchrony flavor of Moped::Socket::TCP
+      class EmTCP < EventMachine::Synchrony::TCPSocket
+        include Connectable
+        attr_accessor :options
+        def alive?
+          !closed?
+        end
       end
-    end
 
-    # The EM-Synchrony flavor of Moped::Sockets::SSL
-    class EmSSL < EmTCP
-      def connection_completed
-        @verified = false
-        @cert_store = ssl_options.delete(:cert_store)
-        @cert_store ||= OpenSSL::X509::Store.new
-        if (cert_file = ssl_options.delete(:verify_cert))
-          @cert_store.add_file(cert_file)
+      # The EM-Synchrony flavor of Moped::Socket::SSL
+      class EmSSL < EmTCP
+        def connection_completed
+          @verified = false
+          @cert_store = ssl_options.delete(:cert_store)
+          @cert_store ||= OpenSSL::X509::Store.new
+          if (cert_file = ssl_options.delete(:verify_cert))
+            @cert_store.add_file(cert_file)
+          end
+          start_tls(ssl_options)
         end
-        start_tls(ssl_options)
-      end
 
-      def ssl_verify_peer(pem)
-        return true unless ssl_options[:verify_peer]
-        if (cert = certificate(pem)) && @cert_store.verify(cert)
-          # bypass hostname checking for this cert if it's a CA
-          return true if cert.extensions.find do |e|
-            e.oid == 'basicConstraints' && e.value == 'CA:TRUE'
+        def ssl_verify_peer(pem)
+          return true unless ssl_options[:verify_peer]
+          if (cert = certificate(pem)) && @cert_store.verify(cert)
+            # bypass hostname checking for this cert if it's a CA
+            return true if cert.extensions.find do |e|
+              e.oid == 'basicConstraints' && e.value == 'CA:TRUE'
+            end
+
+            @verified = true if (host = ssl_options[:verify_host]) &&
+              OpenSSL::SSL.verify_certificate_identity(cert, host)
           end
 
-          @verified = true if (host = ssl_options[:verify_host]) &&
-            OpenSSL::SSL.verify_certificate_identity(cert, host)
+          # Always return true.  We will evaluate the certificate chain in
+          # ssl_handshake_completed.
+          true
         end
 
-        # Always return true.  We will evaluate the certificate chain in
-        # ssl_handshake_completed.
-        true
-      end
-
-      def ssl_handshake_completed
-        if ssl_options[:verify_peer] && !@verified
-          unbind 'Failed to verify SSL certificate of peer'
-        else
-          @opening = false
-          @in_req.succeed self
+        def ssl_handshake_completed
+          if ssl_options[:verify_peer] && !@verified
+            unbind 'Failed to verify SSL certificate of peer'
+          else
+            @opening = false
+            @in_req.succeed self
+          end
         end
-      end
 
-      private
+        private
 
-      def ssl_options
-        @ssl_options ||= @options[:ssl] == true ? {} : @options[:ssl] || {}
-      end
+        def ssl_options
+          @ssl_options ||= @options[:ssl] == true ? {} : @options[:ssl] || {}
+        end
 
-      def certificate(pem)
-        OpenSSL::X509::Certificate.new(pem)
-      end
-    end # EmSSL
+        def certificate(pem)
+          OpenSSL::X509::Certificate.new(pem)
+        end
+      end # EmSSL
+    end
   end
 end
+
+puts Moped::Connection::Socket::EmSSL.inspect

data/lib/em-synchrony/moped/node.rb

@@ -7,39 +7,41 @@ require 'fiber'
 module Moped
   # # Our monkey patches to Moped::Node
   class Node
-    alias_method :super_parse_address, :parse_address
-    # Override to support non-blocking DNS requests
-    def parse_address
-      return super_parse_address unless EventMachine.reactor_thread?
-      host, port = address.split(':')
-      @port = (port || 27_017).to_i
+    if Moped::VERSION < "2.0.0"
+      alias_method :super_parse_address, :parse_address
+      # Override to support non-blocking DNS requests
+      def parse_address
+        return super_parse_address unless EventMachine.reactor_thread?
+        host, port = address.split(':')
+        @port = (port || 27_017).to_i
 
-      @ip_address = em_lookup_address(host).grep(/(::){0}/).first
-      fail SocketError unless @ip_address
-      @resolved_address = "#{@ip_address}:#{@port}"
-    rescue Resolv::ResolvError
-      raise SocketError
-    end
+        @ip_address = em_lookup_address(host).grep(/(::){0}/).first
+        fail SocketError unless @ip_address
+        @resolved_address = "#{@ip_address}:#{@port}"
+      rescue Resolv::ResolvError
+        raise SocketError
+      end
 
-    def em_lookup_address(value)
-      # Lookup in /etc/hosts
-      result = []
-      @hosts ||= Resolv::Hosts.new
-      @hosts.send(:each_address, value) { |x| result << x.to_s if x !~ /::/ }
-      return result unless result.empty?
+      def em_lookup_address(value)
+        # Lookup in /etc/hosts
+        result = []
+        @hosts ||= Resolv::Hosts.new
+        @hosts.send(:each_address, value) { |x| result << x.to_s if x !~ /::/ }
+        return result unless result.empty?
 
-      # Nothing, hit DNS
-      fiber = Fiber.current
-      df = EM::DnsResolver.send(:resolve, value)
-      df.callback do |a|
-        fiber.resume(a)
-      end
-      df.errback do |*a|
-        fiber.resume(Resolv::ResolvError.new(a.inspect))
+        # Nothing, hit DNS
+        fiber = Fiber.current
+        df = EM::DnsResolver.send(:resolve, value)
+        df.callback do |a|
+          fiber.resume(a)
+        end
+        df.errback do |*a|
+          fiber.resume(Resolv::ResolvError.new(a.inspect))
+        end
+        result = Fiber.yield
+        fail result if result.is_a?(StandardError)
+        result
       end
-      result = Fiber.yield
-      fail result if result.is_a?(StandardError)
-      result
     end
   end
 end

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

@@ -6,7 +6,7 @@ require 'em-synchrony/moped'
 
 describe Moped::Connection do
   it 'should have patches included' do
-    expect { Moped::Sockets::EmTCP }.not_to raise_error
+    expect { Moped::Connection::Socket::EmTCP }.not_to raise_error
   end
 
   let(:mongod_options) { {} }
@@ -51,7 +51,7 @@ describe Moped::Connection do
 
   context 'evented' do
     include_context 'with em-synchrony'
-    let(:connection_class) { Moped::Sockets::EmTCP }
+    let(:connection_class) { Moped::Connection::Socket::EmTCP }
     include_context 'common connection'
     context 'with ssl' do
       let(:ssl_options) { nil }
@@ -70,7 +70,7 @@ describe Moped::Connection do
         let(:ssl_options) { nil }
         let(:options) { {} }
         it 'should connect (though comms will fail later)' do
-          expect(conn.connect).to be_a(Moped::Sockets::EmTCP)
+          expect(conn.connect).to be_a(Moped::Connection::Socket::EmTCP)
         end
       end
 
@@ -78,21 +78,21 @@ describe Moped::Connection do
         context 'when specifying ssl: true' do
           let(:ssl_options) { true }
           it 'should connect' do
-            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+            expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
           end
         end
 
         context 'when specifying ssl: {}' do
           let(:ssl_options) { {} }
           it 'should connect' do
-            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+            expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
           end
         end
 
         context 'when not verifying peer' do
           let(:ssl_options) { { verify_peer: false } }
           it 'should connect' do
-            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+            expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
           end
         end
 
@@ -149,7 +149,7 @@ describe Moped::Connection do
                 }
               end
               it 'should connect' do
-                expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+                expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
               end
             end
           end # 'and a certificate is provided'
@@ -169,21 +169,21 @@ describe Moped::Connection do
         context 'when specifying ssl: true' do
           let(:ssl_options) { true }
           it 'should connect' do
-            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+            expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
           end
         end
 
         context 'when specifying ssl: {}' do
           let(:ssl_options) { {} }
           it 'should connect' do
-            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+            expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
           end
         end
 
         context 'when not verifying peer' do
           let(:ssl_options) { { verify_peer: false } }
           it 'should connect' do
-            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+            expect(conn.connect).to be_a(Moped::Connection::Socket::EmSSL)
           end
         end
 
@@ -255,7 +255,7 @@ describe Moped::Connection do
 
   context 'threaded' do
     include_context 'without em-synchrony'
-    let(:connection_class) { Moped::Sockets::TCP }
+    let(:connection_class) { Moped::Connection::Socket::TCP }
     include_context 'common connection'
   end
 

data/spec/support/simulated_mongod.rb

@@ -36,7 +36,7 @@ module Moped
           else
             class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def deserialize_#{name}(buffer)
-                self.#{name} = BSON::Document.deserialize(buffer)
+                self.#{name} = BSON::Document.from_bson(buffer)
               end
             RUBY
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony-moped
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Adam Lebsack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,7 @@ files:
 - Rakefile
 - em-synchrony-moped.gemspec
 - lib/em-synchrony/moped.rb
+- lib/em-synchrony/moped/address.rb
 - lib/em-synchrony/moped/cluster.rb
 - lib/em-synchrony/moped/connection.rb
 - lib/em-synchrony/moped/node.rb
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Moped driver for EM-Synchrony
@@ -259,4 +260,3 @@ test_files:
 - spec/ssl/untrusted.key
 - spec/support/contexts.rb
 - spec/support/simulated_mongod.rb
-has_rdoc: