rack-easy_brotli 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c6a421a62be6d4257439c1f4c3b551bbd130347746aa169a32057cb0acb77c
-  data.tar.gz: 9d07efecfaab4ea4a1e451888d21cc711a0885dff2b69ef2ffc4ef63b6f26739
+  metadata.gz: 4ba33d8d9b2e3867296540cb06b46ed5296fa6caa7a43156f392b3dd54265203
+  data.tar.gz: 2a420d3f16702bb92f9abce28740072c475deb6b17059414e529a055c1e2d664
 SHA512:
-  metadata.gz: adb6aebce3c4c444b6320104b5b1212cf437ae8c32cecd88a3cb75f409702f10c3d295cdb18a16c6382f71b713cc5e70a959320ea3fced996697299822b07e6e
-  data.tar.gz: a924c24565f9ce5dea893277147023622002172c10015abaf61ca6a945117ec573ac5a6d51d8dba17b21bb609e7ea0b95c783757657bb1b8a60f58334a4e6a18
+  metadata.gz: f971c22b9381c9a3abfcb6bf8ab8f992652d8749b259cba85aa9dbaaeada46e8a56debf730b8699ff9bece059a83705a07968d3849cdd9d02ffeaab5c7883d8e
+  data.tar.gz: 20958c1f3fc658f81f0e231c74d35db3da0be5a54d002880fff1157916538fbd01cb8af0a035625837648acc07e393d77b13fb5e8fc5178a08d2757821acc4a4

data/lib/rack/brotli.rb

@@ -1,4 +1,3 @@
-require_relative 'brotli/instrument'
 require_relative 'brotli/deflater'
 require_relative 'brotli/version'
 require_relative 'brotli/railtie' if defined?(::Rails)

data/lib/rack/brotli/deflater.rb

@@ -29,11 +29,6 @@ module Rack::Brotli
 
       @condition = options[:if]
       @compressible_types = options[:include]
-      if defined?(ActiveSupport::Notifications)
-        @notifier = ActiveSupport::Notifications
-      else
-        @notifier = Rack::Brotli::Instrument
-      end
       @deflater_options = { quality: 5 }
       @deflater_options.merge!(options[:deflater]) if options[:deflater]
       @deflater_options
@@ -54,23 +49,21 @@ module Rack::Brotli
 
       return [status, headers, body] unless encoding
 
-      instrument(request) do
-        # Set the Vary HTTP header.
-        vary = headers["Vary"].to_s.split(",").map(&:strip)
-        unless vary.include?("*") || vary.include?("Accept-Encoding")
-          headers["Vary"] = vary.push("Accept-Encoding").join(",")
-        end
-
-        case encoding
-        when "br"
-          headers['Content-Encoding'] = "br"
-          headers.delete('Content-Length')
-          [status, headers, BrotliStream.new(body, @deflater_options)]
-        when nil
-          message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
-          bp = Rack::BodyProxy.new([message]) { body.close if body.respond_to?(:close) }
-          [406, {'Content-Type' => "text/plain", 'Content-Length' => message.length.to_s}, bp]
-        end
+      # Set the Vary HTTP header.
+      vary = headers["Vary"].to_s.split(",").map(&:strip)
+      unless vary.include?("*") || vary.include?("Accept-Encoding")
+        headers["Vary"] = vary.push("Accept-Encoding").join(",")
+      end
+
+      case encoding
+      when "br"
+        headers['Content-Encoding'] = "br"
+        headers.delete('Content-Length')
+        [status, headers, BrotliStream.new(body, @deflater_options)]
+      when nil
+        message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
+        bp = Rack::BodyProxy.new([message]) { body.close if body.respond_to?(:close) }
+        [406, {'Content-Type' => "text/plain", 'Content-Length' => message.length.to_s}, bp]
       end
     end
 
@@ -100,16 +93,9 @@ module Rack::Brotli
     
     private
 
-    # instrument for performance metrics
-    def instrument(request, &block)
-      @notifier.instrument("rack.brotli", request: request) do
-        yield
-      end
-    end
-
     def header_hash(headers)
       if headers.is_a?(Rack::Utils::HeaderHash)
-        header
+        headers
       else
         Rack::Utils::HeaderHash.new(headers) # rack < 2.2
       end

data/lib/rack/brotli/version.rb

@@ -4,7 +4,7 @@ module Rack
   module Brotli
     class Version
       def self.to_s
-        '1.2.0'
+        '1.2.1'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-easy_brotli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Marco Costa
@@ -106,7 +106,6 @@ files:
 - README.md
 - lib/rack/brotli.rb
 - lib/rack/brotli/deflater.rb
-- lib/rack/brotli/instrument.rb
 - lib/rack/brotli/railtie.rb
 - lib/rack/brotli/version.rb
 - lib/rack/easy_brotli.rb

data/lib/rack/brotli/instrument.rb

@@ -1,11 +0,0 @@
-# dummy implementation for non-rails environments
-
-module Rack
-  module Brotli
-    class Instrument
-      def self.instrument(name, **args, &block)
-        yield
-      end
-    end
-  end
-end