esvg 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9717bfddeee730f66c16efd62793f1dfcab055db
-  data.tar.gz: 3f439fb2791e95e3e0b7e1c3d52e255ecdd4db53
+  metadata.gz: 1381c5860ef655f9a00182855cd1b3000a04ca60
+  data.tar.gz: a01013c3fcc860731af45ce62cf03b7e684f4150
 SHA512:
-  metadata.gz: ea0a0fd2a096b162d3082fdb7c126ac4a13c9c3882edecaa3713d0e1773ca3d742139655728abf6670fda56300feb9296f17a1bfadf7ed30e8832297217adabc
-  data.tar.gz: 66f4b16120aca9d1dac4e452a2d2e9cc896469edd71331f6939aea1ea176426bbd6644263e9da080fe9203c23a514450f0142c6981543c2f843f29dbfcc9a300
+  metadata.gz: db44e7974abca942acf1e1ef096c1d8ebabae7a2c61e28dba86fdf58082d563b005328924aecef3ffbfef954388ca1459198b960ace849e271423a7a4c90d6c7
+  data.tar.gz: 69d1a74e01b6d8c640a7828b51ab74ec383ac61f401aaab636ec7775fc509a8fbd8c4638d061f5f0139c0707ee7096d7fbc172df0afb15c74ec525f12f8991cf

data/lib/esvg/railties.rb

@@ -3,6 +3,7 @@ module Esvg
     initializer "esvg.configure_view_controller" do |app|
       ActiveSupport.on_load :action_view do
         include Esvg::Helpers
+        Esvg.new
       end
     end
   end

data/lib/esvg/symbol.rb

@@ -72,7 +72,7 @@ module Esvg
         options[:style] += "color:#{options[:color]};#{options[:style]}"
       end
 
-      use_attr = {
+      svg_attr = {
         class: [@config[:class], @config[:prefix]+"-"+@name, options[:class]].compact.join(' '),
         viewBox: @size[:viewBox],
         style:  options[:style],
@@ -81,25 +81,35 @@ module Esvg
       }
 
       # If user doesn't pass a size or set scale: true
-      if !(options[:width] || options[:height] || options[:scale])
-
-        # default to svg dimensions
-        use_attr[:width]  = @size[:width]
-        use_attr[:height] = @size[:height]
+      if options[:width].nil? && options[:height].nil? && !options[:scale]
+        svg_attr[:width]  = width
+        svg_attr[:height] = height
       else
-
         # Add sizes (nil options will be stripped)
-        use_attr[:width]  = options[:width]
-        use_attr[:height] = options[:height]
+        svg_attr[:width]  = options[:width]
+        svg_attr[:height] = options[:height]
       end
 
-      %Q{<svg #{attributes(use_attr)}>#{use_tag}#{title(options)}#{desc(options)}#{options[:content]||''}</svg>}
+      use_attr = {
+        height: options[:height],
+        width: options[:width],
+        scale: options[:scale],
+      }
+
+      %Q{<svg #{attributes(svg_attr)}>#{use_tag(use_attr)}#{title(options)}#{desc(options)}#{options[:content]||''}</svg>}
     end
 
     def use_tag(options={})
       options["xlink:href"] = "##{@id}"
-      options[:width]  ||= width
-      options[:height] ||= height
+
+      # If user doesn't pass a size or set scale: true
+      if options[:width].nil? && options[:height].nil? && options[:scale].nil?
+        options[:width]  ||= width
+        options[:height] ||= height
+      end
+
+      options.delete(:scale)
+
       %Q{<use #{attributes(options)}/>}
     end
 
@@ -207,8 +217,8 @@ module Esvg
 
         {
           viewBox: viewbox,
-          width: coords[2].to_i - coords[0].to_i,
-          height: coords[3].to_i - coords[1].to_i
+          width: (coords[2].to_i - coords[0].to_i).abs,
+          height: (coords[3].to_i - coords[1].to_i).abs
         }
       else
         {}

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.2.3"
+  VERSION = "4.2.4"
 end

metadata

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