mojombo-proxymachine 0.2.0 → 0.2.1

data/README.md

@@ -26,7 +26,7 @@ correct backend server. If not, it can choose to either do nothing and wait
 for more data to arrive, or close the connection. Once the block returns an
 address, a connection to the backend is made, the buffer is replayed to the
 backend, and the client and backend connections are hooked up to form a
-straight proxy. This bidirectional proxy continues to exist until with the
+straight proxy. This bidirectional proxy continues to exist until either the
 client or backend close the connection.
 
 
@@ -67,9 +67,9 @@ Example routing config file
     proxy do |data|
       if data =~ %r{^....git-upload-pack /([\w\.\-]+)/[\w\.\-]+\000host=\w+\000}
         name = $1
-        GitRouter.lookup(name)
+        { :remote => GitRouter.lookup(name) }
       else
-        :noop
+        { :noop => true }
       end
     end
 
@@ -77,10 +77,11 @@ Example routing config file
 Valid return values
 -------------------
 
-`String` - The host:port of the backend server that will be proxied.  
-`:noop` - Do nothing.  
-`:close` - Close the connection.  
-`{:close => String}` - Close the connection after sending the String.  
+`{ :remote => String }` - String is the host:port of the backend server that will be proxied.  
+`{ :remote => String, :data => String }` - Same as above, but send the given data instead.  
+`{ :noop => true }` - Do nothing.  
+`{ :close` => true } - Close the connection.  
+`{ :close => String }` - Close the connection after sending the String.  
 
 
 Contribute

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 1
 :major: 0
 :minor: 2
-:patch: 0

data/lib/proxymachine/client_connection.rb

@@ -16,9 +16,6 @@ module EventMachine
         if !@server_side
           @buffer << data
           ensure_server_side_connection
-        else @server_side
-          # p data
-          @server_side.send_data(data)
         end
       rescue => e
         close_connection
@@ -55,6 +52,7 @@ module EventMachine
 
       def try_server_connect(host, port)
         @server_side = ServerConnection.request(host, port, self)
+        proxy_incoming_to @server_side
         if @tries > 0
           puts "Successful connection."
         end
@@ -86,6 +84,11 @@ module EventMachine
         @server_side.close_connection_after_writing if @server_side
         ProxyMachine.decr
       end
+
+      # Proxy connection has been lost
+      def proxy_target_unbound
+        @server_side = nil
+      end
     end
   end
-end
+end

data/lib/proxymachine/server_connection.rb

@@ -9,9 +9,8 @@ module EventMachine
         @client_side = conn
       end
 
-      def receive_data(data)
-        # p data
-        @client_side.send_data(data)
+      def post_init
+        proxy_incoming_to @client_side
       end
 
       def unbind
@@ -19,4 +18,4 @@ module EventMachine
       end
     end
   end
-end
+end

data/proxymachine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxymachine}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-07-15}
+  s.date = %q{2009-08-06}
   s.default_executable = %q{proxymachine}
   s.email = %q{tom@mojombo.com}
   s.executables = ["proxymachine"]
@@ -31,11 +31,10 @@ Gem::Specification.new do |s|
      "test/proxymachine_test.rb",
      "test/test_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/mojombo/proxymachine}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.0}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{TODO}
   s.test_files = [
     "test/proxymachine_test.rb",
@@ -46,7 +45,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.6"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-proxymachine
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,8 +47,9 @@ files:
 - proxymachine.gemspec
 - test/proxymachine_test.rb
 - test/test_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/mojombo/proxymachine
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -69,9 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: TODO
 test_files: 
 - test/proxymachine_test.rb