sprockets-svgo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69242204acbe5bd5727ac8229e0b977e46d3de50
-  data.tar.gz: b624f48bcdcc3cdc4122d099a2ac03cf82fbf0dd
+  metadata.gz: 6f173928c13b114219779d6b9d7fe0184b30d7d3
+  data.tar.gz: 247e619aa251348f6e9c68971936554c293ca769
 SHA512:
-  metadata.gz: c63e7a76b71ead2e6a8b40acd26126e3c4a274422ba2afb9ff04b183d09c1bc3dabc014dcc5008adb2f8536d508688642519d63f6b7c26fcc2ff2e0fcb7d57a5
-  data.tar.gz: 8f72e6e5cce6d5d5ac44db7d6fe2109053e9cab600027c7a7e3a019ca77eea2db67eba7dc3427602f3379253ad37893e0a472caa4280c0a9015c22f837048c92
+  metadata.gz: 6eebaa9b7ed82ee870777e0ea5cebf4d44efac8add2279551117d2d8d92f31c00248aa8e138aae135bde16438982d68bc1e048f16132ef039b6052d97ca41cc8
+  data.tar.gz: 2716313df02f6ad9687439021e8db93c2efa845a8866b66887defa7bc5270dc8befe0fd04b97de0af94ced825abf39859e2e37d45820425b54e9d98360c06768

data/README.md

@@ -19,15 +19,15 @@ gem 'sprockets-svgo'
 
 ## Using
 
-In a .css, .scss, or .sass file:
-```css
-/* icons.css */
+With SASS
+```scss
+// icons.scss
 .bold {
   background-image: svgo-data-uri("images/bold.svg");
 }
 ```
-In an .erb file:
-```scss
+With ERB
+```css
 /* icons.css.erb */
 .bold {
   background-image: url(<%= svgo_asset_data_uri("images/bold.svg") %>);

data/lib/sprockets/svgo.rb

@@ -5,8 +5,18 @@ require "sprockets/svgo/context_extensions"
 require "sprockets/svgo/sass_functions"
 
 module Sprockets::SVGO
-  def self.uri(options = {})
-    options = options.merge(datauri: "enc", output: "-")
-    Command.new(options).execute
+  class << self
+    def uri(options = {})
+      options = options.merge(datauri: "enc", output: "-")
+      Command.new(options).execute
+    end
+
+    def cache_key
+      @cache_key ||= "#{name}:#{VERSION}:svgo:#{version}"
+    end
+
+    def version
+      @version ||= Command.new(version: true).execute
+    end
   end
 end

data/lib/sprockets/svgo/command.rb

@@ -39,7 +39,10 @@ class Sprockets::SVGO::Command
 
   def execute
     command = [svgo_path]
-    command << "--input=#{options[:filename]}"
+
+    if options[:filename]
+      command << "--input=#{options[:filename]}"
+    end
 
     if options[:output]
       command << "--output #{options[:output]}"
@@ -69,6 +72,10 @@ class Sprockets::SVGO::Command
       command << "--precision=#{options[:precision]}"
     end
 
+    if options[:version]
+      command << "--version"
+    end
+
     `#{command.join(" ")}`.chomp
   end
 

data/lib/sprockets/svgo/context_extensions.rb

@@ -2,10 +2,9 @@ module Sprockets
   class Context
     def svgo_asset_data_uri(path, options = {})
       asset = depend_on_asset(path)
-      options = options.merge(filename: asset.filename)
-
-      environment.cache.fetch([:svgo, options.to_s]) do
-        SVGO.uri(options)
+      cache_key = [SVGO.cache_key, asset.hexdigest, options]
+      environment.cache.fetch(cache_key) do
+        SVGO.uri(options.merge(filename: asset.filename))
       end
     end
   end

data/lib/sprockets/svgo/sass_functions.rb

@@ -1,7 +1,8 @@
 module Sprockets
   module SassProcessor::Functions
     def svgo_data_uri(path, options = {})
-      url = sprockets_context.svgo_asset_data_uri(path.value, options.symbolize_keys)
+      options = options.transform_values(&:value).symbolize_keys
+      url = sprockets_context.svgo_asset_data_uri(path.value, options)
       Autoload::Sass::Script::String.new("url(" + url + ")")
     end
 

data/lib/sprockets/svgo/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module SVGO
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-svgo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Javan Makhmali