hyperion_http 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5346fc7748837aafc97771a3efb9e54a88305b2f
-  data.tar.gz: e5c16298bb838d5765488b368f640a779fdc856c
+  metadata.gz: 747cd659ba382e3ea9438440afec453cb26b8896
+  data.tar.gz: 4aef37878c21330999d96f8f29451c892dd8359b
 SHA512:
-  metadata.gz: 708acc75b36ce15782d74a7ddf075ee8da1c4e205e920b670dfe7fe8d3fc1d3d17156b11811f1c0bb9fad03c41759389b667681511de959d122050d9cfd80455
-  data.tar.gz: ad4b7d0a2a28e7e7db3dfe7a4417e1c745d184283c0645d64a4bdf064b4b24082c93b03a10a76129b9748e1367d75abdb6dc0bd199e0dab0c5ad95bbf45156b0
+  metadata.gz: ed81d32fc7841590b149ee116fff863c26447624bf08f265a236bc06de34a93c4205fb2797da91f6732eed50538ac1f9d131cad4aa85f32af7b9febf0a267207
+  data.tar.gz: 6b8cc99d7517756273cfdbde316cc888bc4496d725aac003aacd8e127a98d02724a74514d72bb1a58af1902bc7e11c1aac2bbed6a164698782c7f04571e62e87

data/hyperion_http.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hyperion_http'
-  spec.version       = '0.2.4'
+  spec.version       = '0.3.0'
   spec.authors       = ['Indigo BioAutomation, Inc.']
   spec.email         = ['pwinton@indigobio.com']
   spec.summary       = 'Ruby REST client'

data/lib/hyperion_test/fake.rb

@@ -27,27 +27,26 @@ class Hyperion
     # Clear routes but don't stop servers. Meant to be called between tests.
     # Starting/stopping servers is relatively slow. They can be reused.
     def reset
-      servers.values.each(&:clear_routes)
+      servers.values.each { |s| server_pool.check_in(s) }
+      servers.clear
       @configured = false
     end
 
     # Stop all servers. This should only need to be called by tests that use
     # Kim directly (like kim_spec.rb).
     def teardown_cached_servers
-      servers.values.each(&:teardown)
-      servers.clear
-      @configured = false
+      reset
+      server_pool.clear
     end
 
     private
 
     def servers
-      @servers ||= Hash.new{|hash, key| hash[key] = FakeServer.new(next_port)}
+      @servers ||= Hash.new { |hash, key| hash[key] = server_pool.check_out }
     end
 
-    def next_port
-      @last_port ||= 9000
-      @last_port += 1
+    def server_pool
+      @server_pool ||= ServerPool.new
     end
 
     private

data/lib/hyperion_test/fake_server.rb

@@ -6,6 +6,7 @@ require 'hyperion_test/fake_server/types'
 require 'hyperion_test/fake_server/config'
 require 'hyperion_test/kim'
 require 'hyperion_test/kim/matchers'
+require 'hyperion_test/server_pool'
 
 class Hyperion
   class FakeServer

data/lib/hyperion_test/kim.rb

@@ -75,8 +75,9 @@ class Hyperion
               Rack::Handler::WEBrick.run(method(:handle_request), opts) do |webrick|
                 q.push(webrick)
               end
-            ensure
+            rescue Exception => e
               $stderr.puts "Hyperion fake server on port #{@port} exited unexpectedly!" unless @stopped
+              raise e
             end
           end
           @webrick = q.pop
@@ -159,9 +160,9 @@ class Hyperion
 
     def handle(req)
       pred_value, func = @handlers.lazy
-        .map { |h| [h.pred.call(req), h.func] }
-        .select { |(pv, _)| pv }
-        .first || [nil, no_route_matched_func]
+                           .map { |h| [h.pred.call(req), h.func] }
+                           .select { |(pv, _)| pv }
+                           .first || [nil, no_route_matched_func]
       func.call(pred_value.is_a?(Request) ? pred_value : req)
     end
 

data/lib/hyperion_test/server_pool.rb

@@ -0,0 +1,33 @@
+class Hyperion
+  class ServerPool
+    def initialize
+      @free = []
+      @in_use = []
+    end
+
+    def check_out
+      s = @free.pop || FakeServer.new(next_port)
+      @in_use.push(s)
+      s
+    end
+
+    def check_in(s)
+      @in_use.delete(s)
+      @free.push(s)
+    end
+
+    def clear
+      all = @free + @in_use
+      all.each(&:teardown)
+      @free = []
+      @in_use = []
+    end
+
+    private
+
+    def next_port
+      @last_port ||= 9000
+      @last_port += 1
+    end
+  end
+end

data/spec/lib/hyperion/test_spec.rb

@@ -210,6 +210,18 @@ describe Hyperion do
     expect(result.body).to eql({'user' => 'new user'})
   end
 
+  it 'forgets routes after being reset' do
+    Hyperion.fake('https://www.google.com') do |svr|
+      svr.allow(:get, '/webhp') { 'fake google' }
+    end
+    result = Hyperion.request(RestRoute.new(:get, 'https://www.google.com/webhp'))
+    expect(result.body).to include 'fake google'
+    Hyperion.reset
+    result = Hyperion.request(RestRoute.new(:get, 'https://www.google.com/webhp'))
+    expect(result.status).to eql HyperionStatus::SUCCESS
+    expect(result.body).to include 'Google Search'
+  end
+
   def success_response(body)
     [200, {'Content-Type' => 'application/json'}, write(body, :json)]
   end

data/spec/lib/hyperion_test/server_pool_spec.rb

@@ -0,0 +1,46 @@
+require 'rspec'
+require 'hyperion_test'
+
+describe Hyperion::ServerPool do
+
+  let(:pool) { Hyperion::ServerPool.new }
+  before(:each) do
+    allow(Hyperion::FakeServer).to receive(:new) do
+      server = double
+      allow(server).to receive(:teardown)
+      server
+    end
+  end
+
+  describe '#check_out' do
+    it 'creates a new server if there are none free' do
+      new_server = double
+      expect(Hyperion::FakeServer).to receive(:new).and_return(new_server)
+      expect(pool.check_out).to eql new_server
+    end
+    it 'returns a free server' do
+      server = pool.check_out
+      pool.check_in(server)
+      expect(pool.check_out).to eql server
+    end
+  end
+
+  describe '#check_in' do
+    it 'returns a server to the pool' do
+      server = pool.check_out
+      pool.check_in(server)
+      expect(pool.check_out).to eql server
+    end
+  end
+
+  describe '#clear' do
+    it 'tears down both checked out and checked in servers' do
+      a = pool.check_out
+      b = pool.check_out
+      pool.check_in(b)
+      expect(a).to receive(:teardown)
+      expect(b).to receive(:teardown)
+      pool.clear
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperion_http
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Indigo BioAutomation, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,7 +208,6 @@ files:
 - README.md
 - Rakefile
 - build.yml
-- hyperion.gemspec
 - hyperion_http.gemspec
 - lib/hyperion.rb
 - lib/hyperion/aux/bug_error.rb
@@ -242,6 +241,7 @@ files:
 - lib/hyperion_test/kim.rb
 - lib/hyperion_test/kim/matcher.rb
 - lib/hyperion_test/kim/matchers.rb
+- lib/hyperion_test/server_pool.rb
 - lib/hyperion_test/spec_helper.rb
 - lib/hyperion_test/test_framework_hooks.rb
 - spec/fixtures/test
@@ -259,6 +259,7 @@ files:
 - spec/lib/hyperion_test/kim/matcher_spec.rb
 - spec/lib/hyperion_test/kim/matchers_spec.rb
 - spec/lib/hyperion_test/kim_spec.rb
+- spec/lib/hyperion_test/server_pool_spec.rb
 - spec/lib/types_spec.rb
 - spec/spec_helper.rb
 - spec/support/core_helpers.rb
@@ -303,6 +304,7 @@ test_files:
 - spec/lib/hyperion_test/kim/matcher_spec.rb
 - spec/lib/hyperion_test/kim/matchers_spec.rb
 - spec/lib/hyperion_test/kim_spec.rb
+- spec/lib/hyperion_test/server_pool_spec.rb
 - spec/lib/types_spec.rb
 - spec/spec_helper.rb
 - spec/support/core_helpers.rb

data/hyperion.gemspec

@@ -1 +0,0 @@
-hyperion_http.gemspec