sinatra 2.1.0 → 4.1.1

data/lib/sinatra/indifferent_hash.rb

@@ -1,11 +1,4 @@
 # frozen_string_literal: true
-$stderr.puts <<EOF if !Hash.method_defined?(:slice) && !$LOAD_PATH.grep(%r{gems/activesupport}).empty? && ENV['SINATRA_ACTIVESUPPORT_WARNING'] != 'false'
-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.
-
-Set SINATRA_ACTIVESUPPORT_WARNING=false in the environment to hide this warning.
-EOF
 
 module Sinatra
   # A poor man's ActiveSupport::HashWithIndifferentAccess, with all the Rails-y
@@ -28,7 +21,8 @@ module Sinatra
   # writing interface (calling e.g. <tt>[]=</tt>, <tt>merge</tt>). This mapping
   # belongs to the public interface. For example, given:
   #
-  #   hash = Sinatra::IndifferentHash.new(:a=>1)
+  #   hash = Sinatra::IndifferentHash.new
+  #   hash[:a] = 1
   #
   # You are guaranteed that the key is returned as a string:
   #
@@ -36,7 +30,8 @@ module Sinatra
   #
   # Technically other types of keys are accepted:
   #
-  #   hash = Sinatra::IndifferentHash.new(:a=>1)
+  #   hash = Sinatra::IndifferentHash
+  #   hash[:a] = 1
   #   hash[0] = 0
   #   hash # => { "a"=>1, 0=>0 }
   #
@@ -48,12 +43,6 @@ module Sinatra
       new.merge!(Hash[*args])
     end
 
-    def initialize(*args)
-      args.map!(&method(:convert_value))
-
-      super(*args)
-    end
-
     def default(*args)
       args.map!(&method(:convert_key))
 
@@ -86,7 +75,7 @@ module Sinatra
       super(convert_key(key), convert_value(value))
     end
 
-    alias_method :store, :[]=
+    alias store []=
 
     def key(value)
       super(convert_value(value))
@@ -96,35 +85,36 @@ module Sinatra
       super(convert_key(key))
     end
 
-    alias_method :has_key?, :key?
-    alias_method :include?, :key?
-    alias_method :member?, :key?
+    alias has_key? key?
+    alias include? key?
+    alias member? key?
 
     def value?(value)
       super(convert_value(value))
     end
 
-    alias_method :has_value?, :value?
+    alias has_value? value?
 
     def delete(key)
       super(convert_key(key))
     end
 
+    # Added in Ruby 2.3
     def dig(key, *other_keys)
       super(convert_key(key), *other_keys)
-    end if method_defined?(:dig) # Added in Ruby 2.3
+    end
 
     def fetch_values(*keys)
       keys.map!(&method(:convert_key))
 
       super(*keys)
-    end if method_defined?(:fetch_values) # Added in Ruby 2.3
+    end
 
     def slice(*keys)
       keys.map!(&method(:convert_key))
 
       self.class[super(*keys)]
-    end if method_defined?(:slice) # Added in Ruby 2.5
+    end
 
     def values_at(*keys)
       keys.map!(&method(:convert_key))
@@ -148,7 +138,7 @@ module Sinatra
       self
     end
 
-    alias_method :update, :merge!
+    alias update merge!
 
     def merge(*other_hashes, &block)
       dup.merge!(*other_hashes, &block)
@@ -158,28 +148,46 @@ 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(&block)
+      dup.transform_values!(&block)
+    end
 
-      def transform_values!
-        super
-        super(&method(:convert_value))
-      end
+    def transform_values!
+      super
+      super(&method(:convert_value))
     end
 
-    if method_defined?(:transform_keys!) # Added in Ruby 2.5
-      def transform_keys(&block)
-        dup.transform_keys!(&block)
-      end
+    def transform_keys(&block)
+      dup.transform_keys!(&block)
+    end
 
-      def transform_keys!
-        super
-        super(&method(:convert_key))
-      end
+    def transform_keys!
+      super
+      super(&method(:convert_key))
+    end
+
+    def select(*args, &block)
+      return to_enum(:select) unless block_given?
+
+      dup.tap { |hash| hash.select!(*args, &block) }
+    end
+
+    def reject(*args, &block)
+      return to_enum(:reject) unless block_given?
+
+      dup.tap { |hash| hash.reject!(*args, &block) }
     end
 
+    def compact
+      dup.tap(&:compact!)
+    end
+
+    def except(*keys)
+      keys.map!(&method(:convert_key))
+
+      self.class[super(*keys)]
+    end if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0")
+
     private
 
     def convert_key(key)

data/lib/sinatra/main.rb

@@ -1,47 +1,49 @@
+# frozen_string_literal: true
+
 module Sinatra
-  ParamsConfig = {}
+  PARAMS_CONFIG = {}
 
   if ARGV.any?
     require 'optparse'
-    parser = OptionParser.new { |op|
-      op.on('-p port',   'set the port (default is 4567)')               { |val| ParamsConfig[:port] = Integer(val) }
-      op.on('-s server', 'specify rack server/handler')                  { |val| ParamsConfig[:server] = val }
-      op.on('-q',        'turn on quiet mode (default is off)')          {       ParamsConfig[:quiet] = true }
-      op.on('-x',        'turn on the mutex lock (default is off)')      {       ParamsConfig[:lock] = true }
+    parser = OptionParser.new do |op|
+      op.on('-p port',   'set the port (default is 4567)')               { |val| PARAMS_CONFIG[:port] = Integer(val) }
+      op.on('-s server', 'specify rack server/handler')                  { |val| PARAMS_CONFIG[:server] = val }
+      op.on('-q',        'turn on quiet mode (default is off)')          {       PARAMS_CONFIG[:quiet] = true }
+      op.on('-x',        'turn on the mutex lock (default is off)')      {       PARAMS_CONFIG[:lock] = true }
       op.on('-e env',    'set the environment (default is development)') do |val|
         ENV['RACK_ENV'] = val
-        ParamsConfig[:environment] = val.to_sym
+        PARAMS_CONFIG[:environment] = val.to_sym
       end
       op.on('-o addr', "set the host (default is (env == 'development' ? 'localhost' : '0.0.0.0'))") do |val|
-        ParamsConfig[:bind] = val
+        PARAMS_CONFIG[:bind] = val
       end
-    }
+    end
     begin
       parser.parse!(ARGV.dup)
-    rescue => evar
-      ParamsConfig[:optparse_error] = evar
+    rescue StandardError => e
+      PARAMS_CONFIG[:optparse_error] = e
     end
   end
 
   require 'sinatra/base'
 
   class Application < Base
-
     # we assume that the first file that requires 'sinatra' is the
     # app_file. all other path related options are calculated based
     # on this path by default.
     set :app_file, caller_files.first || $0
 
-    set :run, Proc.new { File.expand_path($0) == File.expand_path(app_file) }
+    set :run, proc { File.expand_path($0) == File.expand_path(app_file) }
 
     if run? && ARGV.any?
-      error = ParamsConfig.delete(:optparse_error)
+      error = PARAMS_CONFIG.delete(:optparse_error)
       raise error if error
-      ParamsConfig.each { |k, v| set k, v }
+
+      PARAMS_CONFIG.each { |k, v| set k, v }
     end
   end
 
-  remove_const(:ParamsConfig)
+  remove_const(:PARAMS_CONFIG)
   at_exit { Application.run! if $!.nil? && Application.run? }
 end
 

data/lib/sinatra/middleware/logger.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module Sinatra
+  module Middleware
+    class Logger
+      def initialize(app, level = ::Logger::INFO)
+        @app, @level = app, level
+      end
+
+      def call(env)
+        logger = ::Logger.new(env[Rack::RACK_ERRORS])
+        logger.level = @level
+
+        env[Rack::RACK_LOGGER] = logger
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/sinatra/show_exceptions.rb

@@ -12,6 +12,7 @@ module Sinatra
   class ShowExceptions < Rack::ShowExceptions
     @@eats_errors = Object.new
     def @@eats_errors.flush(*) end
+
     def @@eats_errors.puts(*) end
 
     def initialize(app)
@@ -21,23 +22,24 @@ module Sinatra
     def call(env)
       @app.call(env)
     rescue Exception => e
-      errors, env["rack.errors"] = env["rack.errors"], @@eats_errors
+      errors = env['rack.errors']
+      env['rack.errors'] = @@eats_errors
 
       if prefers_plain_text?(env)
-        content_type = "text/plain"
+        content_type = 'text/plain'
         body = dump_exception(e)
       else
-        content_type = "text/html"
+        content_type = 'text/html'
         body = pretty(env, e)
       end
 
-      env["rack.errors"] = errors
+      env['rack.errors'] = errors
 
       [
         500,
         {
-          "Content-Type" => content_type,
-          "Content-Length" => body.bytesize.to_s
+          'content-type' => content_type,
+          'content-length' => body.bytesize.to_s
         },
         [body]
       ]
@@ -49,27 +51,27 @@ module Sinatra
 
     private
 
-    def bad_request?(e)
-      Sinatra::BadRequest === e
+    def bad_request?(exception)
+      Sinatra::BadRequest === exception
     end
 
     def prefers_plain_text?(env)
-      !(Request.new(env).preferred_type("text/plain","text/html") == "text/html") &&
-      [/curl/].index { |item| item =~ env["HTTP_USER_AGENT"] }
+      Request.new(env).preferred_type('text/plain', 'text/html') != 'text/html' &&
+        [/curl/].index { |item| item =~ env['HTTP_USER_AGENT'] }
     end
 
     def frame_class(frame)
       if frame.filename =~ %r{lib/sinatra.*\.rb}
