sinatra 2.0.0 → 2.2.0

data/lib/sinatra/indifferent_hash.rb

@@ -1,4 +1,12 @@
 # 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
   # stuff removed.
@@ -41,11 +49,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 +73,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,20 +115,34 @@ 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 values_at(*keys)
-      super(*keys.map(&method(:convert_key)))
-    end
+    def slice(*keys)
+      keys.map!(&method(:convert_key))
 
-    def merge!(other_hash)
-      return super if other_hash.is_a?(self.class)
+      self.class[super(*keys)]
+    end if method_defined?(:slice) # Added in Ruby 2.5
 
-      other_hash.each_pair do |key, value|
-        key = convert_key(key)
-        value = yield(key, self[key], value) if block_given? && key?(key)
-        self[key] = convert_value(value)
+    def values_at(*keys)
+      keys.map!(&method(:convert_key))
+
+      super(*keys)
+    end
+
+    def merge!(*other_hashes)
+      other_hashes.each do |other_hash|
+        if other_hash.is_a?(self.class)
+          super(other_hash)
+        else
+          other_hash.each_pair do |key, value|
+            key = convert_key(key)
+            value = yield(key, self[key], value) if block_given? && key?(key)
+            self[key] = convert_value(value)
+          end
+        end
       end
 
       self
@@ -122,14 +150,50 @@ module Sinatra
 
     alias_method :update, :merge!
 
-    def merge(other_hash, &block)
-      dup.merge!(other_hash, &block)
+    def merge(*other_hashes, &block)
+      dup.merge!(*other_hashes, &block)
     end
 
     def replace(other_hash)
       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
+
+    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 if method_defined?(:compact) # Added in Ruby 2.4
+
     private
 
     def convert_key(key)

data/lib/sinatra/main.rb

@@ -1,6 +1,30 @@
-require 'sinatra/base'
-
 module Sinatra
+  ParamsConfig = {}
+
+  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 }
+      op.on('-e env',    'set the environment (default is development)') do |val|
+        ENV['RACK_ENV'] = val
+        ParamsConfig[: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
+      end
+    }
+    begin
+      parser.parse!(ARGV.dup)
+    rescue => evar
+      ParamsConfig[:optparse_error] = evar
+    end
+  end
+
+  require 'sinatra/base'
+
   class Application < Base
 
     # we assume that the first file that requires 'sinatra' is the
@@ -11,18 +35,13 @@ module Sinatra
     set :run, Proc.new { File.expand_path($0) == File.expand_path(app_file) }
 
     if run? && ARGV.any?
-      require 'optparse'
-      OptionParser.new { |op|
-        op.on('-p port',   'set the port (default is 4567)')                { |val| set :port, Integer(val) }
-        op.on('-o addr',   "set the host (default is #{bind})")             { |val| set :bind, val }
-        op.on('-e env',    'set the environment (default is development)')  { |val| set :environment, val.to_sym }
-        op.on('-s server', 'specify rack server/handler (default is thin)') { |val| set :server, val }
-        op.on('-q',        'turn on quiet mode (default is off)')           {       set :quiet, true }
-        op.on('-x',        'turn on the mutex lock (default is off)')       {       set :lock, true }
-      }.parse!(ARGV.dup)
+      error = ParamsConfig.delete(:optparse_error)
+      raise error if error
+      ParamsConfig.each { |k, v| set k, v }
     end
   end
 
+  remove_const(:ParamsConfig)
   at_exit { Application.run! if $!.nil? && Application.run? }
 end
 

data/lib/sinatra/show_exceptions.rb

@@ -25,28 +25,28 @@ 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
 
+    def template
+      TEMPLATE
+    end
+
     private
 
     def bad_request?(e)
@@ -360,6 +360,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.2.0'
 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,14 +17,32 @@ Gem::Specification.new 'sinatra', version do |s|
     "MAINTENANCE.md",
     "Rakefile",
     "SECURITY.md",
-    "sinatra.gemspec"]
-  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]
+    "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]
 
-  s.required_ruby_version = '>= 2.2.0'
+  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
+    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.add_dependency 'rack', '~> 2.0'
+  s.required_ruby_version = '>= 2.3.0'
+
+  s.add_dependency 'rack', '~> 2.2'
   s.add_dependency 'tilt', '~> 2.0'
   s.add_dependency 'rack-protection', version
   s.add_dependency 'mustermann', '~> 1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 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: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -75,17 +75,7 @@ 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.md
-- README.pt-br.md
-- README.pt-pt.md
-- README.ru.md
-- README.zh.md
 - LICENSE
 files:
 - ".yardopts"
@@ -101,6 +91,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,7 +99,10 @@ files:
 - README.zh.md
 - Rakefile
 - SECURITY.md
+- VERSION
 - examples/chat.rb
+- examples/rainbows.conf
+- examples/rainbows.rb
 - examples/simple.rb
 - examples/stream.ru
 - lib/sinatra.rb
@@ -120,14 +114,19 @@ 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"
-- "--inline-source"
 - "--title"
 - Sinatra
 - "--main"
@@ -139,15 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL