sinatra-contrib 2.2.1 → 3.0.0

data/lib/sinatra/streaming.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 
 module Sinatra
-
   # = Sinatra::Streaming
   #
   # Sinatra 1.3 introduced the +stream+ helper. This addon improves the
@@ -84,13 +85,14 @@ module Sinatra
     end
 
     module Stream
-
       attr_accessor :app, :lineno, :pos, :transformer, :closed
       alias tell pos
       alias closed? closed
 
       def self.extended(obj)
-        obj.closed, obj.lineno, obj.pos = false, 0, 0
+        obj.closed = false
+        obj.lineno = 0
+        obj.pos = 0
         obj.callback { obj.closed = true }
         obj.errback  { obj.closed = true }
       end
@@ -108,6 +110,7 @@ module Sinatra
       def each
         # that way body.each.map { ... } works
         return self unless block_given?
+
         super
       end
 
@@ -120,7 +123,8 @@ module Sinatra
         @transformer ||= nil
 
         if @transformer
-          inner, outer = @transformer, block
+          inner = @transformer
+          outer = block
           block = proc { |value| outer[inner[value]] }
         end
         @transformer = block
@@ -132,7 +136,7 @@ module Sinatra
         data.to_s.bytesize
       end
 
-      alias syswrite      write
+      alias syswrite write
       alias write_nonblock write
 
       def print(*args)
@@ -154,7 +158,7 @@ module Sinatra
       end
 
       def close_read
-        raise IOError, "closing non-duplex IO for reading"
+        raise IOError, 'closing non-duplex IO for reading'
       end
 
       def closed_read?
@@ -171,10 +175,6 @@ module Sinatra
         settings.default_encoding
       end
 
-      def closed?
-        @closed
-      end
-
       def settings
         app.settings
       end
@@ -184,7 +184,7 @@ module Sinatra
       end
 
       def not_open_for_reading(*)
-        raise IOError, "not opened for reading"
+        raise IOError, 'not opened for reading'
       end
 
       alias bytes         not_open_for_reading

data/lib/sinatra/test_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 require 'rack'
 begin
@@ -13,19 +15,6 @@ module Sinatra
   # Helper methods to ease testing your Sinatra application. Partly extracted
   # from Sinatra. Testing framework agnostic.
   module TestHelpers
-    # Test variant of session, which exposes a `global_env`.
-    class Session < Rack::Test::Session
-      def global_env
-        @global_env ||= {}
-      end
-
-      private
-
-      def default_env
-        super.merge global_env
-      end
-    end
-
     include Rack::Test::Methods
     extend Forwardable
     attr_accessor :settings
@@ -171,7 +160,7 @@ module Sinatra
       # @param params [Hash]
       # @param env [Hash]
       def options(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "OPTIONS", :params => params))
+        env = env_for(uri, env.merge(method: 'OPTIONS', params: params))
         current_session.send(:process_request, uri, env, &block)
       end
     end
@@ -183,7 +172,7 @@ module Sinatra
       # @param params [Hash]
       # @param env [Hash]
       def patch(uri, params = {}, env = {}, &block)
-        env = env_for(uri, env.merge(:method => "PATCH", :params => params))
+        env = env_for(uri, env.merge(method: 'PATCH', params: params))
         current_session.send(:process_request, uri, env, &block)
       end
     end
@@ -200,7 +189,8 @@ module Sinatra
     # @return [Hash] Session of last request, or the empty Hash
     def session
       return {} unless last_request?
-      raise Rack::Test::Error, "session not enabled for app" unless last_env["rack.session"] or app.session?
+      raise Rack::Test::Error, 'session not enabled for app' unless last_env['rack.session'] || app.session?
+
       last_request.session
     end
 
@@ -208,9 +198,5 @@ module Sinatra
     def last_env
       last_request.env
     end
-
-    def build_rack_test_session(name) # :nodoc:
-      Session.new rack_mock_session(name)
-    end
   end
 end

data/lib/sinatra/webdav.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 
 module Sinatra
-
   # = Sinatra::WebDAV
   #
   # This extensions provides WebDAV verbs, as defined by RFC 4918
@@ -37,8 +38,8 @@ module Sinatra
     module Request
       def self.included(base)
         base.class_eval do
-          alias _safe? safe?
-          alias _idempotent? idempotent?
+          alias_method :_safe?, :safe?
+          alias_method :_idempotent?, :idempotent?
 
           def safe?
             _safe? or propfind?
@@ -70,9 +71,9 @@ module Sinatra
         request_method == 'MOVE'
       end
 
-      #def lock?
+      # def lock?
       #  request_method == 'LOCK'
-      #end
+      # end
 
       def unlock?
         request_method == 'UNLOCK'
@@ -84,7 +85,7 @@ module Sinatra
     def mkcol(path, opts = {}, &bk)     route 'MKCOL',     path, opts, &bk end
     def copy(path, opts = {}, &bk)      route 'COPY',      path, opts, &bk end
     def move(path, opts = {}, &bk)      route 'MOVE',      path, opts, &bk end
-    #def lock(path, opts = {}, &bk)      route 'LOCK',      path, opts, &bk end
+    # def lock(path, opts = {}, &bk)      route 'LOCK',      path, opts, &bk end
     def unlock(path, opts = {}, &bk)    route 'UNLOCK',    path, opts, &bk end
   end
 

data/sinatra-contrib.gemspec

@@ -1,65 +1,58 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
-version = File.read(File.expand_path("../../VERSION", __FILE__)).strip
+version = File.read(File.expand_path('../VERSION', __dir__)).strip
 
 Gem::Specification.new do |s|
-  s.name        = "sinatra-contrib"
+  s.name        = 'sinatra-contrib'
   s.version     = version
-  s.description = "Collection of useful Sinatra extensions"
-  s.homepage    = "http://sinatrarb.com/contrib/"
-  s.license     = "MIT"
+  s.description = 'Collection of useful Sinatra extensions'
+  s.homepage    = 'http://sinatrarb.com/contrib/'
+  s.license     = 'MIT'
   s.summary     = s.description
-  s.authors     = ["https://github.com/sinatra/sinatra/graphs/contributors"]
-  s.email       = "sinatrarb@googlegroups.com"
-  s.files       = Dir["lib/**/*.rb"] + [
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "ideas.md",
-    "sinatra-contrib.gemspec"
+  s.authors     = ['https://github.com/sinatra/sinatra/graphs/contributors']
+  s.email       = 'sinatrarb@googlegroups.com'
+  s.files       = Dir['lib/**/*.rb'] + [
+    'LICENSE',
+    'README.md',
+    'Rakefile',
+    'ideas.md',
+    'sinatra-contrib.gemspec'
   ]
 
-  if s.respond_to?(:metadata)
-    s.metadata = {
-      'source_code_uri'   => 'https://github.com/sinatra/sinatra/tree/master/sinatra-contrib',
-      'homepage_uri'      => 'http://sinatrarb.com/contrib/',
-      'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib'
-    }
-  else
-    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/tree/master/sinatra-contrib',
+    'homepage_uri' => 'http://sinatrarb.com/contrib/',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib',
+    'rubygems_mfa_required' => 'true'
+  }
 
-  s.add_dependency "sinatra", version
-  s.add_dependency "mustermann", "~> 1.0"
-  s.add_dependency "tilt", "~> 2.0"
-  s.add_dependency "rack-protection", version
-  s.add_dependency "multi_json"
+  s.required_ruby_version = '>= 2.6.0'
 
-  s.add_development_dependency "rspec", "~> 3.4"
-  s.add_development_dependency "haml"
-  s.add_development_dependency "erubi"
-  s.add_development_dependency "erubis"
-  s.add_development_dependency "slim"
-  s.add_development_dependency "less"
-  s.add_development_dependency "sass"
-  s.add_development_dependency "builder"
-  s.add_development_dependency "liquid"
-  s.add_development_dependency "redcarpet"
-  s.add_development_dependency "RedCloth", "~> 4.2.9"
-  s.add_development_dependency "asciidoctor"
-  s.add_development_dependency "radius"
-  s.add_development_dependency "coffee-script"
-  s.add_development_dependency "nokogiri"
-  s.add_development_dependency "creole"
-  s.add_development_dependency "wikicloth"
-  s.add_development_dependency "markaby"
-  s.add_development_dependency "rake", "< 11"
-  s.add_development_dependency "rack-test"
+  s.add_dependency 'multi_json'
+  s.add_dependency 'mustermann', '~> 3.0'
+  s.add_dependency 'rack-protection', version
+  s.add_dependency 'sinatra', version
+  s.add_dependency 'tilt', '~> 2.0'
+
+  s.add_development_dependency 'asciidoctor'
+  s.add_development_dependency 'builder'
+  s.add_development_dependency 'erubi'
+  s.add_development_dependency 'haml'
+  s.add_development_dependency 'liquid'
+  s.add_development_dependency 'markaby'
+  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'rack-test', '~> 2'
+  s.add_development_dependency 'rake', '>= 12.3.3'
+  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'rspec', '~> 3'
+  s.add_development_dependency 'slim'
 end

metadata

@@ -1,171 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.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-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: erubi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: slim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: less
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,21 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,21 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.9
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: radius
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: markaby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,35 +179,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: creole
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: wikicloth
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: markaby
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -333,21 +221,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -379,7 +267,6 @@ files:
 - lib/sinatra/contrib/version.rb
 - lib/sinatra/cookies.rb
 - lib/sinatra/custom_logger.rb
-- lib/sinatra/decompile.rb
 - lib/sinatra/engine_tracking.rb
 - lib/sinatra/extension.rb
 - lib/sinatra/json.rb
@@ -402,6 +289,7 @@ metadata:
   source_code_uri: https://github.com/sinatra/sinatra/tree/master/sinatra-contrib
   homepage_uri: http://sinatrarb.com/contrib/
   documentation_uri: https://www.rubydoc.info/gems/sinatra-contrib
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -410,14 +298,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Collection of useful Sinatra extensions

data/lib/sinatra/decompile.rb

@@ -1,5 +0,0 @@
-warn "Sinatra::Decompile is deprecated without replacement."
-
-def warn(message)
-  super "#{caller.first[/^[^:]:\d+:/]} warning: #{message}"
-end