async_sinatra 0.4.0 → 0.5.0

data/CHANGELOG.rdoc

@@ -1,4 +1,13 @@
-=== 0.4.0 / <%= Time.new.strftime("%Y-%m-%d") %>
+=== 0.5.0 / 2011-03-08
+
+* Fix support for conditional routes!
+* Modified assert_async assertion to add error message [JamesAlmond]
+* Move to minitest and add dependency loader
+* Support sinatra 1.2.0
+* Add support for options (sinatra 1.2.0)
+* Add support for gemtest
+
+=== 0.4.0
 
 * 1 major enhancement
 

data/Manifest.txt

@@ -1,3 +1,4 @@
+.gemtest
 CHANGELOG.rdoc
 Manifest.txt
 README.rdoc
@@ -6,4 +7,5 @@ examples/basic.ru
 lib/async_sinatra.rb
 lib/sinatra/async.rb
 lib/sinatra/async/test.rb
+test/gemloader.rb
 test/test_async.rb

data/lib/async_sinatra.rb

@@ -2,5 +2,5 @@ require 'sinatra/async'
 # This is just a stub module for documentation and versioning. Please see
 # Sinatra::Async.
 module AsyncSinatra
-  VERSION = '0.4.0'
-end
+  VERSION = '0.5.0'
+end

data/lib/sinatra/async.rb

@@ -56,10 +56,12 @@ module Sinatra #:nodoc:
     def adelete(path, opts={}, &bk); aroute 'DELETE', path, opts, &bk; end
     # See #aget.
     def ahead(path, opts={}, &bk); aroute 'HEAD', path, opts, &bk; end
+    # See #aget
+    def aoptions(path, opts={}, &bk); aroute 'OPTIONS', path, opts, &bk; end
 
     private
     def aroute(verb, path, opts = {}, &block) #:nodoc:
-      method = "A#{verb} #{path}".to_sym
+      method = :"A#{verb} #{path} #{opts.hash}"
       define_method method, &block
 
       route(verb, path, opts) do |*bargs|
@@ -89,9 +91,9 @@ module Sinatra #:nodoc:
       # is wrapped up so that exceptions and halts (redirect, etc) are handled
       # correctly.
       def async_schedule(&b)
-        if options.environment == :test
-          options.set :async_schedules, [] unless options.respond_to? :async_schedules
-          options.async_schedules << lambda { async_catch_execute(&b) }
+        if settings.environment == :test
+          settings.set :async_schedules, [] unless settings.respond_to? :async_schedules
+          settings.async_schedules << lambda { async_catch_execute(&b) }
         else
           native_async_schedule { async_catch_execute(&b) }
         end
@@ -127,7 +129,7 @@ module Sinatra #:nodoc:
       def async_handle_exception
         yield
       rescue ::Exception => boom
-        if options.show_exceptions?
+        if settings.show_exceptions?
           printer = Sinatra::ShowExceptions.new(proc{ raise boom })
           s, h, b = printer.call(request.env)
           response.status = s
@@ -159,4 +161,4 @@ module Sinatra #:nodoc:
       app.helpers Helpers
     end
   end
-end
+end

data/lib/sinatra/async/test.rb

@@ -51,7 +51,7 @@ class Sinatra::Async::Test
   module Methods
     include Rack::Test::Methods
 
-    %w(get put post delete head).each do |m|
+    %w(get put post delete head options).each do |m|
       eval <<-RUBY, binding, __FILE__, __LINE__ + 1
       def a#{m}(*args)
         #{m}(*args)
@@ -66,7 +66,7 @@ class Sinatra::Async::Test
     end
 
     def assert_async
-      assert last_response.async?
+      assert last_response.async?, "response not asynchronous. expected a status of -1 got #{last_response.status}"
     end
 
     # Simulate a user closing the connection before a response is sent.
@@ -105,4 +105,4 @@ class Sinatra::Async::Test
       end
     end
   end
-end
+end

data/test/gemloader.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+begin
+  project = File.basename(Dir['*.gemspec'].first, '.gemspec')
+  gemspec = File.expand_path("#{project}.gemspec", Dir.pwd)
+  spec = Gem::Specification.load(gemspec)
+  (spec.dependencies + spec.development_dependencies).each do |dep|
+    gem dep.name, dep.requirement.to_s
+  end
+rescue
+  warn "#{__FILE__}: Can't preload project dependencies: #{$!}"
+end

data/test/test_async.rb

@@ -1,11 +1,11 @@
-gem 'test-unit'
-require "test/unit"
+require 'gemloader'
+require 'minitest/autorun'
 
 require 'eventmachine'
 
 require "sinatra/async/test"
 
-class TestSinatraAsync < Test::Unit::TestCase
+class TestSinatraAsync < MiniTest::Unit::TestCase
   include Sinatra::Async::Test::Methods
 
   class TestApp < Sinatra::Base
@@ -78,6 +78,18 @@ class TestSinatraAsync < Test::Unit::TestCase
       em_async_schedule { redirect '/' }
     end
 
+    aget '/agents', :agent => /chrome/ do
+      body { 'chrome' }
+    end
+
+    aget '/agents', :agent => /firefox/ do
+     body { 'firefox' }
+    end
+
+    aget '/agents' do
+      body { 'other' }
+    end
+
     # Defeat the test environment semantics, ensuring we actually follow the
     # non-test branch of async_schedule. You would normally just call
     # async_schedule in user apps, and use test helpers appropriately.
@@ -93,7 +105,7 @@ class TestSinatraAsync < Test::Unit::TestCase
   def app
     TestApp.new
   end
-  
+
   def assert_redirect(path)
     r = last_request.env
     uri = r['rack.url_scheme'] + '://' + r['SERVER_NAME'] + path
@@ -119,7 +131,7 @@ class TestSinatraAsync < Test::Unit::TestCase
   def test_em_async_continue_timeout
     get '/em_timeout'
     assert_async
-    assert_raises(Test::Unit::AssertionFailedError) do
+    assert_raises(MiniTest::Assertion) do
       em_async_continue(0.001)
     end
   end
@@ -194,4 +206,21 @@ class TestSinatraAsync < Test::Unit::TestCase
     assert_equal 302, last_response.status
     assert_redirect '/'
   end
-end
+
+  def test_route_conditions_no_match
+    aget '/agents'
+    assert_equal 'other', last_response.body
+  end
+
+  def test_route_conditions_first
+    header "User-Agent", "chrome"
+    aget '/agents'
+    assert_equal 'chrome', last_response.body
+  end
+
+  def test_route_conditions_second
+    header "User-Agent", "firefox"
+    aget '/agents'
+    assert_equal 'firefox', last_response.body
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: async_sinatra
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - raggi
@@ -36,7 +36,7 @@ cert_chain:
   WjgTOJft4S4=
   -----END CERTIFICATE-----
 
-date: 2011-01-02 00:00:00 -05:00
+date: 2011-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,12 +78,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
-        - 1
-        - 6
+        - 2
         - 0
-        version: 1.6.0
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -200,12 +200,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id011
 description: |-
@@ -231,6 +231,7 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.rdoc
 files: 
+- .gemtest
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
@@ -239,6 +240,7 @@ files:
 - lib/async_sinatra.rb
 - lib/sinatra/async.rb
 - lib/sinatra/async/test.rb
+- test/gemloader.rb
 - test/test_async.rb
 has_rdoc: true
 homepage: http://github.com/raggi/async_sinatra
@@ -271,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: libraggi
-rubygems_version: 1.4.1
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: A Sinatra plugin to provide convenience whilst performing asynchronous responses inside of the Sinatra framework running under async webservers