proxylocal 0.1.1 → 0.2.0

data/Rakefile

@@ -5,12 +5,11 @@ require 'echoe'
 require 'lib/client'
 
 Echoe.new('proxylocal', ProxyLocal::VERSION) do |p|
-  p.description = 'Proxy your local web-server and make it publicly available over the internet'
-  p.url         = 'http://proxylocal.com/'
-  p.author      = 'Just Lest'
-  p.email       = 'just.lest@gmail.com'
-  p.runtime_dependencies     = ['eventmachine >=0.12.10', 'bert >=1.1.2']
-  p.development_dependencies = []
+  p.summary = 'Proxy your local web-server and make it publicly available over the internet'
+  p.url     = 'http://proxylocal.com/'
+  p.author  = 'Just Lest'
+  p.email   = 'just.lest@gmail.com'
+  p.runtime_dependencies = ['eventmachine >=0.12.10', 'bert >=1.1.2']
   p.require_signed = true
-  p.rubyforge_name = ''
+  p.project = nil
 end

data/lib/client.rb

@@ -4,7 +4,7 @@ require 'eventmachine'
 require 'bert'
 
 module ProxyLocal
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 
   module Serializer
     def self.dump(object)
@@ -55,6 +55,10 @@ module ProxyLocal
       send_object(BERT::Tuple[:options, @options])
     end
 
+    def post_init
+      @connections = {}
+    end
+
     def ssl_handshake_completed
       send_options
     end
@@ -74,16 +78,24 @@ module ProxyLocal
         puts message[1]
       when :halt
         EventMachine.stop_event_loop
-      when :request
-        _, uuid, request = message
-        @@logger.info(first_line(request))
-        EventMachine.connect('127.0.0.1', @options[:local_port], ClientProxy) do |connection|
-          connection.callback do |data|
-            @@logger.info("#{first_line(data)} - #{first_line(request)}")
-            send_object(BERT::Tuple[:response, uuid, data])
-          end
-          connection.send_data(request)
+      when :connection
+        _, id = message
+        @@logger.info("New connection")
+        connection = EventMachine.connect('127.0.0.1', @options[:local_port], ClientProxy)
+        connection.on_data do |data|
+          send_object(BERT::Tuple[:stream, id, data])
         end
+        connection.on_unbind do
+          @@logger.info("Connection closed")
+          send_object(BERT::Tuple[:close, id])
+        end
+        @connections[id] = connection
+      when :stream
+        _, id, data = message
+        @connections[id].send_data(data)
+      when :close
+        _, id = message
+        @connections[id].close_connection
       end
     end
 
@@ -95,19 +107,23 @@ module ProxyLocal
 
   class ClientProxy < EventMachine::Connection
     def post_init
-      @data = ''
+      @callbacks = {}
     end
 
     def receive_data(data)
-      @data << data
+      @callbacks[:on_data].call(data) if @callbacks.has_key?(:on_data)
     end
 
     def unbind
-      @callback.call(@data) if @callback
+      @callbacks[:on_unbind].call if @callbacks.has_key?(:on_unbind)
+    end
+
+    def on_data(&block)
+      @callbacks[:on_data] = block
     end
 
-    def callback(&block)
-      @callback = block
+    def on_unbind(&block)
+      @callbacks[:on_unbind] = block
     end
   end
 end

data/proxylocal.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxylocal}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Just Lest"]
   s.cert_chain = ["/Users/lest/.gem/gem-public_cert.pem"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-12-08}
   s.default_executable = %q{proxylocal}
   s.description = %q{Proxy your local web-server and make it publicly available over the internet}
   s.email = %q{just.lest@gmail.com}
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://proxylocal.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Proxylocal"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{}
   s.rubygems_version = %q{1.3.7}
   s.signing_key = %q{/Users/lest/.gem/gem-private_key.pem}
   s.summary = %q{Proxy your local web-server and make it publicly available over the internet}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proxylocal
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Just Lest
@@ -36,7 +36,7 @@ cert_chain:
   9HkV98wF6vQ=
   -----END CERTIFICATE-----
 
-date: 2010-11-23 00:00:00 +02:00
+date: 2010-12-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "1.2"
 requirements: []
 
-rubyforge_project: ""
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3