esvg 4.3.4 → 4.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8ce957c55ac551dc1f3d5b6f258aa17e0c9e07
-  data.tar.gz: 79721c7d5e990437a7860aa33928484c43c7fe9c
+  metadata.gz: 8106c249cd9020c020a26e4ad41524946b1918d7
+  data.tar.gz: 78ad6edd6beac2930cbb2316ef9746ea079a80c9
 SHA512:
-  metadata.gz: 26dee9b0b6b601bbd04b9dfa2ea1729afa20c06772ca433e70c270a6459b3dcbf0b913a91e530510b0cb7f0d768363e47c354807b47bd94c54fb091b67a17030
-  data.tar.gz: 8e58aa8424c853ee832d13f16e95af4e94e1819cea792cdfbb4da8accbe8829ea7195a2951d4aeaf683715d208cb444db160df7283c9baef3c15c67a661bcac6
+  metadata.gz: f9fe3f77e80cb73477f0a93a300fc428251730958b414d14f2660d604a90223aaa2361bb980a4046ac8f19a81c8324ce5655e77b6f572c829ce03eaaa07a056d
+  data.tar.gz: 7278b841d68181cf8c56c8a6e767266916922c52cdcdbee5f64f65d8a0b2f30a707b8d5632b03b1170d7a50d4cf12d156b13c59851d760d5e8644ee2e0cd5376

data/lib/esvg/svg.rb

@@ -67,19 +67,23 @@ module Esvg
     end
 
     def svg
-      attr = {
-        "data-symbol-class" => @config[:class],
-        "data-prefix" => @config[:prefix],
-        "version" => "1.1",
-        "style" => "height:0;position:absolute"
-      }
+      if @svg && @symbols.select(&:changed?).empty?
+        @svg
+      else
+        attr = {
+          "data-symbol-class" => @config[:class],
+          "data-prefix" => @config[:prefix],
+          "version" => "1.1",
+          "style" => "height:0;position:absolute"
+        }
 
-      defs = @symbols.map(&:defs).compact.join
-      defs = "<defs>#{defs}</defs>" unless defs.empty?
+        defs = @symbols.map(&:defs).compact.join
+        defs = "<defs>#{defs}</defs>" unless defs.empty?
 
-      optimized = @symbols.map(&:optimize).join.gsub("\n",'')
+        optimized = @symbols.map(&:optimize).join.gsub("\n",'')
 
-      %Q{<svg id="esvg-#{id}" #{attributes(attr)}>#{defs}#{optimized}</svg>}
+        @svg = %Q{<svg id="esvg-#{id}" #{attributes(attr)}>#{defs}#{optimized}</svg>}
+      end
     end
 
   end

data/lib/esvg/svgs.rb

@@ -14,6 +14,7 @@ module Esvg
       filename: 'svgs',
       class: 'svg-symbol',
       prefix: 'svg',
+      cache_file: '.symbols',
       core: true,
       optimize: false,
       gzip: false,
@@ -132,11 +133,12 @@ module Esvg
     end
 
     def write_cache
-      write_tmp '.symbols', @symbols.map(&:data).to_yaml
+      puts "Writing cache" if config[:print]
+      write_tmp config[:cache_file], @symbols.map(&:data).to_yaml
     end
 
     def read_cache
-      (YAML.load(read_tmp '.symbols') || []).each do |c|
+      (YAML.load(read_tmp config[:cache_file]) || []).each do |c|
         config[:cache] = c
         @symbols << Symbol.new(c[:path], config)
       end
@@ -145,9 +147,20 @@ module Esvg
     # Embed only build scripts
     def embed_script(names=nil)
       embeds = buildable_svgs(names).map(&:embed)
+
+      write_cache if cache_stale?
+
       if !embeds.empty?
         "<script>#{js(embeds.join("\n"))}</script>"
       end
+
+    end
+
+    def cache_stale?
+      path = File.join(config[:temp], config[:cache_file])
+
+      # No cache file exists or cache file is older than a new symbol
+      !File.exist?(path) || File.mtime(path).to_i < @symbols.map(&:mtime).sort.last
     end
 
     def build_paths(names=nil)

data/lib/esvg/symbol.rb

@@ -9,6 +9,7 @@ module Esvg
     def initialize(path, config={})
       @config  = config
       @path    = path
+      @last_checked = 0
       load_data
       read
     end
@@ -16,11 +17,9 @@ module Esvg
     def read
       return if !File.exist?(@path)
 
-      time = last_modified
-
       # Ensure that cache optimization matches current optimization settings
       # If config has changed name, reset optimized build (name gets baked in)
-      if @mtime != time || @svgo_optimized != svgo? || name != file_name
+      if changed? || @svgo_optimized != svgo? || name != file_name
         @optimized = nil
         @optimized_at = nil
       end
@@ -29,9 +28,9 @@ module Esvg
       @name  = file_name
       @id    = file_id file_key
 
-      if @mtime != time
+      if changed?
         @content = prep_defs pre_optimize File.read(@path)
-        @mtime   = time
+        @mtime   = last_modified
         @size    = dimensions
       end
 
@@ -115,8 +114,10 @@ module Esvg
     end
 
     def optimize
+      read if changed?
+
       # Only optimize again if the file has changed
-      return @optimized if @optimized && @optimized_at > @mtime
+      return @optimized if @optimized && @optimized_at && @optimized_at > @mtime
 
       @optimized = @content
 
@@ -134,6 +135,10 @@ module Esvg
       @optimized
     end
 
+    def changed?
+      last_modified != mtime
+    end
+
     private
 
     def load_data
@@ -145,7 +150,12 @@ module Esvg
     end
 
     def last_modified
-      File.mtime(@path).to_i
+      if Time.now.to_i - @last_checked < @config[:throttle_read]
+        @last_modified
+      else
+        @last_checked = Time.now.to_i
+        @last_modified = File.mtime(@path).to_i
+      end
     end
 
     def file_id(name)

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.3.4"
+  VERSION = "4.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler