sinatra-synchrony 0.0.2 → 0.0.3

data/Gemfile

@@ -1,9 +1,3 @@
 source :rubygems
-gem 'sinatra'
-gem 'rack-fiber_pool',   '0.9.1'
-gem 'em-http-request',   '0.3.0'
-gem 'em-synchrony',      '0.2.0'
-gem 'em-resolv-replace', '1.1.1'
-gem 'wrong',             '0.5.0'
-gem 'rack-test',         '0.5.7'
-gem 'ruby-debug19'
+
+gemspec

data/Gemfile.lock

@@ -1,3 +1,14 @@
+PATH
+  remote: .
+  specs:
+    sinatra-synchrony (0.0.3)
+      async-rack (= 0.5.1)
+      em-http-request (= 0.3.0)
+      em-resolv-replace (= 1.1.1)
+      em-synchrony (= 0.2.0)
+      rack-fiber_pool (= 0.9.1)
+      sinatra (>= 1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -8,8 +19,8 @@ GEM
       ZenTest (~> 4.3)
     ZenTest (4.5.0)
     addressable (2.2.5)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.2)
+    async-rack (0.5.1)
+      rack (~> 1.1)
     diff-lcs (1.1.2)
     em-http-request (0.3.0)
       addressable (>= 2.0.0)
@@ -22,26 +33,16 @@ GEM
     eventmachine (0.12.10)
     file-tail (1.0.5)
       spruz (>= 0.1.0)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+    minitest (2.1.0)
     predicated (0.2.2)
     rack (1.2.2)
     rack-fiber_pool (0.9.1)
     rack-test (0.5.7)
       rack (>= 1.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
+    rake (0.8.7)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.5)
@@ -69,11 +70,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  em-http-request (= 0.3.0)
-  em-resolv-replace (= 1.1.1)
-  em-synchrony (= 0.2.0)
-  rack-fiber_pool (= 0.9.1)
+  minitest
   rack-test (= 0.5.7)
-  ruby-debug19
-  sinatra
+  rake
+  sinatra-synchrony!
   wrong (= 0.5.0)

data/README.markdown

@@ -1,3 +1,7 @@
+## Announcement ##
+
+**There is work underway to make this a Rack middleware, and integrate that middleware with this plugin. That way, many other frameworks can take advantage of this. There is also work underway to provide support for non-EventMachine Reactor pattern implementations with this approach. Stay tuned, amazing stuff coming very soon!**
+
 Sinatra::Synchrony
 ===
 
@@ -28,16 +32,19 @@ Install the gem:
 
 Register with Sinatra __at the top, before any other middleware or plugins are loaded__:
 
+    require 'sinatra/base'
     require 'sinatra/synchrony'
     class App < Sinatra::Base
       register Sinatra::Synchrony
     end
-    
-One important thing: __do not use Sinatra's internal session code__. So no "enable :sessions". Instead, enable the sessions directly via the [Rack::Session::Cookie](http://rack.rubyforge.org/doc/classes/Rack/Session/Cookie.html) middleware (there is no consequence to doing this, Sinatra does the same thing under the hood.. it just does it in the wrong load order):
 
-    class App < Sinatra::Base
-      register Sinatra::Synchrony
-      use Rack::Session::Cookie, :secret => 'CHANGE ME TO SOMETHING!'
+If you are developing with a classic style app, just require the gem and it will automatically load:
+
+    require 'sinatra'
+    require 'sinatra/synchrony'
+    
+    get '/' do
+      'Sinatra::Synchrony is loaded automatically in classic mode, nothing needed'
     end
 
 Tests

data/Rakefile

@@ -0,0 +1,15 @@
+require 'bundler'
+
+Bundler.setup
+Bundler::GemHelper.install_tasks
+
+require "rake/testtask"
+
+desc "Run all tests"
+Rake::TestTask.new do |t|
+  t.libs << "spec"
+  t.test_files = FileList['spec/*_spec.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/lib/sinatra/synchrony.rb

@@ -13,8 +13,9 @@ $VERBOSE = original_verbosity
 
 module Sinatra
   module Synchrony
-    def self.registered(app)
-      app.use Rack::FiberPool unless app.test?
+    def setup_sessions(builder)
+      builder.use Rack::FiberPool unless test?
+      super
     end
   end
   register Synchrony

data/spec/synchrony_spec.rb

@@ -17,7 +17,7 @@ describe 'A mock app' do
   include Rack::Test::Methods
   it 'successfully completes a sleep call' do
     mock_app {
-      get '/?' do
+      get '/' do
         EM::Synchrony.sleep(0.0001)
         'ok'
       end
@@ -26,4 +26,18 @@ describe 'A mock app' do
     expect { last_response.ok? }
     expect { last_response.body == 'ok' }
   end
-end
+
+  it 'works with cookie' do
+    mock_app {
+      set :session_secret, 'secret'
+      enable :sessions
+      get '/' do
+        session[:key] = 'val'
+        'ok'
+      end
+    }
+    get '/'
+    expect { last_response.ok? }
+    expect { last_response.headers['Set-Cookie'] }
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: sinatra-synchrony
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kyle Drake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
+date: 2011-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,27 +80,49 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.5.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: wrong
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Bootstraps in code required to take advantage of EventMachine/EM-Synchrony's concurrency enhancements for slow IO. Patches TCPSocket, which makes anything based on it EM-aware (including RestClient). Includes patch for tests. Requires ruby 1.9.
 email: 
 - kyledrake@gmail.com
@@ -116,6 +138,7 @@ files:
 - spec/synchrony_spec.rb
 - Gemfile
 - Gemfile.lock
+- Rakefile
 - README.markdown
 has_rdoc: true
 homepage: https://github.com/kyledrake/sinatra-synchrony
@@ -141,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra-synchrony
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Bootstraps Sinatra with EM-Synchrony code, make TCPSocket EM-aware, provides support for tests