sprockets-svg 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4cd1fe2694f551ceacca4971f50854ea36cfe5
-  data.tar.gz: 92f4f48ba1c319a32991093b2a13be444640f607
+  metadata.gz: d949c8b7f229dbf52884938e1cc7f024327d8258
+  data.tar.gz: 2a9bc2ad1096ce3a015319197fe1014e4bf44fbe
 SHA512:
-  metadata.gz: d850488e8e16308a460584b25a895e27fa5a20d5db1fe2c5dbaabbae3bfe39105c8b173551c445ac54a5d49435824993aede7962fd716fe1520dbb77b64e1118
-  data.tar.gz: 21f274ff68c4166af0c1fe29f5c1a52a08e5c9be1d7ac94e085083067b118a40efa4262a545b7035a9e398693bba6e19b5a9b25e2a8e2cd7338a79532a9c7686
+  metadata.gz: f1f78be0778e8fae21dfc44377414649f535e520e4baa5dbcf1c9e3a256ae4c170f7db33f436783e418ee52c6171c5d674114c4c9d56414bf6dc5d6749021ff4
+  data.tar.gz: c32cf46a4766d384e5094ddc5dae98f3cc2481e1a496acec97d8e6f5c4a7398fb6b874835adacc1db28c10bd504ddea0a113a8cb6a31842bd559a7d4b8170192

data/lib/sprockets/svg.rb

@@ -1,17 +1,25 @@
 require 'sprockets/svg/version'
-
+require 'chunky_png'
 require 'rmagick'
 
 module Sprockets
   module Svg
     extend self
 
+    USELESS_PNG_METADATA = %w(svg:base-uri date:create date:modify).freeze
+
     # TODO: integrate svgo instead: https://github.com/svg/svgo
     # See https://github.com/lautis/uglifier on how to integrate a npm package as a gem.
     def self.convert(svg_blob)
       image_list = Magick::Image.from_blob(svg_blob) { self.format = 'SVG' }
       image = image_list.first
       image.format = 'PNG'
+      strip_png_metadata(image.to_blob)
+    end
+
+    def strip_png_metadata(png_blob)
+      image = ChunkyPNG::Image.from_blob(png_blob)
+      USELESS_PNG_METADATA.each(&image.metadata.method(:delete))
       image.to_blob
     end
 

data/lib/sprockets/svg/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Svg
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/spec/rails_spec.rb

@@ -25,7 +25,7 @@ describe 'Sprockets::Svg' do
 
   let(:manifest) { JSON.parse(File.read(manifest_path)) }
 
-  let(:png_source) { png_path.read }
+  let(:png_fingerprint) { Digest::MD5.hexdigest(png_path.read) }
 
   describe 'Rake task' do
     before :each do
@@ -48,8 +48,13 @@ describe 'Sprockets::Svg' do
       expect(png_path).to be_exist
 
       expect(svg_fingerprint).to be == '2d8738f246e37a7befd06db8dc2f7e11'
-      # Metadata etc are kinda time dependant, so this assertion is the best I can do.
-      expect(png_source).to be_starts_with("\x89PNG\r\n")
+
+      png_metadata = ChunkyPNG::Image.from_file(png_path.to_s).metadata
+      expect(png_metadata).to be_empty
+
+      # Metadata usually contains some timestamps, so sleeping is the best way to make sure they are all stripped
+      sleep 1
+      expect(png_fingerprint).to be == Digest::MD5.hexdigest(Sprockets::Svg.convert(svg_path.read))
 
       expect(manifest['files'][svg_name]).to be_present
       expect(manifest['files'][png_name]).to be_present

data/sprockets-svg.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets', '>= 3'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'rmagick'
+  spec.add_dependency 'chunky_png'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-svg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Minify SVG assets, and optionally convert them to PNG for browser compatibility.
 email:
 - jean.boussier@gmail.com