sprockets-svg 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ce718493c386f82a692df0b2164270e68d1646
-  data.tar.gz: edf737ce5bdb7e0a450b07db04a0ca74f1e0723e
+  metadata.gz: 920dbc50372c4ed37c7ae51dde3e0b559ab618ea
+  data.tar.gz: c1d1bed364e46f9d17e53e95f53558da4e450079
 SHA512:
-  metadata.gz: a6d6859848b0ee077d6a79a4c770168609797e181f3ac351e8fba884daf6a08e9a0b6d48b1cbd1f73788190fb5622204e04626f591c7150a9695aff93fb1be8c
-  data.tar.gz: c8426d7080ef64fc5f41e6178ebf7aac49e844ce23116df4767d32be349b453e2b673e02a2a89f40a923f37bea666dc34a41e5fb6fcba1494a60c33c3b9e080f
+  metadata.gz: 2d25bb9d9a0b5533196d2f4a9450c75f87be8391fd21965b208ec92e51a7f155b0859db77d554e2cb067c1bace026f8a47fe3ab5e63388597cd1dfd5f684a118
+  data.tar.gz: e361fd605239e6decd33387bcad7368db8dfc43ad9d55a0c4bcd5b21ca20988c28332c9ef5ffc21ced771b0e7eaf21afb02e9647875cfe303fac8ac3ab25606c

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sprockets-svg.gemspec
 gemspec
+
+gem 'rake'
+gem 'rspec'
+gem 'rspec-rails'
+gem 'sass-rails'
+gem 'rails'
+gem 'byebug'

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/byroot/sprockets-svg.svg)](https://travis-ci.org/byroot/sprockets-svg)
+[![Code Climate](https://codeclimate.com/github/byroot/sprockets-svg.png)](https://codeclimate.com/github/byroot/sprockets-svg)
+[![Gem Version](https://badge.fury.io/rb/sprockets-svg.png)](http://badge.fury.io/rb/sprockets-svg)
+
 # Sprockets::Svg
 
 SVG toolchain for sprockets

data/Rakefile

@@ -1 +1,7 @@
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/sprockets/svg/cleaner.rb

@@ -6,7 +6,6 @@ module Sprockets
       # 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.process(svg)
-        p :preprocess_svg
         document = Nokogiri::XML(svg)
         document.css('[display=none]').remove()
         document.to_s

data/lib/sprockets/svg/png.rb

@@ -10,16 +10,18 @@ module Sprockets
 
       def write_to_with_png_conversion(path, options={})
         write_to_without_png_conversion(path, options)
-        if path.ends_with?('.svg') && image?(path)
-          Png.convert(path, path + '.png')
+        if Svg.image?(path)
+          Png.convert(path, png_path(path))
         end
         nil
       end
 
-      def image?(path)
-        document = Nokogiri::XML(File.read(path))
-        svg = document.css('svg')
-        svg.attribute('height') && svg.attribute('width')
+      def png_path(svg_path)
+        if svg_path =~ /^(.*)\-([0-9a-f]+)\.svg$/
+          "#{$1}.svg-#{$2}.png"
+        else
+          "#{svg_path}.png"
+        end
       end
 
       # TODO: integrate svgo instead: https://github.com/svg/svgo

data/lib/sprockets/svg/server.rb

@@ -12,13 +12,13 @@ module Sprockets
 
       def find_asset_with_conversion(path, options = {})
         convert = false
-        if path.ends_with?('.svg.png')
+        if path.to_s.ends_with?('.svg.png')
           path = path.gsub(/\.png/, '')
           convert = true
         end
         asset = find_asset_without_conversion(path, options)
 
-        if convert
+        if asset && convert
           asset = svg_asset_to_static_png(asset)
         end
 
@@ -32,7 +32,20 @@ module Sprockets
       def svg_asset_to_static_png(svg_asset)
         tmp_path = Tempfile.new(['svg2png', '.svg']).path
         svg_asset.write_to(tmp_path)
-        ::Sprockets::StaticAsset.new(self, svg_asset.logical_path + '.png', Pathname.new(tmp_path + '.png'))
+        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?
+
+        super do |path|
+          yield path
+          if Svg.image?(path.to_s)
+            yield Pathname.new(path.to_s + '.png')
+          end
+        end
       end
 
     end

data/lib/sprockets/svg/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Svg
-    VERSION = '0.0.4'
+    VERSION = '0.1.0'
   end
 end

data/lib/sprockets/svg.rb

@@ -1,9 +1,19 @@
 require 'sprockets/svg/version'
 
+require 'nokogiri'
+
 module Sprockets
   module Svg
     extend self
 
+    def self.image?(path)
+      return false unless path.ends_with?('.svg')
+
+      document = Nokogiri::XML(File.read(path))
+      svg = document.css('svg')
+      svg.attribute('height') && svg.attribute('width')
+    end
+
     def install(assets)
       assets.register_preprocessor 'image/svg+xml', :svg_min do |context, data|
         Sprockets::Svg::Cleaner.process(data)
@@ -20,5 +30,6 @@ 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)
 
 require_relative 'svg/railtie' if defined?(Rails)

data/spec/app/.gitignore

@@ -0,0 +1,2 @@
+/log
+/tmp

data/spec/app/Rakefile

@@ -0,0 +1,2 @@
+require File.expand_path('../config/application', __FILE__)
+App::Application.load_tasks