sinatra-symphony 0.1.0 → 0.2.0

data/README.md

@@ -38,6 +38,36 @@ Time per request:       186.581 [ms] (mean, across all concurrent requests)
 Transfer rate:          0.72 [Kbytes/sec] received
 ```
 
+## Testing
+
+Uses good old `rack-test` and a wrapper.
+
+```ruby
+  require 'minitest/autorun'
+  require 'sinatra/symphony/test'
+
+  class MiniTest::Spec
+    include Rack::Test::Methods
+    
+    def app
+      Sinatra::Symphony::Test.new(@myapp) 
+    end
+  end
+
+  describe 'myapp' do
+    it 'should work' do
+      @myapp = Class.new(Sinatra::Symphony) do
+        get '/' do
+          'hello world'
+        end
+      end
+
+      get '/'
+      assert_equal 'hello world', last_response.body
+    end
+  end
+```
+
 # See Also
 [https://github.com/kyledrake/sinatra-synchrony](https://github.com/kyledrake/sinatra-synchrony)
 

data/lib/sinatra/symphony/test.rb

@@ -0,0 +1,18 @@
+require 'rack/test'
+require 'sinatra-symphony'
+
+module Sinatra
+  class Symphony::Test
+    def initialize app
+      @app = app
+    end
+
+    def call env
+      EM.run do
+        env['async.callback'] = proc {|response| @response = response; EM.stop}
+        catch(:async) {@app.call(env)}
+      end
+      @response
+    end
+  end # Symphony::Test
+end # Sinatra

data/test/helper.rb

@@ -2,38 +2,8 @@ require 'bundler/setup'
 require 'minitest/autorun'
 require 'em-synchrony/em-http'
 require 'sinatra-symphony'
-require 'thin'
-require 'uri'
+require 'sinatra/symphony/test'
 
 class MiniTest::Spec
-  def schedule app, port = 4000, &block
-    res    = nil
-    server = fork do
-      capture_io do
-        Thin::Server.start('127.0.0.1', port, app)
-      end
-    end
-
-    wait_for_service_start(port)
-    schedule_in_thread { res = block.call URI.parse("http://127.0.0.1:#{port}") }
-    return res
-    ensure
-      Process.kill 'KILL', server rescue nil
-  end
-
-  def schedule_in_thread &block
-    EM.run do
-      EM.synchrony do
-        block.call
-        EM.stop
-      end
-    end
-  end
-
-  def wait_for_service_start port, timeout = 5
-    (timeout / 0.1).to_i.times.each do
-      sleep 0.1
-      break if TCPSocket.new('127.0.0.1', port) rescue nil
-    end
-  end
+  include Rack::Test::Methods
 end

data/test/test_app.rb

@@ -1,16 +1,33 @@
 require 'helper'
 
 describe 'sinatra-symphony app' do
+  def app
+    Sinatra::Symphony::Test.new(@myapp)
+  end
+
   it 'should run' do
-    myapp = Class.new(Sinatra::Symphony) do
+    @myapp = Class.new(Sinatra::Symphony) do
       get '/hello' do
         'world'
       end
     end
 
-    http = schedule(myapp) {|base_uri| EM::HttpRequest.new((base_uri + '/hello').to_s).get}
-    assert http
-    assert_equal 200,     http.response_header.status
-    assert_equal 'world', http.response
+    get '/hello'
+    assert_equal 200,     last_response.status
+    assert_equal 'world', last_response.body
+  end
+
+  it 'should work with rack-test' do
+    @myapp = Class.new(Sinatra::Symphony) do
+      get '/' do
+        http = EM::HttpRequest.new('http://www.google.com/foobar').get
+        status http.response_header.status
+        '404'
+      end
+    end
+
+    get '/'
+    assert_equal 404,   last_response.status
+    assert_equal '404', last_response.body
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-symphony
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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
@@ -107,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: em-synchrony glue for sinatra
+description: em-synchrony glue for sinatra.
 email:
 - deepfryed@gmail.com
 executables: []
@@ -117,6 +133,7 @@ files:
 - test/helper.rb
 - test/test_app.rb
 - lib/sinatra/symphony.rb
+- lib/sinatra/symphony/test.rb
 - lib/sinatra-symphony.rb
 - README.md
 homepage: http://github.com/deepfryed/sinatra-symphony
@@ -139,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: em-synchrony glue for sinatra