bones-rpc 0.0.2 → 0.0.3

data/lib/bones/rpc/connection.rb

@@ -1,23 +1,29 @@
 # encoding: utf-8
-require 'bones/rpc/connection/reader'
 require 'bones/rpc/connection/socket'
-require 'bones/rpc/connection/writer'
 
 module Bones
   module RPC
 
     # This class contains behaviour of Bones::RPC socket connections.
     #
-    # @since 2.0.0
+    # @since 0.0.1
     class Connection
 
       # The default connection timeout, in seconds.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       TIMEOUT = 5
 
       attr_reader :node, :socket
 
+      def self.writer_class(klass = nil)
+        if klass.nil?
+          @writer_class
+        else
+          @writer_class = klass
+        end
+      end
+
       # Is the connection alive?
       #
       # @example Is the connection alive?
@@ -25,7 +31,7 @@ module Bones
       #
       # @return [ true, false ] If the connection is alive.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def alive?
         connected? ? @socket.alive? : false
       end
@@ -45,16 +51,16 @@ module Bones
       #
       # @return [ TCPSocket ] The socket.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def connect
         if @writer
           @writer.terminate
           @writer = nil
         end
         @socket = if !!options[:ssl]
-          Socket::SSL.connect(host, port, timeout)
+          self.class::Socket::SSL.connect(host, port, timeout)
         else
-          Socket::TCP.connect(host, port, timeout)
+          self.class::Socket::TCP.connect(host, port, timeout)
         end
         writer
         return true
@@ -67,7 +73,7 @@ module Bones
       #
       # @return [ true, false ] If the connection is connected.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def connected?
         !!@socket
       end
@@ -79,7 +85,7 @@ module Bones
       #
       # @return [ nil ] nil.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def disconnect
         @socket.close
       rescue
@@ -113,9 +119,7 @@ module Bones
       end
 
       def write(operations)
-        with_connection do |socket|
-          writer.write(operations)
-        end
+        raise NotImplementedError, "Connection#write not implemented for this backend"
       end
 
       private
@@ -132,14 +136,14 @@ module Bones
       #
       # @return The yielded block
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def with_connection
         connect if @socket.nil? || !@socket.alive?
         yield @socket
       end
 
       def writer
-        @writer ||= Writer.new(self, @socket, node.adapter)
+        @writer ||= self.class.writer_class.new(self, @socket, node.adapter)
       end
     end
   end

data/lib/bones/rpc/connection/socket.rb

@@ -1,4 +1,2 @@
 # encoding: utf-8
 require 'bones/rpc/connection/socket/connectable'
-require 'bones/rpc/connection/socket/ssl'
-require 'bones/rpc/connection/socket/tcp'

data/lib/bones/rpc/connection/socket/connectable.rb

@@ -14,7 +14,7 @@ module Bones
           #
           # @return [ true, false ] If the socket is alive.
           #
-          # @since 1.0.0
+          # @since 0.0.1
           def alive?
             io = to_io
             if Kernel::select([ io ], nil, [ io ], 0)
@@ -33,7 +33,7 @@ module Bones
           #
           # @param [ Class ] klass The class including the module.
           #
-          # @since 1.3.0
+          # @since 0.0.1
           def self.included(klass)
             klass.send(:extend, ClassMethods)
           end
@@ -45,7 +45,7 @@ module Bones
           #
           # @return [ Object ] The data.
           #
-          # @since 1.2.0
+          # @since 0.0.1
           def read(size = nil, buf = nil)
             check_if_alive!
             handle_socket_errors { super }
@@ -58,7 +58,7 @@ module Bones
           #
           # @return [ Object ] The data.
           #
-          # @since 1.2.0
+          # @since 0.0.1
           def readpartial(maxlen, buf = nil)
             check_if_alive!
             handle_socket_errors { super }
@@ -68,9 +68,13 @@ module Bones
           #
           # @param [ String ] string The encoding.
           #
-          # @since 1.3.0
+          # @since 0.0.1
           def set_encoding(string)
-            to_io.set_encoding(string)
+            if to_io != self
+              to_io.set_encoding(string)
+            else
+              super
+            end
           end
 
           # Write to the socket.
@@ -82,7 +86,7 @@ module Bones
           #
           # @return [ Integer ] The number of bytes written.
           #
-          # @since 1.0.0
+          # @since 0.0.1
           def write(*args)
             check_if_alive!
             handle_socket_errors { super }
@@ -100,7 +104,7 @@ module Bones
           #
           # @raise [ ConnectionFailure ] If the connectable is not alive.
           #
-          # @since 1.4.0
+          # @since 0.0.1
           def check_if_alive!
             unless alive?
               raise Errors::ConnectionFailure, "Socket connection was closed by remote host"
@@ -119,7 +123,7 @@ module Bones
           #
           # @return [ String ] The error message.
           #
-          # @since 1.4.0
+          # @since 0.0.1
           def generate_message(error)
             "#{host}:#{port}: #{error.class.name} (#{error.errno}): #{error.message}"
           end
@@ -140,7 +144,7 @@ module Bones
           #
           # @return [ Object ] The result of the yield.
           #
-          # @since 1.0.0
+          # @since 0.0.1
           def handle_socket_errors
             yield
           rescue Errno::ECONNREFUSED => e
@@ -172,7 +176,7 @@ module Bones
             #
             # @return [ TCPSocket ] The socket.
             #
-            # @since 1.0.0
+            # @since 0.0.1
             def connect(host, port, timeout)
               begin
                 Timeout::timeout(timeout) do

data/lib/bones/rpc/context.rb

@@ -5,7 +5,7 @@ module Bones
     # The class for interacting with a MongoDB database. One only interacts with
     # this class indirectly through a session.
     #
-    # @since 1.0.0
+    # @since 0.0.1
     class Context
       include Readable
 
@@ -21,7 +21,7 @@ module Bones
       # @param [ Session ] session The session.
       # @param [ String, Symbol ] name The name of the database.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def initialize(session)
         @session = session
       end

data/lib/bones/rpc/dns_resolver.rb

@@ -0,0 +1,85 @@
+require 'resolv'
+
+module Bones
+  module RPC
+    class DNSResolver
+      RESOLV_CONF = '/etc/resolv.conf'
+      DNS_PORT    = 53
+
+      @mutex = Mutex.new
+      @identifier = 1
+
+      def self.generate_id
+        @mutex.synchronize { @identifier = (@identifier + 1) & 0xFFFF }
+      end
+
+      def self.nameservers(config = RESOLV_CONF)
+        File.read(config).scan(/^\s*nameserver\s+([0-9.:]+)/).flatten
+      end
+
+      def initialize
+        @nameservers = self.class.nameservers
+
+        # TODO: fall back on other nameservers if the first one is unavailable
+        @server = @nameservers.first
+
+        @socket = UDPSocket.new
+      end
+
+      def resolve(hostname)
+        if host = resolve_hostname(hostname)
+          unless ip_address = resolve_host(host)
+            raise Resolv::ResolvError, "invalid entry in hosts file: #{host}"
+          end
+          return ip_address
+        end
+
+        query = build_query(hostname)
+        @socket.send query.encode, 0, @server, DNS_PORT
+        data, _ = @socket.recvfrom(512)
+        response = Resolv::DNS::Message.decode(data)
+
+        addrs = []
+        # The answer might include IN::CNAME entries so filters them out
+        # to include IN::A & IN::AAAA entries only.
+        response.each_answer { |name, ttl, value| addrs << value.address if value.respond_to?(:address) }
+
+        return if addrs.empty?
+        return addrs.first if addrs.size == 1
+        addrs
+      end
+
+      private
+
+      def resolve_hostname(hostname)
+        # Resolv::Hosts#getaddresses pushes onto a stack
+        # so since we want the first occurance, simply
+        # pop off the stack.
+        resolv.getaddresses(hostname).pop rescue nil
+      end
+
+      def resolv
+        @resolv ||= Resolv::Hosts.new
+      end
+
+      def build_query(hostname)
+        Resolv::DNS::Message.new.tap do |query|
+          query.id = self.class.generate_id
+          query.rd = 1
+          query.add_question hostname, Resolv::DNS::Resource::IN::A
+        end
+      end
+
+      def resolve_host(host)
+        resolve_ip(Resolv::IPv4, host) || resolve_ip(Resolv::IPv6, host)
+      end
+
+      def resolve_ip(klass, host)
+        begin
+          klass.create(host)
+        rescue ArgumentError
+        end
+      end
+    end
+  end
+end

