em-proxy 0.1.8 → 0.1.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 05d04c15535a7a3dc1b1d6dbe900465dd2a61a30
+  data.tar.gz: 2f14121398f689020237bdea0bf45b1e0141fdee
+SHA512:
+  metadata.gz: f40bf0a4ddd86497cd79d405ec8bf8341f428c30b6821ee3a3832f0469bb888cfc8bc942c2f7a9e744e22985d9f86cd1452a510195e37231d56babda3e89e0d4
+  data.tar.gz: ed2afacaaa70fb79d607989b321d05553e5ba10f7982418d0344d17af5a1468c32c650175907c1bfacb8419c0079daeecc8897903ff78debe8cd683529a71d4f

data/.travis.yml

@@ -1,5 +1,4 @@
+sudo: false
+language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-
+  - 2.3.0

data/Gemfile.lock

@@ -1,34 +1,41 @@
 PATH
   remote: .
   specs:
-    em-proxy (0.1.7)
+    em-proxy (0.1.8)
       eventmachine
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
-    ansi (1.4.0)
-    diff-lcs (1.1.3)
-    em-http-request (1.0.0)
-      addressable (>= 2.2.3)
-      em-socksify
-      eventmachine (>= 1.0.0.beta.3)
-      http_parser.rb (>= 0.5.2)
-    em-socksify (0.1.0)
-      eventmachine
-    eventmachine (1.0.0)
-    http_parser.rb (0.5.3)
-    posix-spawn (0.3.6)
-    rake (0.9.2.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    addressable (2.4.0)
+    ansi (1.5.0)
+    cookiejar (0.3.3)
+    diff-lcs (1.2.5)
+    em-http-request (1.1.4)
+      addressable (>= 2.3.4)
+      cookiejar (!= 0.3.1)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.1)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.2.0.1)
+    http_parser.rb (0.6.0)
+    posix-spawn (0.3.11)
+    rake (11.2.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
 
 PLATFORMS
   ruby
@@ -40,3 +47,6 @@ DEPENDENCIES
   posix-spawn
   rake
   rspec
+
+BUNDLED WITH
+   1.12.5

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2009 Ilya Grigorik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/em-proxy.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-proxy"
-  s.version     = "0.1.8"
+  s.version     = "0.1.9"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]

data/examples/balancing.rb

@@ -55,6 +55,7 @@ module BalancingProxy
       @strategy = strategy.to_sym
       case @strategy
         when :balanced
+          pp [list, list.sort_by { |b| b.load }.first]
           backend = list.sort_by { |b| b.load }.first
         when :roundrobin
           @pool   = list.clone if @pool.nil? || @pool.empty?

data/examples/http_proxy.rb

@@ -12,6 +12,8 @@ puts "listening on #{host}:#{port}..."
 
 Proxy.start(:host => host, :port => port) do |conn|
 
+  @buffer = ''
+
   @p = Http::Parser.new
   @p.on_headers_complete = proc do |h|
     session = UUID.generate
@@ -19,19 +21,23 @@ Proxy.start(:host => host, :port => port) do |conn|
 
     host, port = h['Host'].split(':')
     conn.server session, :host => host, :port => (port || 80) #, :bind_host => conn.sock[0] - # for bind ip
-                         
-    conn.relay_to_servers @buffer
 
-    @buffer.clear
+    conn.relay_to_servers @buffer
+    @buffer = nil
   end
 
-  @buffer = ''
-
   conn.on_connect do |data,b|
     puts [:on_connect, data, b].inspect
   end
 
   conn.on_data do |data|
+    if @buffer
+      @buffer << data
+
+      nil
+    else
+      @
+
     @buffer << data
     @p << data
 

data/lib/em-proxy/backend.rb

@@ -27,8 +27,8 @@ module EventMachine
 
       # Notify upstream plexer that the backend server is done
       # processing the request
-      def unbind
-        debug [@name, :unbind]
+      def unbind(reason = nil)
+        debug [@name, :unbind, reason]
         @plexer.unbind_backend(@name)
       end
 

data/lib/em-proxy/connection.rb

@@ -12,9 +12,17 @@ module EventMachine
       ##### EventMachine
       def initialize(options)
         @debug = options[:debug] || false
+        @tls_key  = options[:tls_key] || false
+        @tls_cert = options[:tls_cert] || false
         @servers = {}
       end
 
+      def post_init
+        if @tls_key and @tls_cert
+          start_tls :private_key_file => @tls_key, :cert_chain_file => @tls_cert, :verify_peer => false
+        end
+      end
+
       def receive_data(data)
         debug [:connection, data]
         processed = @on_data.call(data) if @on_data
@@ -97,12 +105,12 @@ module EventMachine
         @on_connect.call(name) if @on_connect
       end
 
-      def unbind
-        debug [:unbind, :connection]
+      def unbind(reason = nil)
+        debug [:unbind, :connection, reason]
 
         # terminate any unfinished connections
         @servers.values.compact.each do |s|
-          s.close_connection
+          s.close_connection_after_writing
         end
       end
 

data/spec/balancing_spec.rb

@@ -85,8 +85,8 @@ describe BalancingProxy do
       class BalancingProxy::Backend
         def self.list
           @list ||= [
-            {:url => "http://127.0.0.3:3000", :load => 2},
-            {:url => "http://127.0.0.2:3000", :load => 1},
+            {:url => "http://127.0.0.3:3000", :load => 4},
+            {:url => "http://127.0.0.2:3000", :load => 2},
             {:url => "http://127.0.0.1:3000", :load => 0}
           ].map { |backend| new backend }
         end
@@ -94,8 +94,8 @@ describe BalancingProxy do
 
       BalancingProxy::Backend.select.host.should == '127.0.0.1'
       BalancingProxy::Backend.select.host.should == '127.0.0.1'
-      BalancingProxy::Backend.select.host.should == '127.0.0.2'
-      BalancingProxy::Backend.select.host.should == '127.0.0.3'
+      BalancingProxy::Backend.select.host.should_not == '127.0.0.3'
+      BalancingProxy::Backend.select.host.should_not == '127.0.0.3'
     end
 
   end

data/spec/proxy_spec.rb

@@ -62,24 +62,24 @@ describe Proxy do
     end
   end
 
-  it "should duplex TCP traffic to two backends google & yahoo" do
+  it "should duplex TCP traffic to two backends" do
     EM.run do
       EventMachine.add_timer(0.1) do
         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|
-        conn.server :goog, :host => "google.com", :port => 80
-        conn.server :yhoo, :host => "yahoo.com", :port => 80
+        conn.server :goog1, :host => "google.com", :port => 80
+        conn.server :goog2, :host => "google.com", :port => 80
         conn.on_data { |data| data }
 
         seen = []
         conn.on_response do |backend, resp|
           case backend
-          when :goog then
+          when :goog1 then
             resp.should =~ /404/
             seen.push backend
-          when :yhoo
+          when :goog2
             resp.should =~ /404/
             seen.push backend
           end
@@ -112,7 +112,7 @@ describe Proxy do
         conn.server :goog, :host => "google.com", :port => 80
         conn.on_data { |data| data }
         conn.on_response do |backend, data|
-          data.gsub(/^HTTP\/1.1 200/, 'HTTP/1.1 404')
+          data.gsub(/^HTTP\/1.1 301/, 'HTTP/1.1 404')
         end
       end
     end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: em-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.1.9
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: EventMachine Proxy DSL
@@ -115,12 +102,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/em-proxy
@@ -149,27 +137,26 @@ files:
 - spec/support/echo_server.rb
 homepage: http://github.com/igrigorik/em-proxy
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: em-proxy
-rubygems_version: 1.8.24
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EventMachine Proxy DSL
 test_files:
 - spec/balancing_spec.rb