svg_drawer 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5368262397aaec468e35d34f8932d36f15bd09
-  data.tar.gz: cf2cc4742dcd2b630740ba83c42b55d5b7d6c37d
+  metadata.gz: 3ceac63b9d8ea76c14839b59bbc2ed3b6f850231
+  data.tar.gz: cfbf467db61ffc9aa75543b84e3c90c662ad5350
 SHA512:
-  metadata.gz: eea2dde6b645e3b92855183e0bbdf442964ee978acd7d7aee1d97d89918eb12501698d5b891e3be10597e8e94d01c45ec0ab8cfe9029ddd83b7ee0b88f3b687b
-  data.tar.gz: 657f3e7d46a77242e224bc02b756aef7cefd87c461649e032fd3f7857285f4c93093e340a477a946e6ecd071fa30a4b9c4944f5f0376241b731782379ee788bc
+  metadata.gz: e1978a112282787ae1adc5b8c9a954062cbb2ef93b617ed0694ec3439f0a0b2144b0d5924c409050a0ba75a75a24acc046c11cf02b2d534b23fb8dbe95d359e1
+  data.tar.gz: 26030034faf70f4d5d13e1144ea905d469d3d4f0855b82979b1c86d763485c1ad2df3e851ca7a3a410f5b6f6f7013a3bb78c93b71f3d605471fc10cfc7f04699

data/lib/svg_drawer/image.rb

@@ -1,13 +1,14 @@
 module SvgDrawer
   class Image < Base
     # Required since there is no known way to calculate them
-    requires :width
-    requires :height
+    requires :img_width   # raw image
+    requires :img_height  # raw image
 
-    # Retranslate ensures the parent element can correctly draw borders
-    defaults scale: [1, 1],
-             overflow: true,
-             retranslate: false   # true not supported
+    # x_reposition and y_reposition take effect only if viewport bounds are
+    # also given
+    defaults scale: 1,
+             x_reposition: false,     # x
+             y_reposition: false      # y
 
     def initialize(href, params = {})
       @href = href
@@ -15,11 +16,19 @@ module SvgDrawer
     end
 
     def width
-      param(:width)
+      @width ||= width_unscaled * param(:scale).to_d
     end
 
     def height
-      param(:height)
+      @height ||= height_unscaled * param(:scale).to_d
+    end
+
+    def width_unscaled
+      @width_unscaled ||= param(:img_width).to_d
+    end
+
+    def height_unscaled
+      @height_unscaled ||= param(:img_height).to_d
     end
 
     def incomplete
@@ -28,18 +37,26 @@ module SvgDrawer
 
     private
 
-    def _draw(parent)
-      # No idea how to find boundary coordinates
-      raise NotImplementedError if param(:retranslate)
+    def viewport_width
+      param(:width) || width
+    end
 
-      Utils::RasemWrapper.group(parent, class: 'image') do |image_group|
-        w = param(:width) unless param(:overflow)
-        h = param(:height) unless param(:overflow)
+    def viewport_height
+      param(:height) || height
+    end
+
+    # This scale comes from preserveAspectRatio which can't be disabled
+    # (librsvg crashes with OOM when preserveAspectRatio="none")
+    def autoscale
+      [width / param(:img_width), height / param(:img_height)].min
+    end
 
-        res = image_group.image(nil, nil, w, h, @href)
-        %i[x y width height].each { |k| res.attributes.delete(k) if res.attributes[k].blank? }
-        res
-      end.scale(*param(:scale))
+    def _draw(parent)
+      Utils::RasemWrapper.group(parent, class: 'image') do |image_group|
+        x = param(:x_reposition) ? (viewport_width / 2 - width_unscaled * autoscale / 2) / param(:scale) : 0
+        y = param(:y_reposition) ? (viewport_height / 2 - height_unscaled * autoscale / 2) / param(:scale) : 0
+        image_group.image(x, y, width_unscaled, height_unscaled, @href, preserveAspectRatio: 'xMinYMin meet')
+      end.scale(param(:scale), param(:scale))
     end
   end
 end

data/lib/svg_drawer/line.rb

@@ -1,6 +1,5 @@
 module SvgDrawer
   class Line < Polyline
-    # Retranslate ensures the parent element can correctly draw borders
     defaults Polyline.default_params
 
     def incomplete

data/lib/svg_drawer/path.rb

@@ -9,7 +9,8 @@ module SvgDrawer
              stroke: 'none',
              scale: [1, 1],
              overflow: true,      # false not supported
-             retranslate: false   # true not supported
+             x_reposition: false, # true not supported
+             y_reposition: false  # true not supported
 
     def initialize(path_components, params = {})
       @components = path_components
@@ -35,7 +36,7 @@ module SvgDrawer
 
     def _draw(parent)
       # No idea how to find boundary coordinates
-      raise NotImplementedError if param(:retranslate)
+      raise NotImplementedError if param(:x_reposition) || param(:y_reposition)
 
       style = {}
       style[:fill] = param(:fill)

data/lib/svg_drawer/version.rb

@@ -1,3 +1,3 @@
 module SvgDrawer
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg_drawer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Simeon Manolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rasem