sinatra-contrib 2.1.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b975fa7ce92c5cf316ecd5435760f80079cfe461ca28ff298b188eb08519dc52
-  data.tar.gz: a7ec2909d72329c6d9089a00013c02aa11c308ce842f8ba3784dc76253eafa3c
+  metadata.gz: 3e8725df6a0ed1138cd098feabf1a7b5193dfc84c16aacdd414c7b7d38265504
+  data.tar.gz: 0b022fc28d2227211f73dddbec6b40ecf7cf8cce87cacec63b8a4f90c6d410c6
 SHA512:
-  metadata.gz: 6eabdb605ec4c7b4dd0a7cbd7159ed048facdf215e35c6221de15dd0761466e58fc0276e9581f27dbfe78a7849dd481d072aaa5f4b1406899975187c84d89529
-  data.tar.gz: 7bc7a597c8b679045302d66e4e12bfb4e6ce7e5ed1b064b28b8d0c6ae98986e8868a78a63bd9be7a7c2f689d30f514693c25daa2856c22f4ecfe9ac50f2e8f36
+  metadata.gz: 7e2ca0ad2780faa57f0825277098ff95d49a319deb561bfa1460573c5085ce1c919f94de66285542ef09f9294a20067e320c59952146b8211f35e48d0449c79d
+  data.tar.gz: 45d99ddba98ebc07f74f2a2b301abd69c6b7fde827b7b92ac464b928d482ccf27ec8167a80450fa792aaf3aab54da1d671a761f55164adb6431ef1b6226996c9

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

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

data/lib/sinatra/namespace.rb

@@ -238,7 +238,7 @@ module Sinatra
 
       def helpers(*extensions, &block)
         class_eval(&block) if block_given?
-        prepend(*extensions) if extensions.any?
+        include(*extensions) if extensions.any?
       end
 
       def register(*extensions, &block)
@@ -284,8 +284,8 @@ module Sinatra
       end
 
       def set(key, value = self, &block)
+        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)
-        return key.each { |k,v| set(k, v) } if block.nil? and value == self
         block ||= proc { value }
         singleton_class.send(:define_method, key, &block)
       end

data/sinatra-contrib.gemspec

@@ -37,7 +37,7 @@ EOF
   s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency "sinatra", version
-  s.add_dependency "mustermann", "~> 1.0"
+  s.add_dependency "mustermann", "~> 2.0"
   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.1.0
+  version: 2.2.2
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -402,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
@@ -417,8 +417,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Collection of useful Sinatra extensions
 test_files: []