em-synchrony-moped 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA5NjIzNDY3MzZiYzk1MTU4ODRmMGE5Mjg3MjcxMWNkYzYxNzAyOA==
+    M2YxNzAyOGQzNGE4NWYwYTQ0ODBiNmYxNDZiNjI1YmM0NGQwMDczMg==
   data.tar.gz: !binary |-
-    ZjM0ZTVjMTEyZmY0NWZhYTBjNTgyMTFkY2ZjNTNiODAxNmI1MjA5Yg==
+    Y2Y3MjAwZTI1YTJjMzdmNTNhN2M1ZDJhZTU3ZDVkMTg5ZTFhNTY5MQ==
 SHA512:
   metadata.gz: !binary |-
-    OGM1MWY4YTBjNzY3ZWIzMDhmZjI0ZjBhYWM4NTM1MTU2YzVhMzdkNmJlOWFj
-    N2IzNDk1MTFiZGMyMGYyNmUwNmRlMmJkMWUwNzMwNWUyYTEyYTczNTEzNmRh
-    YjVkNzU5YjliYzU1Zjc5OTE4YTIxMGM5M2IwZTk5NzNmYjQ0MWE=
+    YTU3MDgwNDVjOTFlNmM2ZmY3NjI5NmE0MTQwNWYwYzE2MDIwMmQ2ZmJhODkz
+    YWU3ZTgxMmNlNmMyNTUxMGYzNGFhMGIyYzdkYzIzZGZhZmYwYWEwOTFkZmUw
+    YWIwNTFhYjdlZGUyMDQyMjEzYTk5OTZmZGMyMTA3ZGNlYWZmN2Y=
   data.tar.gz: !binary |-
-    OTAzYjhhMGZmMDVkZmFiMzdhNTUzMDA4ZTkwYjM4YWM4N2ZiZDFmOGViZGY3
-    ZDQwZTNkOTAwYWVhMjNjNzM4ZDcwNTkyYmJhNGU5OWUzM2QzMmRmMzQyODgy
-    ZDY0ZTVmNTU3MDU0NDBlMDVmODc2NTIzZmE4NDdmN2U5ODE3Yzk=
+    NzE0MTU3YjQwNjk4OGYwOGVmNzZkZTY1ZGU3NTkyMDdhZGNlNDVlNDc5MGU2
+    NzU5N2RkMTcxNzg4MGIwOGVjMzE2MzJmMDQzNTM0MmI1ZjVlNDgyOWRkZTQ0
+    YzNhMWYwNzk4MmNmM2FmMTdlMzdlMzZjNGUyMzQyOGJkMDA3OWQ=

data/em-synchrony-moped.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'em-synchrony-moped'
-  s.version = "2.0.0.beta.1"
+  s.version = "2.0.0.beta.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Lebsack"]

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

@@ -1,4 +1,9 @@
 # encoding: utf-8
+
+require 'moped/address'
+require 'em-dns-resolver'
+require 'fiber'
+
 module Moped
   class Address
 
@@ -20,8 +25,6 @@ module Moped
     end
 
     def em_each_address(value)
-      puts "em_each_address: #{value.inspect}"
-
       # Lookup in /etc/hosts
       result = []
       @hosts ||= Resolv::Hosts.new

data/lib/em-synchrony/moped.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'em-synchrony'
+require 'em-synchrony/moped/address'
 require 'em-synchrony/moped/cluster'
-require 'em-synchrony/moped/node'
 require 'em-synchrony/moped/connection'
-require 'em-synchrony/moped/address'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony-moped
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Adam Lebsack
@@ -212,7 +212,6 @@ files:
 - lib/em-synchrony/moped/address.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

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

@@ -1,47 +0,0 @@
-# encoding: utf-8
-
-require 'moped/node'
-require 'em-dns-resolver'
-require 'fiber'
-
-module Moped
-  # # Our monkey patches to Moped::Node
-  class Node
-    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
-
-      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))
-        end
-        result = Fiber.yield
-        fail result if result.is_a?(StandardError)
-        result
-      end
-    end
-  end
-end