thrift_client 0.3.3 → 0.4.0

data/CHANGELOG

@@ -1,4 +1,12 @@
-v0.3.3  Allow for a timeout over all requests in a call.
+v0.4.0. Add new EventMachine transport.  This requires two layers of transport
+configurability: 
+  options[:transport] for EventMachine or Socket transports
+  options[:transport_wrapper] for optional Buffered or Framed Transport.
+Clients will need to update their options to ensure they don't conflict with this change. (mperham)
+Revert global timeouts. (ryanking)
+Add support for HTTPClientTransport (Chris Sepic)
+
+v0.3.3. Allow for a timeout over all requests in a call.
 
 v0.3.2. Fix connection close bug (nkallen, mattknox).
 

data/Manifest

@@ -1,9 +1,21 @@
 CHANGELOG
 LICENSE
 Manifest
-README
+README.rdoc
 Rakefile
 lib/thrift_client.rb
+lib/thrift_client/connection.rb
+lib/thrift_client/connection/base.rb
+lib/thrift_client/connection/factory.rb
+lib/thrift_client/connection/http.rb
+lib/thrift_client/connection/socket.rb
+lib/thrift_client/event_machine.rb
+lib/thrift_client/simple.rb
 lib/thrift_client/thrift.rb
+test/greeter/greeter.rb
+test/greeter/greeter.thrift
+test/greeter/server.rb
+test/simple_test.rb
 test/test_helper.rb
+test/thrift_client_http_test.rb
 test/thrift_client_test.rb

data/{README → README.rdoc}

@@ -27,7 +27,7 @@ Instantiate a client:
 You can then make calls to the server via the <tt>client</tt> instance as if was your internal Thrift client. The connection will be opened lazily and methods will be proxied through.
 
   client.get_string_list_property("keyspaces")
-  
+
 On failures, the client will try the remaining servers in the list before giving up. See ThriftClient for more.
 
 == Installation
@@ -36,6 +36,14 @@ You need Ruby 1.8 or 1.9. If you have those, just run:
 
   sudo gem install thrift_client
 
+== Contributing
+
+To contribute changes:
+
+1. Fork the project
+2. make your change, adding tests
+3. send a pull request to fauna and ryanking
+
 == Reporting problems
 
 The Github issue tracker is {here}[http://github.com/fauna/thrift_client/issues].

data/Rakefile

@@ -14,4 +14,3 @@ Echoe.new("thrift_client") do |p|
   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
   p.spec_pattern = "spec/*_spec.rb"
 end
-

data/lib/thrift_client/connection/base.rb

@@ -0,0 +1,20 @@
+module Connection
+  class Base
+    attr_accessor :transport, :server
+
+    def initialize(transport, transport_wrapper, server, timeout, error_hash)
+      @transport = transport
+      @transport_wrapper = transport_wrapper
+      @server = server
+      @timeout = timeout
+      @error_type = error_hash[:handles_error]
+    end
+
+    def connect!
+      raise NotImplementedError
+    end
+
+    def close
+    end
+  end
+end

data/lib/thrift_client/connection/factory.rb

@@ -0,0 +1,11 @@
+module Connection
+  class Factory
+    def self.create(transport, transport_wrapper, server, timeout)
+      if transport == Thrift::HTTPClientTransport
+        Connection::HTTP.new(transport, transport_wrapper, server, timeout, :handles_error => Errno::ECONNREFUSED)
+      else
+        Connection::Socket.new(transport, transport_wrapper, server, timeout, :handles_error => Thrift::TransportException)
+      end
+    end
+  end
+end

data/lib/thrift_client/connection/http.rb

@@ -0,0 +1,18 @@
+module Connection
+  class HTTP < Base
+    def connect!
+      uri = parse_server(@server)
+      @transport = Thrift::HTTPClientTransport.new(@server)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == "https"
+      http.get(uri.path)
+    end
+
+  private
+    def parse_server(server)
+      uri = URI.parse(server)
+      raise ArgumentError, 'Servers must start with http' unless uri.scheme =~ /^http/
+      uri
+    end
+  end
+end

data/lib/thrift_client/connection/socket.rb

@@ -0,0 +1,22 @@
+module Connection
+  class Socket < Base
+    def close
+      @transport.close
+    end
+
+    def connect!
+      host, port = parse_server(@server)
+      @transport = @transport.new(*[host, port.to_i, @timeout])
+      @transport = @transport_wrapper.new(@transport) if @transport_wrapper
+      @transport.open
+    end
+
+  private
+
+    def parse_server(server)
+      host, port = server.to_s.split(":")
+      raise ArgumentError, 'Servers must be in the form "host:port"' unless host and port
+      [host, port]
+    end
+  end
+end

data/lib/thrift_client/connection.rb

@@ -0,0 +1,5 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/connection")
+require "base"
+require "socket"
+require "http"
+require "factory"

data/lib/thrift_client/event_machine.rb

@@ -0,0 +1,141 @@
+raise RuntimeError, "The eventmachine transport requires Ruby 1.9.x" if RUBY_VERSION < '1.9.0'
+
+require 'eventmachine'
+require 'fiber'
+
+# EventMachine-ready Thrift connection
+# Should not be used with a transport wrapper since it already performs buffering in Ruby.
+module Thrift
+  class EventMachineTransport < BaseTransport
+    def initialize(host, port=9090, timeout=5)
+      @host, @port, @timeout = host, port, timeout
+      @connection = nil
+    end
+
+    def open?
+      @connection && @connection.connected?
+    end
+
+    def open
+      @connection = EventMachineConnection.connect(@host, @port, @timeout)
+    end
+
+    def close
+      @connection.close
+    end
+
+    def read(sz)
+      @connection.blocking_read(sz)
+    end
+
+    def write(buf)
+      @connection.send_data(buf)
+    end
+  end
+
+  module EventMachineConnection
+    GARBAGE_BUFFER_SIZE = 4096 # 4kB
+
+    include EM::Deferrable
+
+    def self.connect(host='localhost', port=9090, timeout=5, &block)
+      EM.connect(host, port, self, host, port) do |conn|
+        conn.pending_connect_timeout = timeout
+      end
+    end
+
+    def trap
+      begin
+        yield
+      rescue Exception => ex
+        puts ex.message
+        puts ex.backtrace.join("\n")
+      end
+    end
+
+    def initialize(host, port=9090)
+      @host, @port = host, port
+      @index = 0
+      @reconnecting = false
+      @connected = false
+      @buf = ''
+    end
+
+    def close
+      trap do
+        @connected = false
+        close_connection(true)
+      end
+    end
+
+    def blocking_read(size)
+      trap do
+        if can_read?(size)
+          yank(size)
+        else
+          raise ArgumentError, "Unexpected state" if @size or @callback
+
+          fiber = Fiber.current
+          @size = size
+          @callback = proc { |data|
+            fiber.resume(data)
+          }
+          Fiber.yield
+        end
+      end
+    end
+
+    def receive_data(data)
+      trap do
+        (@buf) << data
+
+        if @callback and can_read?(@size)
+          callback = @callback
+          data = yank(@size)
+          @callback = @size = nil
+          callback.call(data)
+        end
+      end
+    end
+
+    def connected?
+      @connected
+    end
+
+    def connection_completed
+      @reconnecting = false
+      @connected = true
+      succeed
+    end
+
+    def unbind
+      # If we disconnect, try to reconnect
+      if @connected or !@reconnecting
+        EM.add_timer(1) { 
+          # XXX Connect timeout?
+          reconnect @host, @port 
+        }
+        @connected = false
+        @reconnecting = true
+      end
+    end
+
+    def can_read?(size)
+      @buf.size >= @index + size
+    end
+
+    private
+
+    def yank(len)      
+      data = @buf.slice(@index, len)
+      @index += len
+      @index = @buf.size if @index > @buf.size
+      if @index >= GARBAGE_BUFFER_SIZE
+        @buf = @buf.slice(@index..-1)
+        @index = 0
+      end
+      data
+    end
+
+  end
+end

data/lib/thrift_client/simple.rb

@@ -0,0 +1,263 @@
+require 'socket'
+require 'getoptlong'
+
+class ThriftClient
+
+  # This is a simplified form of thrift, useful for clients only, and not
+  # making any attempt to have good performance. It's intended to be used by
+  # small command-line tools that don't want to install a dozen ruby files.
+  module Simple
+    VERSION_1 = 0x8001
+
+    # message types
+    CALL, REPLY, EXCEPTION = (1..3).to_a
+
+    # value types
+    STOP, VOID, BOOL, BYTE, DOUBLE, _, I16, _, I32, _, I64, STRING, STRUCT, MAP, SET, LIST = (0..15).to_a
+
+    FORMATS = {
+      BYTE => "c",
+      DOUBLE => "G",
+      I16 => "n",
+      I32 => "N",
+    }
+
+    SIZES = {
+      BYTE => 1,
+      DOUBLE => 8,
+      I16 => 2,
+      I32 => 4,
+    }
+
+    module ComplexType
+      module Extends
+        def type_id=(n)
+          @type_id = n
+        end
+
+        def type_id
+          @type_id
+        end
+      end
+
+      module Includes
+        def to_i
+          self.class.type_id
+        end
+
+        def to_s
+          args = self.values.map { |v| self.class.type_id == STRUCT ? v.name : v.to_s }.join(", ")
+          "#{self.class.name}.new(#{args})"
+        end
+      end
+    end
+
+    def self.make_type(type_id, name, *args)
+      klass = Struct.new("STT_#{name}", *args)
+      klass.send(:extend, ComplexType::Extends)
+      klass.send(:include, ComplexType::Includes)
+      klass.type_id = type_id
+      klass
+    end
+
+    ListType = make_type(LIST, "ListType", :element_type)
+    MapType = make_type(MAP, "MapType", :key_type, :value_type)
+    SetType = make_type(SET, "SetType", :element_type)
+    StructType = make_type(STRUCT, "StructType", :struct_class)
+
+    class << self
+      def pack_value(type, value)
+        case type
+        when BOOL
+          [ value ? 1 : 0 ].pack("c")
+        when STRING
+          [ value.size, value ].pack("Na*")
+        when I64
+          [ value >> 32, value & 0xffffffff ].pack("NN")
+        when ListType
+          [ type.element_type.to_i, value.size ].pack("cN") + value.map { |item| pack_value(type.element_type, item) }.join("")
+        when MapType
+          [ type.key_type.to_i, type.value_type.to_i, value.size ].pack("ccN") + value.map { |k, v| pack_value(type.key_type, k) + pack_value(type.value_type, v) }.join("")
+        when SetType
+          [ type.element_type.to_i, value.size ].pack("cN") + value.map { |item| pack_value(type.element_type, item) }.join("")
+        when StructType
+          value._pack
+        else
+          [ value ].pack(FORMATS[type])
+        end
+      end
+
+      def pack_request(method_name, arg_struct, request_id=0)
+        [ VERSION_1, CALL, method_name.to_s.size, method_name.to_s, request_id, arg_struct._pack ].pack("nnNa*Na*")
+      end
+
+      def read_value(s, type)
+        case type
+        when BOOL
+          s.read(1).unpack("c").first != 0
+        when STRING
+          len = s.read(4).unpack("N").first
+          s.read(len)
+        when I64
+          hi, lo = s.read(8).unpack("NN")
+          (hi << 32) | lo
+        when LIST
+          read_list(s)
+        when MAP
+          read_map(s)
+        when STRUCT
+          read_struct(s)
+        when ListType
+          read_list(s, type.element_type)
+        when MapType
+          read_map(s, type.key_type, type.value_type)
+        when StructType
+          read_struct(s, type.struct_class)
+        else
+          s.read(SIZES[type]).unpack(FORMATS[type]).first
+        end
+      end
+
+      def read_list(s, element_type=nil)
+        etype, len = s.read(5).unpack("cN")
+        expected_type = (element_type and element_type.to_i == etype.to_i) ? element_type : etype
+        rv = []
+        len.times do
+          rv << read_value(s, expected_type)
+        end
+        rv
+      end
+
+      def read_map(s, key_type=nil, value_type=nil)
+        ktype, vtype, len = s.read(6).unpack("ccN")
+        rv = {}
+        expected_key_type, expected_value_type = if key_type and value_type and key_type.to_i == ktype and value_type.to_i == vtype
+          [ key_type, value_type ]
+        else
+          [ ktype, vtype ]
+        end
+        len.times do
+          key = read_value(s, expected_key_type)
+          value = read_value(s, expected_value_type)
+          rv[key] = value
+        end
+        rv
+      end
+
+      def read_struct(s, struct_class=nil)
+        rv = struct_class.new()
+        while true
+          type = s.read(1).unpack("c").first
+          return rv if type == STOP
+          fid = s.read(2).unpack("n").first
+          field = struct_class ? struct_class._fields.find { |f| (f.fid == fid) and (f.type.to_i == type) } : nil
+          value = read_value(s, field ? field.type : type)
+          rv[field.name] = value if field
+        end
+      end
+
+      def read_response(s, rv_class)
+        version, message_type, method_name_len = s.read(8).unpack("nnN")
+        method_name = s.read(method_name_len)
+        seq_id = s.read(4).unpack("N").first
+        [ method_name, seq_id, read_struct(s, rv_class).rv ]
+      end
+    end
+
+    ## ----------------------------------------
+
+    class Field
+      attr_accessor :name, :type, :fid
+
+      def initialize(name, type, fid)
+        @name = name
+        @type = type
+        @fid = fid
+      end
+
+      def pack(value)
+        value.nil? ? "" : [ type.to_i, fid, ThriftClient::Simple.pack_value(type, value) ].pack("cna*")
+      end
+    end
+
+    class ThriftException < RuntimeError
+      def initialize(reason)
+        @reason = reason
+      end
+
+      def to_s
+        "ThriftException(#{@reason.inspect})"
+      end
+    end
+
+    module ThriftStruct
+      module Include
+        def _pack
+          self.class._fields.map { |f| f.pack(self[f.name]) }.join + [ STOP ].pack("c")
+        end
+      end
+
+      module Extend
+        def _fields
+          @fields
+        end
+
+        def _fields=(f)
+          @fields = f
+        end
+      end
+    end
+
+    def self.make_struct(name, *fields)
+      st_name = "ST_#{name}"
+      if Struct.constants.include?(st_name)
+        warn "#{caller[0]}: Struct::#{st_name} is already defined; returning original class."
+        Struct.const_get(st_name)
+      else
+        names = fields.map { |f| f.name.to_sym }
+        klass = Struct.new(st_name, *names)
+        klass.send(:include, ThriftStruct::Include)
+        klass.send(:extend, ThriftStruct::Extend)
+        klass._fields = fields
+        klass
+      end
+    end
+
+    class ThriftService
+      def initialize(sock)
+        @sock = sock
+      end
+
+      def self._arg_structs
+        @_arg_structs = {} if @_arg_structs.nil?
+        @_arg_structs
+      end
+
+      def self.thrift_method(name, rtype, *args)
+        arg_struct = ThriftClient::Simple.make_struct("Args__#{self.name}__#{name}", *args)
+        rv_struct = ThriftClient::Simple.make_struct("Retval__#{self.name}__#{name}", ThriftClient::Simple::Field.new(:rv, rtype, 0))
+        _arg_structs[name.to_sym] = [ arg_struct, rv_struct ]
+
+        arg_names = args.map { |a| a.name.to_s }.join(", ")
+        class_eval "def #{name}(#{arg_names}); _proxy(:#{name}#{args.size > 0 ? ', ' : ''}#{arg_names}); end"
+      end
+
+      def _proxy(method_name, *args)
+        cls = self.class.ancestors.find { |cls| cls.respond_to?(:_arg_structs) and cls._arg_structs[method_name.to_sym] }
+        arg_class, rv_class = cls._arg_structs[method_name.to_sym]
+        arg_struct = arg_class.new(*args)
+        @sock.write(ThriftClient::Simple.pack_request(method_name, arg_struct))
+        rv = ThriftClient::Simple.read_response(@sock, rv_class)
+        rv[2]
+      end
+
+      # convenience. robey is lazy.
+      [[ :field, "Field.new" ], [ :struct, "StructType.new" ],
+       [ :list, "ListType.new" ], [ :map, "MapType.new" ]].each do |new_name, old_name|
+        class_eval "def self.#{new_name}(*args); ThriftClient::Simple::#{old_name}(*args); end"
+      end
+
+      [ :void, :bool, :byte, :double, :i16, :i32, :i64, :string ].each { |sym| class_eval "def self.#{sym}; ThriftClient::Simple::#{sym.to_s.upcase}; end" }
+    end
+  end
+end

data/lib/thrift_client/thrift.rb

@@ -1,4 +1,3 @@
-
 module Thrift
   class BufferedTransport
     def timeout=(timeout)

data/lib/thrift_client.rb

@@ -1,4 +1,3 @@
-
 if ENV["ANCIENT_THRIFT"]
   $LOAD_PATH.unshift("/Users/eweaver/p/twitter/rails/vendor/gems/thrift-751142/lib")
   $LOAD_PATH.unshift("/Users/eweaver/p/twitter/rails/vendor/gems/thrift-751142/ext")
@@ -8,18 +7,19 @@ else
   require 'thrift'
 end
 
-require 'timeout'
 require 'rubygems'
 require 'thrift_client/thrift'
+require 'thrift_client/connection'
 
 class ThriftClient
+
   class NoServersAvailable < StandardError; end
-  class GlobalThriftClientTimeout < Timeout::Error; end
 
   DEFAULTS = {
     :protocol => Thrift::BinaryProtocol,
     :protocol_extra_params => [],
-    :transport => Thrift::FramedTransport,
+    :transport => Thrift::Socket,
+    :transport_wrapper => Thrift::FramedTransport,
     :randomize_server_list => true,
     :exception_classes => [
       IOError,
@@ -52,8 +52,7 @@ Valid optional parameters are:
 <tt>:retries</tt>:: How many times to retry a request. Defaults to the number of servers defined.
 <tt>:server_retry_period</tt>:: How many seconds to wait before trying to reconnect after marking all servers as down. Defaults to <tt>1</tt>. Set to <tt>nil</tt> to retry endlessly.
 <tt>:server_max_requests</tt>:: How many requests to perform before moving on to the next server in the pool, regardless of error status. Defaults to <tt>nil</tt> (no limit).
-<tt>:global_timeout</tt>:: Specify the timeout for all connections made. Defaults to being disabled.
-<tt>:timeout</tt>:: Specify the default timeout in seconds per connection. Defaults to <tt>1</tt>.
+<tt>:timeout</tt>:: Specify the default timeout in seconds. Defaults to <tt>1</tt>.
 <tt>:timeout_overrides</tt>:: Specify additional timeouts on a per-method basis, in seconds. Only works with <tt>Thrift::BufferedTransport</tt>.
 <tt>:defaults</tt>:: Specify default values to return on a per-method basis, if <tt>:raise</tt> is set to false.
 
@@ -66,17 +65,16 @@ Valid optional parameters are:
     @retries = options[:retries] || @server_list.size
 
     if @options[:timeout_overrides].any?
-      if @options[:transport].instance_methods.include?("timeout=")
+      if (@options[:transport_wrapper] || @options[:transport]).method_defined?(:timeout=)
         @set_timeout = true
       else
-        warn "ThriftClient: Timeout overrides have no effect with with transport type #{@options[:transport]}"
+        warn "ThriftClient: Timeout overrides have no effect with with transport type #{(@options[:transport_wrapper] || @options[:transport])}"
       end
     end
 
     @request_count = 0
     @max_requests = @options[:server_max_requests]
     @retry_period = @options[:server_retry_period]
-    @global_timeout = @options[:global_timeout] || 0
     rebuild_live_server_list!
 
     @client_class.instance_methods.each do |method_name|
@@ -88,23 +86,18 @@ Valid optional parameters are:
 
   # Force the client to connect to the server.
   def connect!
-    server = next_server
-    host, port = server.to_s.split(":")
-    raise ArgumentError, 'Servers must be in the form "host:port"' unless host and port
-
-    @transport = @options[:transport].new(
-      Thrift::Socket.new(host, port.to_i, @options[:timeout]))
-    @transport.open
-    @current_server = server
-    @client = @client_class.new(@options[:protocol].new(@transport, *@options[:protocol_extra_params]))
-  rescue Thrift::TransportException
+    @current_server = next_server
+    @connection = Connection::Factory.create(@options[:transport], @options[:transport_wrapper], @current_server, @options[:timeout])
+    @connection.connect!
+    @client = @client_class.new(@options[:protocol].new(@connection.transport, *@options[:protocol_extra_params]))
+  rescue Thrift::TransportException, Errno::ECONNREFUSED
     @transport.close rescue nil
     retry
   end
 
   # Force the client to disconnect from the server.
   def disconnect!(keep = true)
-    @transport.close rescue nil
+    @connection.close rescue nil
 
     # Keep live servers in the list if we have a retry period. Otherwise,
     # always eject, because we will always re-add them.
@@ -119,16 +112,26 @@ Valid optional parameters are:
 
   private
 
-  def proxy(method_name, *args)
-    Timeout.timeout(@global_timeout, GlobalThriftClientTimeout) do
-      raw_proxy(method_name, *args)
+  def next_server
+    if @retry_period
+      rebuild_live_server_list! if Time.now > @last_rebuild + @retry_period
+      raise NoServersAvailable, "No live servers in #{@server_list.inspect} since #{@last_rebuild.inspect}." if @live_server_list.empty?
+    elsif @live_server_list.empty?
+      rebuild_live_server_list!
+    end
+    @live_server_list.pop
+  end
+
+  def rebuild_live_server_list!
+    @last_rebuild = Time.now
+    if @options[:randomize_server_list]
+      @live_server_list = @server_list.sort_by { rand }
+    else
+      @live_server_list = @server_list.dup
     end
-  rescue GlobalThriftClientTimeout => e
-    disconnect!(false)
-    raise e
   end
 
-  def raw_proxy(method_name, *args)
+  def proxy(method_name, *args)
     disconnect! if @max_requests and @request_count >= @max_requests
     connect! unless @client
 
@@ -148,27 +151,8 @@ Valid optional parameters are:
     @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
   end
 
-  def handle_exception(e, method_name, args)
+  def handle_exception(e, method_name, args=nil)
     raise e if @options[:raise]
     @options[:defaults][method_name.to_sym]
   end
-
-  def next_server
-    if @retry_period
-      rebuild_live_server_list! if Time.now > @last_rebuild + @retry_period
-      raise NoServersAvailable, "No live servers in #{@server_list.inspect} since #{@last_rebuild.inspect}." if @live_server_list.empty?
-    elsif @live_server_list.empty?
-      rebuild_live_server_list!
-    end
-    @live_server_list.pop
-  end
-
-  def rebuild_live_server_list!
-    @last_rebuild = Time.now
-    if @options[:randomize_server_list]
-      @live_server_list = @server_list.sort_by { rand }
-    else
-      @live_server_list = @server_list.dup
-    end
-  end
 end

data/test/greeter/greeter.rb

@@ -0,0 +1,77 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Greeter
+  class Client
+    include ::Thrift::Client
+
+    def greeting(name)
+      send_greeting(name)
+      return recv_greeting()
+    end
+
+    def send_greeting(name)
+      send_message('greeting', Greeting_args, :name => name)
+    end
+
+    def recv_greeting()
+      result = receive_message(Greeting_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'greeting failed: unknown result')
+    end
+
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def process_greeting(seqid, iprot, oprot)
+      args = read_args(iprot, Greeting_args)
+      result = Greeting_result.new()
+      result.success = @handler.greeting(args.name)
+      write_result(result, oprot, 'greeting', seqid)
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class Greeting_args
+    include ::Thrift::Struct
+    NAME = 1
+
+    ::Thrift::Struct.field_accessor self, :name
+    FIELDS = {
+      NAME => {:type => ::Thrift::Types::STRING, :name => 'name'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+  end
+
+  class Greeting_result
+    include ::Thrift::Struct
+    SUCCESS = 0
+
+    ::Thrift::Struct.field_accessor self, :success
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+  end
+
+end
+

data/test/greeter/greeter.thrift

@@ -0,0 +1,3 @@
+service Greeter {
+  string greeting(1:string name)
+}

data/test/greeter/server.rb

@@ -0,0 +1,40 @@
+module Greeter
+  class Handler
+    def greeting(name)
+      "hello there #{name}!"
+    end
+  end
+
+  class Server
+    def initialize(port)
+      @port = port
+      handler = Greeter::Handler.new
+      processor = Greeter::Processor.new(handler)
+      transport = Thrift::ServerSocket.new("127.0.0.1", port)
+      transportFactory = Thrift::FramedTransportFactory.new()
+      @server = Thrift::SimpleServer.new(processor, transport, transportFactory)
+    end
+
+    def serve
+      @server.serve()
+    end
+  end
+
+  # client:
+  # trans = Thrift::HTTPClientTransport.new("http://127.0.0.1:9292/greeter")
+  # prot = Thrift::BinaryProtocol.new(trans)
+  # c = Greeter::Client.new(prot)
+  class HTTPServer
+    def initialize(uri)
+      uri = URI.parse(uri)
+      handler = Greeter::Handler.new
+      processor = Greeter::Processor.new(handler)
+      path = uri.path[1..-1]
+      @server = Thrift::MongrelHTTPServer.new(processor, :port => uri.port, :ip => uri.host, :path => path)
+    end
+
+    def serve
+      @server.serve()
+    end
+  end
+end

data/test/simple_test.rb

@@ -2,18 +2,18 @@
 require "#{File.dirname(__FILE__)}/test_helper"
 
 class SimpleTest < Test::Unit::TestCase
- 
+
   S = ThriftClient::Simple
   S.make_struct("Example", S::Field.new(:name, S::STRING, 1))
   S.make_struct("Args")
   S.make_struct("Retval", S::Field.new(:rv, S::I32, 0))
- 
+
   def test_definition
     assert Struct::ST_Example
     assert Struct::ST_Args
     assert Struct::ST_Retval
   end
-  
+
   ## Encoding
 
   def test_boolean_encoding
@@ -69,7 +69,7 @@ class SimpleTest < Test::Unit::TestCase
     assert_equal "\x80\x01\x00\x01\x00\x00\x00\x09getHeight\x00\x00\x00\x17\x00", 
       S.pack_request("getHeight", Struct::ST_Args.new, 23)
   end
-  
+
   ## Decoding
 
   def test_boolean_decoding
@@ -133,5 +133,5 @@ class SimpleTest < Test::Unit::TestCase
       StringIO.new("\x80\x01\x00\x02\x00\x00\x00\x09getHeight\x00\x00\x00\xff\x08\x00\x00\x00\x00\x00\x01\x00"),
       Struct::ST_Retval)
   end
-  
+
 end

data/test/test_helper.rb

@@ -4,5 +4,9 @@ require 'benchmark'
 $LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
 require 'thrift_client'
 require 'thrift_client/simple'
-require 'scribe'
+
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__)) 
+require 'greeter/greeter'
+require 'greeter/server'
+
 begin; require 'ruby-debug'; rescue LoadError; end

data/test/thrift_client_http_test.rb

@@ -0,0 +1,54 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+require "thrift/server/mongrel_http_server"
+
+class ThriftClientHTTPTest < Test::Unit::TestCase
+
+  def setup
+    @servers = ["http://127.0.0.1:1461/greeter", "http://127.0.0.1:1462/greeter", "http://127.0.0.1:1463/greeter"]
+    @socket = 1461
+    @timeout = 0.2
+    @options = {:protocol_extra_params => [false]}
+    @pid = Process.fork do
+      Signal.trap("INT") { exit }
+      Greeter::HTTPServer.new(@servers.last).serve
+    end
+    # Need to give the child process a moment to open the listening socket or
+    # we get occasional "could not connect" errors in tests.
+    sleep 0.05
+  end
+
+  def teardown
+    Process.kill("INT", @pid)
+    Process.wait
+  end
+
+  def test_bad_uri
+    assert_raises URI::InvalidURIError do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, "127.0.0.1:1463", @options).greeting("someone")
+    end
+  end
+
+  def test_bad_uri_no_http
+    assert_raises ArgumentError do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, "//127.0.0.1:1463", @options).greeting("someone")
+    end
+  end
+
+  def test_valid_server
+    assert_nothing_raised do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, "http://127.0.0.1:1463/greeter", @options).greeting("someone")
+    end
+  end
+  
+  def test_non_random_fall_through
+    @servers = ["http://127.0.0.1:1463/greeter", "http://127.0.0.1:1461/greeter", "http://127.0.0.1:1462/greeter"]
+    assert_nothing_raised do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, @servers, @options.merge(:randomize_server_list => false)).greeting("someone")
+    end
+  end
+
+end

data/test/thrift_client_test.rb

@@ -1,58 +1,74 @@
 require "#{File.dirname(__FILE__)}/test_helper"
 
 class ThriftClientTest < Test::Unit::TestCase
+
   def setup
-    @entry = [ScribeThrift::LogEntry.new(:message => "something", :category => "thrift_client")]
     @servers = ["127.0.0.1:1461", "127.0.0.1:1462", "127.0.0.1:1463"]
     @socket = 1461
     @timeout = 0.2
     @options = {:protocol_extra_params => [false]}
+    @pid = Process.fork do
+      Signal.trap("INT") { exit }
+      Greeter::Server.new("1463").serve
+    end
+    # Need to give the child process a moment to open the listening socket or
+    # we get occasional "could not connect" errors in tests.
+    sleep 0.05
+  end
+
+  def teardown
+    Process.kill("INT", @pid)
+    Process.wait
   end
 
   def test_live_server
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers.last, @options).Log(@entry)
+      ThriftClient.new(Greeter::Client, @servers.last, @options).greeting("someone")
     end
   end
 
   def test_non_random_fall_through
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers, @options.merge(:randomize_server_list => false)).Log(@entry)
+      ThriftClient.new(Greeter::Client, @servers, @options.merge(:randomize_server_list => false)).greeting("someone")
     end
   end
 
   def test_dont_raise
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers.first, @options.merge(:raise => false)).Log(@entry)
+      ThriftClient.new(Greeter::Client, @servers.first, @options.merge(:raise => false)).greeting("someone")
     end
   end
 
   def test_dont_raise_with_defaults
-    client = ThriftClient.new(ScribeThrift::Client, @servers.first, @options.merge(:raise => false, :defaults => {:Log => 1}))
-    assert_equal 1, client.Log(@entry)
+    client = ThriftClient.new(Greeter::Client, @servers.first, @options.merge(:raise => false, :defaults => {:greeting => 1}))
+    assert_equal 1, client.greeting
   end
 
   def test_defaults_dont_override_no_method_error
-    client = ThriftClient.new(ScribeThrift::Client, @servers, @options.merge(:raise => false, :defaults => {:Missing => 2}))
-    assert_raises(NoMethodError) { client.Missing(@entry) }
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:raise => false, :defaults => {:Missing => 2}))
+    assert_raises(NoMethodError) { client.Missing }
   end
 
   def test_random_fall_through
     assert_nothing_raised do
-      10.times { ThriftClient.new(ScribeThrift::Client, @servers, @options).Log(@entry) }
+      10.times do
+        client = ThriftClient.new(Greeter::Client, @servers, @options)
+        client.greeting("someone")
+        client.disconnect!
+      end
     end
   end
 
   def test_lazy_connection
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers[0,2])
+      ThriftClient.new(Greeter::Client, @servers[0,2])
     end
   end
 
   def test_no_servers_eventually_raise
-    client = ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options)
+    client = ThriftClient.new(Greeter::Client, @servers[0,2], @options)
     assert_raises(ThriftClient::NoServersAvailable) do
-      client.Log(@entry)
+      client.greeting("someone")
       client.disconnect!
     end
   end
@@ -61,13 +77,12 @@ class ThriftClientTest < Test::Unit::TestCase
     stub_server(@socket) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Thrift::TransportException) do
-          ThriftClient.new(ScribeThrift::Client, "127.0.0.1:#{@socket}",
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
             @options.merge(:timeout => @timeout)
-          ).Log(@entry)
+          ).greeting("someone")
         end
       end
-      assert((measurement.real > @timeout - 0.01), "#{measurement.real} < #{@timeout}")
-      assert((measurement.real < @timeout + 0.01), "#{measurement.real} > #{@timeout}")
+      assert((measurement.real > @timeout), "#{measurement.real} < #{@timeout}")
     end
   end
 
@@ -75,13 +90,12 @@ class ThriftClientTest < Test::Unit::TestCase
     stub_server(@socket) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Thrift::TransportException) do
-          ThriftClient.new(ScribeThrift::Client, "127.0.0.1:#{@socket}",
-            @options.merge(:timeout => @timeout, :transport => Thrift::BufferedTransport)
-          ).Log(@entry)
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+            @options.merge(:timeout => @timeout, :transport_wrapper => Thrift::BufferedTransport)
+          ).greeting("someone")
         end
       end
