Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up digests with refinements #417

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ cache: bundler
sudo: false

rvm:
- 2.0.0
- 2.1
- 2.2
- 2.3.1
- 2.4.0-preview1
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
**Master**

Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md

## Master

- Minimum Ruby version now 2.2 to support refinements, required keyword args, and symbol GC.

## 4.0.0.beta4

Expand Down
148 changes: 99 additions & 49 deletions lib/sprockets/digest_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,55 +35,107 @@ def detect_digest_class(bytes)
DIGEST_SIZES[bytes.bytesize]
end

ADD_VALUE_TO_DIGEST = {
String => ->(val, digest) { digest << val },
FalseClass => ->(val, digest) { digest << 'FalseClass'.freeze },
TrueClass => ->(val, digest) { digest << 'TrueClass'.freeze },
NilClass => ->(val, digest) { digest << 'NilClass'.freeze },

Symbol => ->(val, digest) {
digest << 'Symbol'.freeze
digest << val.to_s
},
Integer => ->(val, digest) {
digest << 'Integer'.freeze
digest << val.to_s
},
Array => ->(val, digest) {
digest << 'Array'.freeze
val.each do |element|
ADD_VALUE_TO_DIGEST[element.class].call(element, digest)
module RefinementDigestUtils
extend self

module AddValueToDigest
refine Object do
def add_value_to_digest(_)
raise TypeError, "couldn't digest #{self}"
end
end
},
Hash => ->(val, digest) {
digest << 'Hash'.freeze
val.sort.each do |array|
ADD_VALUE_TO_DIGEST[Array].call(array, digest)

refine String do
def add_value_to_digest(digest)
digest << self
end
end
},
Set => ->(val, digest) {
digest << 'Set'.freeze
ADD_VALUE_TO_DIGEST[Array].call(val, digest)
},
Encoding => ->(val, digest) {
digest << 'Encoding'.freeze
digest << val.name
},
}
if 0.class != Integer # Ruby < 2.4
ADD_VALUE_TO_DIGEST[Fixnum] = ->(val, digest) {
digest << 'Integer'.freeze
digest << val.to_s
}
ADD_VALUE_TO_DIGEST[Bignum] = ->(val, digest) {
digest << 'Integer'.freeze
digest << val.to_s
}

refine FalseClass do
def add_value_to_digest(digest)
digest << 'FalseClass'.freeze
end
end

refine TrueClass do
def add_value_to_digest(digest)
digest << 'TrueClass'.freeze
end
end

refine NilClass do
def add_value_to_digest(digest)
digest << 'NilClass'.freeze
end
end

refine Symbol do
def add_value_to_digest(digest)
digest << 'Symbol'.freeze
digest << to_s
end
end

refine Fixnum do
def add_value_to_digest(digest)
digest << 'Integer'.freeze
digest << to_s
end
end

refine Bignum do
def add_value_to_digest(digest)
digest << 'Integer'.freeze
digest << to_s
end
end

refine Array do
def add_value_to_digest(digest)
digest << 'Array'.freeze
each do |element|
element.add_value_to_digest(digest)
end
end
end

refine Hash do
def add_value_to_digest(digest)
digest << 'Hash'.freeze
sort.each do |array|
digest << 'Array'.freeze
array.each do |element|
element.add_value_to_digest(digest)
end
end
end
end

refine Set do
def add_value_to_digest(digest)
digest << 'Set'.freeze
digest << 'Array'.freeze
each do |element|
element.add_value_to_digest(digest)
end
end
end

refine Encoding do
def add_value_to_digest(digest)
digest << 'Encoding'.freeze
digest << self.name
end
end
end
using AddValueToDigest

def digest(digest, obj)
obj.add_value_to_digest(digest)
digest
end
end
ADD_VALUE_TO_DIGEST.default_proc = ->(_, val) {
raise TypeError, "couldn't digest #{ val }"
}
private_constant :ADD_VALUE_TO_DIGEST
private_constant :RefinementDigestUtils

# Internal: Generate a hexdigest for a nested JSON serializable object.
#
Expand Down Expand Up @@ -189,9 +241,7 @@ def hexdigest_integrity_uri(hexdigest)
private
def build_digest(obj)
digest = digest_class.new

ADD_VALUE_TO_DIGEST[obj.class].call(obj, digest)
digest
RefinementDigestUtils.digest(digest, obj)
end
end
end
2 changes: 1 addition & 1 deletion sprockets.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "yui-compressor", "~> 0.12"
s.add_development_dependency "zopfli", "~> 0.0.4"

s.required_ruby_version = '>= 2.0.0'
s.required_ruby_version = '>= 2.2.0'

s.authors = ["Sam Stephenson", "Joshua Peek"]
s.email = ["sstephenson@gmail.com", "josh@joshpeek.com"]
Expand Down