sinatra 2.0.8 → 2.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 996ffb850e9fba979b72012a00ba18a9baf51dd8ecb4369330bd0a8f3057b599
-  data.tar.gz: cd3ccb02b5348188a5f644b5a208d94dad535703236d85e1402f53f32e13d054
+  metadata.gz: d0a9fb798a1b2f906d9b84c950dd0095bbe7fa043468ffcc6b5a48f0320d14a1
+  data.tar.gz: 9e05cfa93c2426526551ad0149562132157a7a01e6ebacc1f153f5d75bd4ea0b
 SHA512:
-  metadata.gz: 6f1f6450b109378735e2018291f54d91be717942d04613df5db578c476c2ad70ec08fe589fb3a917007549957a8e45cc6abf70cee9bbd2fb09b59ff721a69837
-  data.tar.gz: 7aa231036ecad7c7ce280556d7cfbad1000572466c24c36bc47e5a32aa1594e4aac0393f598211c41b1c65e028125b7d45689a3442d824dcddd7a6a5adba23b8
+  metadata.gz: c2d1a38d64c63b2b5de785bc301843a1ce8a84daa752beceea399d3d936d3fdc3ed2e65d642c9f7ad736a3b67d5b66ae4b60078ab5a24841a67d6ccd9fe68d62
+  data.tar.gz: a8382fe4d07c482efa87001d9b4de97dffbf48eb69ded2d177e202cae852898ddf394095bc108f170f789ba2e47b8a45900191efcb8aa81b6e9df5289cf682e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.8.1 / 2020-01-02
+
+* Allow multiple hashes to be passed in `merge` and `merge!` for `Sinatra::IndifferentHash` [#1572](https://github.com/sinatra/sinatra/pull/1572) by Shota Iguchi
+
 ## 2.0.8 / 2020-01-01
 
 * Lookup Tilt class for template engine without loading files [#1558](https://github.com/sinatra/sinatra/pull/1558). Fixes [#1172](https://github.com/sinatra/sinatra/issues/1172) by Jordan Owens
@@ -6,8 +10,6 @@
 
 * Add `.yaml` support in `Sinatra::Contrib::ConfigFile` [#1564](https://github.com/sinatra/sinatra/issues/1564). Fixes [#1563](https://github.com/sinatra/sinatra/issues/1563) by Emerson Manabu Araki
 
-* Allow multiple hashes to be passed in `merge` and `merge!` for `Sinatra::IndifferentHash` [#1572](https://github.com/sinatra/sinatra/pull/1572) by Shota Iguchi
-
 * Remove only routing parameters from @params hash [#1569](https://github.com/sinatra/sinatra/pull/1569). Fixes [#1567](https://github.com/sinatra/sinatra/issues/1567) by Jordan Owens, Horacio
 
 * Support `capture` and `content_for` with Hamlit [#1580](https://github.com/sinatra/sinatra/pull/1580) by Takashi Kokubun

data/VERSION

@@ -1 +1 @@
-2.0.8
+2.0.8.1

data/lib/sinatra/indifferent_hash.rb

@@ -132,13 +132,17 @@ module Sinatra
       super(*keys)
     end
 
-    def merge!(other_hash)
-      return super if other_hash.is_a?(self.class)
-
-      other_hash.each_pair do |key, value|
-        key = convert_key(key)
-        value = yield(key, self[key], value) if block_given? && key?(key)
-        self[key] = convert_value(value)
+    def merge!(*other_hashes)
+      other_hashes.each do |other_hash|
+        if other_hash.is_a?(self.class)
+          super(other_hash)
+        else
+          other_hash.each_pair do |key, value|
+            key = convert_key(key)
+            value = yield(key, self[key], value) if block_given? && key?(key)
+            self[key] = convert_value(value)
+          end
+        end
       end
 
       self
@@ -146,8 +150,8 @@ module Sinatra
 
     alias_method :update, :merge!
 
-    def merge(other_hash, &block)
-      dup.merge!(other_hash, &block)
+    def merge(*other_hashes, &block)
+      dup.merge!(*other_hashes, &block)
     end
 
     def replace(other_hash)

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '2.0.8'
+  VERSION = '2.0.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.8.1
 platform: ruby
 authors:
 - Blake Mizerany
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.8.1
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement