async_sinatra 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 936be7542ca92ea77fc6d33777319324e09c85be
-  data.tar.gz: 84e9708650bcff0416f174b530dd8f46ca6742f2
+  metadata.gz: 88155191c2f2520c93ed812212df0467b9fade93
+  data.tar.gz: e24790e795892a895fd12dbfabae797066251337
 SHA512:
-  metadata.gz: fbb3a889be58cb2d704fb7d7d2af1dbe44569ce23dc2ca0247c3aa9ebf0bf5a2a4cae1509bcd6159a4ae7b04d3706b1b5c2060f8f07940141ede44545affe6a1
-  data.tar.gz: 61264687edd7200f62557c94692bad22f80ffb2984607ddd4e1937852dd405dbf74445782252c947a0e39fea047b3568ebf6bc13a5f49ce86fae707a5004f13c
+  metadata.gz: 0264d3896a5269259293fe49258b7c0cca738bdb715999077ad3c9de0570dd5ce6c87c947e0b789e08b58d7214cef2c4b45d338f62a09099b5cf356fc66f41b7
+  data.tar.gz: d3934e32a91a32d3ca4d94c1ffe64d6fc480da6a6193caf206c56faa346ae07c5a3ed70bcb68d0fdc8d140d437ef7cf627e15eee1639bbef501ffd4525b579e0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 1.2.1 / 2016-01-16
+
+* Fix a bug where in ahalt, the async.callback was called twice (boxofbrad)
+* Improve testing support, allowing multiple requests (emschwar)
+
 === 1.2.0 / 2015-05-09
 
 * Added apatch, alink, aunlink for PATCH, LINK, UNLINK (thanks dalehamel)

data/Manifest.txt

@@ -7,5 +7,4 @@ examples/basic.ru
 lib/async_sinatra.rb
 lib/sinatra/async.rb
 lib/sinatra/async/test.rb
-test/gemloader.rb
 test/test_async.rb

data/Rakefile

@@ -10,6 +10,7 @@ Hoe.spec 'async_sinatra' do
   extra_deps << %w[rack >=1.4.1]
   extra_deps << %w[sinatra >=1.3.2]
 
+  extra_dev_deps << %w(rack-test)
   extra_dev_deps << %w(hoe-doofus >=1.0)
   extra_dev_deps << %w(hoe-seattlerb >=1.2)
   extra_dev_deps << %w(hoe-git >=1.3)

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 = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/sinatra/async.rb

@@ -87,7 +87,7 @@ module Sinatra #:nodoc:
       # Send the given body or block as the final response to the asynchronous 
       # request.
       def body(value = nil)
-        if @async_running && (value || block_given?)
+        if @async_running
           if block_given?
             super { async_handle_exception { yield } }
           else
@@ -100,8 +100,8 @@ module Sinatra #:nodoc:
 
           # Taken from Base#call
           unless @response['Content-Type']
-            if Array === body and body[0].respond_to? :content_type
-              content_type body[0].content_type
+            if Array === response.body and response.body[0].respond_to? :content_type
+              content_type response.body[0].content_type
             else
               content_type :html
             end
@@ -114,7 +114,7 @@ module Sinatra #:nodoc:
           result[-1] = [] if request.head?
 
           request.env['async.callback'][ result ]
-          body
+          response.body
         else
           super
         end
@@ -187,8 +187,7 @@ module Sinatra #:nodoc:
       # the original call stack.
       def ahalt(*args)
         invoke { halt(*args) }
-        invoke { error_block! response.status }
-        body response.body
+        invoke { error_block! response.status } unless @env['sinatra.error']
       end
 
       # The given block will be executed if the user closes the connection

data/lib/sinatra/async/test.rb

@@ -46,6 +46,10 @@ class Sinatra::Async::Test
       @after_request.each { |hook| hook.call }
       @last_response
     end
+
+    def reset_last_response
+      @last_response = nil
+    end
   end
 
   module Methods
@@ -54,6 +58,7 @@ class Sinatra::Async::Test
     %w(get put post delete head options).each do |m|
       eval <<-RUBY, binding, __FILE__, __LINE__ + 1
       def a#{m}(*args)
+        rack_mock_session.reset_last_response
         #{m}(*args)
         assert_async
         async_continue

data/test/test_async.rb

@@ -1,15 +1,37 @@
-require 'gemloader'
 require 'minitest/autorun'
 
 require 'eventmachine'
 
 require "sinatra/async/test"
 
+class CallbackCounter
+  @@count = 0
+
+  def self.count
+    @@count
+  end
+
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    callback = env['async.callback']
+    env['async.callback'] = lambda do |response|
+      @@count += 1
+      callback.call(response)
+    end
+    @app.call(env)
+  end
+end
+
 class TestSinatraAsync < MiniTest::Unit::TestCase
   include Sinatra::Async::Test::Methods
 
   class TestApp < Sinatra::Base
     set :environment, :test
+    set :call_count, 0
+
     register Sinatra::Async
 
     # Hack for storing some global data accessible in tests (normally you
@@ -94,7 +116,6 @@ 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
@@ -111,6 +132,10 @@ class TestSinatraAsync < MiniTest::Unit::TestCase
       async_schedule { body { aparams[:a] } }
     end
 
+    aget '/halt-with-body' do
+      async_schedule { ahalt 404, 'halted' }
+    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.
@@ -124,7 +149,10 @@ class TestSinatraAsync < MiniTest::Unit::TestCase
   end
 
   def app
-    TestApp.new
+    Rack::Builder.new do
+      use CallbackCounter
+      run TestApp.new
+    end.to_app
   end
 
   def assert_redirect(path)
@@ -282,4 +310,17 @@ class TestSinatraAsync < MiniTest::Unit::TestCase
     assert_equal 'test', last_response.body
   end
 
+  def test_two_requests
+    aget '/hello'
+    assert last_response.ok?
+    aget '/302'
+    assert_equal 302, last_response.status
+  end
+
+  def test_bug_42_halt_with_body_should_only_call_callback_once
+    start = CallbackCounter.count
+    aget '/halt-with-body'
+    assert_equal 'halted', last_response.body
+    assert_equal start + 1, CallbackCounter.count
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async_sinatra
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - raggi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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'
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   A Sinatra plugin to provide convenience whilst performing asynchronous
   responses inside of the Sinatra framework running under async webservers.
@@ -180,7 +194,6 @@ files:
 - lib/async_sinatra.rb
 - lib/sinatra/async.rb
 - lib/sinatra/async/test.rb
-- test/gemloader.rb
 - test/test_async.rb
 homepage: http://github.com/raggi/async_sinatra
 licenses:
@@ -204,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Sinatra plugin to provide convenience whilst performing asynchronous responses

data/test/gemloader.rb

@@ -1,11 +0,0 @@
-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