sinatra 1.4.8 → 2.0.0

data/lib/sinatra/indifferent_hash.rb

@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+module Sinatra
+  # A poor man's ActiveSupport::HashWithIndifferentAccess, with all the Rails-y
+  # stuff removed.
+  #
+  # Implements a hash where keys <tt>:foo</tt> and <tt>"foo"</tt> are
+  # considered to be the same.
+  #
+  #   rgb = Sinatra::IndifferentHash.new
+  #
+  #   rgb[:black]    =  '#000000' # symbol assignment
+  #   rgb[:black]  # => '#000000' # symbol retrieval
+  #   rgb['black'] # => '#000000' # string retrieval
+  #
+  #   rgb['white']   =  '#FFFFFF' # string assignment
+  #   rgb[:white]  # => '#FFFFFF' # symbol retrieval
+  #   rgb['white'] # => '#FFFFFF' # string retrieval
+  #
+  # Internally, symbols are mapped to strings when used as keys in the entire
+  # 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)
+  #
+  # You are guaranteed that the key is returned as a string:
+  #
+  #   hash.keys # => ["a"]
+  #
+  # Technically other types of keys are accepted:
+  #
+  #   hash = Sinatra::IndifferentHash.new(:a=>1)
+  #   hash[0] = 0
+  #   hash # => { "a"=>1, 0=>0 }
+  #
+  # But this class is intended for use cases where strings or symbols are the
+  # expected keys and it is convenient to understand both as the same. For
+  # example the +params+ hash in Sinatra.
+  class IndifferentHash < Hash
+    def self.[](*args)
+      new.merge!(Hash[*args])
+    end
+
+    def initialize(*args)
+      super(*args.map(&method(:convert_value)))
+    end
+
+    def default(*args)
+      super(*args.map(&method(:convert_key)))
+    end
+
+    def default=(value)
+      super(convert_value(value))
+    end
+
+    def assoc(key)
+      super(convert_key(key))
+    end
+
+    def rassoc(value)
+      super(convert_value(value))
+    end
+
+    def fetch(key, *args)
+      super(convert_key(key), *args.map(&method(:convert_value)))
+    end
+
+    def [](key)
+      super(convert_key(key))
+    end
+
+    def []=(key, value)
+      super(convert_key(key), convert_value(value))
+    end
+
+    alias_method :store, :[]=
+
+    def key(value)
+      super(convert_value(value))
+    end
+
+    def key?(key)
+      super(convert_key(key))
+    end
+
+    alias_method :has_key?, :key?
+    alias_method :include?, :key?
+    alias_method :member?, :key?
+
+    def value?(value)
+      super(convert_value(value))
+    end
+
+    alias_method :has_value?, :value?
+
+    def delete(key)
+      super(convert_key(key))
+    end
+
+    def dig(key, *other_keys)
+      super(convert_key(key), *other_keys)
+    end if method_defined?(:dig) # Added in Ruby 2.3
+
+    def fetch_values(*keys)
+      super(*keys.map(&method(:convert_key)))
+    end if method_defined?(:fetch_values) # Added in Ruby 2.3
+
+    def values_at(*keys)
+      super(*keys.map(&method(:convert_key)))
+    end
+
+    def merge!(other_hash)
+      return super if other_hash.is_a?(self.class)
+
+      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
+
+      self
+    end
+
+    alias_method :update, :merge!
+
+    def merge(other_hash, &block)
+      dup.merge!(other_hash, &block)
+    end
+
+    def replace(other_hash)
+      super(other_hash.is_a?(self.class) ? other_hash : self.class[other_hash])
+    end
+
+    private
+
+    def convert_key(key)
+      key.is_a?(Symbol) ? key.to_s : key
+    end
+
+    def convert_value(value)
+      case value
+      when Hash
+        value.is_a?(self.class) ? value : self.class[value]
+      when Array
+        value.map(&method(:convert_value))
+      else
+        value
+      end
+    end
+  end
+end

data/lib/sinatra/main.rb

@@ -17,6 +17,7 @@ module Sinatra
         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)
     end

data/lib/sinatra/show_exceptions.rb

@@ -1,8 +1,6 @@
-begin
-  require 'rack/show_exceptions'
-rescue LoadError
-  require 'rack/showexceptions'
-end
+# frozen_string_literal: true
+
+require 'rack/show_exceptions'
 
 module Sinatra
   # Sinatra::ShowExceptions catches all exceptions raised from the app it
@@ -17,8 +15,7 @@ module Sinatra
     def @@eats_errors.puts(*) end
 
     def initialize(app)
-      @app      = app
-      @template = ERB.new(TEMPLATE)
+      @app = app
     end
 
     def call(env)
@@ -44,7 +41,7 @@ module Sinatra
         500,
         {
           "Content-Type" => content_type,
-          "Content-Length" => Rack::Utils.bytesize(body.join).to_s
+          "Content-Length" => body.join.bytesize.to_s
         },
         body
       ]
@@ -52,23 +49,27 @@ module Sinatra
 
     private
 
+    def bad_request?(e)
+      Sinatra::BadRequest === e
+    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"]}
+      [/curl/].index { |item| item =~ env["HTTP_USER_AGENT"] }
     end
 
     def frame_class(frame)
-      if frame.filename =~ /lib\/sinatra.*\.rb/
+      if frame.filename =~ %r{lib/sinatra.*\.rb}
         "framework"
       elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
-            frame.filename =~ /\/bin\/(\w+)$/
+            frame.filename =~ %r{/bin/(\w+)\z}
         "system"
       else
         "app"
       end
     end
 
-TEMPLATE = <<-HTML # :nodoc:
+TEMPLATE = ERB.new <<-HTML # :nodoc:
 <!DOCTYPE html>
 <html>
 <head>
@@ -213,8 +214,10 @@ TEMPLATE = <<-HTML # :nodoc:
       <p><a href="#" id="expando"
             onclick="toggleBacktrace(); return false">(expand)</a></p>
       <p id="nav"><strong>JUMP TO:</strong>
-         <a href="#get-info">GET</a>
-         <a href="#post-info">POST</a>
+         <% unless bad_request?(exception) %>
+            <a href="#get-info">GET</a>
+            <a href="#post-info">POST</a>
+         <% end %>
          <a href="#cookie-info">COOKIES</a>
          <a href="#env-info">ENV</a>
       </p>
@@ -267,47 +270,49 @@ TEMPLATE = <<-HTML # :nodoc:
       </ul>
     </div> <!-- /BACKTRACE -->
 
-    <div id="get">
-      <h3 id="get-info">GET</h3>
-      <% if req.GET and not req.GET.empty? %>
-        <table class="req">
-          <tr>
-            <th>Variable</th>
-            <th>Value</th>
-          </tr>
-           <% req.GET.sort_by { |k, v| k.to_s }.each { |key, val| %>
-          <tr>
-            <td><%=h key %></td>
-            <td class="code"><div><%=h val.inspect %></div></td>
-          </tr>
-          <% } %>
-        </table>
-      <% else %>
-        <p class="no-data">No GET data.</p>
-      <% end %>
-      <div class="clear"></div>
-    </div> <!-- /GET -->
-
-    <div id="post">
-      <h3 id="post-info">POST</h3>
-      <% if req.POST and not req.POST.empty? %>
-        <table class="req">
-          <tr>
-            <th>Variable</th>
-            <th>Value</th>
-          </tr>
-          <% req.POST.sort_by { |k, v| k.to_s }.each { |key, val| %>
-          <tr>
-            <td><%=h key %></td>
-            <td class="code"><div><%=h val.inspect %></div></td>
-          </tr>
-          <% } %>
-        </table>
-      <% else %>
-        <p class="no-data">No POST data.</p>
-      <% end %>
-      <div class="clear"></div>
-    </div> <!-- /POST -->
+    <% unless bad_request?(exception) %>
+      <div id="get">
+        <h3 id="get-info">GET</h3>
+        <% if req.GET and not req.GET.empty? %>
+          <table class="req">
+            <tr>
+              <th>Variable</th>
+              <th>Value</th>
+            </tr>
+             <% req.GET.sort_by { |k, v| k.to_s }.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val.inspect %></div></td>
+            </tr>
+            <% } %>
+          </table>
+        <% else %>
+          <p class="no-data">No GET data.</p>
+        <% end %>
+        <div class="clear"></div>
+      </div> <!-- /GET -->
+
+      <div id="post">
+        <h3 id="post-info">POST</h3>
+        <% if req.POST and not req.POST.empty? %>
+          <table class="req">
+            <tr>
+              <th>Variable</th>
+              <th>Value</th>
+            </tr>
+            <% req.POST.sort_by { |k, v| k.to_s }.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val.inspect %></div></td>
+            </tr>
+            <% } %>
+          </table>
+        <% else %>
+          <p class="no-data">No POST data.</p>
+        <% end %>
+        <div class="clear"></div>
+      </div> <!-- /POST -->
+    <% end %>
 
     <div id="cookies">
       <h3 id="cookie-info">COOKIES</h3>
@@ -355,3 +360,6 @@ 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 = '1.4.8'
+  VERSION = '2.0.0'
 end

data/sinatra.gemspec

@@ -1,19 +1,31 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'sinatra/version'
+version = File.read(File.expand_path("../VERSION", __FILE__)).strip
 
-Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
+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://www.sinatrarb.com/"
   s.license           = 'MIT'
-  s.files             = `git ls-files`.split("\n") - %w[.gitignore .travis.yml]
+  s.files             = Dir['README*.md', 'lib/**/*', 'examples/*'] + [
+    ".yardopts",
+    "AUTHORS.md",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "Gemfile",
+    "LICENSE",
+    "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]
 
-  s.add_dependency 'rack', '~> 1.5'
-  s.add_dependency 'tilt', '>= 1.3', '< 3'
-  s.add_dependency 'rack-protection', '~> 1.4'
+  s.required_ruby_version = '>= 2.2.0'
+
+  s.add_dependency 'rack', '~> 2.0'
+  s.add_dependency 'tilt', '~> 2.0'
+  s.add_dependency 'rack-protection', version
+  s.add_dependency 'mustermann', '~> 1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -19,48 +19,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-protection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
 description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal
   effort.
 email: sinatrarb@googlegroups.com
@@ -86,6 +94,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- MAINTENANCE.md
 - README.de.md
 - README.es.md
 - README.fr.md
@@ -98,117 +107,19 @@ files:
 - README.ru.md
 - README.zh.md
 - Rakefile
+- SECURITY.md
 - examples/chat.rb
 - examples/simple.rb
 - 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/indifferent_hash.rb
 - lib/sinatra/main.rb
 - lib/sinatra/show_exceptions.rb
 - lib/sinatra/version.rb
 - sinatra.gemspec
-- test/asciidoctor_test.rb
-- test/base_test.rb
-- test/builder_test.rb
-- test/coffee_test.rb
-- test/compile_test.rb
-- test/contest.rb
-- test/creole_test.rb
-- test/delegator_test.rb
-- test/encoding_test.rb
-- test/erb_test.rb
-- test/extensions_test.rb
-- test/filter_test.rb
-- test/haml_test.rb
-- test/helper.rb
-- test/helpers_test.rb
-- test/integration/app.rb
-- test/integration_helper.rb
-- test/integration_test.rb
-- test/less_test.rb
-- test/liquid_test.rb
-- test/mapped_error_test.rb
-- test/markaby_test.rb
-- test/markdown_test.rb
-- test/mediawiki_test.rb
-- 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
-- test/rdoc_test.rb
-- test/readme_test.rb
-- test/request_test.rb
-- test/response_test.rb
-- test/result_test.rb
-- test/route_added_hook_test.rb
-- test/routing_test.rb
-- test/sass_test.rb
-- test/scss_test.rb
-- test/server_test.rb
-- test/settings_test.rb
-- test/sinatra_test.rb
-- test/slim_test.rb
-- test/static_test.rb
-- test/streaming_test.rb
-- test/stylus_test.rb
-- test/templates_test.rb
-- test/textile_test.rb
-- test/views/a/in_a.str
-- test/views/ascii.erb
-- test/views/b/in_b.str
-- test/views/calc.html.erb
-- test/views/error.builder
-- test/views/error.erb
-- test/views/error.haml
-- test/views/error.sass
-- test/views/explicitly_nested.str
-- test/views/foo/hello.test
-- test/views/hello.asciidoc
-- test/views/hello.builder
-- test/views/hello.coffee
-- test/views/hello.creole
-- test/views/hello.erb
-- test/views/hello.haml
-- test/views/hello.less
-- test/views/hello.liquid
-- test/views/hello.mab
-- test/views/hello.md
-- test/views/hello.mediawiki
-- test/views/hello.nokogiri
-- test/views/hello.rabl
-- test/views/hello.radius
-- test/views/hello.rdoc
-- test/views/hello.sass
-- test/views/hello.scss
-- test/views/hello.slim
-- test/views/hello.str
-- test/views/hello.styl
-- test/views/hello.test
-- test/views/hello.textile
-- test/views/hello.wlang
-- test/views/hello.yajl
-- test/views/layout2.builder
-- test/views/layout2.erb
-- test/views/layout2.haml
-- test/views/layout2.liquid
-- test/views/layout2.mab
-- test/views/layout2.nokogiri
-- test/views/layout2.rabl
-- test/views/layout2.radius
-- test/views/layout2.slim
-- test/views/layout2.str
-- test/views/layout2.test
-- test/views/layout2.wlang
-- test/views/nested.str
-- test/views/utf8.erb
-- test/wlang_test.rb
-- test/yajl_test.rb
 homepage: http://www.sinatrarb.com/
 licenses:
 - MIT
@@ -228,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -236,53 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL
-test_files:
-- test/asciidoctor_test.rb
-- test/base_test.rb
-- test/builder_test.rb
-- test/coffee_test.rb
-- test/compile_test.rb
-- test/creole_test.rb
-- test/delegator_test.rb
-- test/encoding_test.rb
-- test/erb_test.rb
-- test/extensions_test.rb
-- test/filter_test.rb
-- test/haml_test.rb
-- test/helpers_test.rb
-- test/integration_test.rb
-- test/less_test.rb
-- test/liquid_test.rb
-- test/mapped_error_test.rb
-- test/markaby_test.rb
-- test/markdown_test.rb
-- test/mediawiki_test.rb
-- test/middleware_test.rb
-- test/nokogiri_test.rb
-- test/rabl_test.rb
-- test/rack_test.rb
-- test/radius_test.rb
-- test/rdoc_test.rb
-- test/readme_test.rb
-- test/request_test.rb
-- test/response_test.rb
-- test/result_test.rb
-- test/route_added_hook_test.rb
-- test/routing_test.rb
-- test/sass_test.rb
-- test/scss_test.rb
-- test/server_test.rb
-- test/settings_test.rb
-- test/sinatra_test.rb
-- test/slim_test.rb
-- test/static_test.rb
-- test/streaming_test.rb
-- test/stylus_test.rb
-- test/templates_test.rb
-- test/textile_test.rb
-- test/wlang_test.rb
-- test/yajl_test.rb
+test_files: []

data/lib/sinatra/ext.rb

@@ -1,17 +0,0 @@
-# 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