esvg 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b5d0d6910641142e441309223019ebfbb1d2a89482bddbe54ab449a27043beb
-  data.tar.gz: 46834ffa28ddc045350703ba4e3606c168e65022d3a024dc989970252d3a68cc
+  metadata.gz: 41bb830e6af4939063aeca838f5c69c550a851f71e701599ed3d4cbb52a42b5c
+  data.tar.gz: f494f42e0e9f9f847145a8f9d65658a9bf3104741f4a4bf513866cb6d92f942b
 SHA512:
-  metadata.gz: 25e807067537f26d6aba337e6c94acfcf22385842411706fde699338460ed1ae6a49a9850f513a63bba17d75620696107cd4b458b97fc4bff4eadab494786ed2
-  data.tar.gz: e69bfb87e23cffe1b4b7a17e92475f605f0ad24f7d092dd169a97ca4561819f2447790ef39a1dcc3ed6813032b7e8df04eeab4d7710b7d827286beac5d30306a
+  metadata.gz: bbce86545a336224d47db5219352407210fa16b16efc85c6f984058ee3ba09ea559a24122488c03e02bef076f141895107a70a2ce5f5868898f73c3dd708037e
+  data.tar.gz: e62b4ad90f511af5671df2d0c39c9c54e9506b25f580da403f84015cefb77f4fc843d2def09b42382bb52bb23991f70beaca2c19402883af4ac233c6aaddab14

data/lib/esvg.rb

@@ -79,7 +79,9 @@ module Esvg
   end
 
   def embed(names=nil)
-    html_safe find_svgs(names).map{|s| s.embed_script(names) }.join
+    html_safe( find_svgs(names).map{ |s| 
+      s.embed_script(names) 
+    }.join )
   end
 
   def build_paths(names=nil)
@@ -108,13 +110,18 @@ module Esvg
     defined?(Rails) || File.exist?("./bin/rails")
   end
 
+  def rails_production?
+    rails? && Rails.env.production?
+  end
+
   def html_safe(input)
     input = input.html_safe if rails?
     input
   end
 
+  # Add SVG build task to `rake assets:precompile`
   def precompile_assets
-    if defined?(Rails) && Rails.env.production? && defined?(Rake)
+    if rails_production? && defined?(Rake)
       ::Rake::Task['assets:precompile'].enhance do
         new(gzip: true, print: true).build
       end
@@ -161,14 +168,17 @@ module Esvg
 
     config = CONFIG.dup
 
-    if Esvg.rails? || options[:rails]
+    if rails? || options[:rails]
       config.merge!(CONFIG_RAILS)
     elsif defined?(Jekyll)
       config.merge!(CONFIG_JEKYLL)
     end
 
     if path = paths.select{ |p| File.exist?(p)}.first
+      options[:config_file] = path
       config.merge!(deep_symbolize_keys(YAML.load(File.read(path) || {})))
+    else
+      options[:config_file] = false
     end
 
     config.merge!(options)
@@ -189,10 +199,15 @@ module Esvg
     config[:temp]     = File.expand_path File.join(config[:temp], '.esvg-cache')
 
     config[:aliases] = load_aliases(config[:alias])
-    config[:flatten] = [config[:flatten]].flatten.map { |dir| File.join(dir, '/') }.join('|')
+    config[:flatten_dir] = [config[:flatten]].flatten.map { |dir| File.join(dir, '/') }.join('|')
+    config[:read] = Time.now.to_i
 
     config
   end
+
+  def update_config ( options )
+    config( { config_file: options[:config_file] } )
+  end
   
   # Load aliases from configuration.
   #  returns a hash of aliasees mapped to a name.

data/lib/esvg/svg.rb

@@ -7,13 +7,13 @@ module Esvg
 
     attr_reader :asset, :vesion, :name
 
-    def initialize(name, symbols, config={})
+    def initialize(name, symbols, parent)
+      @parent = parent
       @name = name
-      @config = config
       @symbols = symbols
       @symbol_defs = []
       @asset = File.basename(name).start_with?('_')
-      @version = @config[:version] || Digest::MD5.hexdigest(symbols.map(&:mtime).join)
+      @version = parent.config[:version] || Digest::MD5.hexdigest(symbols.map(&:mtime).join)
     end
 
     def embed
@@ -22,6 +22,10 @@ module Esvg
     }}
     end
 
+    def config
+      @parent.config
+    end
+
     def named?(names=[])
       [names].flatten.map { 
         |n| dasherize(n) 
@@ -32,7 +36,7 @@ module Esvg
       if @name == '.'
         'symbols'
       else
-        dasherize "#{@config[:prefix]}-#{name_key}"
+        dasherize "#{config[:prefix]}-#{name_key}"
       end
     end
 
@@ -41,14 +45,14 @@ module Esvg
         name = name_key
 
         if name.start_with?('_') # Is it an asset?
-          File.join @config[:assets], "#{name}.js"
+          File.join config[:assets], "#{name}.js"
         else # or a build file?
 
           # User doesn't want a fingerprinted build file and hasn't set a version
-          if !@config[:fingerprint] && !@config[:version]
-            File.join @config[:build], "#{name}.js"
+          if !config[:fingerprint] && !config[:version]
+            File.join config[:build], "#{name}.js"
           else
-            File.join @config[:build], "#{name}-#{@version}.js"
+            File.join config[:build], "#{name}-#{@version}.js"
           end
         end
       end
@@ -58,9 +62,9 @@ module Esvg
 
     def name_key
       if @name == '_'  # Root level asset file
-        "_#{@config[:filename]}".sub(/_+/, '_')
+        "_#{config[:filename]}".sub(/_+/, '_')
       elsif @name == '.'      # Root level build file
-        @config[:filename]
+        config[:filename]
       else
         @name
       end
@@ -71,8 +75,8 @@ module Esvg
         @svg
       else
         attr = {
-          "data-symbol-class" => @config[:class],
-          "data-prefix" => @config[:prefix],
+          "data-symbol-class" => config[:class],
+          "data-prefix" => config[:prefix],
           "version" => "1.1",
           "style" => "height:0;position:absolute"
         }

data/lib/esvg/svgs.rb

@@ -9,25 +9,42 @@ module Esvg
     include Esvg::Utils
 
     attr_reader :symbols
-    attr_reader :config
 
     def initialize(options={})
       @config = options
       @symbols = []
       @svgs = []
-      @last_read = 0
+      @files_loaded = 0
       read_cache
 
       load_files
     end
 
+    def config
+      # use cached configuration
+      if !Esvg.rails_production? && config_expired? && config_changed?
+        puts "LOADING CONFIG"
+        @config = Esvg.update_config( @config )
+      else
+        @config
+      end
+    end
+
+    def config_expired?
+      @config[:throttle_read] < (Time.now.to_i - @config[:read])
+    end
+
+    def config_changed?
+      @config[:config_file] && @config[:read] < File.mtime( @config[:config_file] ).to_i
+    end
+
     def load_files
-      return if (Time.now.to_i - @last_read) < config[:throttle_read]
+      return if @config[:throttle_read] < (Time.now.to_i - @files_loaded)
 
-      files = Dir[File.join(config[:source], '**/*.svg')].uniq.sort
+      files = Dir[File.join(@config[:source], '**/*.svg')].uniq.sort
 
-      if files.empty? && config[:print]
-        puts "No svgs found at #{config[:source]}"
+      if files.empty? && @config[:print]
+        puts "No svgs found at #{@config[:source]}"
         return
       end
 
@@ -36,19 +53,19 @@ module Esvg
 
       files.each do |path|
         unless @symbols.find { |s| s.path == path }
-          @symbols << Symbol.new(path, config)
+          @symbols << Symbol.new(path, self)
         end
       end
 
       @svgs.clear
 
       sort(@symbols.group_by(&:group)).each do |name, symbols|
-        @svgs << Svg.new(name, symbols, config)
+        @svgs << Svg.new(name, symbols, self)
       end
 
-      @last_read = Time.now.to_i
+      @files_loaded = Time.now.to_i
 
-      puts "Read #{@symbols.size} files from #{config[:source]}" if config[:print]
+      puts "Read #{@symbols.size} files from #{@config[:source]}" if @config[:print]
 
     end
 
@@ -56,8 +73,8 @@ module Esvg
 
       paths = []
 
-      if config[:core]
-        path = File.join config[:assets], "_esvg.js"
+      if @config[:core]
+        path = File.join @config[:assets], "_esvg.js"
         write_file path, js_core
         paths << path
       end
@@ -65,11 +82,11 @@ module Esvg
       @svgs.each do |file|
         write_file file.path, js(file.embed)
 
-        puts "Writing #{file.path}" if config[:print]
+        puts "Writing #{file.path}" if @config[:print]
         paths << file.path
 
-        if !file.asset && config[:gzip] && gz = compress(file.path)
-          puts "Writing #{gz}" if config[:print]
+        if !file.asset && @config[:gzip] && gz = compress(file.path)
+          puts "Writing #{gz}" if @config[:print]
           paths << gz
         end
       end
@@ -79,20 +96,20 @@ module Esvg
     end
 
     def write_cache
-      puts "Writing cache" if config[:print]
-      write_tmp config[:cache_file], @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 config[:cache_file]) || []).each do |c|
-        config[:cache] = c
-        @symbols << Symbol.new(c[:path], config)
+      (YAML.load(read_tmp @config[:cache_file]) || []).each do |c|
+        @config[:cache] = c
+        @symbols << Symbol.new(c[:path], self)
       end
     end
 
     # Embed svg symbols
     def embed_script(names=nil)
-      if Esvg.rails? && Rails.env.production?
+      if Esvg.rails_production?
         embeds = buildable_svgs(names).map(&:embed)
       else
         embeds = find_svgs(names).map(&:embed)
@@ -107,7 +124,7 @@ module Esvg
     end
 
     def cache_stale?
-      path = File.join(config[:temp], config[:cache_file])
+      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
@@ -119,7 +136,7 @@ module Esvg
 
     def find_symbol(name, fallback=nil)
       # Ensure that file changes are picked up in development
-      load_files unless Esvg.rails? && Rails.env.production?
+      load_files unless Esvg.rails_production?
 
       name = get_alias dasherize(name)
 
@@ -177,7 +194,7 @@ module Esvg
   }
 
   function svgName( name ) {
-    return "#{config[:prefix]}-"+dasherize( name )
+    return "#{@config[:prefix]}-"+dasherize( name )
   }
 
   function use( name, options ) {
@@ -239,18 +256,18 @@ module Esvg
     end
 
     def get_alias(name)
-      config[:aliases][dasherize(name).to_sym] || name
+      @config[:aliases][dasherize(name).to_sym] || name
     end
 
     def write_tmp(name, content)
-      path = File.join(config[:temp], name)
+      path = File.join(@config[:temp], name)
       FileUtils.mkdir_p(File.dirname(path))
       write_file path, content
       path
     end
 
     def read_tmp(name)
-      path = File.join(config[:temp], name)
+      path = File.join(@config[:temp], name)
       if File.exist? path
         File.read path
       else

data/lib/esvg/symbol.rb

@@ -6,14 +6,18 @@ module Esvg
 
     include Esvg::Utils
 
-    def initialize(path, config={})
-      @config  = config
+    def initialize(path, parent)
+      @parent  = parent
       @path    = path
       @last_checked = 0
       load_data
       read
     end
 
+    def config
+      @parent.config
+    end
+
     def read
       return if !File.exist?(@path)
 
@@ -102,12 +106,12 @@ module Esvg
     def use(options={})
       
       # If preset key is set, merge presets from configuration
-      if options[:preset] && preset = @config[:presets][ options.delete(:preset).to_sym ]
+      if options[:preset] && preset = config[:presets][ options.delete(:preset).to_sym ]
         options = options.merge( preset )
       end
 
       # If size key is set, merge size class from configuration
-      if options[:size] && size_class = @config[:sizes][ options.delete(:size).to_sym ]
+      if options[:size] && size_class = config[:sizes][ options.delete(:size).to_sym ]
         options = options.merge( size_class )
       end
 
@@ -124,7 +128,7 @@ module Esvg
       use_attr = options.delete(:use) || {}
 
       svg_attr = {
-        class: [@config[:class], @config[:prefix]+"-"+@name, options.delete(:class)].compact.join(' '),
+        class: [config[:class], config[:prefix]+"-"+@name, options.delete(:class)].compact.join(' '),
         viewBox: @size[:viewBox],
         role: 'img'
       }.merge(options)
@@ -143,7 +147,7 @@ module Esvg
     def use_tag(options={})
       options["xlink:href"] = "##{@id}"
 
-      if options[:scale] && @config[:scale]
+      if options[:scale] && config[:scale]
         # User doesn't want dimensions to be set
         options.delete(:scale)
       else
@@ -157,7 +161,7 @@ module Esvg
     end
 
     def svgo?
-      @config[:optimize] && !!Esvg.node_module('svgo')
+      config[:optimize] && !!Esvg.node_module('svgo')
     end
 
     def optimize
@@ -192,15 +196,15 @@ module Esvg
     private
 
     def load_data
-      if @config[:cache]
-        @config.delete(:cache).each do |name, value|
+      if config[:cache]
+        config.delete(:cache).each do |name, value|
           instance_variable_set("@#{name}", value)
         end
       end
     end
 
     def last_modified
-      if Time.now.to_i - @last_checked < @config[:throttle_read]
+      if Time.now.to_i - @last_checked < config[:throttle_read]
         @last_modified
       else
         @last_checked = Time.now.to_i
@@ -209,11 +213,11 @@ module Esvg
     end
 
     def file_id(name)
-      dasherize "#{@config[:prefix]}-#{name}"
+      dasherize "#{config[:prefix]}-#{name}"
     end
 
     def local_path
-      @local_path ||= sub_path(@config[:source], @path)
+      @local_path ||= sub_path(config[:source], @path)
     end
 
     def file_name
@@ -230,7 +234,7 @@ module Esvg
       # Flattened paths which should be treated as assets will use '_' as their dir key
       # - flatten: _foo - _foo/icon.svg will have a dirkey of _
       # - filename: _icons - treats all root or flattened files as assets
-      if dir == '.' && ( local_path.start_with?('_') || @config[:filename].start_with?('_') )
+      if dir == '.' && ( local_path.start_with?('_') || config[:filename].start_with?('_') )
         '_'
       else
         dir
@@ -238,14 +242,14 @@ module Esvg
     end
 
     def flatten_path
-      @flattened_path ||= local_path.sub(Regexp.new(@config[:flatten]), '')
+      @flattened_path ||= local_path.sub(Regexp.new(config[:flatten_dir]), '')
     end
 
     def name_key(key)
       if key == '_'  # Root level asset file
-        "_#{@config[:filename]}".sub(/_+/, '_')
+        "_#{config[:filename]}".sub(/_+/, '_')
       elsif key == '.'      # Root level build file
-        @config[:filename]
+        config[:filename]
       else
         "#{key}"
       end

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.6.1"
+  VERSION = "4.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler