esvg 4.4.3 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7284570aded091cd4def0968ecd79cd23e416a1413f5125a4aba7054ec7942fd
-  data.tar.gz: 2feba6f145d0a09480c315420a6ffb2d327ab57893ab166bd857e51a19d4caec
+  metadata.gz: '09c5c765988ce0a64353406948e42d7d97d4c5b7326ae4d8531987d98650f510'
+  data.tar.gz: 63248c8391f17ec3d197f2ef525e88d9e84f67415a9e85e0b2b7d3533764f3dc
 SHA512:
-  metadata.gz: 952db8d5555a887a6f1b94f2703a2999d8eb74931e84dc97cf916f90350eec8f830a3a5d222a6d22a1c13a56023d35b49e8c841201f637a5ec34eeaf9c343ad1
-  data.tar.gz: 7cf058895072daa328a45ff0e1ac81dd770ede834b2cfad97256da2da36fe08fa048aa66ee202f9e141f0b2651772cdf47d09b871569a9f65421dbf7568d74f3
+  metadata.gz: 7a480482a7aa333789dee900e968fae4930998f06da35af24f18238253302542caf542748707898140d0fac81c658f01330e5625751583c62f51d946594202c5
+  data.tar.gz: 53016c37c452c2adb00234baa5d98a9c6e059373136dba962b26864bac3da8512e0c9cf77f973857a002b2ae3c7bda6235866727d001610e3bd511d038632ced

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 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`.
+- Units are supported, so `height: 1em` will find the proper `em` based proportion for width.
+
 ### 4.4.3 (2018-12-09)
 - IE 10 compatibility fix: Replaced self-closing `<use>` tag with close tag version.
 - IE 10 compatibility fix: Using `forEach` instead of `for var of` because IE 10 is garbage. ¯\_(ツ)_/¯

data/lib/esvg/symbol.rb

@@ -45,6 +45,41 @@ module Esvg
       @size[:height]
     end
 
+    # Scale width based on propotion to height
+    def scale_width( h )
+      s = split_unit( h )
+      "#{( s[:size] / height * width ).round(2)}#{s[:unit]}"
+    end
+
+    # Scale height based on propotion to width
+    def scale_height( w )
+      s = split_unit( w )
+      "#{( s[:size] / width * height ).round(2)}#{s[:unit]}"
+    end
+
+    # Separate size and unit for easier math.
+    # Returns: { size: 10, unit: 'px' }
+    def split_unit( size )
+      m = size.to_s.match(/(\d+)\s*(\D*)/)
+      { size: m[1].to_f, unit: m[2] }
+    end
+
+    def scale( a )
+      # Width was set, determine scaled height
+      if a[:width]
+        a[:height] ||= scale_height( a[:width] )
+      # Height was set, determine scaled width
+      elsif a[:height]
+        a[:width] ||= scale_width( a[:height] )
+      # Nothing was set, default to dimensions
+      else
+        a[:width]  = width
+        a[:height] = height
+      end
+
+      a
+    end
+
     def data
       {
         path: @path,
@@ -84,24 +119,26 @@ module Esvg
         role: 'img'
       }.merge(options)
 
-      # If user doesn't pass a size or set scale: true
-      if svg_attr[:width].nil? && svg_attr[:height].nil? && !svg_attr[:scale]
-        svg_attr[:width]  = width
-        svg_attr[:height] = height
+      if svg_attr[:scale]
+        # User doesn't want dimensions to be set
+        svg_attr.delete(:scale)
+      else
+        # Scale dimensions based on attributes
+        svg_attr = scale( svg_attr )
       end
 
-      svg_attr.delete(:scale)
-
       %Q{<svg #{attributes(svg_attr)}>#{use_tag(use_attr)}#{content}</svg>}
     end
 
     def use_tag(options={})
       options["xlink:href"] = "##{@id}"
 
-      # If user doesn't pass a size or set scale: true
-      if options[:width].nil? && options[:height].nil? && !options[:scale] && !@config[:scale]
-        options[:width]  ||= width
-        options[:height] ||= height
+      if options[:scale] && @config[:scale]
+        # User doesn't want dimensions to be set
+        options.delete(:scale)
+      else
+        # Scale dimensions based on attributes
+        options = scale( options )
       end
 
       options.delete(:scale)
@@ -121,7 +158,7 @@ module Esvg
 
       @optimized = @content
 
-      if svgo? 
+      if svgo?
         response = Open3.capture3(%Q{#{Esvg.node_module('svgo')} --disable=removeUselessDefs -s '#{@optimized}' -o -})
         if !response[0].empty? && response[2].success?
           @optimized = response[0]
@@ -255,7 +292,7 @@ module Esvg
 
       # <defs> should be moved to the beginning of the SVG file for braod browser support. Ahem, Firefox ಠ_ಠ
       # When symbols are reassembled, @defs will be added back
-      
+
       if @defs = svg.scan(/<defs>(.+)<\/defs>/m).flatten[0]
         svg.sub!("<defs>#{@defs}</defs>", '')
         @defs.gsub!(/(\n|\s{2,})/,'')

data/lib/esvg/version.rb

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

metadata

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