sprockets 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd0209b90a101e98586e5dbc8c1828fb54552e0
-  data.tar.gz: 4c5a23c98fba032b63f914e27eca0cafc139602f
+  metadata.gz: 929bf083589cbbd2e0c130a06fd8c3a528dc9be8
+  data.tar.gz: 87faf2c9c2276b06057647e99ab856d19ae3e1cb
 SHA512:
-  metadata.gz: 25ac8156e0bf67173e12ff95c683fe5ad7805946b8baf503e6821db164e19c7477af4fbc4384f620ff5f9cd917439a89d3ffeb2ae326f6cd582897e0162b38b2
-  data.tar.gz: 8d437551f99263d8b4bc636e4a3de57adff4816505d271d60e096661c06e74f0d812d67e95fb6e32f2598d5a28aa6148cc1cc8912a4799a630f288fd1623b169
+  metadata.gz: 88961b6e91bcc5f16e4e0d62440a03e16cb783ec57c953300a971d327d02f52871e8a0826fec6695711ddf6dda0894f2a1abf213d8bca8c5a8d5a68b7b6abe11
+  data.tar.gz: 250a379b175d515ca5a34c8f85fe50a3b9af881c367783756e72ff20fb34cc2a492c646af0b31f1c53c78beaff6fd690253a14a44dbf70f03671403025c9c512

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 **Master**
 
+**3.5.2** (December 8, 2015)
+
+* Fix JRuby bug with concurrent-ruby.
+* Fix disabling gzip generation in cached environments.
+
 **3.5.1** (December 5, 2015)
 
 * Fix gzip asset generation for assets already on disk.

data/lib/sprockets.rb

@@ -33,7 +33,8 @@ module Sprockets
     registered_transformers: Hash.new { |h, k| {}.freeze }.freeze,
     root: File.expand_path('..', __FILE__).freeze,
     transformers: Hash.new { |h, k| {}.freeze }.freeze,
-    version: ""
+    version: "",
+    gzip_enabled: true
   }.freeze
   self.computed_config = {}
 

data/lib/sprockets/compressing.rb

@@ -51,21 +51,6 @@ module Sprockets
       end
     end
 
-    def gzip?
-      return @gzip if defined?(@gzip)
-      true
-    end
-
-    def skip_gzip?
-      !gzip?
-    end
-
-    # Enable or disable the creation of gzip files,
-    # on by default.
-    def gzip=(gzip)
-      @gzip = gzip
-    end
-
     # Assign a compressor to run on `application/javascript` assets.
     #
     # The compressor object must respond to `compress`.
@@ -85,5 +70,25 @@ module Sprockets
 
       register_bundle_processor 'application/javascript', klass
     end
+
+    # Public: Checks if Gzip is enabled.
+    def gzip?
+      config[:gzip_enabled]
+    end
+
+    # Public: Checks if Gzip is disabled.
+    def skip_gzip?
+      !gzip?
+    end
+
+    # Public: Enable or disable the creation of Gzip files.
+    #
+    # Defaults to true.
+    #
+    #     environment.gzip = false
+    #
+    def gzip=(gzip)
+      self.config = config.merge(gzip_enabled: gzip).freeze
+    end
   end
 end

data/lib/sprockets/manifest.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'time'
 
-require 'concurrent/future'
+require 'concurrent'
 
 require 'sprockets/manifest_utils'
 require 'sprockets/utils/gzip'

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.5.1"
+  VERSION = "3.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sprockets
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rack-based asset packaging system