sinatra-contrib 2.0.8.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20c83e70cf4ab1d1433ac3f3795c168259f0e2d964c095db13ee3db12a94b28
-  data.tar.gz: 7f7d70137b46068e37f1c7b73216f07c90216f5cbd70bf360dfcc66a67454f5e
+  metadata.gz: 9c39f2f87ea6fe310e1ee1ba3b6e59d358bba08e7c5262ac1c3b929a7f960913
+  data.tar.gz: d089938141342b810a03f360623a38361bdd9535031c385fa2d33202119de48e
 SHA512:
-  metadata.gz: 0023522137ae873a8533d8be320fcd2b6715c46caa9ec0170e4b581a677dc96f75b4dc30e58402c0a0f5fb35d6b0b011f9ac3c24a313dca5839849b5e09e4ab1
-  data.tar.gz: a301fd1006159f2551d6cd70daa0179ce1b334797e5221e7bb3024092925983bff0f451db0c6e596870890dacfcb7a85241053ba2ad6b2e7ed7820206b93e596
+  metadata.gz: 5b12a1e1e513525d3bed0845ce085099c2869a8518c65bf7a64fbb0dc1aa563a9f4b3eb459c0b54ff43e9eb9bc7953ad4e4d8f281c279a339fe2958ecde5815c
+  data.tar.gz: db98ec6a5d297b0fc553a021d02e1339c3561070e962e12685bbe7852c9268aeb43008841254dbd4a9a7e2c352b1d1d20a2651c3fc23507c7997bedc2de0eb7d

data/README.md

@@ -67,6 +67,9 @@ Currently included:
 * [`sinatra/test_helpers`][sinatra-test-helpers]: Helper methods to ease testing your Sinatra
   application. Partly extracted from Sinatra. Testing framework agnostic
 
+* `sinatra/quiet_logger`: Extension to exclude specific pathes from access log.
+  It works by patching Rack::CommonLogger
+
 ## Installation
 
 Add `gem 'sinatra-contrib'` to *Gemfile*, then execute `bundle install`.

data/lib/sinatra/config_file.rb

@@ -124,7 +124,11 @@ module Sinatra
             raise UnsupportedConfigType unless ['.yml', '.yaml', '.erb'].include?(File.extname(file))
             logger.info "loading config file '#{file}'" if logging? && respond_to?(:logger)
             document = ERB.new(IO.read(file)).result
-            yaml = YAML.load(document)
+            yaml = begin
+              YAML.load(document, aliases: true)
+            rescue ArgumentError
+              YAML.load(document)
+            end
             config = config_for_env(yaml)
             config.each_pair { |key, value| set(key, value) }
           end

data/lib/sinatra/contrib/setup.rb

@@ -1,6 +1,5 @@
 require 'sinatra/base'
 require 'sinatra/contrib/version'
-require 'backports/rails/string' # for String#underscore
 
 module Sinatra
   module Contrib
@@ -9,16 +8,15 @@ module Sinatra
         @extensions ||= {:helpers => [], :register => []}
       end
 
-      def register(name, path = nil)
+      def register(name, path)
         autoload name, path, :register
       end
 
-      def helpers(name, path = nil)
+      def helpers(name, path)
         autoload name, path, :helpers
       end
 
-      def autoload(name, path = nil, method = nil)
-        path ||= "sinatra/#{name.to_s.underscore}"
+      def autoload(name, path, method = nil)
         extensions[method] << name if method
         Sinatra.autoload(name, path)
       end

data/lib/sinatra/contrib/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Contrib
-    VERSION = '2.0.8.1'
+    VERSION = '2.2.1'
   end
 end
 

data/lib/sinatra/contrib.rb

@@ -7,32 +7,32 @@ module Sinatra
     # or breaks if external dependencies are missing. Will extend
     # Sinatra::Application by default.
     module Common
-      register :ConfigFile
-      register :MultiRoute
-      register :Namespace
-      register :RespondWith
+      register :ConfigFile, 'sinatra/config_file'
+      register :MultiRoute, 'sinatra/multi_route'
+      register :Namespace, 'sinatra/namespace'
+      register :RespondWith, 'sinatra/respond_with'
 
-      helpers :Capture
-      helpers :ContentFor
-      helpers :Cookies
-      helpers :EngineTracking
-      helpers :JSON
-      helpers :LinkHeader
-      helpers :Streaming
-      helpers :RequiredParams
+      helpers :Capture, 'sinatra/capture'
+      helpers :ContentFor, 'sinatra/content_for'
+      helpers :Cookies, 'sinatra/cookies'
+      helpers :EngineTracking, 'sinatra/engine_tracking'
+      helpers :JSON, 'sinatra/json'
+      helpers :LinkHeader, 'sinatra/link_header'
+      helpers :Streaming, 'sinatra/streaming'
+      helpers :RequiredParams, 'sinatra/required_params'
     end
 
     ##
     # Other extensions you don't want to be loaded unless needed.
     module Custom
-      # register :Compass
-      register :Reloader
+      # register :Compass, 'sinatra/compass'
+      register :Reloader, 'sinatra/reloader'
     end
 
     ##
     # Stuff that aren't Sinatra extensions, technically.
-    autoload :Extension
-    autoload :TestHelpers
+    autoload :Extension, 'sinatra/extension'
+    autoload :TestHelpers, 'sinatra/test_helpers'
   end
 
   register Sinatra::Contrib::Common

data/lib/sinatra/namespace.rb

@@ -224,6 +224,12 @@ module Sinatra
       include SharedMethods
       attr_reader :base, :templates
 
+      ALLOWED_ENGINES = [
+        :erb, :erubi, :erubis, :haml, :hamlit, :builder, :nokogiri, :sass, :scss,
+        :less, :liquid, :markdown, :textile, :rdoc, :asciidoc, :radius, :markaby,
+        :rabl, :slim, :creole, :mediawiki, :coffee, :stylus, :yajl, :wlang
+      ]
+
       def self.prefixed(*names)
         names.each { |n| define_method(n) { |*a, &b| prefixed(n, *a, &b) }}
       end
@@ -278,8 +284,8 @@ module Sinatra
       end
 
       def set(key, value = self, &block)
-        raise ArgumentError, "may not set #{key}" if key != :views
-        return key.each { |k,v| set(k, v) } if block.nil? and value == self
+        return key.each { |k,v| set(k, v) } if key.respond_to?(:each) and block.nil? and value == self
+        raise ArgumentError, "may not set #{key}" unless ([:views] + ALLOWED_ENGINES).include?(key)
         block ||= proc { value }
         singleton_class.send(:define_method, key, &block)
       end
@@ -332,7 +338,7 @@ module Sinatra
       def prefixed(method, pattern = nil, conditions = {}, &block)
         default = %r{(?:/.*)?} if method == :before or method == :after
         pattern, conditions = compile pattern, conditions, default
-        result = base.send(method, pattern, conditions, &block)
+        result = base.send(method, pattern, **conditions, &block)
         invoke_hook :route_added, method.to_s.upcase, pattern, block
         result
       end

data/lib/sinatra/quiet_logger.rb

@@ -0,0 +1,50 @@
+module Sinatra
+  # = Sinatra::QuietLogger
+  #
+  # QuietLogger extension allows you to define paths excluded
+  # from logging using the +quiet_logger_prefixes+ setting.
+  # It is inspired from rails quiet_logger, but handles multiple paths.
+  #
+  # == Usage
+  #
+  # === Classic Application
+  #
+  # You have to require the quiet_logger, set the prefixes
+  # and register the extension in your application.
+  #
+  #     require 'sinatra'
+  #     require 'sinatra/quiet_logger'
+  #
+  #     set :quiet_logger_prefixes, %w(css js images fonts)
+  #     register Sinatra::QuietLogger
+  #
+  # === Modular Application
+  #
+  # The same for modular application:
+  #
+  #     require 'sinatra/base'
+  #     require 'sinatra/quiet_logger'
+  #
+  #     set :quiet_logger_prefixes, %w(css js images fonts)
+  #
+  #     class App < Sinatra::Base
+  #       register Sinatra::QuietLogger
+  #     end
+  #
+  module QuietLogger
+
+    def self.registered(app)
+      quiet_logger_prefixes = app.settings.quiet_logger_prefixes.join('|') rescue ''
+      return warn('You need to specify the paths you wish to exclude from logging via `set :quiet_logger_prefixes, %w(images css fonts)`') if quiet_logger_prefixes.empty?
+      const_set('QUIET_LOGGER_REGEX', %r(\A/{0,2}(?:#{quiet_logger_prefixes})))
+      ::Rack::CommonLogger.prepend(
+        ::Module.new do
+          def log(env, *)
+            super unless env['PATH_INFO'] =~ QUIET_LOGGER_REGEX
+          end
+        end
+      )
+    end
+
+  end
+end

data/lib/sinatra/reloader.rb

@@ -269,7 +269,7 @@ module Sinatra
       #
       # Note: We are using #compile! so we don't interfere with extensions
       # changing #route.
-      def compile!(verb, path, block, options = {})
+      def compile!(verb, path, block, **options)
         source_location = block.respond_to?(:source_location) ?
           block.source_location.first : caller_files[1]
         signature = super
@@ -302,7 +302,7 @@ module Sinatra
       # Does everything Sinatra::Base#add_filter does, but it also tells
       # the +Watcher::List+ for the Sinatra application to watch the defined
       # filter.
-      def add_filter(type, path = nil, options = {}, &block)
+      def add_filter(type, path = nil, **options, &block)
         source_location = block.respond_to?(:source_location) ?
           block.source_location.first : caller_files[1]
         result = super

data/lib/sinatra/respond_with.rb

@@ -221,7 +221,7 @@ module Sinatra
 
     private
 
-    def compile!(verb, path, block, options = {})
+    def compile!(verb, path, block, **options)
       options[:provides] ||= respond_to if respond_to
       super
     end
@@ -240,7 +240,7 @@ module Sinatra
         :css  => [:less,  :sass, :scss],
         :xml  => [:builder, :nokogiri],
         :js   => [:coffee],
-        :html => [:erb, :erubi, :erubis, :haml, :halmit, :slim, :liquid, :radius,
+        :html => [:erb, :erubi, :erubis, :haml, :hamlit, :slim, :liquid, :radius,
           :mab, :markdown, :textile, :rdoc],
         :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
           [:mab] - [:find_template, :markaby]),

data/sinatra-contrib.gemspec

@@ -34,11 +34,10 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
 EOF
   end
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency "sinatra", version
   s.add_dependency "mustermann", "~> 1.0"
-  s.add_dependency "backports", ">= 2.8.2"
   s.add_dependency "tilt", "~> 2.0"
   s.add_dependency "rack-protection", version
   s.add_dependency "multi_json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.8.1
+  version: 2.2.1
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-01 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +386,7 @@ files:
 - lib/sinatra/link_header.rb
 - lib/sinatra/multi_route.rb
 - lib/sinatra/namespace.rb
+- lib/sinatra/quiet_logger.rb
 - lib/sinatra/reloader.rb
 - lib/sinatra/required_params.rb
 - lib/sinatra/respond_with.rb
@@ -415,7 +402,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
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -423,16 +410,15 @@ 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.7.3
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Collection of useful Sinatra extensions
 test_files: []