esvg 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0c206a64c04632e938319e8691c9de670e3fa6
-  data.tar.gz: b60c62f573cee170960725e72ca8a557bef8aa74
+  metadata.gz: ce03f468b00edef2311bb762573567e6be4dc210
+  data.tar.gz: b3e999343131df4bf21abaa1f5e69625c09a7bd9
 SHA512:
-  metadata.gz: 66ad8fb1565b46cb83b73c45a7265f5a4719ff4c7db7a1cc0a9f7fab8a8cbb17c8edfe3260868c2d63c2ca541a2f29e7b1133e81d7fdab7341998f335138cab8
-  data.tar.gz: 0f3eb9c16d85a346d47125e828e2d015a22f715bef07de6464c308ce8a5f397815e8c067b3d0ce2cae2cf51e17feabbeb63e7304547899981186be3f249325b9
+  metadata.gz: 234e339099f30cb2390e64d2da36b035ab9865b6d6b3667f99a56a380b2236d37171d1b9070aa6c30197c662a0ca2f7923a98dc2be5ec93313e8fe741601ea09
+  data.tar.gz: 0469ebe8dd5d341709e1887a5df5dc8185f6957aa3a55238a15a781af7e904c93ca8da80c322becaa8dad0e7e3508ee5fd8068751297d150e05fdff981616aba

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /test/build
+/test/optimized

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - 2.1.2
 before_install: gem install bundler -v 1.10.3
+before_script: npm install svgo -g
 script: bundle exec clash

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.0.2 (2015-09-23)
+- Fix: Caching on just about everything.
+
 ### 2.0.2 (2015-07-10)
 - Fix: Caching on just about everything.
 

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 
 ## Usage: Rails
 
-First, add SVG files to your `app/assets/svg_icons/` directory.
+First, add SVG files to your `app/assets/esvg/` directory.
 
 ### Inject SVG symbols
 

data/esvg.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "svg_optimizer", "~> 0.0.2"
-
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry-byebug"

data/exe/esvgo

@@ -0,0 +1,18 @@
+#! /usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
+
+require 'optparse'
+require 'esvg'
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.on("-c", "--config PATH", String, "Path to a config file (default: esvg.yml, config/esvg.yml)") do |path|
+    options[:config_file] = path
+  end
+end.parse!
+
+options[:path] = ARGV.shift
+
+esvg = Esvg::SVG.new(options).optimize

data/lib/esvg.rb

@@ -1,4 +1,3 @@
-require "svg_optimizer"
 require "fileutils"
 
 require "esvg/version"

data/lib/esvg/svg.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Esvg
   class SVG
     attr_accessor :files
@@ -6,6 +8,7 @@ module Esvg
       path: Dir.pwd,
       base_class: 'svg-icon',
       namespace: 'icon',
+      optimize: false,
       namespace_before: true,
       font_size: '1em',
       output_path: Dir.pwd,
@@ -39,6 +42,12 @@ module Esvg
       @mtime != mtime
     end
 
+    def svgo?
+      @svgo ||= begin
+         !(`npm ls -g svgo`.match(/empty/) && `npm ls svgo`.match(/emtpy/))
+      end
+    end
+
     def cache_name(input, options)
       input + options.flatten.join('-')
     end
@@ -52,8 +61,27 @@ module Esvg
       @mtime = File.mtime(found.last)
 
       found.each do |f|
-        svg = File.read(f)
-        @files[File.basename(f, ".*")] = SvgOptimizer.optimize(svg)
+        @files[File.basename(f, ".*")] = read(f)
+      end
+    end
+
+    def read(file)
+      if config[:optimize] && svgo?
+        # Compress files outputting to $STDOUT
+        `svgo #{file} -o -`
+      else
+        File.read(file)
+      end
+    end
+
+    # Optiize all svg source files
+    #
+    def optimize
+      if svgo?
+        puts "Optimzing #{config[:path]}"
+        system "svgo -f #{config[:path]}"
+      else
+        abort 'To optimize files, please install svgo; `npm install svgo -g`'
       end
     end
 
@@ -185,13 +213,13 @@ document.addEventListener("DOMContentLoaded", function(event) { esvg.embed() })
       @config ||= begin
         paths = [options[:config_file], 'config/esvg.yml', 'esvg.yml'].compact
 
-        config = if path = paths.select{ |p| File.exist?(p)}.first
-          CONFIG.merge(symbolize_keys(YAML.load(File.read(path) || {})))
-        else
-          CONFIG
+        config = CONFIG
+        config.merge!(CONFIG_RAILS) if Esvg.rails?
+
+        if path = paths.select{ |p| File.exist?(p)}.first
+          config.merge!(symbolize_keys(YAML.load(File.read(path) || {})))
         end
 
-        config.merge!(CONFIG_RAILS) if Esvg.rails?
         config.merge!(options)
 
         config[:js_path]   ||= File.join(config[:output_path], 'esvg.js')

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: svg_optimizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +71,7 @@ email:
 - brandon@imathis.com
 executables:
 - esvg
+- esvgo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -100,6 +87,7 @@ files:
 - bin/setup
 - esvg.gemspec
 - exe/esvg
+- exe/esvgo
 - lib/esvg.rb
 - lib/esvg/helpers.rb
 - lib/esvg/railties.rb
@@ -125,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Embed svgs in HTML or CSS