mojombo-proxymachine 0.1.3 → 0.2.0

data/VERSION.yml

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

data/examples/git.rb

@@ -19,8 +19,8 @@ end
 proxy do |data|
   if data =~ %r{^....git-upload-pack /([\w\.\-]+)/[\w\.\-]+\000host=(.+)\000}
     name, host = $1, $2
-    GitRouter.lookup(name)
+    { :remote => GitRouter.lookup(name) }
   else
-    :noop
+    { :noop => true }
   end
 end

data/examples/transparent.rb

@@ -1,4 +1,4 @@
 proxy do |data|
   # p data
-  "localhost:80"
+  { :remote => "google.com:80" }
 end

data/lib/proxymachine/client_connection.rb

@@ -28,16 +28,24 @@ module EventMachine
       def ensure_server_side_connection
         @timer.cancel if @timer
         unless @server_side
-          op = ProxyMachine.router.call(@buffer.join)
-          if op.instance_of?(String)
-            m, host, port = *op.match(/^(.+):(.+)$/)
+          commands = ProxyMachine.router.call(@buffer.join)
+          close_connection unless commands.instance_of?(Hash)
+          if remote = commands[:remote]
+            m, host, port = *remote.match(/^(.+):(.+)$/)
             if try_server_connect(host, port.to_i)
+              if data = commands[:data]
+                @buffer = [data]
+              end
               send_and_clear_buffer
             end
-          elsif op.instance_of?(Hash) && op[:close]
-            send_data(op[:close])
-            close_connection_after_writing
-          elsif op == :noop
+          elsif close = commands[:close]
+            if close == true
+              close_connection
+            else
+              send_data(close)
+              close_connection_after_writing
+            end
+          elsif commands[:noop]
             # do nothing
           else
             close_connection
@@ -68,7 +76,6 @@ module EventMachine
       def send_and_clear_buffer
         if !@buffer.empty?
           @buffer.each do |x|
-            # p x
             @server_side.send_data(x)
           end
           @buffer = []

data/proxymachine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxymachine}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-05-27}
+  s.date = %q{2009-07-15}
   s.default_executable = %q{proxymachine}
   s.email = %q{tom@mojombo.com}
   s.executables = ["proxymachine"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-proxymachine
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -07:00
+date: 2009-07-15 00:00:00 -07:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency