bones-rpc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf1eca258ffb6071f1299db7578fbcc9d98f121
-  data.tar.gz: fe15de1e247f1ef12bdc24520a2b9cf520fadbb8
+  metadata.gz: 64b5fc8956bbbb066be3f8d398bc89cb2027f2be
+  data.tar.gz: 20261b3e59c98eb0693c7bc08f694c85af48f5c5
 SHA512:
-  metadata.gz: 8e2ac1a8610ccfd42c5c9a257cc6cc21e0b2242b1e3582ee9ee0bbd3a73d2f902b29597c88676dc7767e51c2836ce20fd60cb5b1a70875f93dacbed56fe2ae67
-  data.tar.gz: 6acdf3a32e6ab6a2df2a8643f3230e8bf0bd35255ffb7f1b8352fc0ca1a11be8b6d587740533f304587e69fc8c0d6f3917677c72111bc8a2c973ab1b744f6d91
+  metadata.gz: 84314e5a51a7723fd7455eeda8ced426375b5022b8ee2093ebdd50aecafc47345e3bea46d8b11f87c77f393d242e11942a249f0caac005a3112af7efa3fd3790
+  data.tar.gz: 32a75f9c693b9de01ffbb4f77d6ba25dcc799af9ded5f4686a5414c6b323c421813cf3597b3be7b27e4fc8ebe3d6bc9054f86c3057f35104b31c4648d4d720db

data/.ruby-gemset

@@ -1 +1 @@
-bones
+bones-rpc

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.0.0

data/bones-rpc.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "bones-rpc"
   spec.version       = Bones::RPC::VERSION
   spec.authors       = ["Andrew Bennett"]
-  spec.email         = ["andrew@delorum.com"]
+  spec.email         = ["andrew@pagodabox.com"]
   spec.description   = %q{Bones::RPC client for ruby}
   spec.summary       = %q{Bones::RPC client for ruby}
   spec.homepage      = ""
@@ -18,9 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "celluloid-io", ">= 0.14.0"
-  spec.add_dependency "erlang-etf"
-  spec.add_dependency "msgpack"
   spec.add_dependency "optionable"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/bones/rpc.rb

@@ -3,12 +3,12 @@ require 'logger'
 require 'stringio'
 require 'monitor'
 require 'timeout'
-require 'celluloid/io'
 require 'optionable'
 require 'bones/rpc/errors'
 require 'bones/rpc/loggable'
 require 'bones/rpc/uri'
 require 'bones/rpc/adapter'
+require 'bones/rpc/backend'
 require 'bones/rpc/parser'
 require 'bones/rpc/protocol'
 require 'bones/rpc/session'

data/lib/bones/rpc/adapter.rb

@@ -27,6 +27,50 @@ module Bones
         return adapter
       end
 
+      def read_ext(buffer)
+        ext_code, = buffer.read(1).unpack('C')
+        ext_length, = case ext_code
+        when 0xC7
+          buffer.read(1).unpack('C')
+        when 0xC8
+          buffer.read(2).unpack('n')
+        when 0xC9
+          buffer.read(4).unpack('N')
+        end
+        ext_type, = buffer.read(1).unpack('c')
+        ext_data = buffer.read(ext_length)
+        return ext_data
+      end
+
+      def write_ext(head, data, buffer = "")
+        ext_length = data.bytesize + 1
+        ext_code = if ext_length <= 0xFF
+          0xC7
+        elsif ext_length <= 0xFFFF
+          0xC8
+        elsif ext_length <= 0xFFFFFFFF
+          0xC9
+        else
+          raise ArgumentError, "datasize too large: #{ext_length} (max #{0xFFFFFFFF} bytes)"
+        end
+        buffer << [ext_code].pack('C')
+        ext_length_packer = case ext_code
+        when 0xC7
+          'C'
+        when 0xC8
+          'n'
+        when 0xC9
+          'N'
+        else
+          raise ArgumentError, "bad ext_code: #{ext_code} (should be one of #{0xC7}, #{0xC8}, #{0xC9})"
+        end
+        buffer << [ext_length].pack(ext_length_packer)
+        ext_type = 0x0D
+        buffer << [ext_type].pack('c')
+        buffer << [head].pack('C')
+        buffer << data.force_encoding('BINARY')
+      end
+
       private
 
       def adapters
@@ -41,9 +85,5 @@ module Bones
 end
 
 require 'bones/rpc/adapter/parser'
-
 require 'bones/rpc/adapter/base'
