async_sinatra 0.5.0 → 1.0.0

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 1.0.0 / 2012-02-20
+
+* Fixed basic usage of #params inside route blocks.
+* Introduced #aparams for use inside of asynchronous actions in place of #params
+* Bumped the rack and sinatra dependencies. Yes, this might be rails
+  incompatible. Make your async apps standalone, it'll save you anyway.
+* Various minor bug fixes
+
 === 0.5.0 / 2011-03-08
 
 * Fix support for conditional routes!

data/Rakefile

@@ -6,8 +6,8 @@ Hoe.plugin :doofus, :git, :minitest, :gemspec2, :rubyforge
 Hoe.spec 'async_sinatra' do
   developer 'raggi', 'raggi@rubyforge.org'
 
-  extra_deps << %w[rack >=1.2.1]
-  extra_deps << %w[sinatra >=1.0]
+  extra_deps << %w[rack >=1.4.1]
+  extra_deps << %w[sinatra >=1.3.2]
 
   extra_dev_deps << %w(hoe-doofus >=1.0)
   extra_dev_deps << %w(hoe-seattlerb >=1.2)

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.5.0'
+  VERSION = '1.0.0'
 end

data/lib/sinatra/async.rb

@@ -71,17 +71,43 @@ module Sinatra #:nodoc:
     end
 
     module Helpers
+      # aparams are used when inside of something that has been scheduled
+      # asynchronously in an asynchronous route. Essentially it is the last
+      # parameters to be set by the router (for example, containing the route
+      # captures).
+      attr_reader :aparams
+
       # Send the given body or block as the final response to the asynchronous 
       # request.
-      def body(*args)
-        if @async_running
-          block_given? ? async_handle_exception { super(yield) } : super
+      def body(value = nil)
+        if @async_running && (value || block_given?)
+          if block_given?
+            super { async_handle_exception { yield } }
+          else
+            super
+          end
+
           if response.body.respond_to?(:call)
             response.body = Array(async_handle_exception {response.body.call})
           end
-          request.env['async.callback'][
-            [response.status, response.headers, response.body]
-          ]
+
+          # Taken from Base#call
+          unless @response['Content-Type']
+            if Array === body and body[0].respond_to? :content_type
+              content_type body[0].content_type
+            else
+              content_type :html
+            end
+          end
+
+          result = response.finish
+
+          # We don't get the HEAD middleware, so just do something convenient
+          # here.
+          result[-1] = [] if request.head?
+
+          request.env['async.callback'][ result ]
+          body
         else
           super
         end
@@ -111,8 +137,17 @@ module Sinatra #:nodoc:
         throw :async
       end
 
-      def async_runner(method, *bargs)
-        async_schedule { __send__(method, *bargs); nil }
+      def async_runner(meth, *bargs)
+        @aparams = @params.dup
+        async_schedule do
+          begin
+            original, @params = @params, @aparams
+            method(meth).arity == 0 ? send(meth) : send(meth, *bargs)
+          ensure
+            @params = original
+          end
+          nil
+        end
       end
 
       def async_catch_execute(&b)
@@ -135,6 +170,7 @@ module Sinatra #:nodoc:
           response.status = s
           response.headers.replace(h)
           response.body = b
+          body(response.body)
         else
           body(handle_exception!(boom))
         end

data/lib/sinatra/async/test.rb

@@ -78,11 +78,22 @@ class Sinatra::Async::Test
     # Executes the pending asynchronous blocks, required for the
     # aget/apost/etc blocks to run.
     def async_continue
-      while b = app.options.async_schedules.shift
+      while b = settings.async_schedules.shift
         b.call
       end
     end
 
+    def settings
+      # This hack exists because sinatra is now returning a proper rack stack.
+      # We might need to consider alternative approaches in future.
+      app = app()
+      until app.nil? || app.is_a?(Sinatra::Base)
+        app = app.instance_variable_get(:@app)
+      end
+      raise "Cannot determine sinatra application from #{app()}" unless app
+      app.settings
+    end
+
     # Crank the eventmachine loop until a response is made, or timeout after a
     # particular period, by default 10s. If the timeout is nil, no timeout
     # will occur.

data/test/test_async.rb

@@ -26,6 +26,10 @@ class TestSinatraAsync < MiniTest::Unit::TestCase
       body { 'hello async' }
     end
 
+    aget '/world' do
+      body 'world'
+    end
+
     aget '/em' do
       EM.add_timer(0.001) { body { 'em' }; EM.stop }
     end
@@ -90,6 +94,23 @@ class TestSinatraAsync < MiniTest::Unit::TestCase
       body { 'other' }
     end
 
+    set :call_count, 0
+    aget '/double_body_bug/:subdomain' do |subdomain|
+      body { settings.call_count += 1; '' }
+    end
+
+    aget '/param/:a' do |ma|
+      body { ma }
+    end
+
+    aget '/params/:a' do
+      body { params[:a] }
+    end
+
+    aget '/params/deferred/:a' do
+      async_schedule { body { aparams[:a] } }
+    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.
@@ -223,4 +244,42 @@ class TestSinatraAsync < MiniTest::Unit::TestCase
     aget '/agents'
     assert_equal 'firefox', last_response.body
   end
+
+  def test_basic_async_head
+    head '/hello'
+    assert_async
+    async_continue
+    assert last_response.ok?
+    assert_equal '', last_response.body
+    assert_equal "11", last_response.headers['Content-Length']
+  end
+
+  def test_string_body
+    get '/world'
+    assert_async
+    async_continue
+    assert last_response.ok?
+    assert_equal 'world', last_response.body
+  end
+
+  def test_double_body_bug
+    aget '/double_body_bug/example'
+    assert_equal 1, settings.call_count
+  end
+
+  def test_block_with_no_args
+    aget '/params/test'
+    assert_equal 'test', last_response.body
+  end
+
+  def test_block_with_an_arg
+    aget '/param/test'
+    assert_equal 'test', last_response.body
+  end
+
+  def test_params_deferred
+    aget '/params/deferred/test'
+    assert_equal 'test', last_response.body
+  end
+
 end

metadata

@@ -1,236 +1,175 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: async_sinatra
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - raggi
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNDCCAhygAwIBAgIBADANBgkqhkiG9w0BAQUFADBAMQ4wDAYDVQQDDAVyYWdn
-  aTEZMBcGCgmSJomT8ixkARkWCXJ1Ynlmb3JnZTETMBEGCgmSJomT8ixkARkWA29y
-  ZzAeFw0xMDEyMjIyMDIyMzlaFw0xMTEyMjIyMDIyMzlaMEAxDjAMBgNVBAMMBXJh
-  Z2dpMRkwFwYKCZImiZPyLGQBGRYJcnVieWZvcmdlMRMwEQYKCZImiZPyLGQBGRYD
-  b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvgeVrJxLGm2PgcrM
-  DoB5mgQVC8PMYzpzJ64+75DQ1BgHa6wIeAuRphLY9qQh+sTTvKbUHtdgkWGghRVf
-  GaRVmtFlDHRt6RHWBmxXhXmcywT6c1xeni+eC7p56/zSkZ2RFHaZ4BXC4+8lO56j
-  sAh7c+YTcY1xd7teRX6g98aIep4MLxQlbEY+DcdDvtCIAswUYNVY+Nw08goIEw5Q
-  Sjm4fjrFPBT0T6RsmkcI4ea78h993nrWPdIndgVniwBc/SxGuBUGrfm637yCXNwL
-  FUzVd0qsJcIeMhXS8ZTii04oWKcK+G2B7KZ8/+olu7TwJu5mom9ORRMlflrTxJxi
-  rd4TBQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU
-  2QvD5zSSmpVqxaJSYrFbamIWCn0wDQYJKoZIhvcNAQEFBQADggEBAHwCkRkMjr/h
-  oYjGvs3BdEDuEYvzpKgWr6xv0hjsklBZ096dOjm0tLNSdplpn5MALUw3Cqtgp1KK
-  EKEZgEi9fbhhyzhkQyoociuqLQQ0daZuigh2CESrznX1b8AawCLyB2bJ9blNylPi
-  GWGaAjsqPBtAP6LoQib2aS0YuK7kVWxUTlupQ2D3Af5ag6NY8pS/etpS4IMVQU5l
-  v9ctVo17bHsWM3sjLW3Lj6xzYheYo0r9YAMOLXz7c92JwDQahDN95W4rUTj68rAQ
-  dHaj98YtwM8tjKyJsxZSeZEn+4wEtwTHuqU7v/HaK7OX+eIb090ZsV5ii5YpD/Fh
-  WjgTOJft4S4=
-  -----END CERTIFICATE-----
-
-date: 2011-03-08 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain: []
+date: 2012-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70275016993560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016993560
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70275016992740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016992740
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70275016991820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016991820
+- !ruby/object:Gem::Dependency
+  name: rubyforge
+  requirement: &70275016990980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe-doofus
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016990980
+- !ruby/object:Gem::Dependency
+  name: hoe-doofus
+  requirement: &70275016990220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe-seattlerb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016990220
+- !ruby/object:Gem::Dependency
+  name: hoe-seattlerb
+  requirement: &70275016989440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe-git
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016989440
+- !ruby/object:Gem::Dependency
+  name: hoe-git
+  requirement: &70275016988560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: hoe-gemspec2
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016988560
+- !ruby/object:Gem::Dependency
+  name: hoe-gemspec2
+  requirement: &70275016987460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70275016987460
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70275017002960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70275017002960
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70275017001380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 12
-        - 11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.11
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70275017001380
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70275016999680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70275016999680
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &70275016998740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
-        version: 2.9.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id011
-description: |-
-  A Sinatra plugin to provide convenience whilst performing asynchronous
+  prerelease: false
+  version_requirements: *70275016998740
+description: ! 'A Sinatra plugin to provide convenience whilst performing asynchronous
+
   responses inside of the Sinatra framework running under async webservers.
-  
+
+
   To properly utilise this package, some knowledge of EventMachine and/or
+
   asynchronous patterns is recommended.
-  
+
+
   Currently, supporting servers include:
-  
+
+
   * Thin
+
   * Rainbows
-  * Zbatery
-email: 
+
+  * Zbatery'
+email:
 - raggi@rubyforge.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - CHANGELOG.rdoc
 - README.rdoc
-files: 
+files:
 - .gemtest
 - CHANGELOG.rdoc
 - Manifest.txt
@@ -242,40 +181,32 @@ files:
 - lib/sinatra/async/test.rb
 - test/gemloader.rb
 - test/test_async.rb
-has_rdoc: true
 homepage: http://github.com/raggi/async_sinatra
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: libraggi
-rubygems_version: 1.6.0
+rubygems_version: 1.8.17
 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
-test_files: 
+summary: A Sinatra plugin to provide convenience whilst performing asynchronous responses
+  inside of the Sinatra framework running under async webservers
+test_files:
 - test/test_async.rb

data.tar.gz.sig

@@ -1,3 +0,0 @@
-?��ͫ�-��*����$}k�������@o^\�Z�!,|�Z��R�BA7	�^�$�<��%(��E�	e���C�9Xߘ����v���V��~�yX��{3E�m�I`cn��®�S�$U>���p����U���;�1Q��'�s��/-C�z��5���6�Y�'���xۣ@q�z�
�K��P�xr�q\�0�`
-�� �bdYU~U�~:���+�/N
-ev2��3;�~.p�鹏�Ⱦ��A�@$!