muxer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e481663f4f6adcdc844d99625cf45c3defb47e
-  data.tar.gz: 331679a17c1a099881adc1b0332f3f12d8c941a7
+  metadata.gz: 5cbe8738783f06b32d10471723bb67a93db7d4b2
+  data.tar.gz: 1f84ad1ec573791317e96fdd2fc499a88774fe10
 SHA512:
-  metadata.gz: e1e79736f08a399ef007029c4910370325bd7b44b3526a1c16b96251693181122cc3876a1eb79c13112c3e77fae71b594b81ab758024c7a6e4797f02dfff4ce6
-  data.tar.gz: ff5f16e51bc89ebe94fdb881888f43a35c2bc1b3623a76c51a1ee0f197469555cee66dcd5e282b14b86881b482791905e0bfa5368febb1cfe2af68f6c9ca5931
+  metadata.gz: f5c63ae1b19c7d41b2abdb00d12824c2980939c0fdbec3584b5a79cb7bac2e11dcda357a2751273ab2b6d007c2d942d7ecd2f612a1a45ccf3a7520c52876bf08
+  data.tar.gz: a8c372bea209d0524b67c01d0409089d85a90b4afac42057cdbd588f3cd935fac5b482d628a91a0a46b4721b2ba0729b204d5577d4ddf3147b6b2976a66534b4

data/lib/muxer/multiplexer.rb

@@ -1,6 +1,7 @@
 module Muxer
   class Multiplexer
     attr_reader :requests
+    attr_writer :timeout
     def initialize
       @requests = []
       @timeout = nil
@@ -14,40 +15,62 @@ module Muxer
     end
 
     def execute
-      responses = {succeeded: [], failed: [], pending: []}
-      looping = true
-      finish = Time.now + @timeout if @timeout
+      @responses = {succeeded: [], failed: [], pending: []}
+      @start = Time.now
       EventMachine.run do
         requests.each do |request|
-          responses[:pending] << request.process!
+          @responses[:pending] << request.process!
         end
 
-        EM::PeriodicTimer.new(0.01) do
-          responses[:pending].each do |pending|
-            # binding.pry
-            if pending.completed?
-              responses[:pending].delete(pending)
-              if pending.error.nil?
-                responses[:succeeded] << pending
-              else
-                responses[:failed] << pending
-              end
-            end
-          end
-          if @timeout && Time.now >= finish
-            responses[:pending].each do |pending|
-              responses[:failed] << pending
-            end
-            responses[:pending] = []
-            EM.stop
-          end
+        EM::PeriodicTimer.new(0.001) do
+          process_requests
+        end
+      end
+      @responses
+    end
 
-          if responses[:pending].empty?
-            EM.stop
+    private
+
+    def process_requests
+      process_pending
+      
+      process_timeouts
+
+      if @responses[:pending].empty?
+        EM.stop
+      end
+    end
+
+    def process_pending
+      @responses[:pending].each do |pending|
+        if pending.completed?
+          @responses[:pending].delete(pending)
+          if pending.error.nil?
+            @responses[:succeeded] << pending
+          else
+            @responses[:failed] << pending
           end
         end
       end
-      responses
+    end
+
+    def process_timeouts
+      if @timeout && Time.now >= finish
+        finish_timeouts
+        return
+      end
+      highest_remaining_timeout = @responses[:pending].map(&:timeout).max
+      if highest_remaining_timeout && (@start + highest_remaining_timeout <= Time.now)
+        finish_timeouts
+      end
+    end
+
+    def finish_timeouts
+      @responses[:pending].each do |pending|
+        @responses[:failed] << pending
+      end
+      @responses[:pending] = []
+      EM.stop
     end
   end
 end

data/lib/muxer/version.rb

@@ -1,3 +1,3 @@
 module Muxer
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/muxer/multiplexer_spec.rb

@@ -1,6 +1,26 @@
 require 'spec_helper'
 
 RSpec.describe Muxer::Multiplexer do
-  let(:request) { Muxer::Multiplexer.new }
+  let(:multiplexer) { Muxer::Multiplexer.new }
 
+  it 'kills requests with a timeout' do
+    VCR.use_cassette('muxer/multiplexer/with_a_timeout') do
+      multiplexer.add_url('https://github.com//', 0.0001)
+      response = multiplexer.execute
+
+      expect(response[:succeeded].count).to eq(0)
+      expect(response[:failed].count).to eq(1)
+   end
+  end
+
+  it 'lets a request wait on the longer one' do
+    VCR.use_cassette('muxer/multiplexer/with_one_timeout') do
+      multiplexer.add_url('https://github.com/', 0.0001)
+      multiplexer.add_url('https://github.com/', 2)
+      response = multiplexer.execute
+
+      expect(response[:succeeded].count).to eq(2)
+      expect(response[:failed].count).to eq(0)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'vcr'
 require 'pry'
 require File.join(__FILE__, "..","..","lib","muxer")
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
@@ -34,6 +34,7 @@ RSpec.configure do |config|
   VCR.configure do |c|
     c.cassette_library_dir = 'spec/cassettes'
     c.hook_into :webmock
+    c.ignore_hosts 'codeclimate.com', 'github.com'
   end
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muxer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris MacNaughton