sinatra 1.3.3 → 1.3.4

data/AUTHORS

@@ -1,8 +1,11 @@
 Sinatra was designed and developed by Blake Mizerany (bmizerany) in
-California. Continued development would not be possible without the ongoing
-financial support provided by [Heroku](http://heroku.com) and the emotional
-support provided by Adam Wiggins (adamwiggins) of Heroku, Chris Wanstrath (defunkt),
-PJ Hyett (pjhyett), and the rest of the GitHub crew.
+California.
+
+Sinatra would not have been possible without strong company backing.
+In the past, financial and emotional support have been provided mainly by
+[Heroku](http://heroku.com), [GitHub](http://github.com) and
+[Engine Yard](http://www.engineyard.com/), and is now taken care of by
+[Travis CI](http://travis-ci.com/).
 
 Special thanks to the following extraordinary individuals, who-out which
 Sinatra would not be possible:

data/CHANGES

@@ -1,3 +1,20 @@
+= 1.3.4 / 2012-01-26
+
+ * Improve documentation. (Kashyap, Stanislav Chistenko, Konstantin Haase,
+   ymmtmsys, Anurag Priyam)
+
+ * Adjustments to template system to work with Tilt edge. (Konstantin Haase)
+
+ * Fix streaming with latest Rack release. (Konstantin Haase)
+
+ * Fix default content type for Sinatra::Response with latest Rack release.
+   (Konstantin Haase)
+
+ * Fix regression where + was no longer treated like space. (Ross Boucher)
+
+* Status, headers and body will be set correctly in an after filter when using
+  halt in a before filter or route. (Konstantin Haase)
+
 = 1.3.3 / 2012-08-19
 
  * Improved documentation. (burningTyger, Konstantin Haase, Gabriel Andretta,
@@ -9,9 +26,9 @@
    clients closing the connection. (Konstantin Haase)
 
  * Fix bug where having a query param and a URL param by the same name would
-   concatinate the two values. (Konstantin Haase)
+   concatenate the two values. (Konstantin Haase)
 
- * Prevent douplicated log output when application is already wrapped in a
+ * Prevent duplicated log output when application is already wrapped in a
    `Rack::CommonLogger`. (Konstantin Haase)
 
  * Fix issue where `Rack::Link` and Rails were preventing indefinite streaming.
@@ -25,6 +42,9 @@
  * When protecting against CSRF attacks, drop the session instead of refusing
    the request. (Konstantin Haase)
 
+ * Status, headers and body will be set correctly in an after filter when using
+   halt in a before filter or route. (Konstantin Haase)
+
 = 1.3.2 / 2011-12-30
 
  * Don't automatically add `Rack::CommonLogger` if `Rack::Server` is adding it,

data/README.rdoc

@@ -867,18 +867,33 @@ the stream object, allowing you to close it at any later point in the
 execution flow. This only works on evented servers, like Thin and Rainbows.
 Other servers will still close the stream:
 
+  # long polling
+
   set :server, :thin
   connections = []
 
-  get '/' do
-    # keep stream open
+  get '/subscribe' do
+    # register a client's interest in server events
     stream(:keep_open) { |out| connections << out }
+
+    # purge dead connections
+    connections.reject!(&:closed?)
+
+    # acknowledge
+    "subscribed"
   end
 
-  post '/' do
-    # write to all open streams
-    connections.each { |out| out << params[:message] << "\n" }
-    "message sent"
+  post '/message' do
+    connections.each do |out|
+      # notify client that a new message has arrived
+      out << message << "\n"
+
+      # indicate client to connect again
+      out.close
+    end
+
+    # acknowledge
+    "message received"
   end
 
 === Logging
@@ -1111,7 +1126,7 @@ error handlers) through the <tt>request</tt> method:
     request.host                # "example.com"
     request.get?                # true (similar methods for other verbs)
     request.form_data?          # false
-    request["SOME_HEADER"]      # value of SOME_HEADER header
+    request["some_param"]       # value of some_param parameter. [] is a shortcut to the params hash.
     request.referrer            # the referrer of the client or '/'
     request.user_agent          # user agent (used by :agent condition)
     request.cookies             # hash of browser cookies
@@ -1281,8 +1296,8 @@ You can access those options via <tt>settings</tt>:
 
 Sinatra is using
 {Rack::Protection}[https://github.com/rkh/rack-protection#readme] to defend
-you application against common, opportunistic attacks. You can easily disable
-this behavior (which will open your application to tons of common
+your application against common, opportunistic attacks. You can easily disable
+this behavior (which will open up your application to tons of common
 vulnerabilities):
 
   disable :protection
@@ -1640,7 +1655,7 @@ Start with:
 
 Or with a <tt>config.ru</tt>, which allows using any Rack handler:
 
-  # config.ru
+  # config.ru (run with rackup)
   require './my_app'
   run MyApp
 
@@ -1724,7 +1739,7 @@ assign them to a constant, you can do this with <tt>Sinatra.new</tt>:
 
 It takes the application to inherit from as optional argument:
 
-  # config.ru
+  # config.ru (run with rackup)
   require 'sinatra/base'
 
   controller = Sinatra.new do

data/README.ru.rdoc

@@ -997,7 +997,7 @@ Thin - это более производительный и функциона
     request.host                # "example.com"
     request.get?                # true (есть аналоги для других методов HTTP)
     request.form_data?          # false
-    request["SOME_HEADER"]      # значение заголовка SOME_HEADER
+    request["some_param"]       # значение параметра some_param. Шорткат для хеша params
     request.referrer            # источник запроса клиента либо '/'
     request.user_agent          # user agent (используется для :agent условия)
     request.cookies             # хеш, содержащий cookies браузера

data/lib/sinatra/base.rb

@@ -63,6 +63,11 @@ module Sinatra
   # http://rack.rubyforge.org/doc/classes/Rack/Response.html
   # http://rack.rubyforge.org/doc/classes/Rack/Response/Helpers.html
   class Response < Rack::Response
+    def initialize(*)
+      super
+      headers['Content-Type'] ||= 'text/html'
+    end
+
     def body=(value)
       value = value.body while Rack::Response === value
       @body = String === value ? [value.to_str] : value
@@ -73,19 +78,39 @@ module Sinatra
     end
 
     def finish
-      if status.to_i / 100 == 1
+      result = body
+
+      if drop_content_info?
         headers.delete "Content-Length"
         headers.delete "Content-Type"
-      elsif Array === body and not [204, 304].include?(status.to_i)
+      end
+
+      if drop_body?
+        close
+        result = []
+      end
+
+      if calculate_content_length?
         # if some other code has already set Content-Length, don't muck with it
         # currently, this would be the static file-handler
-        headers["Content-Length"] ||= body.inject(0) { |l, p| l + Rack::Utils.bytesize(p) }.to_s
+        headers["Content-Length"] = body.inject(0) { |l, p| l + Rack::Utils.bytesize(p) }.to_s
       end
 
-      # Rack::Response#finish sometimes returns self as response body. We don't want that.
-      status, headers, result = super
-      result = body if result == self
-      [status, headers, result]
+      [status.to_i, header, result]
+    end
+
+    private
+
+    def calculate_content_length?
+      headers["Content-Type"] and not headers["Content-Length"] and Array === body
+    end
+
+    def drop_content_info?
+      status.to_i / 100 == 1 or drop_body?
+    end
+
+    def drop_body?
+      [204, 205, 304].include?(status.to_i)
     end
   end
 
@@ -288,7 +313,7 @@ module Sinatra
     # Class of the response body in case you use #stream.
     #
     # Three things really matter: The front and back block (back being the
-    # blog generating content, front the one sending it to the client) and
+    # block generating content, front the one sending it to the client) and
     # the scheduler, integrating with whatever concurrency feature the Rack
     # handler is using.
     #
@@ -860,7 +885,7 @@ module Sinatra
       route = @request.path_info
       route = '/' if route.empty? and not settings.empty_path_info?
       return unless match = pattern.match(route)
-      values += match.captures.to_a.map { |v| force_encoding URI.decode(v) if v }
+      values += match.captures.to_a.map { |v| force_encoding URI.decode_www_form_component(v) if v }
 
       if values.any?
         original, @params = params, params.merge('splat' => [], 'captures' => values)
@@ -927,15 +952,18 @@ module Sinatra
       elsif res.respond_to? :each
         body res
       end
+      nil # avoid double setting the same response tuple twice
     end
 
     # Dispatch a request with error handling.
     def dispatch!
-      static! if settings.static? && (request.get? || request.head?)
-      filter! :before
-      route!
+      invoke do
+        static! if settings.static? && (request.get? || request.head?)
+        filter! :before
+        route!
+      end
     rescue ::Exception => boom
-      handle_exception!(boom)
+      invoke { handle_exception!(boom) }
     ensure
       filter! :after unless env['sinatra.static_file']
     end

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/sinatra.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
   s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc --encoding=UTF-8]
 
-  s.add_dependency 'rack',            '~> 1.3', '>= 1.3.6'
-  s.add_dependency 'rack-protection', '~> 1.2'
+  s.add_dependency 'rack',            '~> 1.4'
+  s.add_dependency 'rack-protection', '~> 1.3'
   s.add_dependency 'tilt',            '~> 1.3', '>= 1.3.3'
 end

data/test/markdown_test.rb

@@ -74,8 +74,9 @@ Tilt.mappings['md'].each do |t|
     t.new { "" }
     klass = Class.new(Test::Unit::TestCase) { define_method(:engine) { t }}
     klass.class_eval(&MarkdownTest)
-    Object.const_set t.name[/[^:]+(?=Template$)/] << "Test", klass
-  rescue LoadError
+    name = t.name[/[^:]+$/].sub(/Template$/, '') << "Test"
+    Object.const_set name, klass
+  rescue LoadError, NameError
     warn "#{$!}: skipping markdown tests with #{t}"
   end
 end

data/test/response_test.rb

@@ -7,6 +7,11 @@ class ResponseTest < Test::Unit::TestCase
     @response = Sinatra::Response.new
   end
 
+  def assert_same_body(a, b)
+    enum = Enumerable.const_get(:Enumerator)
+    assert_equal enum.new(a).to_a, enum.new(b).to_a
+  end
+
   it "initializes with 200, text/html, and empty body" do
     assert_equal 200, @response.status
     assert_equal 'text/html', @response['Content-Type']
@@ -37,7 +42,7 @@ class ResponseTest < Test::Unit::TestCase
     @response.body = ['Hello', 'World!', '✈']
     status, headers, body = @response.finish
     assert_equal '14', headers['Content-Length']
-    assert_equal @response.body, body
+    assert_same_body @response.body, body
   end
 
   it 'does not call #to_ary or #inject on the body' do
@@ -51,11 +56,11 @@ class ResponseTest < Test::Unit::TestCase
 
   it 'does not nest a Sinatra::Response' do
     @response.body = Sinatra::Response.new ["foo"]
-    assert_equal @response.body, ["foo"]
+    assert_same_body @response.body, ["foo"]
   end
 
   it 'does not nest a Rack::Response' do
     @response.body = Rack::Response.new ["foo"]
-    assert_equal @response.body, ["foo"]
+    assert_same_body @response.body, ["foo"]
   end
 end

data/test/routing_test.rb

@@ -335,6 +335,17 @@ class RoutingTest < Test::Unit::TestCase
     assert not_found?
   end
 
+  it "converts plus sign into space as the value of a named param" do
+    mock_app {
+      get '/:test' do
+        params["test"]
+      end
+    }
+    get '/bob+ross'
+    assert ok?
+    assert_equal 'bob ross', body
+  end
+
   it "literally matches parens in paths" do
     route_def '/test(bar)/'
 
@@ -537,6 +548,17 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'HelloWorldHowAreYou', body
   end
 
+  it 'sets response.status with halt' do
+    status_was = nil
+    mock_app do
+      after { status_was = status }
+      get('/') { halt 500, 'error' }
+    end
+    get '/'
+    assert_status 500
+    assert_equal 500, status_was
+  end
+
   it "transitions to the next matching route on pass" do
     mock_app {
       get '/:foo' do

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.3.4
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
 platform: ruby
-authors: 
+authors:
 - Blake Mizerany
 - Ryan Tomayko
 - Simon Rozet
@@ -17,78 +12,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !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
-  requirement: *id001
-  prerelease: false
-  name: rack
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  requirement: *id002
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   name: rack-protection
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !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
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
-description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+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
@@ -101,7 +86,7 @@ extra_rdoc_files:
 - README.ru.rdoc
 - README.zh.rdoc
 - LICENSE
-files: 
+files:
 - .yardopts
 - AUTHORS
 - CHANGES
@@ -213,12 +198,10 @@ 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
@@ -226,34 +209,33 @@ rdoc_options:
 - --main
 - README.rdoc
 - --encoding=UTF-8
-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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -145507804200122103
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -145507804200122103
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 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