Push Connection into ThriftHelpers to prevent namespace pollution.

twitter · Sep 10, 2012 · ab27b71 · ab27b71
1 parent d490a2b
commit ab27b71
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 51 deletions.
diff --git a/lib/thrift_client/connection/base.rb b/lib/thrift_client/connection/base.rb
@@ -1,19 +1,21 @@
-module Connection
-  class Base
-    attr_accessor :transport, :server
+module ThriftHelpers
+  module Connection
+    class Base
+      attr_accessor :transport, :server
 
-    def initialize(transport, transport_wrapper, server, timeout)
-      @transport = transport
-      @transport_wrapper = transport_wrapper
-      @server = server
-      @timeout = timeout
-    end
+      def initialize(transport, transport_wrapper, server, timeout)
+        @transport = transport
+        @transport_wrapper = transport_wrapper
+        @server = server
+        @timeout = timeout
+      end
 
-    def connect!
-      raise NotImplementedError
-    end
+      def connect!
+        raise NotImplementedError
+      end
 
-    def close
+      def close
+      end
     end
   end
 end
diff --git a/lib/thrift_client/connection/factory.rb b/lib/thrift_client/connection/factory.rb
@@ -1,10 +1,12 @@
-module Connection
-  class Factory
-    def self.create(transport, transport_wrapper, server, timeout)
-      if transport == Thrift::HTTPClientTransport
-        Connection::HTTP.new(transport, transport_wrapper, server, timeout)
-      else
-        Connection::Socket.new(transport, transport_wrapper, server, timeout)
+module ThriftHelpers
+  module Connection
+    class Factory
+      def self.create(transport, transport_wrapper, server, timeout)
+        if transport == Thrift::HTTPClientTransport
+          Connection::HTTP.new(transport, transport_wrapper, server, timeout)
+        else
+          Connection::Socket.new(transport, transport_wrapper, server, timeout)
+        end
       end
     end
   end

diff --git a/lib/thrift_client/connection/http.rb b/lib/thrift_client/connection/http.rb
@@ -1,18 +1,20 @@
-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
+module ThriftHelpers
+  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
+      private
+      def parse_server(server)
+        uri = URI.parse(server)
+        raise ArgumentError, 'Servers must start with http' unless uri.scheme =~ /^http/
+        uri
+      end
     end
   end
-end
+end
diff --git a/lib/thrift_client/connection/socket.rb b/lib/thrift_client/connection/socket.rb
@@ -1,22 +1,24 @@
-module Connection
-  class Socket < Base
-    def close
-      @transport.close
-    end
+module ThriftHelpers
+  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
+      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
+      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]
+      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
 end