response_bank 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54fd4c438eab18c36f842002725ec243f6ca9837f03a2d70dc594a8bf4765d8d
-  data.tar.gz: cc5512b2fa88dd622da3ef9fae6abda48f9c7122eed828dd988a17343607f0cd
+  metadata.gz: 29c24e1f40f49dfe75fb0fee30851a8892ed5ca93d3740038fc059c3eb23eac1
+  data.tar.gz: 6b1d0473f7abcf5b7b3377da97e67d4954fd14f90b9c4a75b7ebe3d0f136d8e7
 SHA512:
-  metadata.gz: 9637541060aab3ac047247fdd13e83d57b99e3921689a7dd354ce684c247f9decb04de2c784e6f04bb57796e71279098a2f1a3db670d67ad25bb8406a7eb30f3
-  data.tar.gz: d3ba8c122b58152cd1e10e8d1fb504b65c2e8c906d3a862be98050f7b252129d392bbc83d0e220a2c79248f0da16bb3f85d8ae441c0c2b03281ee123a872b4bf
+  metadata.gz: 06d5965eed82aba811616d52444a07287e566aff3f43451d1ff343eb55b2f8be47773daa8a9388589e69465e2d728654162925108614fbdd39c173bc16671e2f
+  data.tar.gz: 5f47dd03e0ed7fc61ef67306416040be136faa4e6c1fe0bc8552a3ef150b531cad370212772420bdfe36452d3918adf38722da7e56b560a8f892db6fb43a2456

data/lib/response_bank/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ResponseBank
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/lib/response_bank.rb

@@ -114,16 +114,20 @@ module ResponseBank
       when Hash
         return data.inspect unless data.key?(:key)
 
-        key = hash_value_str(data[:key])
+        # Components are joined as bytes, so values in different encodings can't raise.
+        key = String.new(encoding: Encoding::BINARY)
 
-        key = %{#{data[:key_schema_version]}:#{key}} if data[:key_schema_version]
+        key << hash_value_str(data[:key_schema_version]) << ":" if data[:key_schema_version]
 
-        key = %{#{key}:#{hash_value_str(data[:version])}} if data[:version]
+        key << hash_value_str(data[:key])
+
+        key << ":" << hash_value_str(data[:version]) if data[:version]
 
         # add the encoding to only the cache key but don't expose this detail in the entity_tag
-        key = %{#{key}:#{hash_value_str(data[:encoding])}} if data[:encoding]
+        key << ":" << hash_value_str(data[:encoding]) if data[:encoding]
 
-        key
+        key.force_encoding(Encoding::UTF_8)
+        key.valid_encoding? ? key : key.force_encoding(Encoding::BINARY)
       when Array
         data.inspect
       when Time, DateTime
@@ -152,10 +156,32 @@ module ResponseBank
 
     def hash_value_str(data)
       if data.is_a?(Hash)
-        data.values.join(",")
+        append_key_component(String.new(encoding: Encoding::BINARY), data)
+      else
+        data.to_s.b
+      end
+    end
+
+    # Hashes and Arrays are written as a type tag and element count, followed
+    # by their elements; Hash entries are written as name then value, in
+    # insertion order. Every other value is written as the byte length of its
+    # #to_s followed by those bytes, so no value can be read as part of another.
+    def append_key_component(buffer, data)
+      case data
+      when Hash
+        buffer << "h" << data.size.to_s << ":"
+        data.each do |name, value|
+          append_key_component(buffer, name)
+          append_key_component(buffer, value)
+        end
+      when Array
+        buffer << "a" << data.size.to_s << ":"
+        data.each { |value| append_key_component(buffer, value) }
       else
-        data.to_s
+        value = data.to_s.b
+        buffer << value.bytesize.to_s << ":" << value
       end
+      buffer
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: response_bank
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Tobias Lütke
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Simple response caching for Ruby applications
 test_files: []