-
-require 'bones/rpc/adapter/erlang'
 require 'bones/rpc/adapter/json'
-require 'bones/rpc/adapter/msgpack'

data/lib/bones/rpc/adapter/json.rb

@@ -16,6 +16,72 @@ module Bones
           ::JSON.load(buffer)
         end
 
+        def unpacker(data)
+          Unpacker.new(data)
+        end
+
+        def parser(data)
+          Adapter::Parser.new(self, data)
+        end
+
+        def unpacker_pos(parser)
+          parser.unpacker.buffer.pos
+        end
+
+        def unpacker_seek(parser, n)
+          parser.unpacker.buffer.seek(n)
+          return n
+        end
+
+        # I apologize for how nasty this unpacker is; Oj or Yajl would be better fits
+        class Unpacker
+          attr_reader :buffer
+
+          ARRAY_START = '['.freeze
+
+          def initialize(data)
+            @buffer = Bones::RPC::Parser::Buffer.new(data)
+          end
+
+          def read
+            if skip_to_array_start
+              unpack_stream("", buffer.pos)
+            else
+              nil
+            end
+          end
+
+          private
+
+          def unpack_stream(temp, pos)
+            if char = buffer.getc
+              temp << char
+              term = begin
+                ::JSON.load(temp)
+              rescue ::JSON::ParserError
+                unpack_stream(temp, pos)
+              end
+              return term
+            else
+              buffer.seek(pos)
+              return nil
+            end
+          end
+
+          def skip_to_array_start
+            i = buffer.pos
+            case buffer.getc
+            when ARRAY_START
+              buffer.seek(i)
+              return true
+            when nil
+              return false
+            else
+              skip_to_array_start
+            end
+          end
+        end
+
         Adapter.register self
       end
     end

data/lib/bones/rpc/address.rb

@@ -1,10 +1,12 @@
 # encoding: utf-8
+require 'bones/rpc/dns_resolver'
+
 module Bones
   module RPC
 
     # Encapsulates behaviour around addresses and resolving dns.
     #
-    # @since 2.0.0
+    # @since 0.0.1
     class Address
 
       # @!attribute host
@@ -26,7 +28,7 @@ module Bones
       #
       # @param [ String ] address The host:port pair as a string.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def initialize(address, port = nil)
         if address.is_a?(Bones::RPC::Address)
           @host     = address.host
@@ -97,7 +99,7 @@ module Bones
       #
       # @return [ String ] The resolved address.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def resolve(node)
         begin
           resolve! unless valid?
@@ -151,7 +153,7 @@ module Bones
 
         # Guess it's not an IP address, so let's try DNS
         unless @ip
-          addrs = Array(::Celluloid::IO::DNSResolver.new.resolve(@host))
+          addrs = Array(::Bones::RPC::DNSResolver.new.resolve(@host))
           raise Resolv::ResolvError, "DNS result has no information for #{@host}" if addrs.empty?
 
           # Pseudorandom round-robin DNS support :/

data/lib/bones/rpc/backend.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+module Bones
+  module RPC
+    module Backend
+      extend self
+
+      def get(backend_name)
+        backends[backend_name] || raise(Errors::InvalidBackend, "Unknown backend #{backend_name.inspect}")
+      end
+
+      def register(backend)
+        backend.send(:attr_reader, :backend_name)
+        backend.send(:include, Backend::Base)
+        backend.send(:extend, backend)
+        backends[backend] ||= backend
+        backends[backend.backend_name] ||= backend
+        backends[backend.backend_name.to_s] ||= backend
+        return backend
+      end
+
+      private
+
+      def backends
+        @backends ||= {}
+      end
+    end
+  end
+end
+
+require 'bones/rpc/backend/base'
+require 'bones/rpc/backend/synchronous'

data/lib/bones/rpc/backend/base.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Bones
+  module RPC
+    module Backend
+      module Base
+
+        def backend_name
+          raise NotImplementedError, "Backend #{self.name} does not implement #backend_name"
+        end
+
+        def setup
+          raise NotImplementedError, "Backend #{self.name} does not implement #setup"
+        end
+
+        def connection_class
+          raise NotImplementedError, "Backend #{self.name} does not implement #connection_class"
+        end
+
+        def future_class
+          raise NotImplementedError, "Backend #{self.name} does not implement #future_class"
+        end
+
+        def node_class
+          raise NotImplementedError, "Backend #{self.name} does not implement #node_class"
+        end
+
+      end
+    end
+  end
+end

data/lib/bones/rpc/backend/synchronous.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module Bones
+  module RPC
+    module Backend
+      module Synchronous
+
+        @backend_name = :synchronous
+
+        def setup
+          require 'bones/rpc/synchronous'
+        end
+
+        def connection_class
+          ::Bones::RPC::Synchronous::Connection
+        end
+
+        def future_class
+          ::Bones::RPC::Synchronous::Future
+        end
+
+        def node_class
+          ::Bones::RPC::Synchronous::Node
+        end
+
+        Backend.register self
+      end
+    end
+  end
+end

data/lib/bones/rpc/cluster.rb

@@ -7,22 +7,22 @@ module Bones
     # The cluster represents a cluster of MongoDB server nodes, either a single
     # node, a replica set, or a mongos server.
     #
-    # @since 1.0.0
+    # @since 0.0.1
     class Cluster
 
       # The default interval that a node would be flagged as "down".
       #
-      # @since 2.0.0
+      # @since 0.0.1
       DOWN_INTERVAL = 30
 
       # The default interval that a node should be refreshed in.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       REFRESH_INTERVAL = 300
 
       # The default time to wait to retry an operation.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       RETRY_INTERVAL = 0.25
 
       # @!attribute options
@@ -39,7 +39,7 @@ module Bones
       #
       # @return [ true ] True if the disconnect succeeded.
       #
-      # @since 1.2.0
+      # @since 0.0.1
       def disconnect
         nodes.each { |node| node.disconnect } and true
       end
@@ -52,7 +52,7 @@ module Bones
       #
       # @return [ Integer ] The down interval.
       #
-      # @since 1.2.7
+      # @since 0.0.1
       def down_interval
         @down_interval ||= options[:down_interval] || DOWN_INTERVAL
       end
@@ -75,10 +75,10 @@ module Bones
       # @option options [ Integer ] :timeout The time in seconds to wait for an
       #   operation to timeout. (5)
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def initialize(session, hosts)
         @session = session
-        @seeds = hosts.map { |host| Node.new(self, Address.new(host)) }
+        @seeds = hosts.map { |host| session.backend.node_class.new(self, Address.new(host)) }
         @peers = []
       end
 
@@ -89,7 +89,7 @@ module Bones
       #
       # @return [ String ] A nicely formatted string.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def inspect
         "#<#{self.class.name}:#{object_id} @seeds=#{seeds.inspect}>"
       end
@@ -102,7 +102,7 @@ module Bones
       #
       # @return [ Integer ] The max retries.
       #
-      # @since 1.2.7
+      # @since 0.0.1
       def max_retries
         @max_retries ||= options[:max_retries] || seeds.size
       end
@@ -116,7 +116,7 @@ module Bones
       #
       # @return [ Array<Node> ] the list of available nodes.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def nodes
         # Find the nodes that were down but are ready to be refreshed, or those
         # with stale connection information.
@@ -153,7 +153,7 @@ module Bones
       #
       # @return [ Array<Node> ] the available nodes
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def refresh(nodes_to_refresh = seeds)
         refreshed_nodes = []
         seen = {}
@@ -184,7 +184,7 @@ module Bones
       #
       # @return [ Integer ] The refresh interval.
       #
-      # @since 1.2.7
+      # @since 0.0.1
       def refresh_interval
         @refresh_interval ||= options[:refresh_interval] || REFRESH_INTERVAL
       end
@@ -197,7 +197,7 @@ module Bones
       #
       # @return [ Integer ] The retry interval.
       #
-      # @since 1.2.7
+      # @since 0.0.1
       def retry_interval
         @retry_interval ||= options[:retry_interval] || RETRY_INTERVAL
       end
@@ -213,7 +213,7 @@ module Bones
       #
       # @return [ Time ] The down boundary.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def down_boundary
         Time.new - down_interval
       end
@@ -227,7 +227,7 @@ module Bones
       #
       # @return [ Time ] The refresh boundary.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def refresh_boundary
         Time.new - refresh_interval
       end
@@ -243,7 +243,7 @@ module Bones
       #
       # @param [ Node ] node The Node to check.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def refreshable?(node)
         node.down? ? node.down_at < down_boundary : node.needs_refresh?(refresh_boundary)
       end
@@ -257,7 +257,7 @@ module Bones
       #
       # @return [ Cluster ] The cloned cluster.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def initialize_copy(_)
         @seeds = seeds.map(&:dup)
       end