-      assert((measurement.real > @timeout - 0.01), "#{measurement.real} < #{@timeout}")
-      assert((measurement.real < @timeout + 0.01), "#{measurement.real} > #{@timeout}")
+      assert((measurement.real > @timeout), "#{measurement.real} < #{@timeout}")
     end
   end
 
@@ -91,30 +105,29 @@ class ThriftClientTest < Test::Unit::TestCase
     stub_server(@socket) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Thrift::TransportException) do
-          ThriftClient.new(ScribeThrift::Client, "127.0.0.1:#{@socket}",
-            @options.merge(:timeout => @timeout, :timeout_overrides => {:Log => log_timeout}, :transport => Thrift::BufferedTransport)
-          ).Log(@entry)
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+            @options.merge(:timeout => @timeout, :timeout_overrides => {:greeting => log_timeout}, :transport_wrapper => Thrift::BufferedTransport)
+          ).greeting("someone")
         end
       end
-      assert((measurement.real > log_timeout - 0.01), "#{measurement.real} < #{log_timeout }")
-      assert((measurement.real < log_timeout + 0.01), "#{measurement.real} > #{log_timeout}")
+      assert((measurement.real > log_timeout), "#{measurement.real} < #{log_timeout}")
     end
   end
 
   def test_retry_period
-    client = ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options.merge(:server_retry_period => 1))
-    assert_raises(ThriftClient::NoServersAvailable) { client.Log(@entry) }
+    client = ThriftClient.new(Greeter::Client, @servers[0,2], @options.merge(:server_retry_period => 1))
+    assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
     sleep 1.1
-    assert_raises(ThriftClient::NoServersAvailable) { client.Log(@entry) }
+    assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
   end
-  
+
   def test_server_max_requests
-    client = ThriftClient.new(ScribeThrift::Client, @servers, @options.merge(:server_max_requests => 2))
-    client.Log(@entry)
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
+    client.greeting("someone")
     internal_client = client.client
-    client.Log(@entry)
+    client.greeting("someone")
     assert_equal internal_client, client.client
-    client.Log(@entry)  
+    client.greeting("someone") 
     assert_not_equal internal_client, client.client
   end
 

data/thrift_client.gemspec

@@ -2,22 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2010-01-11}
+  s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
+  s.date = %q{2010-02-18}
   s.description = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/thrift_client.rb", "lib/thrift_client/thrift.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/thrift.rb", "test/test_helper.rb", "test/thrift_client_test.rb", "thrift_client.gemspec", "test/simple_test.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb", "test/greeter/greeter.rb", "test/greeter/greeter.thrift", "test/greeter/server.rb", "test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb", "thrift_client.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/thrift_client/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   s.rubygems_version = %q{1.3.5}