-        "framework"
+        'framework'
       elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
             frame.filename =~ %r{/bin/(\w+)\z}
-        "system"
+        'system'
       else
-        "app"
+        'app'
       end
     end
 
-TEMPLATE = ERB.new <<-HTML # :nodoc:
+    TEMPLATE = ERB.new <<-HTML # :nodoc:
 <!DOCTYPE html>
 <html>
 <head>
@@ -357,6 +359,6 @@ enabled the <code>show_exceptions</code> setting.</p>
   </div> <!-- /WRAP -->
   </body>
 </html>
-HTML
+    HTML
   end
 end

data/lib/sinatra/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sinatra
-  VERSION = '2.1.0'
+  VERSION = '4.1.1'
 end

data/lib/sinatra.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sinatra/main'
 
 enable :inline_templates

data/sinatra.gemspec

@@ -1,55 +1,54 @@
-version = File.read(File.expand_path("../VERSION", __FILE__)).strip
+# frozen_string_literal: true
+
+version = File.read(File.expand_path('VERSION', __dir__)).strip
 
 Gem::Specification.new 'sinatra', version do |s|
-  s.description       = "Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."
-  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://sinatrarb.com/"
+  s.description       = 'Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'
+  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://sinatrarb.com/'
   s.license           = 'MIT'
   s.files             = Dir['README*.md', 'lib/**/*', 'examples/*'] + [
-    ".yardopts",
-    "AUTHORS.md",
-    "CHANGELOG.md",
-    "CONTRIBUTING.md",
-    "Gemfile",
-    "LICENSE",
-    "MAINTENANCE.md",
-    "Rakefile",
-    "SECURITY.md",
-    "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]
+    '.yardopts',
+    'AUTHORS.md',
+    'CHANGELOG.md',
+    'CONTRIBUTING.md',
+    'Gemfile',
+    'LICENSE',
+    'MAINTENANCE.md',
+    'Rakefile',
+    'SECURITY.md',
+    'sinatra.gemspec',
+    'VERSION'
+  ]
+  s.extra_rdoc_files  = %w[README.md LICENSE]
+  s.rdoc_options      = %w[--line-numbers --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
+  unless s.respond_to?(:metadata)
+    raise <<-WARN
 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
+    WARN
   end
 
-  s.required_ruby_version = '>= 2.3.0'
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/sinatra/sinatra',
+    'changelog_uri' => 'https://github.com/sinatra/sinatra/blob/main/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'
+  }
 
-  s.add_dependency 'rack', '~> 2.2'
-  s.add_dependency 'tilt', '~> 2.0'
+  s.required_ruby_version = '>= 2.7.8'
+
+  s.add_dependency 'logger', '>= 1.6.0'
+  s.add_dependency 'mustermann', '~> 3.0'
+  s.add_dependency 'rack', '>= 3.0.0', '< 4'
   s.add_dependency 'rack-protection', version
-  s.add_dependency 'mustermann', '~> 1.0'
+  s.add_dependency 'rack-session', '>= 2.0.0', '< 3'
+  s.add_dependency 'tilt', '~> 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,82 +11,111 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
-  name: mustermann
+  name: rack-session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal
   effort.
 email: sinatrarb@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.de.md
-- README.es.md
-- README.fr.md
-- README.hu.md
-- README.ja.md
-- README.ko.md
-- README.malayalam.md
 - README.md
-- README.pt-br.md
-- README.pt-pt.md
-- README.ru.md
-- README.zh.md
 - LICENSE
 files:
 - ".yardopts"
@@ -96,24 +125,12 @@ files:
 - Gemfile
 - LICENSE
 - MAINTENANCE.md
-- README.de.md
-- README.es.md
-- README.fr.md
-- README.hu.md
-- README.ja.md
-- README.ko.md
-- README.malayalam.md
 - README.md
-- README.pt-br.md
-- README.pt-pt.md
-- README.ru.md
-- README.zh.md
 - Rakefile
 - SECURITY.md
 - VERSION
 - examples/chat.rb
-- examples/rainbows.conf
-- examples/rainbows.rb
+- examples/lifecycle_events.rb
 - examples/simple.rb
 - examples/stream.ru
 - lib/sinatra.rb
@@ -122,6 +139,7 @@ files:
 - lib/sinatra/images/500.png
 - lib/sinatra/indifferent_hash.rb
 - lib/sinatra/main.rb
+- lib/sinatra/middleware/logger.rb
 - lib/sinatra/show_exceptions.rb
 - lib/sinatra/version.rb
 - sinatra.gemspec
@@ -130,7 +148,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/sinatra/sinatra
-  changelog_uri: https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/sinatra/sinatra/blob/main/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
@@ -138,7 +156,6 @@ metadata:
 post_install_message: 
 rdoc_options:
 - "--line-numbers"
-- "--inline-source"
 - "--title"
 - Sinatra
 - "--main"
@@ -150,14 +167,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL