sinatra-contrib 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e41b42273b4dff36c72e1bd901a13347f5dbbfaa83175185af9f4678677782
-  data.tar.gz: 86bc4a0a68d0c62aa2fa757846f2859e4d0f4d058d79e71989860fa704e83f53
+  metadata.gz: 181cb2475ddb6a42c84126e1723f08b13317fe84e84e34f87c6d825dedb3d50b
+  data.tar.gz: 7195ef32216c40ecc566bdaa62e3f4843b506021af646623c2c0dfb6f151131e
 SHA512:
-  metadata.gz: ccf4ecac97a7122b4b1b5fb8f717e74b7a6404c67591db5cc8d599a4a9dba7fb57bfe60f2b7596137b22ec4420539454706cc8baa47dedf3412607159be3a953
-  data.tar.gz: af89061e536cb04e6c53bcf5bd42a64c3ecfd57d7fd68e59ed2065476000f11f9596f79d368b32593d0d14f60eaeb2c0db6261bcd877a7f89adddd7b86d45465
+  metadata.gz: 4ca55fb88020f784dab9e5d1d47f518ae6c709b2609bd58648d94212e097e493ab8eb09e4ed3520c513da215679eb3a90ae426cbcbf07ef6e3a958790fb11b54
+  data.tar.gz: 459b6a3e00849f5f00ed2904c0b65da24d2cfa1ac7d075eaeed80fe1a45b87dff74a4fbdaa3f7db70f09a7387a944f6e369e13c2b7b0da99cbbeb50178927274

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

@@ -1,6 +1,6 @@
 module Sinatra
   module Contrib
-    VERSION = '2.0.7'
+    VERSION = '2.0.8'
   end
 end
 

data/lib/sinatra/respond_with.rb

@@ -169,15 +169,14 @@ 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|
-          begin
-            klass = Tilt[engine]
-          rescue LoadError
-            next
-          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
@@ -241,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, :halmit, :slim, :liquid, :radius,
+          :mab, :markdown, :textile, :rdoc],
         :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
           [:mab] - [:find_template, :markaby]),
         :json => [:yajl],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2020-01-01 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.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement