sinatra-contrib 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875fcac85ec3549476fa9363e6d74a93169d9bff6a285afa085dd9927e377b8f
-  data.tar.gz: a6f37d1271320146ef8a988b236276bb9b5385a44839f26ccc9740e5bd1fba85
+  metadata.gz: b975fa7ce92c5cf316ecd5435760f80079cfe461ca28ff298b188eb08519dc52
+  data.tar.gz: a7ec2909d72329c6d9089a00013c02aa11c308ce842f8ba3784dc76253eafa3c
 SHA512:
-  metadata.gz: 129dad2460c8a80bca9db661361479bf78a8c1369c053056414df493fc37a4b4135dd155c7bc0660b37a5ab03acc68da5dacea9fe35bf48e7493aab833ae5fde
-  data.tar.gz: ee1bccd800b4636a48a74e31c0371ed3be754e5037c1bf9afe95d782cb3ce8ddabced908fbe1a32cc9841dce16729513cd5c61baf1c0853ca30eb27b8404e60e
+  metadata.gz: 6eabdb605ec4c7b4dd0a7cbd7159ed048facdf215e35c6221de15dd0761466e58fc0276e9581f27dbfe78a7849dd481d072aaa5f4b1406899975187c84d89529
+  data.tar.gz: 7bc7a597c8b679045302d66e4e12bfb4e6ce7e5ed1b064b28b8d0c6ae98986e8868a78a63bd9be7a7c2f689d30f514693c25daa2856c22f4ecfe9ac50f2e8f36

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/capture.rb

@@ -86,7 +86,7 @@ module Sinatra
 
     def capture(*args, &block)
       return block[*args] if ruby?
-      if haml?
+      if haml? && Tilt[:haml] == Tilt::HamlTemplate
         buffer = Haml::Buffer.new(nil, Haml::Options.new.for_buffer)
         with_haml_buffer(buffer) { capture_haml(*args, &block) }
       else

data/lib/sinatra/config_file.rb

@@ -121,7 +121,7 @@ module Sinatra
       Dir.chdir(root || '.') do
         paths.each do |pattern|
           Dir.glob(pattern) do |file|
-            raise UnsupportedConfigType unless ['.yml', '.erb'].include?(File.extname(file))
+            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)
@@ -134,7 +134,7 @@ module Sinatra
 
     class UnsupportedConfigType < Exception
       def message
-        'Invalid config file type, use .yml or .yml.erb'
+        'Invalid config file type, use .yml, .yaml or .erb'
       end
     end
 

data/lib/sinatra/content_for.rb

@@ -174,7 +174,7 @@ module Sinatra
     # for <tt>:head</tt>.
     def yield_content(key, *args, &block)
       if block_given? && !content_for?(key)
-        haml? ? capture_haml(*args, &block) : yield(*args)
+        (haml? && Tilt[:haml] == Tilt::HamlTemplate) ? capture_haml(*args, &block) : yield(*args)
       else
         content = content_blocks[key.to_sym].map { |b| capture(*args, &b) }
         content.join.tap do |c|

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/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.5'
+    VERSION = '2.1.0'
   end
 end
 

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
@@ -232,7 +238,7 @@ module Sinatra
 
       def helpers(*extensions, &block)
         class_eval(&block) if block_given?
-        include(*extensions) if extensions.any?
+        prepend(*extensions) if extensions.any?
       end
 
       def register(*extensions, &block)
@@ -278,7 +284,7 @@ module Sinatra
       end
 
       def set(key, value = self, &block)
-        raise ArgumentError, "may not set #{key}" if key != :views
+        raise ArgumentError, "may not set #{key}" unless ([:views] + ALLOWED_ENGINES).include?(key)
         return key.each { |k,v| set(k, v) } if block.nil? and value == self
         block ||= proc { value }
         singleton_class.send(:define_method, key, &block)
@@ -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

@@ -169,20 +169,15 @@ module Sinatra
         settings.template_engines[:all].each do |engine|
           exts.each { |ext| possible << [engine, "#{name}.#{ext}"] }
         end
+
         exts.each do |ext|
           settings.template_engines[ext].each { |e| possible << [e, name] }
         end
+
         possible.each do |engine, template|
-          # not exactly like Tilt[engine], but does not trigger a require
-          if Tilt.respond_to?(:mappings)
-            klass = Tilt.mappings[Tilt.normalize(engine)].first
-          else
-            begin
-              klass = Tilt[engine]
-            rescue LoadError
-              next
-            end
-          end
+          klass = Tilt.default_mapping.template_map[engine.to_s] ||
+            Tilt.lazy_map[engine.to_s].fetch(0, [])[0]
+
           find_template(settings.views, template, klass) do |file|
             next unless File.exist? file
             return settings.rendering_method(engine) << template.to_sym
@@ -226,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
@@ -245,8 +240,8 @@ module Sinatra
         :css  => [:less,  :sass, :scss],
         :xml  => [:builder, :nokogiri],
         :js   => [:coffee],
-        :html => [:erb, :erubi, :erubis, :haml, :slim, :liquid, :radius, :mab,
-          :markdown, :textile, :rdoc],
+        :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]),
         :json => [:yajl],

data/sinatra-contrib.gemspec

@@ -34,12 +34,11 @@ 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",      ">= 1.3", "< 3"
+  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.5
+  version: 2.1.0
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2020-09-04 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.5
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -38,54 +38,34 @@ 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
     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.5
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -406,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
@@ -429,15 +410,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.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Collection of useful Sinatra extensions