svg_drawer 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f0dea008c28aa454fd56e928243d4fd0c29416e
-  data.tar.gz: 2e5c8ada45634e66bbb397c573dd962e6d32777e
+  metadata.gz: 67e816a4f1d1374b19062873a74cd131fcd844d6
+  data.tar.gz: 9582d217d457cd39654878b9ef8f8e1e55e40dae
 SHA512:
-  metadata.gz: bfec3b7b141046aa6d9fd92062a66f1422bf71e28e31fe86a31fc2d3b113c773e9769f05af23018796bc74c16bb8b84b14b5a3fde96327a634226920ced62283
-  data.tar.gz: 352534a521f5eef69c88a26a4a3cd5fe830d2bcc999f868d0af6f3859fad15ea4d178ddecef8241f4fd698331a869bce2d014cd4169b179d370eb86b06fc66a6
+  metadata.gz: fdf36de00b438e46fbc84e58f79a83e3ae3799922cc51c1b9a6eaf3a44faaa02609ab008d751858be486efc9b8b4906b5efe2b29cda6cfd3bba6b9ef9869fa82
+  data.tar.gz: f146c30aa7bed301be4f32331eb443f390987ce5d3bf014fb8567e4b4f0c1cc9a52b0a253b2a30c3d924a5f5fa1d3bfc758cc55497619304faf9a3b4dbecdee0

data/lib/fonts.yml

@@ -31,7 +31,7 @@ default:
   width: 0.596
 
 'Courier New':
-  width: 0.8
+  width: 0.61
 
 'Arial':
   width: 0.63

data/lib/svg_drawer.rb

@@ -23,6 +23,7 @@ require 'svg_drawer/multipolyline'
 require 'svg_drawer/line'
 require 'svg_drawer/path'
 require 'svg_drawer/circle'
+require 'svg_drawer/image'
 require 'svg_drawer/table/cell'
 require 'svg_drawer/table/blank_row'
 require 'svg_drawer/table/row'

data/lib/svg_drawer/image.rb

@@ -0,0 +1,45 @@
+module SvgDrawer
+  class Image < Base
+    # Required since there is no known way to calculate them
+    requires :width
+    requires :height
+
+    # Retranslate ensures the parent element can correctly draw borders
+    defaults scale: [1, 1],
+             overflow: true,
+             retranslate: false   # true not supported
+
+    def initialize(href, params = {})
+      @href = href
+      super(params)
+    end
+
+    def width
+      param(:width)
+    end
+
+    def height
+      param(:height)
+    end
+
+    def incomplete
+      false
+    end
+
+    private
+
+    def _draw(parent)
+      # No idea how to find boundary coordinates
+      raise NotImplementedError if param(:retranslate)
+
+      Utils::RasemWrapper.group(parent, class: 'image') do |image_group|
+        w = param(:width) unless param(:overflow)
+        h = param(:height) unless param(:overflow)
+
+        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))
+    end
+  end
+end

data/lib/svg_drawer/path.rb

@@ -5,13 +5,15 @@ module SvgDrawer
     requires :height
 
     # Retranslate ensures the parent element can correctly draw borders
-    defaults scale: [1, 1],
+    defaults fill: 'black',
+             stroke: 'none',
+             scale: [1, 1],
              overflow: true,      # false not supported
              retranslate: false   # true not supported
 
-    def initialize(path_components, defaults = {})
-      super(defaults)
+    def initialize(path_components, params = {})
       @components = path_components
+      super(params)
     end
 
     # No idea how to compute dimensions for paths
@@ -35,8 +37,12 @@ module SvgDrawer
       # No idea how to find boundary coordinates
       raise NotImplementedError if param(:retranslate)
 
+      style = {}
+      style[:fill] = param(:fill)
+      style[:stroke] = param(:stroke)
+
       Utils::RasemWrapper.group(parent, class: 'path') do |path_group|
-        @components.each { |path| path_group.path(d: path) }
+        @components.each { |path| path_group.path(d: path, style: style) }
       end.scale(*param(:scale))
     end
   end

data/lib/svg_drawer/table/cell.rb

@@ -47,6 +47,10 @@ module SvgDrawer
       @content = Circle.new(center, radius, params.merge(inherited: child_params))
     end
 
+    def image(href, params = {})
+      @content = Image.new(href, params.merge(inherited: child_params))
+    end
+
     #
     # See Row#draw for info on col_width and row_height
     #

data/lib/svg_drawer/table/row.rb

@@ -82,6 +82,10 @@ module SvgDrawer
       cell(params) { |c| c.circle(center, radius) }
     end
 
+    def image_cell(href, params = {})
+      cell(params) { |c| c.image(href) }
+    end
+
     private
 
     #

data/lib/svg_drawer/table/table.rb

@@ -88,6 +88,10 @@ module SvgDrawer
       row(params) { |r| r.circle_cell(center, radius) }
     end
 
+    def image_row(href, params = {})
+      row(params) { |r| r.image_cell(href) }
+    end
+
     def sub_table_row(params = {})
       t = Table.new(params)
       row { |r| r.cell { |c| c.content(t) && yield(t) } }

data/lib/svg_drawer/version.rb

@@ -1,3 +1,3 @@
 module SvgDrawer
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/svg_drawer.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rasem', '~> 0.7'
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry-byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg_drawer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Simeon Manolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rasem
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - s.manolloff@gmail.com
@@ -64,6 +78,7 @@ files:
 - lib/svg_drawer.rb
 - lib/svg_drawer/base.rb
 - lib/svg_drawer/circle.rb
+- lib/svg_drawer/image.rb
 - lib/svg_drawer/line.rb
 - lib/svg_drawer/multipolyline.rb
 - lib/svg_drawer/path.rb