+  s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
   s.summary = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
-  s.test_files = ["test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_test.rb"]
+  s.test_files = ["test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Evan Weaver
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ0wCwYDVQQDDARyeWFu
+  MRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMTAwMTA4MTc1MDM0WhcNMTEwMTA4MTc1MDM0WjBBMQ0wCwYDVQQDDARy
+  eWFuMRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLPp+0PtRT3qCI
+  02sMsADSn7Uf1GpyXUtk4Fb94LqUO6Scl91YDmbFMpjzrQwQvBYMIVreWcwSish6
+  nip6WEk9lqXcOeDmex/qY2/FVXG8ffqjFHiNiN9vpWrWj5VMICequ+ftzWLKsPIS
+  DGJ4o+Z6wEYRuirgaRPCYAUDPglsaqctJ56wPuycryMe5+ApSkOS9iLWMprQKEAq
+  j2R2OBV0dSARdbtzuKwrP7sLDo7uPa0egFBUlcZ+nujGr4LvmpryB8scNRNmZK1w
+  1rEI7O06CbULj08qYxEhnKmFE7LbBoN/HrmvZLVQK5mWuiZQhtmJuhBfStJsaDux
+  5tBEkYZVAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBSnLarDEo5eBE2arSMrBdOOhtrnPTANBgkqhkiG9w0BAQUFAAOCAQEANER07s4K
+  Pvc1DSduliRDMUax/VSfLzDTtTAQwuSAPDrWAYXKugcJtOZOXjDbGL7c5zoWmy9u
+  Fn5vEVdm/93J+84D/IMaaof3BwX/NNEYH01CeZEIGMfc5AFFha7dabzP/uiPpb/c
+  GSvomC9IzyN37+eWwOS16cC+5XnBT6KRCaXYg2Fh6WpTgde67OVgXr4Q58HXlaZ+
+  /2BB3wq9lZ4JskvlpYpYnlPAUyiyc6R2Mjts1pURz5nkW4SuS7Kd1KCOOyr1McDH
+  VP12sTSjJclmI17BjDGQpAF0n9v5ExhJxWpeOjeBUPQsOin3ypEM1KkckLmOKvH6
+  zyKMYVRO0z/58g==
+  -----END CERTIFICATE-----
 
-date: 2010-01-11 00:00:00 -08:00
+date: 2010-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,18 +52,37 @@ extensions: []
 extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
-- README
+- README.rdoc
 - lib/thrift_client.rb
+- lib/thrift_client/connection.rb
+- lib/thrift_client/connection/base.rb
+- lib/thrift_client/connection/factory.rb
+- lib/thrift_client/connection/http.rb
+- lib/thrift_client/connection/socket.rb
+- lib/thrift_client/event_machine.rb
+- lib/thrift_client/simple.rb
 - lib/thrift_client/thrift.rb
 files: 
 - CHANGELOG
 - LICENSE
 - Manifest
-- README
+- README.rdoc
 - Rakefile
 - lib/thrift_client.rb
+- lib/thrift_client/connection.rb
+- lib/thrift_client/connection/base.rb
+- lib/thrift_client/connection/factory.rb
+- lib/thrift_client/connection/http.rb
+- lib/thrift_client/connection/socket.rb
+- lib/thrift_client/event_machine.rb
+- lib/thrift_client/simple.rb
 - lib/thrift_client/thrift.rb
+- test/greeter/greeter.rb
+- test/greeter/greeter.thrift
+- test/greeter/server.rb
+- test/simple_test.rb
 - test/test_helper.rb
+- test/thrift_client_http_test.rb
 - test/thrift_client_test.rb
 - thrift_client.gemspec
 has_rdoc: true
@@ -56,7 +96,7 @@ rdoc_options:
 - --title
 - Thrift_client
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,4 +121,5 @@ summary: A Thrift client wrapper that encapsulates some common failover behavior
 test_files: 
 - test/simple_test.rb
 - test/test_helper.rb
+- test/thrift_client_http_test.rb
 - test/thrift_client_test.rb

metadata.gz.sig

@@ -0,0 +1,3 @@
+w�
+� ����_e�@j	~C�q�Kv�)�y k�4����1հ��o�M�_��3,^�&ȯ0i��-ħ�Ve�`�D�x5&��
+9b�KŮ��c4�uX�Z�m{��U��:'�ٟG�֔�%9�D��0�u���-v�Ma��ֹ��͗"n����t�pN�1֊�2�3�E�\u����֕�ʹ��Q�<I�Ky��}{A