sinatra 1.4.6 → 1.4.7

data/Rakefile

@@ -182,8 +182,8 @@ if defined?(Gem)
   end
 
   task 'release' => ['test', package('.gem')] do
-    if File.binread("CHANGES") =~ /= \d\.\d\.\d . not yet released$/i
-      fail 'please update changes first' unless %x{git symbolic-ref HEAD} == "refs/heads/prerelease\n"
+    if File.binread("CHANGELOG.md") =~ /= \d\.\d\.\d . not yet released$/i
+      fail 'please update the changelog first' unless %x{git symbolic-ref HEAD} == "refs/heads/prerelease\n"
     end
 
     sh <<-SH

data/lib/sinatra/base.rb

@@ -10,6 +10,7 @@ require 'uri'
 
 # other files we need
 require 'sinatra/show_exceptions'
+require 'sinatra/ext'
 require 'sinatra/version'
 
 module Sinatra
@@ -1034,7 +1035,7 @@ module Sinatra
     # a matching file is found, returns nil otherwise.
     def static!(options = {})
       return if (public_dir = settings.public_folder).nil?
-      path = File.expand_path("#{public_dir}#{unescape(request.path_info)}" )
+      path = File.expand_path("#{public_dir}#{URI_INSTANCE.unescape(request.path_info)}" )
       return unless File.file?(path)
 
       env['sinatra.static_file'] = path
@@ -1617,25 +1618,21 @@ module Sinatra
         if path.respond_to? :to_str
           keys = []
 
-          # We append a / at the end if there was one.
-          # Reason: Splitting does not split off an empty
-          # string at the end if the split separator
-          # is at the end.
-          #
-          postfix = '/' if path =~ /\/\z/
-
           # Split the path into pieces in between forward slashes.
+          # A negative number is given as the second argument of path.split
+          # because with this number, the method does not ignore / at the end
+          # and appends an empty string at the end of the return value.
           #
-          segments = path.split('/').map! do |segment|
+          segments = path.split('/', -1).map! do |segment|
             ignore = []
 
             # Special character handling.
             #
-            pattern = segment.to_str.gsub(/[^\?\%\\\/\:\*\w]/) do |c|
+            pattern = segment.to_str.gsub(/[^\?\%\\\/\:\*\w]|:(?!\w)/) do |c|
               ignore << escaped(c).join if c.match(/[\.@]/)
               patt = encoded(c)
               patt.gsub(/%[\da-fA-F]{2}/) do |match|
-                match.split(//).map! {|char| char =~ /[A-Z]/ ? "[#{char}#{char.tr('A-Z', 'a-z')}]" : char}.join
+                match.split(//).map! { |char| char == char.downcase ? char : "[#{char}#{char.downcase}]" }.join
               end
             end
 
@@ -1658,16 +1655,12 @@ module Sinatra
 
           # Special case handling.
           #
-          if segment = segments.pop
-            if segment.match(/\[\^\\\./)
-              parts = segment.rpartition(/\[\^\\\./)
-              parts[1] = '[^'
-              segments << parts.join
-            else
-              segments << segment
-            end
+          if last_segment = segments[-1] and last_segment.match(/\[\^\\\./)
+            parts = last_segment.rpartition(/\[\^\\\./)
+            parts[1] = '[^'
+            segments[-1] = parts.join
           end
-          [/\A#{segments.join('/')}#{postfix}\z/, keys]
+          [/\A#{segments.join('/')}\z/, keys]
         elsif path.respond_to?(:keys) && path.respond_to?(:match)
           [path, path.keys]
         elsif path.respond_to?(:names) && path.respond_to?(:match)
@@ -1698,10 +1691,7 @@ module Sinatra
         end
         unsafe_patterns = unsafe_ignore.map! do |unsafe|
           chars = unsafe.split(//).map! do |char|
-            if char =~ /[A-Z]/
-              char <<= char.tr('A-Z', 'a-z')
-            end
-            char
+            char == char.downcase ? char : char + char.downcase
           end
 
           "|(?:%[^#{chars[0]}].|%[#{chars[0]}][^#{chars[1]}])"
@@ -1776,6 +1766,8 @@ module Sinatra
           begin
             return Rack::Handler.get(server_name.to_s)
           rescue LoadError, NameError
+          rescue ArgumentError
+            Sinatra::Ext.get_handler(server_name.to_s)
           end
         end
         fail "Server handler (#{servers.join(',')}) not found."

data/lib/sinatra/ext.rb

@@ -0,0 +1,17 @@
+# This can be removed once rack/rack@2fd9df71 is released
+module Sinatra
+  module Ext
+    def self.get_handler(str)
+      begin
+        ::Object.const_get("Object", false)
+        def self._const_get(str, inherit = true)
+          Rack::Handler.const_get(str, inherit)
+        end
+      rescue
+        def self._const_get(str, inherit = true)
+          Rack::Handler.const_get(str)
+        end
+      end
+    end
+  end
+end

data/lib/sinatra/show_exceptions.rb

@@ -1,4 +1,8 @@
-require 'rack/showexceptions'
+begin
+  require 'rack/show_exceptions'
+rescue LoadError
+  require 'rack/showexceptions'
+end
 
 module Sinatra
   # Sinatra::ShowExceptions catches all exceptions raised from the app it
@@ -24,23 +28,25 @@ module Sinatra
 
       if prefers_plain_text?(env)
         content_type = "text/plain"
-        exception_string = dump_exception(e)
+        exception = dump_exception(e)
       else
         content_type = "text/html"
-        exception_string = pretty(env, e)
+        exception = pretty(env, e)
       end
 
       env["rack.errors"] = errors
 
       # Post 893a2c50 in rack/rack, the #pretty method above, implemented in
       # Rack::ShowExceptions, returns a String instead of an array.
-      body = Array(exception_string)
+      body = Array(exception)
 
       [
         500,
-       {"Content-Type" => content_type,
-        "Content-Length" => Rack::Utils.bytesize(body.join).to_s},
-       body
+        {
+          "Content-Type" => content_type,
+          "Content-Length" => Rack::Utils.bytesize(body.join).to_s
+        },
+        body
       ]
     end
 

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

data/sinatra.gemspec

@@ -13,7 +13,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.4'
+  s.add_dependency 'rack', '~> 1.5'
   s.add_dependency 'tilt', '>= 1.3', '< 3'
   s.add_dependency 'rack-protection', '~> 1.4'
 end

data/test/public/hello+world.txt

@@ -0,0 +1 @@
+This is a test intended for the + sign in urls for static serving

data/test/routing_test.rb

@@ -99,6 +99,50 @@ class RoutingTest < Minitest::Test
     assert_body "foo/bar"
   end
 
+  it "it handles encoded colons correctly" do
+    mock_app {
+      get("/:") { 'a' }
+      get("/a/:") { 'b' }
+      get("/a/:/b") { 'c' }
+      get("/a/b:") { 'd' }
+      get("/a/b: ") { 'e' }
+    }
+    get '/:'
+    assert_equal 200, status
+    assert_body "a"
+    get '/%3a'
+    assert_equal 200, status
+    assert_body "a"
+
+    get '/a/:'
+    assert_equal 200, status
+    assert_body "b"
+    get '/a/%3a'
+    assert_equal 200, status
+    assert_body "b"
+
+    get '/a/:/b'
+    assert_equal 200, status
+    assert_body "c"
+    get '/a/%3A/b'
+    assert_equal 200, status
+    assert_body "c"
+
+    get '/a/b:'
+    assert_equal 200, status
+    assert_body "d"
+    get '/a/b%3a'
+    assert_equal 200, status
+    assert_body "d"
+
+    get '/a/b%3a%20'
+    assert_equal 200, status
+    assert_body "e"
+    get '/a/b%3a+'
+    assert_equal 200, status
+    assert_body "e"
+  end
+
   it "overrides the content-type in error handlers" do
     mock_app {
       before { content_type 'text/plain' }

data/test/static_test.rb

@@ -233,4 +233,34 @@ class StaticTest < Minitest::Test
     assert response.headers.include?('Last-Modified')
   end
 
+  it 'serves files with a + sign in the path' do
+    mock_app do
+      set :static, true
+      set :public_folder, File.join(File.dirname(__FILE__), 'public')
+    end
+    
+    get "/hello+world.txt"
+    
+    real_path = File.join(File.dirname(__FILE__), 'public', 'hello+world.txt')
+    assert ok?
+    assert_equal File.read(real_path), body
+    assert_equal File.size(real_path).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
+  end
+
+  it 'serves files with a URL encoded + sign (%2B) in the path' do
+    mock_app do
+      set :static, true
+      set :public_folder, File.join(File.dirname(__FILE__), 'public')
+    end
+    
+    get "/hello%2bworld.txt"
+    
+    real_path = File.join(File.dirname(__FILE__), 'public', 'hello+world.txt')
+    assert ok?
+    assert_equal File.read(real_path), body
+    assert_equal File.size(real_path).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,8 @@ extra_rdoc_files:
 files:
 - ".yardopts"
 - AUTHORS.md
-- CHANGES
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.de.md
@@ -102,6 +103,7 @@ files:
 - examples/stream.ru
 - lib/sinatra.rb
 - lib/sinatra/base.rb
+- lib/sinatra/ext.rb
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
@@ -135,6 +137,7 @@ files:
 - test/middleware_test.rb
 - test/nokogiri_test.rb
 - test/public/favicon.ico
+- test/public/hello+world.txt
 - test/rabl_test.rb
 - test/rack_test.rb
 - test/radius_test.rb
@@ -233,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL