heroku-deflater 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e888115a9c0fbd89dc637847bee2ed1ba6831b96
-  data.tar.gz: a517faae436b94fb29069ab00278fa6e5be8e42e
+SHA256:
+  metadata.gz: bc43fb6e8ecff5ba8ba4a374e79dfd2353c049830026161cb57cfdea433a37dd
+  data.tar.gz: cb450b53c9d7b8cb46f9bdedccbec4b5d88d0eab53cbdc5ab4d7d8318e2ba40e
 SHA512:
-  metadata.gz: 918d69b7754e30c1774be67c151cf64ae77e131334f06ac763ca5ab74d2c050f1676f3649d167047c40b2e37f5c23d8769095118aca56832cd05a7b2ecb90d10
-  data.tar.gz: cb7bf0e6d947e487b0080a925aed940ba65a461ecbc68ff3c4c138e8df2c830a07c69524fa699d77ff3d4b4ec5642508fe17a61daec22fc1cd433140585739b2
+  metadata.gz: 80c79692c6397ea1c49c63c0a7054ad6de941b5484e2928b0c5724c7aa48b59d1251316b4278a7608edd4e1e89646d1820000f2495b532263c7b2048923e2540
+  data.tar.gz: e3e1738333089af3c793573c091471d825f59dab1803e84acdd2e5390fb4307d7cc25ccae327972e0b767ef86a44f3dd1a20d01ae0c3905c7e73e2291c7dc687

data/.gitignore

@@ -0,0 +1,11 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status

data/Gemfile

@@ -1,10 +1,13 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
 
 gem 'rack', '>=1.4.5'
 
 group :development do
-  gem "bundler"
-  gem "jeweler"
-  gem "rspec"
-  gem "rails"
+  gem 'bundler'
+  gem 'rspec'
+  gem 'rails', '~>6.0.3.1'
 end

data/Gemfile.lock

@@ -1,170 +1,174 @@
+PATH
+  remote: .
+  specs:
+    heroku-deflater (0.7.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actioncable (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      actionview (= 6.0.3.7)
+      activejob (= 6.0.3.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.0.3.7)
+      actionview (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.7)
+      activesupport (= 6.0.3.7)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.7)
+      activesupport (= 6.0.3.7)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
+    activemodel (6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activerecord (6.0.3.7)
+      activemodel (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activestorage (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
-    builder (3.2.3)
-    concurrent-ruby (1.0.4)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    git (1.3.0)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    hashie (3.4.6)
-    highline (1.7.8)
-    i18n (0.7.0)
-    jeweler (2.3.3)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api (~> 0.11.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych (~> 2.2)
-      rake
-      rdoc
-      semver2
-    jwt (1.5.6)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    multi_json (1.12.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nio4r (1.2.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    oauth2 (1.3.0)
-      faraday (>= 0.8, < 0.11)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    psych (2.2.2)
-    public_suffix (2.0.5)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.21.4)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
+    net-imap (0.4.1)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.4.0)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    racc (1.7.1)
+    rack (2.2.8)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (6.0.3.7)
+      actioncable (= 6.0.3.7)
+      actionmailbox (= 6.0.3.7)
+      actionmailer (= 6.0.3.7)
+      actionpack (= 6.0.3.7)
+      actiontext (= 6.0.3.7)
+      actionview (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activemodel (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.7)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rdoc (5.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    semver2 (3.4.2)
-    sprockets (3.7.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (1.3.0)
+    thread_safe (0.3.6)
+    timeout (0.4.0)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  jeweler
+  heroku-deflater!
   rack (>= 1.4.5)
-  rails
+  rails (~> 6.0.3.1)
   rspec
 
 BUNDLED WITH
-   1.14.2
+   2.2.33

data/README.md

@@ -1,14 +1,14 @@
 # heroku-deflater
 
-A simple rack middleware that enables compressing of your assets and application
-responses on Heroku, while not wasting CPU cycles on pointlessly compressing images
-and other binary responses.
+A simple rack middleware that enables compressing of your sprockets and
+webpacker assets and application responses on Heroku, while not wasting CPU
+cycles on pointlessly compressing images and other binary responses.
 
 It also includes code from https://github.com/mattolson/heroku_rails_deflate
 
-Before serving a file from disk to a gzip-enabled client, it will look for
-a precompressed file in the same location that ends in ".gz".
-The purpose is to avoid compressing the same file each time it is requested.
+Before serving a file from disk to a gzip-enabled client, it will look for a
+precompressed file in the same location that ends in ".gz". The purpose is to
+avoid compressing the same file each time it is requested.
 
 ## Installing
 
@@ -19,17 +19,21 @@ Add to your Gemfile:
 
 ## Contributing to heroku-deflater
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Check out the latest master to make sure the feature hasn't been implemented
+or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it
+and/or contributed it.
 * Fork the project.
 * Start a feature/bugfix branch.
 * Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Make sure to add tests for it. This is important so I don't break it in a
+future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to
+have your own version, or is otherwise necessary, that is fine, but please
+isolate to its own commit so I can cherry-pick around it.
 
 ## Copyright
 
-Copyright (c) 2012 Roman Shterenzon. See LICENSE.txt for
-further details.
+Copyright (c) 2012 Roman Shterenzon. See LICENSE.txt for further details.
 
 [1]: https://github.com/rack/rack/issues/349

data/Rakefile

@@ -1,42 +1,17 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'rubygems'
-require 'bundler'
+require 'bundler/gem_tasks'
 begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "heroku-deflater"
-  gem.homepage = "http://github.com/romanbsd/heroku-deflater"
-  gem.license = "MIT"
-  gem.summary = %Q{Deflate assets on heroku}
-  gem.description = gem.summary
-  gem.email = "romanbsd@yahoo.com"
-  gem.authors = ["Roman Shterenzon"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
+task default: :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "heroku-deflater #{version}"

data/heroku-deflater.gemspec

@@ -1,72 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: heroku-deflater 0.6.3 ruby lib
+# frozen_string_literal: true
+
+require_relative 'lib/heroku-deflater/version'
 
 Gem::Specification.new do |s|
-  s.name = "heroku-deflater".freeze
-  s.version = "0.6.3"
+  s.name = 'heroku-deflater'
+  s.version = HerokuDeflater::VERSION
+  s.authors = ['Roman Shterenzon']
+  s.email = 'romanbsd@yahoo.com'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Roman Shterenzon".freeze]
-  s.date = "2017-01-25"
-  s.description = "Deflate assets on heroku".freeze
-  s.email = "romanbsd@yahoo.com".freeze
+  s.summary = 'Deflate assets on heroku'
+  s.description = 'Deflate assets on Heroku'
+  s.homepage = 'https://github.com/romanbsd/heroku-deflater'
+  s.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  s.require_paths = ['lib']
   s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "heroku-deflater.gemspec",
-    "lib/heroku-deflater.rb",
-    "lib/heroku-deflater/cache_control_manager.rb",
-    "lib/heroku-deflater/railtie.rb",
-    "lib/heroku-deflater/serve_zipped_assets.rb",
-    "lib/heroku-deflater/skip_binary.rb",
-    "spec/cache_control_manager_spec.rb",
-    "spec/fixtures/assets/spec.js",
-    "spec/fixtures/assets/spec.js.gz",
-    "spec/fixtures/assets/spec2.js",
-    "spec/fixtures/non-assets/spec.js.gz",
-    "spec/serve_zipped_assets_spec.rb",
-    "spec/skip_binary_spec.rb"
+    'LICENSE.txt',
+    'README.md'
   ]
-  s.homepage = "http://github.com/romanbsd/heroku-deflater".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.8".freeze
-  s.summary = "Deflate assets on heroku".freeze
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>.freeze, [">= 1.4.5"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rails>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<rack>.freeze, [">= 1.4.5"])
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<rails>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rack>.freeze, [">= 1.4.5"])
-    s.add_dependency(%q<bundler>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-    s.add_dependency(%q<rspec>.freeze, [">= 0"])
-    s.add_dependency(%q<rails>.freeze, [">= 0"])
+  s.licenses = ['MIT']
+  s.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 end
-

data/lib/heroku-deflater/cache_control_manager.rb

@@ -10,30 +10,16 @@ module HerokuDeflater
 
     def setup_max_age(max_age)
       @max_age = max_age
-      if rails_version_5?
-        app.config.public_file_server.headers ||= {}
-        app.config.public_file_server.headers['Cache-Control'] = cache_control
-      else
-        app.config.static_cache_control = cache_control
-      end
     end
 
     def cache_control_headers
-      if rails_version_5?
-        { 'Cache-Control' => cache_control }
+      if HerokuDeflater.rails_version_5?
+        headers = app.config.public_file_server.headers ||= {}
+        headers['Cache-Control'] ||= "public, max-age=#{max_age}"
+        headers
       else
-        cache_control
+        app.config.static_cache_control ||= "public, max-age=#{max_age}"
       end
     end
-
-    private
-
-    def rails_version_5?
-      Rails::VERSION::MAJOR >= 5
-    end
-
-    def cache_control
-      @_cache_control ||= "public, max-age=#{max_age}"
-    end
   end
 end

data/lib/heroku-deflater/railtie.rb

@@ -8,19 +8,31 @@ module HerokuDeflater
     initializer 'heroku_deflater.configure_rails_initialization' do |app|
       app.middleware.insert_before ActionDispatch::Static, Rack::Deflater
       app.middleware.insert_before ActionDispatch::Static, HerokuDeflater::SkipBinary
-      app.middleware.insert_before Rack::Deflater, HerokuDeflater::ServeZippedAssets,
-        app.paths['public'].first, app.config.assets.prefix, self.class.cache_control_manager(app)
-    end
 
-    # Set default Cache-Control headers to one week.
-    # The configuration block in config/application.rb overrides this.
-    config.before_configuration do |app|
-      cache_control = cache_control_manager(app)
-      cache_control.setup_max_age(86400)
+      assets_prefix = app.config.assets.prefix if app.config.respond_to?(:assets)
+
+      if Object.const_defined?(:Webpacker)
+        public_path = Webpacker.config.public_path.to_s
+        public_output_path = Webpacker.config.public_output_path.to_s
+        webpacker_prefix = public_output_path.split(public_path).last
+      end
+
+      if assets_prefix || webpacker_prefix
+        paths = [assets_prefix, webpacker_prefix].compact
+        app.middleware.insert_before Rack::Deflater, HerokuDeflater::ServeZippedAssets,
+          app.paths['public'].first, paths, self.class.cache_control_manager(app)
+      end
     end
 
     def self.cache_control_manager(app)
       @_cache_control_manager ||= CacheControlManager.new(app)
     end
+
+    # Set default Cache-Control headers to 24 hours.
+    # The configuration block in config/application.rb overrides this.
+    config.before_initialize do |app|
+      cache_control = cache_control_manager(app)
+      cache_control.setup_max_age(86400)
+    end
   end
 end

data/lib/heroku-deflater/serve_zipped_assets.rb

@@ -1,18 +1,22 @@
 require 'action_controller'
-require 'active_support/core_ext/uri'
 require 'action_dispatch/middleware/static'
 
+if Rails::VERSION::MAJOR < 7
+  # Deprecated in Rails 7.0, and removed in 7.1
+  require 'active_support/core_ext/uri'
+end
+
 # Adapted from https://gist.github.com/guyboltonking/2152663
 #
 # Taken from: https://github.com/mattolson/heroku_rails_deflate
 #
-
 module HerokuDeflater
   class ServeZippedAssets
-    def initialize(app, root, assets_path, cache_control_manager)
+    def initialize(app, root, paths, cache_control_manager)
       @app = app
-      @assets_path = assets_path.chomp('/') + '/'
-      if rails_version_5?
+      @paths = paths.map { |p| p.chomp('/') + '/' }
+
+      if HerokuDeflater.rails_version_5?
         @file_handler = ActionDispatch::FileHandler.new(root, headers: cache_control_manager.cache_control_headers)
       else
         @file_handler = ActionDispatch::FileHandler.new(root, cache_control_manager.cache_control_headers)
@@ -28,7 +32,7 @@ module HerokuDeflater
           # See if gzipped version exists in assets directory
           compressed_path = env['PATH_INFO'] + '.gz'
 
-          if compressed_path.start_with?(@assets_path) && (match = @file_handler.match?(compressed_path))
+          if compressed_path.start_with?(*@paths) && (match = @file_handler.match?(compressed_path))
             # Get the FileHandler to serve up the gzipped file, then strip the .gz suffix
             env['PATH_INFO'] = match
             status, headers, body = @file_handler.call(env)
@@ -53,10 +57,5 @@ module HerokuDeflater
 
       @app.call(env)
     end
-
-    private
-    def rails_version_5?
-      Rails::VERSION::MAJOR >= 5
-    end
   end
 end

data/lib/heroku-deflater/skip_binary.rb

@@ -8,7 +8,7 @@ module HerokuDeflater
     WHITELIST = [
       %r{^text/},
       'application/javascript',
-      %r{^application/json},
+      %r{^application/.*?json},
       %r{^application/.*?xml},
       'application/x-font-ttf',
       'font/opentype',

data/lib/heroku-deflater/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module HerokuDeflater
+  VERSION = '0.7.0'
+end

data/lib/heroku-deflater.rb

@@ -1 +1,7 @@
 require 'heroku-deflater/railtie'
+
+module HerokuDeflater
+  def self.rails_version_5?
+    Rails::VERSION::MAJOR >= 5
+  end
+end

metadata

@@ -1,86 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: heroku-deflater
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Roman Shterenzon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.5
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Deflate assets on heroku
+date: 2023-10-19 00:00:00.000000000 Z
+dependencies: []
+description: Deflate assets on Heroku
 email: romanbsd@yahoo.com
 executables: []
 extensions: []
@@ -88,6 +18,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".gitignore"
 - ".rspec"
 - Gemfile
 - Gemfile.lock
@@ -101,18 +32,12 @@ files:
 - lib/heroku-deflater/railtie.rb
 - lib/heroku-deflater/serve_zipped_assets.rb
 - lib/heroku-deflater/skip_binary.rb
-- spec/cache_control_manager_spec.rb
-- spec/fixtures/assets/spec.js
-- spec/fixtures/assets/spec.js.gz
-- spec/fixtures/assets/spec2.js
-- spec/fixtures/non-assets/spec.js.gz
-- spec/serve_zipped_assets_spec.rb
-- spec/skip_binary_spec.rb
-homepage: http://github.com/romanbsd/heroku-deflater
+- lib/heroku-deflater/version.rb
+homepage: https://github.com/romanbsd/heroku-deflater
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,16 +45,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Deflate assets on heroku
 test_files: []

data/spec/cache_control_manager_spec.rb

@@ -1,68 +0,0 @@
-require 'heroku-deflater/cache_control_manager'
-require 'rails'
-
-describe HerokuDeflater::CacheControlManager do
-  class Rails5App
-    def config
-      @_config ||= Config.new
-    end
-
-    class Config
-      attr_accessor :headers
-
-      def initialize
-        @headers = {}
-      end
-
-      def public_file_server
-        self
-      end
-    end
-  end
-
-  class Rails4App
-    def config
-      @_config ||= Config.new
-    end
-
-    class Config
-      attr_accessor :static_cache_control
-    end
-  end
-
-  context 'Rails 4.x and below' do
-    let(:app) { Rails4App.new }
-
-    subject { described_class.new(app) }
-    before do
-      allow(subject).to receive(:rails_version_5?).and_return(false)
-      subject.setup_max_age(86400)
-    end
-
-    it 'sets max age for static_cache_control config option' do
-      expect(app.config.static_cache_control).to eq('public, max-age=86400')
-    end
-
-    it 'cache_control_headers returns cache control option' do
-      expect(subject.cache_control_headers).to eq('public, max-age=86400')
-    end
-  end
-
-  context 'Rails 5' do
-    let(:app) { Rails5App.new }
-
-    subject { described_class.new(app) }
-    before do
-      allow(subject).to receive(:rails_version_5?).and_return(true)
-      subject.setup_max_age(86400)
-    end
-
-    it 'sets max age for public_file_server config option' do
-      expect(app.config.public_file_server.headers['Cache-Control']).to eq('public, max-age=86400')
-    end
-
-    it 'cache_control_headers returns hash cache control headers' do
-      expect(subject.cache_control_headers).to eq({'Cache-Control' =>'public, max-age=86400'})
-    end
-  end
-end

data/spec/fixtures/assets/spec.js

@@ -1,6 +0,0 @@
-// Fixture file
-(function() {
-  console.log("Hello world");
-  console.log("Hello world");
-  console.log("Hello world");
-})();

data/spec/fixtures/assets/spec2.js

@@ -1,4 +0,0 @@
-// Fixture file
-(function() {
-  console.log("Hello world");
-})();

data/spec/serve_zipped_assets_spec.rb

@@ -1,80 +0,0 @@
-require 'rack/mock'
-require 'rack/static'
-require 'heroku-deflater/serve_zipped_assets'
-require 'heroku-deflater/cache_control_manager'
-
-describe HerokuDeflater::ServeZippedAssets do
-  def process(path, accept_encoding = 'compress, gzip, deflate')
-    env = Rack::MockRequest.env_for(path)
-    env['HTTP_ACCEPT_ENCODING'] = accept_encoding
-    app.call(env)
-  end
-
-  def app
-    @app ||= begin
-      root_path = File.expand_path('../fixtures', __FILE__)
-      cache_control_manager = HerokuDeflater::CacheControlManager.new(nil)
-      mock = lambda { |env| [404, {'X-Cascade' => 'pass'}, []] }
-      described_class.new(mock, root_path, '/assets', cache_control_manager)
-    end
-  end
-
-  shared_examples_for 'ServeZippedAssets' do
-
-    it 'does nothing for clients which do not want gzip' do
-      status, headers, body = process('/assets/spec.js', nil)
-      expect(status).to eq(404)
-    end
-
-    it 'handles the pre-gzipped assets' do
-      status, headers, body = process('/assets/spec.js')
-      expect(status).to eq(200)
-    end
-
-    it 'has correct content type' do
-      status, headers, body = process('/assets/spec.js')
-      expect(headers['Content-Type']).to eq('application/javascript')
-    end
-
-    it 'has correct content encoding' do
-      status, headers, body = process('/assets/spec.js')
-      expect(headers['Content-Encoding']).to eq('gzip')
-    end
-
-    it 'has correct content length' do
-      status, headers, body = process('/assets/spec.js')
-      expect(headers['Content-Length']).to eq('86')
-    end
-
-    it 'has correct cache control' do
-      status, headers, body = process('/assets/spec.js')
-      expect(headers['Cache-Control']).to eq('public, max-age=86400')
-    end
-
-    it 'does not serve non-gzipped assets' do
-      status, headers, body = process('/assets/spec2.js')
-      expect(status).to eq(404)
-    end
-
-    it 'does not serve anything from non-asset directories' do
-      status, headers, body = process('/non-assets/spec.js')
-      expect(status).to eq(404)
-    end
-  end
-
-  describe 'Rais 4.x' do
-    before do
-      allow(app).to receive(:rails_version_5?) { false }
-    end
-
-    it_behaves_like 'ServeZippedAssets'
-  end
-
-  describe 'Rais 5.x' do
-    before do
-      allow(app).to receive(:rails_version_5?) { true }
-    end
-
-    it_behaves_like 'ServeZippedAssets'
-  end
-end

data/spec/skip_binary_spec.rb

@@ -1,40 +0,0 @@
-require 'rack/mock'
-require 'heroku-deflater/skip_binary'
-
-describe HerokuDeflater::SkipBinary do
-  let(:env) { Rack::MockRequest.env_for('/') }
-
-  def app_returning_type(type, headers = {})
-    lambda { |env| [200, {'Content-Type' => type}.merge(headers), ['']] }
-  end
-
-  def process(type, headers = {})
-    described_class.new(app_returning_type(type, headers)).call(env)[1]
-  end
-
-  it "forbids compressing of binary types" do
-    %w[application/gzip application/pdf image/jpeg].each do |type|
-      headers = process(type)
-      expect(headers['Cache-Control'].to_s).to include('no-transform')
-    end
-  end
-
-  it "allows compressing of text types" do
-    %w[text/plain text/html application/json application/javascript
-    application/rss+xml].each do |type|
-      headers = process(type)
-      expect(headers['Cache-Control'].to_s).not_to include('no-transform')
-    end
-  end
-
-  it "adds to existing headers" do
-    headers = process('image/gif', 'Cache-Control' => 'public')
-    expect(headers['Cache-Control']).to eq('public, no-transform')
-  end
-
-  it "doesn't add 'no-transform' if it's already present" do
-    headers = process('image/gif', 'Cache-Control' => 'public, no-transform')
-    expect(headers['Cache-Control']).to eq('public, no-transform')
-  end
-
-end