svg_drawer 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20b212c8dbf5477c1958ababd22b93d25fef505
-  data.tar.gz: 38f8d9d0dd4784aa176443009a3130f2da2f1518
+  metadata.gz: 471c99db15c507a7b6bdc120cf2979958aae4bb0
+  data.tar.gz: 3def8fc5dd2475c4566ca1f6c75d354a8c563e36
 SHA512:
-  metadata.gz: 95b7f567b0d5f3b2b624c9978ae699812d65af2e5e469c70fb89ec39873550936762a6801f584a6fa5923d709af719acadf3e1603b4dc1bd506e36a7c76ad5d1
-  data.tar.gz: c20c30a31b676d3d091401f88228ae43a693701ccc1f97c94f2fc90d1343c2a4e47d4d2a1541c694a297a91b7392a3907c750ea7e96e9cbc307cd4f31b266c28
+  metadata.gz: 830d1a7b4cce489dc7c3ae0b99601cba395a6864a0ab8bfe2c234043488189a2fbb42b8be59e73bd771f3e782a3f384736162c675089f346ed2d895eac6b1eab
+  data.tar.gz: 7acfdd098d2c7f18136ec42d0c6e01b8ca5d4040969fd923a1c0d305ec9ad6cf0417e4651e9e36202b663145b5e024ab0609d198337a61c9f8b2e3b43b7011dd

data/lib/svg_drawer/path.rb

@@ -1,31 +1,41 @@
 module SvgDrawer
   class Path < Base
     # Required since there is no known way to calculate them
-    requires :width
-    requires :height
+    # requires :width
+    # requires :height
+
+    requires :img_width   # raw image
+    requires :img_height  # raw image
 
     # Retranslate ensures the parent element can correctly draw borders
+    # x_reposition and y_reposition take effect only if viewport bounds are
+    # also given
     defaults fill: 'black',
              stroke: 'none',
-             scale: [1, 1],
+             scale: 1,
              overflow: true,      # false not supported
-             x_reposition: false, # true not supported
-             y_reposition: false  # true not supported
+             x_reposition: false, # x
+             y_reposition: false  # y
 
     def initialize(path_components, params = {})
       @components = path_components
       super(params)
     end
 
-    # No idea how to compute dimensions for paths
     def width
-      raise NotImplementedError unless param(:overflow)
-      param(:width)
+      @width ||= width_unscaled * param(:scale).to_d
     end
 
     def height
-      raise NotImplementedError unless param(:overflow)
-      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
@@ -34,17 +44,31 @@ module SvgDrawer
 
     private
 
-    def _draw(parent)
-      # No idea how to find boundary coordinates
-      raise NotImplementedError if param(:x_reposition) || param(:y_reposition)
+    def viewport_width
+      param(:width) || width
+    end
 
+    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
+
+    def _draw(parent)
       style = {}
       style[:fill] = param(:fill)
       style[:stroke] = param(:stroke)
 
+      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
+
       Utils::RasemWrapper.group(parent, class: 'path') do |path_group|
         @components.each { |path| path_group.path(d: path, style: style) }
-      end.scale(*param(:scale))
+      end.scale(param(:scale), param(:scale)).translate(x, y)
     end
   end
 end

data/lib/svg_drawer/version.rb

@@ -1,3 +1,3 @@
 module SvgDrawer
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

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