capybarbecue 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2678761d8bc81927ea82cb9bca880c1a8818043
-  data.tar.gz: 6d41973f08aa3b7f8bd69cb0bae7fe88db3e77c8
+  metadata.gz: 27de67f89e44f79597616f0b196c84d0632e724f
+  data.tar.gz: bc371c0201a52e2cc887df403aa0bd3a9b8d9e39
 SHA512:
-  metadata.gz: ef670b9982bc9a534a8b36b1f5edcf05c99e0a22d334bb8e88af8d6505ffee4dd0d169f156a7bf8ce29b214bcbff6771a74e1bc7c26f2518a1af50ead9f58b89
-  data.tar.gz: 63a06f7afeffa2d0b9d66f15d62dd0767efc01842d15c73a8483c06ff912cad74af0e2f7aa9773a9aa138ebad0230b021d03ca615635e75471c5a0b944758718
+  metadata.gz: 290b2dff533e72f579b90a256ed111d167620da15a9a624df3c33bb5996699aea4b6a4ec85cfb0a59c96c4a32d5687523ad9b9fe20b5dc993cc59d4cc958a2a5
+  data.tar.gz: 328e5dc4f01996ff18c791b585a4cc3024c6ece748dc40b13fea459c250edd6acea0bb1c95f3fe9f8b98e0e8013333603e981797c5fc5abb9dab3bf4f7c9be4a

data/lib/capybarbecue/server.rb

@@ -14,6 +14,7 @@ module Capybarbecue
     end
 
     def call(env)
+      env.update({"rack.multithread" => false, "rack.multiprocess" => false, "rack.run_once" => false})
       queue_and_wait(env)
     end
 
@@ -38,19 +39,27 @@ module Capybarbecue
       request = QueuedRequest.new(env)
       @requestmq.enq(request)
       return unless wait_for_response
+      wait_for request
+      check_exception_for request
+      request.response
+    end
+
+    def wait_for(request)
       started_at = Time.now
       while !request.ready? && Time.now - started_at < timeout.seconds
         # It feels dangerous not to sleep here... keep a pulse on this (sleep causes performance problems)
         Thread.pass
       end
       raise Timeout::Error.new('Timeout expired before response received') unless request.ready?
+    end
+
+    def check_exception_for(request)
       if request.exception.present?
         # Add the backtrace from this thread to make it useful
         backtrace = request.exception.backtrace + Kernel.caller
         request.exception.set_backtrace(backtrace)
         raise request.exception
       end
-      request.response
     end
 
     class QueuedRequest

data/lib/capybarbecue/version.rb

@@ -1,3 +1,3 @@
 module Capybarbecue
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/capybarbecue/server_spec.rb

@@ -11,8 +11,8 @@ describe Capybarbecue::Server do
   describe '#handle_requests' do
     before{ subject.wait_for_response = false }
     it 'responds to all queued requests' do
-      request1 = Object.new
-      request2 = Object.new
+      request1 = {}
+      request2 = {}
       mock(app).call(request1)
       mock(app).call(request2)
       subject.call(request1)
@@ -23,7 +23,7 @@ describe Capybarbecue::Server do
       let(:body){ Rack::BodyProxy.new('body') }
       before do
         stub(app).call { [200, {}, body] }
-        subject.call(nil)
+        subject.call({})
       end
       it 'closes the BodyProxy' do
         mock(body).close
@@ -32,6 +32,15 @@ describe Capybarbecue::Server do
     end
   end
   describe '#call' do
+    it 'sets some env properties' do
+      stub(subject).queue_and_wait
+      env = {}
+      subject.call(env)
+      env.keys.should match_array %w{rack.multithread rack.multiprocess rack.run_once}
+      env['rack.multithread'].should be_false
+      env['rack.multiprocess'].should be_false
+      env['rack.run_once'].should be_false
+    end
     context 'when another thread handles the request' do
       before do
         stub(app).call.with_any_args { |arg| arg }
@@ -46,7 +55,8 @@ describe Capybarbecue::Server do
       end
       after { thread.kill }
       it 'gives the response' do
-        expect(subject.call('avacado')).to eq 'avacado'
+        env = {}
+        expect(subject.call(env)).to be env
       end
       context 'when there is an exception' do
         before do
@@ -60,7 +70,7 @@ describe Capybarbecue::Server do
     context 'when the timeout expires' do
       before{ subject.timeout = 0.01 }
       it 'raises an exception' do
-        expect{ subject.call(nil) }.to raise_error Timeout::Error
+        expect{ subject.call({}) }.to raise_error Timeout::Error
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybarbecue
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew DiMichele
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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'
 description: Makes fundamental changes to Capybara's threading architecture so you
   can write stable tests with a shared database connection.
 email: backflip@gmail.com