em-proxy 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/em-proxy/backend.rb

@@ -11,6 +11,7 @@ module EventMachine
 
       def connection_completed
         debug [@name, :conn_complete]
+        @plexer.connected(@name)
         @connected.succeed
       end
 

data/lib/em-proxy/connection.rb

@@ -2,12 +2,12 @@ module EventMachine
   module ProxyServer
     class Connection < EventMachine::Connection
       attr_accessor :debug
-      
+
       ##### Proxy Methods
       def on_data(&blk); @on_data = blk; end
       def on_response(&blk); @on_response = blk; end
       def on_finish(&blk); @on_finish = blk; end
-      def on_connect(&blk); blk.call; end
+      def on_connect(&blk); @on_connect = blk; end
 
       ##### EventMachine
       def initialize(options)
@@ -17,7 +17,7 @@ module EventMachine
 
       def receive_data(data)
         debug [:connection, data]
-        processed = @on_data.call(data)
+        processed = @on_data.call(data) if @on_data
 
         return if processed == :async or processed.nil?
         relay_to_servers(processed)
@@ -38,7 +38,7 @@ module EventMachine
           s.send_data data unless data.nil?
         end
       end
-      
+
       #
       # initialize connections to backend servers
       #
@@ -57,7 +57,8 @@ module EventMachine
       # [ip, port] of the connected client
       #
       def peer
-        @peer ||= Socket.unpack_sockaddr_in(get_peername).reverse
+        peername = get_peername
+        @peer ||= peername ? Socket.unpack_sockaddr_in(peername).reverse : nil
       end
 
       #
@@ -66,13 +67,18 @@ module EventMachine
       def relay_from_backend(name, data)
         debug [:relay_from_backend, name, data]
 
-        data = @on_response.call(name, data)
+        data = @on_response.call(name, data) if @on_response
         send_data data unless data.nil?
       end
 
+      def connected(name)
+        debug [:connected]
+        @on_connect.call(name) if @on_connect
+      end
+
       def unbind
         debug [:unbind, :connection]
-      
+
         # terminate any unfinished connections
         @servers.values.compact.each do |s|
           s.close_connection
@@ -85,7 +91,7 @@ module EventMachine
 
         # if all connections are terminated downstream, then notify client
         close_connection_after_writing if @servers.values.compact.size.zero?
-        
+
         if @on_finish
           @on_finish.call(name)
 
@@ -95,7 +101,7 @@ module EventMachine
       end
 
       private
-      
+
       def debug(*data)
         if @debug
           require 'pp'

data/spec/proxy_spec.rb

@@ -26,11 +26,13 @@ describe Proxy do
     connected = false
     EM.run do
       EventMachine.add_timer(0.1) do
-        EventMachine::HttpRequest.new('http://127.0.0.1:8080/test').get({:timeout => 1})
+        EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
       end
 
       Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
-        conn.on_connect do 
+        conn.server :goog, :host => "google.com", :port => 80
+
+        conn.on_connect do |name|
           connected = true
           EventMachine.stop
         end
@@ -62,7 +64,7 @@ describe Proxy do
   it "should duplex TCP traffic to two backends google & yahoo" do
     EM.run do
       EventMachine.add_timer(0.1) do
-        EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
+        EventMachine::HttpRequest.new('http://127.0.0.1:8080/test').get({:timeout => 1})
       end
 
       Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
@@ -74,10 +76,10 @@ describe Proxy do
         conn.on_response do |backend, resp|
           case backend
           when :goog then
-            resp.should =~ /google/
+            resp.should =~ /404/
             seen.push backend
           when :yhoo
-            resp.should =~ /yahoo|yimg/
+            resp.should =~ /404/
             seen.push backend
           end
           seen.uniq!
@@ -134,12 +136,12 @@ describe Proxy do
           http =EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
           http.callback { EventMachine.stop }
         end
-  
+
         Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
           conn.server :goog, :host => "google.com", :port => 80, :relay_client => true
           conn.on_data { |data| raise "Should not be here"; data }
           conn.on_response { |backend, resp| resp }
-          
+
         end
       end
     }.should_not raise_error
@@ -152,12 +154,12 @@ describe Proxy do
           http =EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
           http.callback { EventMachine.stop }
         end
-  
+
         Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
           conn.server :goog, :host => "google.com", :port => 80, :relay_server => true
           conn.on_data { |data| data }
           conn.on_response { |backend, resp| raise "Should not be here"; }
-          
+
         end
       end
     }.should_not raise_error

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -04:00
+date: 2010-05-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,6 @@ test_files:
 - examples/line_interceptor.rb
 - examples/port_forward.rb
 - examples/relay_port_forward.rb
-- examples/schemaless-mysql/client.rb
 - examples/schemaless-mysql/mysql_interceptor.rb
 - examples/selective_forward.rb
 - examples/smtp_spam_filter.rb

data/examples/schemaless-mysql/client.rb

@@ -1,17 +0,0 @@
-require "rubygems"
-require "mysql"    # gem install ruby-mysql -v 2.9.2
-
-my = Mysql.connect('127.0.0.1', 'root', '', 'noschema', 3307)
-
-p my.list_tables
-__END__
-
-# look ma, no schema! ooh yeah.
-my.query("create table posts")
-
-# insert a few records into our schemaless MySQL store... :-)
-my.query("insert into posts values('first post'('author', 'Ilya'),('nick', 'igrigorik'))")
-my.query("insert into posts values('author:Ilya','location:Waterloo')")
-
-my.query("select author from posts") { |r| puts r }
-my.query("select nick from posts") { |r| puts r }