data/lib/bones/rpc/errors.rb

@@ -21,6 +21,9 @@ module Bones
       # Raised when an Adapter is invalid.
       class InvalidAdapter < StandardError; end
 
+      # Raised when an Backend is invalid.
+      class InvalidBackend < StandardError; end
+
       # Raised when a Bones::RPC URI is invalid.
       class InvalidBonesRPCURI < StandardError; end
 

data/lib/bones/rpc/failover.rb

@@ -9,13 +9,13 @@ module Bones
     # Provides behaviour around failover scenarios for different types of
     # exceptions that get raised on connection and execution of operations.
     #
-    # @since 2.0.0
+    # @since 0.0.1
     module Failover
       extend self
 
       # Hash lookup for the failover classes based off the exception type.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       STRATEGIES = {
         Errors::ConnectionFailure => Retry
       }.freeze
@@ -29,7 +29,7 @@ module Bones
       #
       # @return [ Object ] The failover handler.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def get(exception)
         STRATEGIES.fetch(exception.class, Disconnect)
       end

data/lib/bones/rpc/failover/disconnect.rb

@@ -6,7 +6,7 @@ module Bones
       # Disconnect is for the case when we get exceptions we do not know about,
       # and need to disconnect the node to cleanup the problem.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       module Disconnect
         extend self
 
@@ -22,7 +22,7 @@ module Bones
         #
         # @raise [ Errors::SocketError ] The extended exception that was thrown.
         #
-        # @since 2.0.0
+        # @since 0.0.1
         def execute(exception, node)
           node.disconnect
           raise(exception.extend(Errors::SocketError))

data/lib/bones/rpc/failover/ignore.rb

@@ -6,7 +6,7 @@ module Bones
       # Ignore is for the case when we get exceptions we deem are proper user
       # or datbase errors and should be re-raised.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       module Ignore
         extend self
 
@@ -21,7 +21,7 @@ module Bones
         #
         # @raise [ Exception ] The exception that was previously thrown.
         #
-        # @since 2.0.0
+        # @since 0.0.1
         def execute(exception, node)
           raise(exception)
         end

data/lib/bones/rpc/failover/retry.rb

@@ -6,7 +6,7 @@ module Bones
       # Retry is for the case when we get exceptions around the connection, and
       # want to make another attempt to try and resolve the issue.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       module Retry
         extend self
 
@@ -23,7 +23,7 @@ module Bones
         #
         # @return [ Object ] The result of the block yield.
         #
-        # @since 2.0.0
+        # @since 0.0.1
         def execute(exception, node)
           node.disconnect
           begin

data/lib/bones/rpc/instrumentable.rb

@@ -8,12 +8,12 @@ module Bones
 
       # The name of the topic of operations for Bones::RPC.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       TOPIC = "bones-rpc.operations"
 
       # Topic for warning instrumentation.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       WARN = "bones-rpc.warn"
 
       # @!attribute instrumenter
@@ -32,7 +32,7 @@ module Bones
       #
       # @return [ Object ] The result of the yield.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def instrument(name, payload = {}, &block)
         instrumenter.instrument(name, payload, &block)
       end

data/lib/bones/rpc/instrumentable/log.rb

@@ -6,7 +6,7 @@ module Bones
       # Provides logging instrumentation for compatibility with active support
       # notifications.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       class Log
 
         class << self
@@ -21,7 +21,7 @@ module Bones
           #
           # @return [ Object ] The result of the yield.
           #
-          # @since 2.0.0
+          # @since 0.0.1
           def instrument(name, payload = {})
             started = Time.new
             begin

data/lib/bones/rpc/instrumentable/noop.rb

@@ -5,7 +5,7 @@ module Bones
 
       # Does not instrument anything, just yields.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       class Noop
 
         class << self
@@ -22,7 +22,7 @@ module Bones
           #
           # @return [ Object ] The result of the yield.
           #
-          # @since 2.0.0
+          # @since 0.0.1
           def instrument(name, payload = {})
             yield payload if block_given?
           end