esvg 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c5c765988ce0a64353406948e42d7d97d4c5b7326ae4d8531987d98650f510'
-  data.tar.gz: 63248c8391f17ec3d197f2ef525e88d9e84f67415a9e85e0b2b7d3533764f3dc
+  metadata.gz: 820db24a0bf898bc0a5fc35930e83c09fc14c7d83e352cb31b0150d0d84b74c3
+  data.tar.gz: 25e7b4d70ec12353ac66a44379359f039f44cc2d554afb99d4bb73f1239a4a7d
 SHA512:
-  metadata.gz: 7a480482a7aa333789dee900e968fae4930998f06da35af24f18238253302542caf542748707898140d0fac81c658f01330e5625751583c62f51d946594202c5
-  data.tar.gz: 53016c37c452c2adb00234baa5d98a9c6e059373136dba962b26864bac3da8512e0c9cf77f973857a002b2ae3c7bda6235866727d001610e3bd511d038632ced
+  metadata.gz: cc625fd97ac79845b97224d438a9f8187c95894651a2418b942ba6ef5dfbf04d7529f66f210136829ef89d0c6c4e8160a4b9cb508591fe0170b3fc11ab822623
+  data.tar.gz: 49fa04b7635aa59a5d42c9bf358ab7c4bc63b195454a3abb9c6eb0783e2b557eda5d409e281053e475de1245a8764545c6856acd6e45dd86445fb130c0da27dc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 4.6.0 (2018-12-12)
+- New: `presets` configuration. Configure `presets: { icon: { height: '1em', fill: 'currentColor' }}` in esvg.yml and set option `preset: 'icon'` to apply these defaults options.
+- New: `sizes` configuration. Configure `sizes: { sm: { height: '10px' }, med: { height: '14px' }, … }` in esvg.yml and set option `size: 'sm'` to add load those size configuration options.
+
 ### 4.5.0 (2018-12-11)
 - New: width and height will be scaled proportionately. So passing only `width: 50` will set height proportionately based on original svg dimensions.
 - To disable automatic calculation pass `scale: true`.

data/README.md

@@ -82,6 +82,12 @@ To place an SVG, use the `use_svg` vew helper. This helper will embed an SVG `us
 # Add custom styles
 <%= use_svg 'logo', style: 'fill: #c0ffee' %>
 
+# Use presets (setup in config yaml)
+<%= use_svg 'chevron', preset: 'icon' %>
+
+# Use size classes (setup in config yaml)
+<%= use_svg 'chevron', size: 'small' %>
+
 # Output: 
 # <svg class="svg-symbol svg-logo" style="fill: #coffee;"><use xlink:href="#svg-logo"/></svg>
 
@@ -129,6 +135,17 @@ namespace_before: true      # Add namespace before, e.g. 'svg-logo', false would
 alias:                      # Add aliases for icon names
   comment: chat             # use "chat" to reference comment.svg
   error: bad, broken        # Use "bad" or "broken" to reference error.svg
+
+presets:                    # Add named presets for setting common options
+  icon:                     # Passing option preset: 'icon' will set these defaults
+    height: 1em
+    class: icon
+
+sizes:                      # Define size classes for easy assignment
+  small:                    # size classes override presets
+    height: 10px
+  medium:
+    height: 20px
 ```
 
 ## Contributing

data/lib/esvg.rb

@@ -26,7 +26,9 @@ CONFIG = {
   fingerprint: true,
   throttle_read: 4,
   flatten: [],
-  alias: {}
+  alias: {},
+  presets: {},
+  sizes: {}
 }
 
 CONFIG_RAILS = {
@@ -133,10 +135,21 @@ module Esvg
     end
   end
 
-  def symbolize_keys(hash)
-    h = {}
-    hash.each {|k,v| h[k.to_sym] = v }
-    h
+  def deep_transform_keys_in_object(object, &block)
+    case object
+    when Hash
+      object.each_with_object({}) do |(key, value), result|
+        result[yield(key)] = deep_transform_keys_in_object(value, &block)
+      end
+    when Array
+      object.map {|e| deep_transform_keys_in_object(e, &block) }
+    else
+      object
+    end
+  end
+
+  def deep_symbolize_keys(hash)
+    deep_transform_keys_in_object( hash ){ |key| key.to_sym rescue key }
   end
 
   def config(options={})
@@ -151,7 +164,7 @@ module Esvg
     end
 
     if path = paths.select{ |p| File.exist?(p)}.first
-      config.merge!(symbolize_keys(YAML.load(File.read(path) || {})))
+      config.merge!(deep_symbolize_keys(YAML.load(File.read(path) || {})))
     end
 
     config.merge!(options)

data/lib/esvg/jekyll_hooks.rb

@@ -57,7 +57,7 @@ module Jekyll
         if @options.empty?
           @options = {}
         else
-          @options = Jekyll::Utils.symbolize_hash_keys(YAML.load(@options)) unless @options.empty?
+          @options = Esvg.deep_symbolize_hash_keys(YAML.load(@options)) unless @options.empty?
         end
       end
 

data/lib/esvg/svgs.rb

@@ -106,7 +106,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) || File.mtime(path).to_i < @symbols.map(&:mtime).sort.last
+      !File.exist?(path) || @symbols.size > 0 && File.mtime(path).to_i < @symbols.map(&:mtime).sort.last
     end
 
     def build_paths(names=nil)

data/lib/esvg/symbol.rb

@@ -101,6 +101,15 @@ module Esvg
     end
 
     def use(options={})
+      
+      if options[:preset] && preset = @config[:presets][ options.delete(:preset).to_sym ]
+        options = options.merge( preset )
+      end
+
+      if options[:size] && size_class = @config[:sizes][ options.delete(:size).to_sym ]
+        options = options.merge( size_class )
+      end
+
       options.delete(:fallback)
       content = options.delete(:content) || ''
 

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.5.0"
+  VERSION = "4.6.0"
 end

metadata

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