esvg 4.6.6 → 4.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1fd96050bdf56d0142342f8e38822676995708375d778d9b24c09716974bad
-  data.tar.gz: b82301f64fc222ef379f051fd69df9adce549efa25560fc9735313c0f617f641
+  metadata.gz: 8408a1ef6e2e40db2dc5a5945ec78f0224cda3074bbf480effde65e5d567de0d
+  data.tar.gz: b955e1c879cbd7a69ace9be3d9bf66fea63587a1ab1ad664ca2a77688051a09d
 SHA512:
-  metadata.gz: 83d6383ac2a2c9644f0d0df4033bfd91820f0171300201bc0b6c1b73db37c56ab0cb4399dc9da34fa94c25edd5322d3cbb14a7d9fac3092169ea979701f95992
-  data.tar.gz: 2e159b4d5b176ce5d8204ce13a9959369242e47e839463d909ee740be1a85823aceba2f13a8bdca615d815062344edeb6aa8ccfd00f9e0e851f60e60eaa49b32
+  metadata.gz: 35b4f35c024126562bd5d05cbbdd7c6196e3bf22d4742a76e5665f0cc475eb378a1229c77954ce3aec6836fa5c8733d57e9e8efa45d4bdee118f5f1da67f89f3
+  data.tar.gz: f0a843a8f31b63da98e0779b155167f8e524f23d12233e70e0a5d607526f9271085a406f241bb2468579a2ee2af578bb2e1d6a8815b30bf37096e9d80daaaddf

data/esvg.gemspec

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

data/lib/esvg.rb

@@ -24,6 +24,8 @@ CONFIG = {
   gzip: false,
   scale: false,
   fingerprint: true,
+  debug: false,
+  print: false,
   throttle_read: 4,
   flatten: [],
   alias: {},

data/lib/esvg/svgs.rb

@@ -69,7 +69,7 @@ module Esvg
         end
       end
 
-      if @config[:print]
+      if @config[:debug]
         puts %Q{Read #{files.size} SVGs from #{print_path( @config[:source] )}}
         puts %Q{  Added: #{added.size} SVG#{'s' if added.size != 1} } if added.size > 0 
         puts %Q{  Removed: #{removed.size} SVG#{'s' if removed.size != 1} } if removed.size > 0 
@@ -87,7 +87,6 @@ module Esvg
     end
 
     def build
-
       paths = []
 
       if @config[:core]
@@ -113,15 +112,24 @@ module Esvg
     end
 
     def write_cache
-      puts "Writing cache: #{ print_path( File.join( @config[:temp], @config[:cache_file]) )}" if @config[:print]
+      puts "Writing cache: #{ print_path( File.join( @config[:temp], @config[:cache_file]) )}" if @config[:debug]
       write_tmp @config[:cache_file], @symbols.map(&:data).to_yaml
     end
 
     def read_cache
-      (YAML.load(read_tmp(@config[:cache_file])) || []).each do |c|
+      return unless cache = read_tmp(@config[:cache_file])
+
+      YAML.load(cache).each do |c|
+
+        # Only read cache data which matches this source
+        # Example: Cache data from previous gem versions shouldn't be loaded
+        next unless c[:path].include?(@config[:source])
+
         @config[:cache] = c
         @symbols << Symbol.new(c[:path], self)
       end
+
+      @reset_cache = cache.size != @symbols.size
     end
 
     # Embed svg symbols
@@ -132,7 +140,7 @@ module Esvg
         embeds = find_svgs(names).map(&:embed)
       end
 
-      write_cache if cache_stale?
+      write_cache if !production? && cache_stale?
 
       if !embeds.empty?
         "<script>#{js(embeds.join("\n"))}</script>"
@@ -144,7 +152,7 @@ module Esvg
       path = File.join(@config[:temp], @config[:cache_file])
 
       # No cache file exists or cache file is older than a new symbol
-      !File.exist?(path) || @symbols.size > 0 && File.mtime(path).to_i < @symbols.map(&:mtime).sort.last
+      !File.exist?(path) || @reset_cache || @symbols.size > 0 && File.mtime(path).to_i < @symbols.map(&:mtime).sort.last
     end
 
     def build_paths(names=nil)
@@ -208,11 +216,7 @@ module Esvg
 
     def read_tmp(name)
       path = File.join(@config[:temp], name)
-      if File.exist? path
-        File.read path
-      else
-        ''
-      end
+      File.read path if File.exist? path
     end
 
     def write_file(path, contents)

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.6.6"
+  VERSION = "4.6.7"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 4.6.6
+  version: 4.6.7
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency