sinatra 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 408edcc34c87364c484205f7056c82f9076fdd2c284206703ec3948984366ce4
-  data.tar.gz: 3a014fbe4abde165d916ee9156ec2c43a9c458dd5bb2dcb6d148f7a30c42951d
+SHA1:
+  metadata.gz: 2eb0ce368ea68772182f3af721a991c23d85cc97
+  data.tar.gz: d55ba8f5d95c39f7e8903ced236103b46b1a29ab
 SHA512:
-  metadata.gz: aec2788f887f884d0abd09eb2f17d1f86a6f6ff49bba82ba9028bf8e33ea7e0ac4aec8919f194e69c89cdf4c7a449d54124921de32d078f8d0016d97dbbc63e7
-  data.tar.gz: 8e2e42fc678564774e666392bd17bd08b676bff58909fc1aa46a1b093d14f150813499b9d54e4907bf9be964723ea1c3d45243d19d51660e94c3ee43d15403b6
+  metadata.gz: e9ccb8f9d0a4636c538af77f6f35920620873aa7b5330a74e0811213505ab8ac7ee3daa238b22d378a2ccf603130091acef6cae2cbb661ecd8038cefab2f6f03
+  data.tar.gz: 77fcd98ec71a87f3ba5cf0105f8f0e3f1a8f2c079051d2b44677fe22be1cb7cc3a0b8b85fed4997e3a83f9baae1f268e802d3f34eb5a85544a1260c7290d88e8

data/CHANGELOG.md

@@ -1,6 +1,18 @@
+## 2.0.4 / 2018-09-15
+
+* Don't blow up when passing frozen string to `send_file` disposition [#1137](https://github.com/sinatra/sinatra/pull/1137) by Andrew Selder
+
+* Fix ubygems LoadError [#1436](https://github.com/sinatra/sinatra/pull/1436) by Pavel Rosický
+
+* Unescape regex captures [#1446](https://github.com/sinatra/sinatra/pull/1446) by Jordan Owens
+
+* Slight performance improvements for IndifferentHash [#1427](https://github.com/sinatra/sinatra/pull/1427) by Mike Pastore
+
+* Improve development support and documentation and source code by Will Yang, Jake Craige, Grey Baker and Guilherme Goettems Schneider
+
 ## 2.0.3 / 2018-06-09
 
-* Fix the backports gem regression [#1442](ttps://github.com/sinatra/sinatra/issues/1442) by Marc-André Lafortune
+* Fix the backports gem regression [#1442](https://github.com/sinatra/sinatra/issues/1442) by Marc-André Lafortune
 
 ## 2.0.2 / 2018-06-05
 

data/Gemfile

@@ -28,7 +28,7 @@ end
 
 if RUBY_ENGINE == "ruby"
   gem 'less', '~> 2.0'
-  gem 'mini_racer'
+  gem 'therubyracer'
   gem 'redcarpet'
   gem 'wlang', '>= 2.0.1'
   gem 'bluecloth'

data/README.md

@@ -1,6 +1,8 @@
 # Sinatra
 
+[![Gem Version](https://badge.fury.io/rb/sinatra.svg)](http://badge.fury.io/rb/sinatra)
 [![Build Status](https://secure.travis-ci.org/sinatra/sinatra.svg)](https://travis-ci.org/sinatra/sinatra)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=sinatra&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=sinatra&package-manager=bundler&version-scheme=semver)
 
 Sinatra is a [DSL](https://en.wikipedia.org/wiki/Domain-specific_language) for
 quickly creating web applications in Ruby with minimal effort:
@@ -2191,7 +2193,7 @@ end
 ### Configuring attack protection
 
 Sinatra is using
-[Rack::Protection](https://github.com/sinatra/rack-protection#readme) to
+[Rack::Protection](https://github.com/sinatra/sinatra/tree/master/rack-protection#readme) to
 defend your application against common, opportunistic attacks. You can
 easily disable this behavior (which will open up your application to tons
 of common vulnerabilities):

data/Rakefile

@@ -30,7 +30,7 @@ end
 
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts = ['-r rubygems'] if defined? Gem
   t.ruby_opts << '-I.'
   t.warning = true
 end
@@ -41,7 +41,7 @@ Rake::TestTask.new(:"test:core") do |t|
      readme request response result route_added_hook
      routing server settings sinatra static templates]
   t.test_files = core_tests.map {|n| "test/#{n}_test.rb"}
-  t.ruby_opts = ["-rubygems"] if defined? Gem
+  t.ruby_opts = ["-r rubygems"] if defined? Gem
   t.ruby_opts << "-I."
   t.warning = true
 end

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/lib/sinatra/base.rb

@@ -360,7 +360,7 @@ module Sinatra
     # Set the Content-Disposition to "attachment" with the specified filename,
     # instructing the user agents to prompt to save.
     def attachment(filename = nil, disposition = :attachment)
-      response['Content-Disposition'] = disposition.to_s
+      response['Content-Disposition'] = disposition.to_s.dup
       if filename
         params = '; filename="%s"' % File.basename(filename)
         response['Content-Disposition'] << params
@@ -1028,7 +1028,7 @@ module Sinatra
 
       regexp_exists = pattern.is_a?(Mustermann::Regular) || (pattern.respond_to?(:patterns) && pattern.patterns.any? {|subpattern| subpattern.is_a?(Mustermann::Regular)} )
       if regexp_exists
-        captures           = pattern.match(route).captures
+        captures           = pattern.match(route).captures.map { |c| URI_INSTANCE.unescape(c) if c }
         values            += captures
         @params[:captures] = force_encoding(captures) unless captures.nil? || captures.empty?
       else
@@ -1813,10 +1813,9 @@ module Sinatra
       server.unshift 'control_tower'
     else
       server.unshift 'reel'
+      server.unshift 'puma'
       server.unshift 'mongrel'  if ruby_engine.nil?
-      server.unshift 'puma'     if ruby_engine != 'rbx'
       server.unshift 'thin'     if ruby_engine != 'jruby'
-      server.unshift 'puma'     if ruby_engine == 'rbx'
       server.unshift 'trinidad' if ruby_engine == 'jruby'
     end
 

data/lib/sinatra/indifferent_hash.rb

@@ -1,4 +1,23 @@
 # frozen_string_literal: true
+if !$LOAD_PATH.grep(%r{gems/activesupport}).empty? && $LOADED_FEATURES.grep(%r{active_support/core_ext/hash}).empty?
+  puts <<-EOF
+WARNING: If you plan to load any of ActiveSupport's core extensions to Hash, be
+sure to do so *before* loading Sinatra::Application or Sinatra::Base. If not,
+you may disregard this warning.
+  EOF
+end
+
+if ENV['APP_ENV'] == 'test' && !Hash.method_defined?(:slice)
+  # Some extensions get loaded during testing (e.g. by RABL and our RABL test)
+  # that we have no control over, but we need it to load *before*
+  # IndifferentHash, so we'll do it preemptively here.
+  #
+  # Newer Rubies have these methods built-in, so the extensions are no-ops.
+  require 'active_support/core_ext/hash/conversions'
+  require 'active_support/core_ext/hash/slice'
+  require 'active_support/core_ext/hash/keys'
+end
+
 module Sinatra
   # A poor man's ActiveSupport::HashWithIndifferentAccess, with all the Rails-y
   # stuff removed.
@@ -41,11 +60,15 @@ module Sinatra
     end
 
     def initialize(*args)
-      super(*args.map(&method(:convert_value)))
+      args.map!(&method(:convert_value))
+
+      super(*args)
     end
 
     def default(*args)
-      super(*args.map(&method(:convert_key)))
+      args.map!(&method(:convert_key))
+
+      super(*args)
     end
 
     def default=(value)
@@ -61,7 +84,9 @@ module Sinatra
     end
 
     def fetch(key, *args)
-      super(convert_key(key), *args.map(&method(:convert_value)))
+      args.map!(&method(:convert_value))
+
+      super(convert_key(key), *args)
     end
 
     def [](key)
@@ -101,16 +126,21 @@ module Sinatra
     end if method_defined?(:dig) # Added in Ruby 2.3
 
     def fetch_values(*keys)
-      super(*keys.map(&method(:convert_key)))
+      keys.map!(&method(:convert_key))
+
+      super(*keys)
     end if method_defined?(:fetch_values) # Added in Ruby 2.3
 
     def slice(*keys)
       keys.map!(&method(:convert_key))
+
       self.class[super(*keys)]
     end if method_defined?(:slice) # Added in Ruby 2.5
 
     def values_at(*keys)
-      super(*keys.map(&method(:convert_key)))
+      keys.map!(&method(:convert_key))
+
+      super(*keys)
     end
 
     def merge!(other_hash)
@@ -135,6 +165,28 @@ module Sinatra
       super(other_hash.is_a?(self.class) ? other_hash : self.class[other_hash])
     end
 
+    if method_defined?(:transform_values!) # Added in Ruby 2.4
+      def transform_values(&block)
+        dup.transform_values!(&block)
+      end
+
+      def transform_values!
+        super
+        super(&method(:convert_value))
+      end
+    end
+
+    if method_defined?(:transform_keys!) # Added in Ruby 2.5
+      def transform_keys(&block)
+        dup.transform_keys!(&block)
+      end
+
+      def transform_keys!
+        super
+        super(&method(:convert_key))
+      end
+    end
+
     private
 
     def convert_key(key)

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 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",
@@ -23,6 +23,29 @@ Gem::Specification.new '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]
 
+  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.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-09-15 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.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -121,10 +121,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"
@@ -148,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL