sinatra 2.0.0 → 2.0.8.1

data/lib/sinatra/show_exceptions.rb

@@ -25,28 +25,63 @@ module Sinatra
 
       if prefers_plain_text?(env)
         content_type = "text/plain"
-        exception = dump_exception(e)
+        body = dump_exception(e)
       else
         content_type = "text/html"
-        exception = pretty(env, e)
+        body = 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)
-
       [
         500,
         {
           "Content-Type" => content_type,
-          "Content-Length" => body.join.bytesize.to_s
+          "Content-Length" => body.bytesize.to_s
         },
-        body
+        [body]
       ]
     end
 
+    # Pulled from Rack::ShowExceptions in order to override TEMPLATE.
+    # If Rack provides another way to override, this could be removed
+    # in the future.
+    def pretty(env, exception)
+      req = Rack::Request.new(env)
+
+      # This double assignment is to prevent an "unused variable" warning on
+      # Ruby 1.9.3.  Yes, it is dumb, but I don't like Ruby yelling at me.
+      path = path = (req.script_name + req.path_info).squeeze("/")
+
+      # This double assignment is to prevent an "unused variable" warning on
+      # Ruby 1.9.3.  Yes, it is dumb, but I don't like Ruby yelling at me.
+      frames = frames = exception.backtrace.map { |line|
+        frame = OpenStruct.new
+        if line =~ /(.*?):(\d+)(:in `(.*)')?/
+          frame.filename = $1
+          frame.lineno = $2.to_i
+          frame.function = $4
+
+          begin
+            lineno = frame.lineno-1
+            lines = ::File.readlines(frame.filename)
+            frame.pre_context_lineno = [lineno-CONTEXT, 0].max
+            frame.pre_context = lines[frame.pre_context_lineno...lineno]
+            frame.context_line = lines[lineno].chomp
+            frame.post_context_lineno = [lineno+CONTEXT, lines.size].min
+            frame.post_context = lines[lineno+1..frame.post_context_lineno]
+          rescue
+          end
+
+          frame
+        else
+          nil
+        end
+      }.compact
+
+      TEMPLATE.result(binding)
+    end
+
     private
 
     def bad_request?(e)
@@ -360,6 +395,3 @@ enabled the <code>show_exceptions</code> setting.</p>
 HTML
   end
 end
-
-Rack::ShowExceptions.send :remove_const, "TEMPLATE"
-Rack::ShowExceptions.const_set "TEMPLATE", Sinatra::ShowExceptions::TEMPLATE

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '2.0.0'
+  VERSION = '2.0.8.1'
 end

data/sinatra.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new 'sinatra', version do |s|
   s.summary           = "Classy web-development dressed in a DSL"
   s.authors           = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
   s.email             = "sinatrarb@googlegroups.com"
-  s.homepage          = "http://www.sinatrarb.com/"
+  s.homepage          = "http://sinatrarb.com/"
   s.license           = 'MIT'
   s.files             = Dir['README*.md', 'lib/**/*', 'examples/*'] + [
     ".yardopts",
@@ -17,11 +17,35 @@ Gem::Specification.new 'sinatra', version do |s|
     "MAINTENANCE.md",
     "Rakefile",
     "SECURITY.md",
-    "sinatra.gemspec"]
+    "sinatra.gemspec",
+    "VERSION"]
   s.test_files        = s.files.select { |p| p =~ /^test\/.*_test.rb/ }
   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]
 
+  if s.respond_to?(:metadata)
+    s.metadata = {
+      'source_code_uri'   => 'https://github.com/sinatra/sinatra',
+      'changelog_uri'     => 'https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md',
+      'homepage_uri'      => 'http://sinatrarb.com/',
+      'bug_tracker_uri'   => 'https://github.com/sinatra/sinatra/issues',
+      'mailing_list_uri'  => 'http://groups.google.com/group/sinatrarb',
+      'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra'
+    }
+  else
+    msg = "RubyGems 2.0 or newer is required to protect against public "\
+          "gem pushes. You can update your rubygems version by running:\n\n"\
+          "gem install rubygems-update\n"\
+          "update_rubygems\n"\
+          "gem update --system"
+    raise <<-EOF
+RubyGems 2.0 or newer is required to protect against public gem pushes. You can update your rubygems version by running:
+  gem install rubygems-update
+  update_rubygems:
+  gem update --system
+EOF
+  end
+
   s.required_ruby_version = '>= 2.2.0'
 
   s.add_dependency 'rack', '~> 2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.8.1
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.8.1
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,7 @@ extra_rdoc_files:
 - README.hu.md
 - README.ja.md
 - README.ko.md
+- README.malayalam.md
 - README.md
 - README.pt-br.md
 - README.pt-pt.md
@@ -101,6 +102,7 @@ files:
 - README.hu.md
 - README.ja.md
 - README.ko.md
+- README.malayalam.md
 - README.md
 - README.pt-br.md
 - README.pt-pt.md
@@ -108,6 +110,7 @@ files:
 - README.zh.md
 - Rakefile
 - SECURITY.md
+- VERSION
 - examples/chat.rb
 - examples/simple.rb
 - examples/stream.ru
@@ -120,10 +123,16 @@ files:
 - lib/sinatra/show_exceptions.rb
 - lib/sinatra/version.rb
 - sinatra.gemspec
-homepage: http://www.sinatrarb.com/
+homepage: http://sinatrarb.com/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/sinatra/sinatra
+  changelog_uri: https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md
+  homepage_uri: http://sinatrarb.com/
+  bug_tracker_uri: https://github.com/sinatra/sinatra/issues
+  mailing_list_uri: http://groups.google.com/group/sinatrarb
+  documentation_uri: https://www.rubydoc.info/gems/sinatra
 post_install_message: 
 rdoc_options:
 - "--line-numbers"
@@ -147,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL