sinatra 1.3.2 → 1.3.3

data/test/integration_test.rb

@@ -1,65 +1,85 @@
 require File.expand_path('../helper', __FILE__)
-require 'rbconfig'
-require 'open-uri'
-require 'timeout'
+require File.expand_path('../integration_helper', __FILE__)
 
+# These tests start a real server and talk to it over TCP.
+# Every test runs with every detected server.
+#
+# See test/integration/app.rb for the code of the app we test against.
 class IntegrationTest < Test::Unit::TestCase
-  def app_file
-    File.expand_path('../integration/app.rb', __FILE__)
-  end
+  extend IntegrationHelper
+  attr_accessor :server
+
+  it('sets the app_file') { assert_equal server.app_file, server.get("/app_file") }
 
-  def port
-    5000 + (Process.pid % 1000)
+  it 'logs once in development mode' do
+    random = "%064x" % Kernel.rand(2**256-1)
+    server.get "/ping?x=#{random}"
+    count = server.log.scan("GET /ping?x=#{random}").count
+    server.webrick? ? assert(count > 0) : assert_equal(1, count)
   end
 
-  def command
-    cmd = ['exec']
-    if RbConfig.respond_to? :ruby
-      cmd << RbConfig.ruby.inspect
-    else
-      file, dir = RbConfig::CONFIG.values_at('ruby_install_name', 'bindir')
-      cmd << File.expand_path(file, dir).inspect
+  it 'streams' do
+    next if server.webrick?
+    times, chunks = [Time.now], []
+    server.get_stream do |chunk|
+      next if chunk.empty?
+      chunks << chunk
+      times << Time.now
     end
-    cmd << "-I" << File.expand_path('../../lib', __FILE__).inspect
-    cmd << app_file.inspect << '-p' << port << '2>&1'
-    cmd.join(" ")
+    assert_equal ["a", "b"], chunks
+    assert times[1] - times[0] < 1
+    assert times[2] - times[1] > 1
   end
 
-  def display_output(pipe)
-    out = ""
-    loop { out <<  pipe.read_nonblock(1) }
-  rescue
-    $stderr.puts command, out unless out.empty?
-  end
+  it 'streams async' do
+    next unless server.thin?
 
-  def kill(pid, signal = "TERM")
-    Process.kill(signal, pid)
-  rescue NotImplementedError
-    system "kill -s #{signal} #{pid}"
+    Timeout.timeout(3) do
+      chunks = []
+      server.get_stream '/async' do |chunk|
+        next if chunk.empty?
+        chunks << chunk
+        case chunk
+        when "hi!"   then server.get "/send?msg=hello"
+        when "hello" then server.get "/send?close=1"
+        end
+      end
+
+      assert_equal ['hi!', 'hello'], chunks
+    end
   end
 
-  def with_server
-    pipe = IO.popen(command)
-    error = nil
-    Timeout.timeout(120) do
-      begin
-        yield
-      rescue Errno::ECONNREFUSED => e
-        error = e
-        sleep 0.1
-        retry
+  it 'streams async from subclass' do
+    next unless server.thin?
+
+    Timeout.timeout(3) do
+      chunks = []
+      server.get_stream '/subclass/async' do |chunk|
+        next if chunk.empty?
+        chunks << chunk
+        case chunk
+        when "hi!"   then server.get "/subclass/send?msg=hello"
+        when "hello" then server.get "/subclass/send?close=1"
+        end
       end
+
+      assert_equal ['hi!', 'hello'], chunks
     end
-    kill(pipe.pid) if pipe
-  rescue Timeout::Error => e
-    display_output pipe
-    kill(pipe.pid, "KILL") if pipe
-    raise error || e
   end
 
-  it 'starts a top level application' do
-    with_server do
-      assert_equal open("http://127.0.0.1:#{port}/app_file").read, app_file
-    end
+  it 'starts the correct server' do
+    exp = %r{
+      ==\sSinatra/#{Sinatra::VERSION}\s
+      has\staken\sthe\sstage\son\s\d+\sfor\sdevelopment\s
+      with\sbackup\sfrom\s#{server}
+    }ix
+
+    assert_match exp, server.log
+  end
+
+  it 'does not generate warnings' do
+    assert_raise(OpenURI::HTTPError) { server.get '/' }
+    server.get '/app_file'
+    assert_equal [], server.warnings
   end
-end
+end

data/test/routing_test.rb

@@ -236,6 +236,12 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal "format=", body
   end
 
+  it 'does not concatinate params with the same name' do
+    mock_app { get('/:foo') { params[:foo] } }
+    get '/a?foo=b'
+    assert_body 'a'
+  end
+
   it "supports single splat params like /*" do
     mock_app {
       get '/*' do

data/test/sass_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../helper', __FILE__)
 
 begin
+raise LoadError, 'sass not supported on Ruby 2.0' if RUBY_VERSION >= '2.0'
 require 'sass'
 
 class SassTest < Test::Unit::TestCase

data/test/scss_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../helper', __FILE__)
 
 begin
+raise LoadError, 'sass not supported on Ruby 2.0' if RUBY_VERSION >= '2.0'
 require 'sass'
 
 class ScssTest < Test::Unit::TestCase

data/test/static_test.rb

@@ -37,6 +37,7 @@ class StaticTest < Test::Unit::TestCase
     assert ok?
     assert_equal '', body
     assert response.headers.include?('Last-Modified')
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
   end
 
   %w[POST PUT DELETE].each do |verb|

data/test/streaming_test.rb

@@ -120,4 +120,21 @@ class StreamingTest < Test::Unit::TestCase
     get '/foo'
     assert_body 'foo'
   end
+
+  it 'sets up async.close if available' do
+    ran = false
+    mock_app do
+      get('/') do
+        close = Object.new
+        def close.callback; yield end
+        def close.errback; end
+        env['async.close'] = close
+        stream(:keep_open) do |out|
+          out.callback { ran = true }
+        end
+      end
+    end
+    get '/'
+    assert ran
+  end
 end

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sinatra
-version: !ruby/object:Gem::Version
-  version: 1.3.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 1
+  - 3
+  - 3
+  version: 1.3.3
 platform: ruby
-authors:
+authors: 
 - Blake Mizerany
 - Ryan Tomayko
 - Simon Rozet
@@ -12,65 +17,91 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2153237200 !ruby/object:Gem::Requirement
+
+date: 2012-08-19 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 3
+        - 6
         version: 1.3.6
-  type: :runtime
+  requirement: *id001
   prerelease: false
-  version_requirements: *2153237200
-- !ruby/object:Gem::Dependency
-  name: rack-protection
-  requirement: &2153236060 !ruby/object:Gem::Requirement
+  name: rack
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  requirement: *id002
   prerelease: false
-  version_requirements: *2153236060
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: &2153235320 !ruby/object:Gem::Requirement
+  name: rack-protection
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-  type: :runtime
+  requirement: *id003
   prerelease: false
-  version_requirements: *2153235320
-description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal
-  effort.
+  name: tilt
+  type: :runtime
+description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.
 email: sinatrarb@googlegroups.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.de.rdoc
 - README.es.rdoc
 - README.fr.rdoc
 - README.hu.rdoc
 - README.jp.rdoc
+- README.ko.rdoc
 - README.pt-br.rdoc
 - README.pt-pt.rdoc
 - README.rdoc
 - README.ru.rdoc
 - README.zh.rdoc
 - LICENSE
-files:
+files: 
 - .yardopts
 - AUTHORS
 - CHANGES
@@ -81,6 +112,7 @@ files:
 - README.fr.rdoc
 - README.hu.rdoc
 - README.jp.rdoc
+- README.ko.rdoc
 - README.pt-br.rdoc
 - README.pt-pt.rdoc
 - README.rdoc
@@ -112,6 +144,7 @@ files:
 - test/helper.rb
 - test/helpers_test.rb
 - test/integration/app.rb
+- test/integration_helper.rb
 - test/integration_test.rb
 - test/less_test.rb
 - test/liquid_test.rb
@@ -180,43 +213,47 @@ files:
 - test/views/layout2.test
 - test/views/nested.str
 - test/views/utf8.erb
+has_rdoc: true
 homepage: http://www.sinatrarb.com/
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Sinatra
 - --main
 - README.rdoc
-require_paths:
+- --encoding=UTF-8
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2805773660361067313
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2805773660361067313
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Classy web-development dressed in a DSL
-test_files:
+test_files: 
 - test/base_test.rb
 - test/builder_test.rb
 - test/coffee_test.rb