sprockets-svg 0.4.2 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1d0b1f522eaf1ac2f387b14122706132b0cf0b3
-  data.tar.gz: 029dae652ab761ab8191d97d10a03226c893ceb2
+  metadata.gz: 53db6df6150544cc5980d807795150e37467ef64
+  data.tar.gz: c6617061fa6ba299513e78879557320b0ce87dfe
 SHA512:
-  metadata.gz: 7c5b95750b1821fc93e4ab829249c8f2d736a87300b17095d64c2b085f3cbcb56a419144961a9958758b51b43e8d3346ce8260dab7ced10d1f2b15769baee9de
-  data.tar.gz: ce0c58a163e0ea056da210f9f98e23d660ec8fb36c3197e717094a34a0be49999555b48d1303c7c2f233e523cb2ca1a042a2b255ff257dba44f20df5f5c214ee
+  metadata.gz: 2ef4008781a13823cc905fff0bb1e4ff084ac70721abe720fa5d7a4a7dabe19ff063c9aa43378101bb62e6e8e898e1028a651b6d547283734a935625b20a6997
+  data.tar.gz: 749fb5253184279f9b1af415447988079f841ea42e90f32c63952a5d4c93abb1a3aac025abf7c6a873fb6a88e8e90bf6377a1a0d4ab4d2ebab7c06f09c8894dd

data/Gemfile

@@ -8,6 +8,7 @@ gem 'rspec'
 gem 'rspec-rails'
 gem 'sass-rails'
 gem 'rails'
+gem 'sprockets-rails', '>= 3.0.0.beta2'
 
 if RUBY_VERSION >= '2'
   gem 'byebug'

data/lib/sprockets/svg.rb

@@ -1,6 +1,5 @@
 require 'sprockets/svg/version'
 
-require 'nokogiri'
 require 'rmagick'
 
 module Sprockets
@@ -9,42 +8,26 @@ 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.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')
-
-      document = Nokogiri::XML(File.read(path))
-      svg = document.css('svg')
-      svg.attribute('height') && svg.attribute('width')
-    end
-
-    def self.png_path(svg_path)
-      if svg_path =~ /^(.*)\-([0-9a-f]{32})\.svg$/
-        "#{$1}.svg-#{$2}.png"
-      else
-        "#{svg_path}.png"
-      end
+    def self.convert(svg_blob)
+      image_list = Magick::Image.from_blob(svg_blob) { self.format = 'SVG' }
+      image = image_list.first
+      image.format = 'PNG'
+      image.to_blob
     end
 
     def install(assets)
       assets.register_preprocessor 'image/svg+xml', :svg_min do |context, data|
         Sprockets::Svg::Cleaner.process(data)
       end
+
+      assets.register_transformer 'image/svg+xml', 'image/png', -> (input) {
+        Sprockets::Svg.convert(input[:data])
+      }
     end
 
   end
 end
 
 require_relative 'svg/cleaner'
-require_relative 'svg/proxy_asset'
-require_relative 'svg/sass_functions'
-require_relative 'svg/server'
-
-Sprockets::Environment.send(:include, Sprockets::Svg::Server)
-Sprockets::Index.send(:include, Sprockets::Svg::Server)
 
 require_relative 'svg/railtie' if defined?(Rails)

data/lib/sprockets/svg/railtie.rb

@@ -3,10 +3,12 @@ begin
 
   module Sprockets::Svg
     class Railtie < ::Rails::Railtie
-      initializer :setup_sprockets_svg, group: :all do |app|
-        Sprockets::Svg.install(app.assets)
+      initializer :setup_sprockets_svg do
+        config.assets.configure do |env|
+          Sprockets::Svg.install(env)
+        end
       end
     end
   end
 rescue LoadError
-end
+end

data/lib/sprockets/svg/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Svg
-    VERSION = '0.4.2'
+    VERSION = '1.0.0.beta1'
   end
 end

