esvg 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa191e67f41886a10774b5cf8afe96d36e9df8b2
-  data.tar.gz: 663b4c607e06517b9e3f5db6c7b7d9dfe849b0a3
+  metadata.gz: c3c75eeb77428c51bc4e6746328c9e8749b853d6
+  data.tar.gz: 258aa171b7119d73f4d744770986d075b21a3375
 SHA512:
-  metadata.gz: 964a746975dc300ef9baf7c45fae3f06761a3b7f6e6c8906f60e4de392eb4a231b94ec644afc2c627d9d79801a05dc773b7ca8018ce626d7e33e7f15d8136df9
-  data.tar.gz: 5af0496f0676f485ea0d7c3f186ffe0c96ecc76e2add8a7f491b2030be66a0b4b47d03f620da00b11f2ff8350ebbee17b3d772c54eba7fae1627cb369f9d2d8b
+  metadata.gz: 9768ae503d3368438f470917b7740d592f2f679c8681fcbc9d50f3cea7c316a691e2286e68d1d3e0f0cceee59ab6d833df5b93a7dc19197f3fd56fefa68611b3
+  data.tar.gz: a6eb7131c5168194727cc4e8f6894284fbd551d95b5bf334dfbd99e9548d4878df13cb65772a84ec6eea075aaf611ea2ef15655d42eee234ef5af5f8b7196772

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-### 2.8.1 (2015-01-03)
+### 2.8.3 (2016-01-04)
+- Fix: file read throttling
+- Fix: Caching for Rails helper
+- Improved tests covering dash vs. underscore usage
+
+### 2.8.2 (2016-01-03)
 - Fix: Rails helpers work better out of the box and hit the file system only when necessary.
 
 ### 2.8.1 (2015-12-16)

data/lib/esvg.rb

@@ -11,26 +11,12 @@ end
 module Esvg
   extend self
 
-  def icons(options={})
-    @icons ||= SVG.new(options)
-
-    if !rails? || Rails.env.development?
-      @icons.read_files
-    end
-
-    @icons
-  end
-
-  def embed(options={})
-    icons(options).embed
-  end
-
-  def svg_icon(name, options={})
-    @icons.svg_icon(name, options)
+  def new(options={})
+    SVG.new(options)
   end
 
-  def exist?(name)
-    @icons.exist?(name)
+  def embed
+    new.embed
   end
 
   def rails?

data/lib/esvg/helpers.rb

@@ -1,23 +1,7 @@
 module Esvg::Helpers
-  def embed_svgs(options={})
-    Esvg.icons(options).embed.html_safe
+  def svg_icons(options={})
+    @@svg_icons ||= Esvg.new(options)
+    @@svg_icons.read_files if Rails.env.development?
+    @@svg_icons
   end
-
-  def svg_icon(name, options={})
-    name = dasherize(name)
-
-    begin
-      icon_svg = Esvg.icons.svg_icon(name, options).html_safe
-    rescue Exception => e
-      raise e if !Rails.env.production?
-      icon_svg = ''
-    end
-
-    icon_svg
-  end
-
-  def dasherize(input)
-    input.gsub(/[\W,_]/, '-').gsub(/-{2,}/, '-')
-  end
-
 end

data/lib/esvg/svg.rb

@@ -3,7 +3,7 @@ require 'json'
 
 module Esvg
   class SVG
-    attr_accessor :files, :svgs
+    attr_accessor :files, :svgs, :last_read
 
     CONFIG = {
       path: Dir.pwd,
@@ -16,6 +16,7 @@ module Esvg
       output_path: Dir.pwd,
       verbose: false,
       format: 'js',
+      throttle_read: 4,
       alias: {}
     }
 
@@ -27,6 +28,7 @@ module Esvg
       config(options)
 
       @svgo = nil
+      @last_read = nil
       @svgs = {}
 
       read_files
@@ -85,17 +87,26 @@ module Esvg
 
     def embed
       return if files.empty?
-      case config[:format]
-      when "html"
+      output = if config[:format] == "html"
         html
-      when "js"
+      elsif config[:format] == "js"
         js
-      when "css"
+      elsif config[:format] == "css"
         css
       end
+
+      if Esvg.rails?
+        output.html_safe
+      else
+        output
+      end
     end
 
     def read_files
+      if !@last_read.nil? && (Time.now.to_i - @last_read) < config[:throttle_read]
+        return
+      end
+
       @files = {}
 
       # Get a list of svg files and modification times
@@ -104,6 +115,8 @@ module Esvg
         files[f] = File.mtime(f)
       end
 
+      @last_read = Time.now.to_i
+
       puts "Read #{files.size} files from #{config[:path]}" if config[:cli]
 
       process_files
@@ -151,7 +164,11 @@ module Esvg
         if fallback = options.delete(:fallback)
           svg_icon(fallback, options)
         else
-          raise "no svg named '#{get_alias(file)}' exists at #{config[:path]}"
+          if Esvg.rails? && Rails.env.production?
+            return ''
+          else
+            raise "no svg named '#{get_alias(file)}' exists at #{config[:path]}"
+          end
         end
       else
 
@@ -166,7 +183,13 @@ module Esvg
           end
         end
 
-        embed.sub(/><\/svg/, ">#{title(options)}#{desc(options)}</svg")
+        embed = embed.sub(/><\/svg/, ">#{title(options)}#{desc(options)}</svg")
+
+        if Esvg.rails?
+          embed.html_safe
+        else
+          embed
+        end
       end
     end
 

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "2.8.2"
+  VERSION = "2.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler