bones-rpc 0.0.2 → 0.0.3

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

@@ -0,0 +1,91 @@
+# encoding: utf-8
+require 'thread'
+
+module Bones
+  module RPC
+    module Synchronous
+      class Future
+
+        def initialize
+          @start = Time.now
+          @mutex = Mutex.new
+          @ready = false
+          @result = nil
+          @forwards = nil
+        end
+
+        # Check if this future has a value yet
+        def ready?
+          @ready
+        end
+
+        # Obtain the value for this Future
+        def value(timeout = nil)
+          ready = result = nil
+
+          begin
+            @mutex.lock
+
+            if @ready
+              ready = true
+              result = @result
+            end
+          ensure
+            @mutex.unlock
+          end
+
+          unless ready
+            if timeout
+              raise TimeoutError, "Timeout not supported by Bones::RPC::Synchronous backend"
+            end
+          end
+
+          if result
+            result.value
+          else
+            raise TimeoutError, "Timeout not supported by Bones::RPC::Synchronous backend"
+          end
+        end
+        alias_method :call, :value
+
+        # Signal this future with the given result value
+        def signal(value)
+          @stop = Time.now
+          result = Result.new(value, self)
+
+          @mutex.synchronize do
+            raise "the future has already happened!" if @ready
+
+            @result = result
+            @ready = true
+          end
+        end
+        alias_method :<<, :signal
+
+        # Inspect this Bones::RPC::Synchronous::Future
+        alias_method :inspect, :to_s
+
+        def runtime
+          if @stop
+            @stop - @start
+          else
+            Time.now - @start
+          end
+        end
+
+        # Wrapper for result values to distinguish them in mailboxes
+        class Result
+          attr_reader :future
+
+          def initialize(result, future)
+            @result, @future = result, future
+          end
+
+          def value
+            @result.value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# encoding: utf-8
+require 'bones/rpc/node'
+require 'bones/rpc/synchronous/connection'
+require 'bones/rpc/synchronous/future'
+require 'thread'
+
+module Bones
+  module RPC
+    module Synchronous
+
+      # Represents a client to a node in a server cluster.
+      #
+      # @since 0.0.1
+      class Node < ::Bones::RPC::Node
+        # Compatability with Celluloid
+        def abort(cause)
+          raise cause
+        end
+
+        def async
+          self
+        end
+
+        def current_actor
+          self
+        end
+
+        def connection
+          @mutex.synchronize do
+            if block_given?
+              yield @connection
+            else
+              @connection
+            end
+          end
+        end
+
+        def initialize(*args)
+          @mutex = ::Mutex.new
+          super(*args)
+        end
+      end
+    end
+  end
+end

data/lib/bones/rpc/uri.rb

@@ -4,52 +4,52 @@ module Bones
 
     # Parses Bones::RPC uri
     #
-    # @since 1.3.0
+    # @since 0.0.1
     class Uri
 
       # Get the scheme pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       SCHEME = /(bones-rpc:\/\/)/
 
       # The user name pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       USER = /([-.\w:]+)/
 
       # The password pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       PASS = /([^@,]+)/
 
       # The nodes pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       NODES = /((([-.\w]+)(?::(\w+))?,?)+)/
 
       # The database pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       DATABASE = /(?:\/([-\w]+))?/
 
       # The options pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       OPTIONS  = /(?:\?(.+))/
 
       # The full URI pattern.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       URI = /#{SCHEME}(#{USER}:#{PASS}@)?#{NODES}#{DATABASE}#{OPTIONS}?/
 
       # The options that have to do with write concerns.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       WRITE_OPTIONS = [ "w", "j", "fsync", "wtimeout" ].freeze
 
       # The mappings from read preferences in the URI to Bones::RPC's.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       READ_MAPPINGS = {
         "nearest" => :nearest,
         "primary" => :primary,
@@ -69,7 +69,7 @@ module Bones
       #
       # @return [ true, false ] If authorization is provided.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def auth_provided?
         !username.nil? && !password.nil?
       end
@@ -81,7 +81,7 @@ module Bones
       #
       # @return [ String ] The database.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def database
         @database ||= match[9]
       end
@@ -93,7 +93,7 @@ module Bones
       #
       # @return [ Array<String> ] The hosts.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def hosts
         @hosts ||= match[5].split(",")
       end
@@ -105,7 +105,7 @@ module Bones
       #
       # @param [ String ] string The uri string.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def initialize(string)
         @match = string.match(URI)
         invalid_uri!(string) unless @match
@@ -118,7 +118,7 @@ module Bones
       #
       # @param [ String ] Invalid string
       #
-      # @since 1.3.1
+      # @since 0.0.1
       def invalid_uri!(string)
         scrubbed = string.gsub(/[^:]+@/, '<password>@')
         raise Errors::InvalidBonesRPCURI, "The provided connection string is not a value URI: #{scrubbed}"
@@ -134,7 +134,7 @@ module Bones
       #
       # @return [ Hash ] Options hash usable by Moped
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def options
         options_string, options = match[10], {}
         unless options_string.nil?
@@ -159,7 +159,7 @@ module Bones
       #
       # @return [ String ] The password.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def password
         @password ||= match[4]
       end
@@ -171,7 +171,7 @@ module Bones
       #
       # @return [ Hash ] The uri as options.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def to_hash
         config = { database: database, hosts: hosts }
         if username && password
@@ -187,7 +187,7 @@ module Bones
       #
       # @return [ Array ] Array of arguments usable by bones_rpc
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def bones_rpc_arguments
         [ hosts, options ]
       end
@@ -199,7 +199,7 @@ module Bones
       #
       # @return [ String ] The username.
       #
-      # @since 1.3.0
+      # @since 0.0.1
       def username
         @username ||= match[3]
       end

data/lib/bones/rpc/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Bones
   module RPC
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bones-rpc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Bennett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: erlang-etf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: optionable
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +54,7 @@ dependencies:
         version: '0'
 description: Bones::RPC client for ruby
 email:
-- andrew@delorum.com
+- andrew@pagodabox.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -113,26 +71,23 @@ files:
 - lib/bones/rpc.rb
 - lib/bones/rpc/adapter.rb
 - lib/bones/rpc/adapter/base.rb
-- lib/bones/rpc/adapter/erlang.rb
 - lib/bones/rpc/adapter/json.rb
-- lib/bones/rpc/adapter/msgpack.rb
 - lib/bones/rpc/adapter/parser.rb
 - lib/bones/rpc/address.rb
+- lib/bones/rpc/backend.rb
+- lib/bones/rpc/backend/base.rb
+- lib/bones/rpc/backend/synchronous.rb
 - lib/bones/rpc/cluster.rb
 - lib/bones/rpc/connection.rb
-- lib/bones/rpc/connection/reader.rb
 - lib/bones/rpc/connection/socket.rb
 - lib/bones/rpc/connection/socket/connectable.rb
-- lib/bones/rpc/connection/socket/ssl.rb
-- lib/bones/rpc/connection/socket/tcp.rb
-- lib/bones/rpc/connection/writer.rb
 - lib/bones/rpc/context.rb
+- lib/bones/rpc/dns_resolver.rb
 - lib/bones/rpc/errors.rb
 - lib/bones/rpc/failover.rb
 - lib/bones/rpc/failover/disconnect.rb
 - lib/bones/rpc/failover/ignore.rb
 - lib/bones/rpc/failover/retry.rb
-- lib/bones/rpc/future.rb
 - lib/bones/rpc/instrumentable.rb
 - lib/bones/rpc/instrumentable/log.rb
 - lib/bones/rpc/instrumentable/noop.rb
@@ -155,6 +110,15 @@ files:
 - lib/bones/rpc/read_preference/selectable.rb
 - lib/bones/rpc/readable.rb
 - lib/bones/rpc/session.rb
+- lib/bones/rpc/synchronous.rb
+- lib/bones/rpc/synchronous/connection.rb
+- lib/bones/rpc/synchronous/connection/reader.rb
+- lib/bones/rpc/synchronous/connection/socket.rb
+- lib/bones/rpc/synchronous/connection/socket/ssl.rb
+- lib/bones/rpc/synchronous/connection/socket/tcp.rb
+- lib/bones/rpc/synchronous/connection/writer.rb
+- lib/bones/rpc/synchronous/future.rb
+- lib/bones/rpc/synchronous/node.rb
 - lib/bones/rpc/uri.rb
 - lib/bones/rpc/version.rb
 homepage: ''

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

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require 'erlang/etf'
-
-module Bones
-  module RPC
-    module Adapter
-      module Erlang
-
-        @adapter_name = :erlang
-
-        def pack(message, buffer="")
-          data = ::Erlang.term_to_binary(message)
-          len = data.bytesize
-          buffer << [len].pack('N')
-          buffer << data
-        end
-
-        def unpack(buffer)
-          len, = buffer.read(4).unpack('N')
-          data = buffer.read(len)
-          ::Erlang.binary_to_term(data)
-        end
-
-        Adapter.register self
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-# encoding: utf-8
-require 'msgpack'
-
-module Bones
-  module RPC
-    module Adapter
-      module MessagePack
-
-        @adapter_name = :msgpack
-
-        def pack(message, buffer="")
-          buffer << ::MessagePack.pack(message)
-        end
-
-        def unpack(buffer)
-          ::MessagePack.unpack(buffer)
-        end
-
-        def unpack_stream(stream)
-          buffer = StringIO.new(stream)
-          ::MessagePack::Unpacker.new(buffer).read
-        end
-
-        def read(unpacker)
-          (unpacker.adapter_unpacker ||= ::MessagePack::Unpacker.new(unpacker.buffer)).read
-        end
-
-        def unpacker(data)
-          ::MessagePack::Unpacker.new(StringIO.new(data))
-        end
-
-        def parser(data)
-          Adapter::Parser.new(self, data)
-        end
-
-        def unpacker_pos(parser)
-          size = parser.unpacker.buffer.size
-          pos  = parser.unpacker.buffer.io.pos
-          (pos > size) ? (pos - size) : 0
-        end
-
-        def unpacker_seek(parser, n)
-          pos = unpacker_pos(parser)
-          parser.unpacker.buffer.skip(n - pos) if pos < n
-          return pos
-        end
-
-        Adapter.register self
-      end
-    end
-  end
-end