intervention 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb373518e1a0985bdbde2581efbd6b6d73bccc0
-  data.tar.gz: 1585574390f891690da5147cc86abb404b4d809a
+  metadata.gz: bb1843752ea5b1b0bea7ae7e852614d838fe0f48
+  data.tar.gz: 7bdb14f821ac87314b665ab3aba72f0d44119ef7
 SHA512:
-  metadata.gz: 535d100a35b5dc4d045a96d19ce7c30b12eb0b1d3c4f749828a2add0c06ec192fa6f0d422e625b17602595dbbb1ad34d8e0733d642276a7cf321ef80db2418c5
-  data.tar.gz: 31a7da1e2f046fca410db30c8e2d9a7296bb5c264117bff61b76ae2570550e7a7944fd6fa10dd0ba447e9eb852f6da7fa4cc9d51a73bab7b488b4593825e9cb1
+  metadata.gz: 69b21c4fcd487201f345bb250b807649049a7845e00ef4ad02472eeb94c1eebd40c6011fde666f05c1f8ed27c845949ddd3079bef5bac12447837392071d59d6
+  data.tar.gz: d205d7f8cef7c12e26980b08d0cbe5d86bb64241bce19f3a14a7f136815647f6769b5a31e4c0ceb53eeccc64334bf44f4dcaa2b49d7dba8c84ee896dab5bc1ec

data/lib/intervention.rb

@@ -71,7 +71,6 @@ Thread.new{ EventMachine.run{ thread.wakeup } }
 Thread.stop
 
 Intervention.configure do |config|
-  config.listen_port  = 2222
-  config.host_address = 'localhost'
-  config.host_port    = 80
-end
+  config.listen_port = 2222
+  config.host_port   = { 'localhost' => 80 }
+end

data/lib/intervention/client.rb

@@ -18,7 +18,14 @@ module Intervention
     def on_message_complete parser
       callback :request
 
-      @server = EventMachine.connect (@parser.uri.host || @parser.headers['host']), Intervention.config.host_port, Intervention::Server, client: self
+      host = @parser.headers['host'][/([^\:]*)(?:\:|$)/,1]
+      port = (@parser.headers['host'][/(?:\:)(\d+)/,1] || 80)
+
+      if Intervention.config.host_port.keys.include?(host)
+        @server = EventMachine.connect host, Intervention.config.host_port[host], Intervention::Server, client: self
+      else
+        @server = EventMachine.connect host, port, Intervention::Server, client: self
+      end
       @server.send_data @parser.raw_data
       Intervention.clients.delete self
     end
@@ -35,4 +42,4 @@ module Intervention
       Intervention.callbacks.each { |c| c.send(event, self) if c.respond_to? event }
     end
   end
-end
+end

data/lib/intervention/version.rb

@@ -1,4 +1,4 @@
 module Intervention
-  VERSION = "0.1.1".freeze
-  DATE = "2013-11-11".freeze
-end
+  VERSION = "0.2.0".freeze
+  DATE = "2015-05-14".freeze
+end

data/spec/helper.rb

@@ -4,7 +4,6 @@ Coveralls.wear!
 require 'intervention'
 
 RSpec.configure do |config|
-  config.color_enabled  = true
   config.formatter      = :documentation
 end
 

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: intervention
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Slaughter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: segregate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple proxy that can be configured to perform actions upon a request
@@ -148,12 +148,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []