esvg 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b06ff83f195a1168a3fe62eb1a64f661218c9ce
-  data.tar.gz: d56ce3d9d1acfcfb9378850829bfbc57b68b5c94
+  metadata.gz: 9b0c206a64c04632e938319e8691c9de670e3fa6
+  data.tar.gz: b60c62f573cee170960725e72ca8a557bef8aa74
 SHA512:
-  metadata.gz: 31ff50c185b91638aca651808230aa46bf7d3c77c48a2a3542d59ce82ccea9b4c802f306234cf225716752657b88a06c2e5274c6191fd095b0aaf02d90f466f5
-  data.tar.gz: 389c9ed99e9152a78d2eaa759a7c9f17ea9ef28d4c2dc4df28f5bbb60fa0b21dba3c0f9edc9d1e734d516bc585f789461645e78d495a833094a5656a10d89905
+  metadata.gz: 66ad8fb1565b46cb83b73c45a7265f5a4719ff4c7db7a1cc0a9f7fab8a8cbb17c8edfe3260868c2d63c2ca541a2f29e7b1133e81d7fdab7341998f335138cab8
+  data.tar.gz: 0f3eb9c16d85a346d47125e828e2d015a22f715bef07de6464c308ce8a5f397815e8c067b3d0ce2cae2cf51e17feabbeb63e7304547899981186be3f249325b9

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.0.2 (2015-07-10)
+- Fix: Caching on just about everything.
+
 ### 2.0.1 (2015-07-10)
 - Fix: Caching icons again is fixed.
 

data/lib/esvg/helpers.rb

@@ -4,6 +4,6 @@ module Esvg::Helpers
   end
 
   def svg_icon(name, options={})
-    Esvg.svg_icon(name, options)
+    Esvg.svg_icon(name, options).html_safe
   end
 end

data/lib/esvg/railties.rb

@@ -1,6 +1,6 @@
 module Esvg
   class Railtie < ::Rails::Railtie
-    initializer "my_gem.configure_view_controller" do |app|
+    initializer "esvg.configure_view_controller" do |app|
       ActiveSupport.on_load :action_view do
         include Esvg::Helpers
       end

data/lib/esvg/svg.rb

@@ -9,7 +9,6 @@ module Esvg
       namespace_before: true,
       font_size: '1em',
       output_path: Dir.pwd,
-      names: [],
       format: 'js'
     }
 
@@ -20,9 +19,11 @@ module Esvg
     def initialize(options={})
       config(options)
       read_icons
+      @cache = {}
     end
 
     def embed
+      return if @files.empty?
       case config[:format]
       when "html"
         html
@@ -38,6 +39,10 @@ module Esvg
       @mtime != mtime
     end
 
+    def cache_name(input, options)
+      input + options.flatten.join('-')
+    end
+
     def read_icons
       @files = {}
       @mtime = {}
@@ -53,6 +58,7 @@ module Esvg
     end
 
     def write
+      return if @files.empty?
       case config[:format]
       when "html"
         write_html
@@ -71,79 +77,72 @@ module Esvg
     end
 
     def write_js
-      unless @files.empty?
-        write_file config[:js_path], js
-      end
+      write_file config[:js_path], js
     end
 
     def write_css
-      unless @files.empty?
-        write_file config[:css_path], css
-      end
+      write_file config[:css_path], css
     end
     
     def write_html
-      unless @files.empty?
-        write_file config[:html_path], html
-      end
+      write_file config[:html_path], html
     end 
 
     def css
-      styles = []
-      
-      classes = files.keys.map{|k| ".#{icon_name(k)}"}.join(', ')
-      preamble = %Q{#{classes} { 
-    clip: auto;
-    font-size: #{config[:font_size]};
-    background-size: auto 1em;
-    background-repeat: no-repeat;
-    background-position: center center;
-    display: inline-block;
-    overflow: hidden;
-    height: 1em;
-    width: 1em;
-    color: transparent;
-    vertical-align: middle;
-  }}
-      styles << preamble
-
-      files.each do |name, contents|
-        f = contents.gsub(/</, '%3C') # escape <
-                    .gsub(/>/, '%3E') # escape >
-                    .gsub(/#/, '%23') # escape #
-                    .gsub(/\n/,'')    # remove newlines
-        styles << ".#{icon_name(name)} { background-image: url('data:image/svg+xml;utf-8,#{f}'); }"
+      @cache['css'] ||= begin
+        styles = []
+        
+        classes = files.keys.map{|k| ".#{icon_name(k)}"}.join(', ')
+        preamble = %Q{#{classes} { 
+  clip: auto;
+  font-size: #{config[:font_size]};
+  background-size: auto 1em;
+  background-repeat: no-repeat;
+  background-position: center center;
+  display: inline-block;
+  overflow: hidden;
+  height: 1em;
+  width: 1em;
+  color: transparent;
+  vertical-align: middle;
+}}
+        styles << preamble
+
+        files.each do |name, contents|
+          f = contents.gsub(/</, '%3C') # escape <
+                      .gsub(/>/, '%3E') # escape >
+                      .gsub(/#/, '%23') # escape #
+                      .gsub(/\n/,'')    # remove newlines
+          styles << ".#{icon_name(name)} { background-image: url('data:image/svg+xml;utf-8,#{f}'); }"
+        end
+        styles.join("\n")
       end
-      styles.join("\n")
     end
 
     def html
-      names = Array(config[:names]) # In case a single string is passed
-
-      if @files.empty?
-        ''
-      else
-        files.each do |name, contents|
-          @svgs[name] = contents.gsub(/<svg.+?>/, %Q{<symbol id="#{icon_name(name)}" #{dimensions(contents)}>})  # convert svg to symbols
-                         .gsub(/<\/svg/, '</symbol')     # convert svg to symbols
-                         .gsub(/style=['"].+?['"]/, '')  # remove inline styles
-                         .gsub(/\n/, '')                 # remove endlines
-                         .gsub(/\s{2,}/, ' ')            # remove whitespace
-                         .gsub(/>\s+</, '><')            # remove whitespace between tags
-        end
+      @cache['html'] ||= begin
+        if @files.empty?
+          ''
+        else
+          files.each do |name, contents|
+            @svgs[name] = contents.gsub(/<svg.+?>/, %Q{<symbol id="#{icon_name(name)}" #{dimensions(contents)}>})  # convert svg to symbols
+                           .gsub(/<\/svg/, '</symbol')     # convert svg to symbols
+                           .gsub(/style=['"].+?['"]/, '')  # remove inline styles
+                           .gsub(/\n/, '')                 # remove endlines
+                           .gsub(/\s{2,}/, ' ')            # remove whitespace
+                           .gsub(/>\s+</, '><')            # remove whitespace between tags
+          end
 
-        if names.empty?
           icons = @svgs
-        else
-          icons = @svgs.select { |k,v| names.include?(k) }
-        end
 
-        %Q{<svg id="esvg-symbols" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">#{icons.values.join("\n")}</svg>}
+          %Q{<svg id="esvg-symbols" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">#{icons.values.join("\n")}</svg>}
+        end
       end
     end
 
     def js
-      %Q{var esvg = {
+      @cache['js'] ||= begin
+        %Q{var esvg = {
   embed: function(){
     if (!document.querySelector('#esvg-symbols')) {
       document.querySelector('body').insertAdjacentHTML('afterbegin', '#{html.gsub(/\n/,'').gsub("'"){"\\'"}}')
@@ -160,11 +159,14 @@ document.addEventListener("page:change", function(event) { esvg.embed() })
 // Handle standard DOM ready events
 document.addEventListener("DOMContentLoaded", function(event) { esvg.embed() })
 }
+      end
     end
 
     def svg_icon(file, options={})
-      name = icon_name(file)
-      %Q{<svg class="#{config[:base_class]} #{name} #{options[:class] || ""}" #{dimensions(@files[file])}><use xlink:href="##{name}"/>#{title(options)}#{desc(options)}</svg>}.html_safe
+      @cache[cache_name(file, options)] ||= begin 
+        name = icon_name(file)
+        %Q{<svg class="#{config[:base_class]} #{name} #{options[:class] || ""}" #{dimensions(@files[file])}><use xlink:href="##{name}"/>#{title(options)}#{desc(options)}</svg>}
+      end
     end
 
     def title(options)

data/lib/esvg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brandon Mathis