data/spec/app/app/assets/stylesheets/application.css.scss

@@ -1,4 +1,4 @@
 .facebook-icon {
-  background-image: image-url('facebook.svg.png');
+  background-image: image-url('facebook.png');
   background-image: image-url('facebook.svg'), none;
 }

data/spec/app/config/environments/test.rb

@@ -1,7 +1,9 @@
 App::Application.configure do
+  config.cache_store = :memory_store
+  config.assets.configure { |env| env.cache = Rails.cache }
   config.assets.digest = true
   config.cache_classes = true
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
   config.eager_load = false
   config.consider_all_requests_local = true

data/spec/rails_spec.rb

@@ -9,19 +9,19 @@ ASSETS = Pathname.new(COMPILED_ASSETS_PATH)
 
 describe 'Sprockets::Svg' do
 
-  let(:svg_name) { 'facebook-83a94368b23ba9e928820abc2cc12254.svg' }
+  let(:svg_name) { manifest['assets']['facebook.svg'] }
 
-  let(:png_name) { 'facebook.svg-83a94368b23ba9e928820abc2cc12254.png' }
+  let(:png_name) { manifest['assets']['facebook.png'] }
 
   let(:svg_path) { ASSETS.join(svg_name) }
 
   let(:png_path) { ASSETS.join(png_name) }
 
-  let(:font_path) { ASSETS.join('fontawesome-webfont-be512ff93d0957609a535f25f438ac42.svg') }
+  let(:font_path) { ASSETS.join('fontawesome-webfont-62b810b30c0775c7680f56a9d411feb0b239a24aa33afcdda468c4686eeee9bb.svg') }
 
   let(:svg_fingerprint) { Digest::MD5.hexdigest(svg_path.read) }
 
-  let(:manifest_path) { Dir[ASSETS.join('manifest-*.json')].first }
+  let(:manifest_path) { Dir[ASSETS.join('.sprockets-manifest-*.json')].first }
 
   let(:manifest) { JSON.parse(File.read(manifest_path)) }
 
@@ -41,6 +41,9 @@ describe 'Sprockets::Svg' do
       puts output unless $?.success?
       expect($?).to be_success
 
+      expect(svg_name).not_to be_nil
+      expect(png_name).not_to be_nil
+
       expect(svg_path).to be_exist
       expect(png_path).to be_exist
 
@@ -51,7 +54,7 @@ describe 'Sprockets::Svg' do
       expect(manifest['files'][svg_name]).to be_present
       expect(manifest['files'][png_name]).to be_present
 
-      expect(manifest['assets']['facebook.svg.png']).to be == png_name
+      expect(manifest['assets']['facebook.png']).to be == png_name
 
       expect(font_path).to be_exist
       expect(Dir[ASSETS.join('fontawesome-webfont-*.png')]).to be_empty
@@ -61,7 +64,7 @@ describe 'Sprockets::Svg' do
   describe AssetsController, type: :controller do
 
     it 'rack' do
-      get :test, file: 'facebook.svg.png'
+      get :test, file: 'facebook.png'
       expect(response).to be_success
       expect(response.body.force_encoding('utf-8')).to be_starts_with("\x89PNG\r\n".force_encoding('utf-8'))
       expect(response.headers['Content-Type']).to be == 'image/png'
@@ -70,8 +73,8 @@ describe 'Sprockets::Svg' do
     it 'compile scss' do
       get :test, file: 'application.css'
       expect(response).to be_success
-      expect(response.body).to include svg_name
-      expect(response.body).to include png_name
+      expect(response.body).to match %r{url\(/assets/facebook-\w+\.svg\)}
+      expect(response.body).to match %r{url\(/assets/facebook-\w+\.png\)}
     end
 
   end

data/sprockets-svg.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_dependency 'sprockets'
+  spec.add_dependency 'sprockets', '>= 3'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'rmagick'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-svg
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -83,10 +83,7 @@ files:
 - lib/sprockets-svg.rb
 - lib/sprockets/svg.rb
 - lib/sprockets/svg/cleaner.rb
-- lib/sprockets/svg/proxy_asset.rb
 - lib/sprockets/svg/railtie.rb
-- lib/sprockets/svg/sass_functions.rb
-- lib/sprockets/svg/server.rb
 - lib/sprockets/svg/version.rb
 - spec/app/.gitignore
 - spec/app/Rakefile
@@ -122,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6
@@ -150,4 +147,3 @@ test_files:
 - spec/fixtures/source.svg
 - spec/rails_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/sprockets/svg/proxy_asset.rb

@@ -1,93 +0,0 @@
-module Sprockets
-  module Svg
-    class ProxyAsset
-
-      def initialize(original_asset)
-        @original_asset = original_asset
-      end
-
-      def digest_path
-        ::Sprockets::Svg.png_path(@original_asset.digest_path)
-      end
-
-      def logical_path
-        @original_asset.logical_path + '.png'
-      end
-
-      def length
-        # If length isn't already set we default to original asset length.
-        # It is most certainly wrong, but at least it will be bigger than the real size, so it is unlikely to create any issue.
-        # And most importantly it prevent useless on the fly compilation
-        @length || @original_asset.length
-      end
-
-      def content_type
-        'image/png'
-      end
-
-      def write_to(filename, options = {})
-        # Gzip contents if filename has '.gz'
-        options[:compress] ||= File.extname(filename) == '.gz'
-
-        file = Tempfile.new(['svg2png', '.svg'])
-        tmp_path = file.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)
-
-        @length = File.stat(filename).size
-
-        nil
-      ensure
-        # Ensure tmp file gets cleaned up
-        FileUtils.rm("#{filename}+") if File.exist?("#{filename}+")
-      end
-
-      def to_s
-        @source ||= begin
-          tmp_path = Tempfile.new(['png-cache', '.png']).path
-          write_to(tmp_path)
-          File.read(tmp_path)
-        end
-      end
-
-      private
-
-      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/sass_functions.rb

@@ -1,38 +0,0 @@
-module Sprockets
-  module Svg
-    module SassFunctions
-
-      def image_path(path)
-        Sass::Script::String.new(svg2png_image_path(path.value), :string)
-      end
-
-      def image_url(path)
-        Sass::Script::String.new("url(" + svg2png_image_path(path.value) + ")")
-      end
-
-      def svg2png_image_path(path)
-        convert = false
-        if path.ends_with?('.svg.png')
-          path = path.gsub(/\.png$/, '')
-          convert = true
-        end
-
-        url = sprockets_context.image_path(path)
-        convert ? ::Sprockets::Svg.png_path(url) : url
-      end
-
-    end
-  end
-end
-
-Sprockets::SassTemplate.class_eval do
-
-  def initialize_engine_with_png_conversion
-    initialize_engine_without_png_conversion
-    ::Sass::Script::Functions.send :include, Sprockets::Svg::SassFunctions
-  end
-
-  alias_method :initialize_engine_without_png_conversion, :initialize_engine
-  alias_method :initialize_engine, :initialize_engine_with_png_conversion
-
-end

data/lib/sprockets/svg/server.rb

@@ -1,41 +0,0 @@
-require 'tempfile'
-require 'pathname'
-
-module Sprockets
-  module Svg
-    module Server
-
-      def self.included(base)
-        base.send(:alias_method, :find_asset_without_conversion, :find_asset)
-        base.send(:alias_method, :find_asset, :find_asset_with_conversion)
-      end
-
-      def find_asset_with_conversion(path, options = {})
-        convert = false
-        if path.to_s.ends_with?('.svg.png')
-          path = path.gsub(/\.png/, '')
-          convert = true
-        end
-        asset = find_asset_without_conversion(path, options)
-
-        if asset && convert
-          asset = ProxyAsset.new(asset)
-        end
-
-        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
-  end
-end