sprockets-svg 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e56d6446c52c59929d03a10f8049bd82641227
-  data.tar.gz: 1e909a1fbdfcf1296cad5ccb24f7d3553af71e95
+  metadata.gz: fc803303d0b7589ee6a223b66943829369763e2d
+  data.tar.gz: 99cc9b849a270e98fedd58d51436d53f969c155a
 SHA512:
-  metadata.gz: 62c102f80c869e1972e13edb991c7bb816b1f0842a1e38f6854deb71f4ac81c1aea902e89a04df7fd52ac20e457df8f7d23753984aa35353ca5ef1b5ab11945d
-  data.tar.gz: 285921e5a4a3821d757e789c594c1b61cb8cec311c167da13339297eca98e533d9f93e00c0b31ee01c797dc56c80ef084446ea392d285da488f494565353a741
+  metadata.gz: 14c328cc5f480d9714002fc756ac2513202c1ba79237f874d859c63490f9241c58ca77a05599a3e9bcef48aedcd0de20dd05c5a2482fcacf552e9143767a6b0b
+  data.tar.gz: 4cac1740330bb335efd7e64606ca894ada311f468e190419725094a87e6818a19c7b908f0c7e027e289e51d7a2e64f1de877d3d5aea7de348bb66f391f3e3846

data/lib/sprockets/svg.rb

@@ -1,11 +1,19 @@
 require 'sprockets/svg/version'
 
 require 'nokogiri'
+require 'RMagick'
 
 module Sprockets
   module Svg
     extend self
 
+    # 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_path, png_path)
+      image = Magick::ImageList.new(svg_path)
+      image.write(png_path)
+    end
+
     def self.image?(path)
       return false unless path.ends_with?('.svg')
 
@@ -24,11 +32,9 @@ module Sprockets
 end
 
 require_relative 'svg/cleaner'
-require_relative 'svg/png'
+require_relative 'svg/proxy_asset'
 require_relative 'svg/server'
 
-Sprockets::Asset.send(:include, Sprockets::Svg::Png)
-Sprockets::StaticAsset.send(:include, Sprockets::Svg::Png)
 Sprockets::Environment.send(:include, Sprockets::Svg::Server)
 Sprockets::Index.send(:include, Sprockets::Svg::Server)
 

data/lib/sprockets/svg/proxy_asset.rb

@@ -0,0 +1,85 @@
+module Sprockets
+  module Svg
+    class ProxyAsset
+
+      def initialize(original_asset)
+        @original_asset = original_asset
+      end
+
+      def digest_path
+        png_path(@original_asset.digest_path)
+      end
+
+      def logical_path
+        @original_asset.logical_path + '.png'
+      end
+
+      def write_to(filename, options = {})
+        # Gzip contents if filename has '.gz'
+        options[:compress] ||= File.extname(filename) == '.gz'
+
+        tmp_path = Tempfile.new(['svg2png', '.svg']).path
+        png_path = tmp_path + '.png'
+
+        @original_asset.write_to(tmp_path, options.merge(compress: false))
+        Svg.convert(tmp_path, png_path)
+
+        FileUtils.mkdir_p File.dirname(filename)
+
+        if options[:compress]
+          # Open file and run it through `Zlib`
+          File.open(png_path, 'rb') do |rd|
+            File.open("#{filename}+", 'wb') do |wr|
+              gz = Zlib::GzipWriter.new(wr, Zlib::BEST_COMPRESSION)
+              gz.mtime = mtime.to_i
+              buf = ""
+              while rd.read(16384, buf)
+                gz.write(buf)
+              end
+              gz.close
+            end
+          end
+        else
+          # If no compression needs to be done, we can just copy it into place.
+          FileUtils.cp(png_path, "#{filename}+")
+        end
+
+        # Atomic write
+        FileUtils.mv("#{filename}+", filename)
+
+        # Set mtime correctly
+        File.utime(mtime, mtime, filename)
+
+        nil
+      ensure
+        # Ensure tmp file gets cleaned up
+        FileUtils.rm("#{filename}+") if File.exist?("#{filename}+")
+      end
+
+      def to_s
+        tmp_path = Tempfile.new(['png-cache', '.png']).path
+        write_to(tmp_path)
+        File.read(tmp_path)
+      end
+
+      private
+
+      def png_path(svg_path)
+        if svg_path =~ /^(.*)\-([0-9a-f]{32})\.svg$/
+          "#{$1}.svg-#{$2}.png"
+        else
+          "#{svg_path}.png"
+        end
+      end
+
+      def method_missing(name, *args, &block)
+        if @original_asset.respond_to?(name)
+          @original_asset.public_send(name, *args, &block)
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/sprockets/svg/server.rb

@@ -19,24 +19,12 @@ module Sprockets
         asset = find_asset_without_conversion(path, options)
 
         if asset && convert
-          asset = svg_asset_to_static_png(asset)
+          asset = ProxyAsset.new(asset)
         end
 
         asset
       end
 
-      def svg2png_cache_path
-        @cache_path ||= cache.instance_variable_get(:@root).join('svg2png')
-      end
-
-      def svg_asset_to_static_png(svg_asset)
-        tmp_path = Tempfile.new(['svg2png', '.svg']).path
-        svg_asset.write_to(tmp_path)
-        png_asset = ::Sprockets::StaticAsset.new(self, svg_asset.logical_path + '.png', Pathname.new(tmp_path + '.png'))
-        png_asset.instance_variable_set(:@digest, svg_asset.digest)
-        png_asset
-      end
-
       def each_file(*args)
         return to_enum(__method__) unless block_given?
 

data/lib/sprockets/svg/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Svg
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-svg
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,7 @@ files:
 - lib/sprockets-svg.rb
 - lib/sprockets/svg.rb
 - lib/sprockets/svg/cleaner.rb
-- lib/sprockets/svg/png.rb
+- lib/sprockets/svg/proxy_asset.rb
 - lib/sprockets/svg/railtie.rb
 - lib/sprockets/svg/server.rb
 - lib/sprockets/svg/version.rb

data/lib/sprockets/svg/png.rb

@@ -1,35 +0,0 @@
-require 'RMagick'
-
-module Sprockets
-  module Svg
-    module Png
-      def self.included(base)
-        base.send(:alias_method, :write_to_without_png_conversion, :write_to)
-        base.send(:alias_method, :write_to, :write_to_with_png_conversion)
-      end
-
-      def write_to_with_png_conversion(path, options={})
-        write_to_without_png_conversion(path, options)
-        if Svg.image?(path)
-          Png.convert(path, png_path(path))
-        end
-        nil
-      end
-
-      def png_path(svg_path)
-        if svg_path =~ /^(.*)\-([0-9a-f]{40})\.svg$/
-          "#{$1}.svg-#{$2}.png"
-        else
-          "#{svg_path}.png"
-        end
-      end
-
-      # 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_path, png_path)
-        image = Magick::ImageList.new(svg_path)
-        image.write(png_path)
-      end
-    end
-  end
-end