sablon 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e4309c45c7d9eb7360f7acb59f0ec625d2c0eef
-  data.tar.gz: 20b6e2f1917f5af629078ec07d507058392ad88e
+  metadata.gz: 47a5aeb4ef473eea715114b4a32f0e2a5ab63711
+  data.tar.gz: 2335675beefc2ff842609cf7be53c2146c6bb4cb
 SHA512:
-  metadata.gz: c37fe0cea7659f36f3498667bb9ea984308112306fb074b6ce9b771674423c52672ac81943628c48673fb80009d6a830c1cb12bbc11e90cd079ca38a9ca816f2
-  data.tar.gz: a4040805a95867d75573b0b7d2ae705e673b4c9a588793c2eaa05dbd563ff7585006a12a1e81fcf549e3f3939ca3c17e2639a77d7c0836d3e8a43389aa8fd89e
+  metadata.gz: a66e1e936397fbc66858216b2259c4665a52d32c754c416ad71705c36d2bf2e6deff152421ee67eebce4d643ee8ecf3d543746f00a921b0533ce44dcfe5bd5ab
+  data.tar.gz: '0053920d8f9de09ab35885f68c79cc63f46f72b19874c2970c4e3b0655915c210af7f0c0836d8447c8a556955d937b9535a1abe426de4ed46444e3c3ba75a35b'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sablon (0.3.0)
+    sablon (0.3.1)
       nokogiri (>= 1.6.0)
       rubyzip (>= 1.1.1)
 
@@ -10,10 +10,10 @@ GEM
   specs:
     mini_portile2 (2.3.0)
     minitest (5.10.3)
-    nokogiri (1.8.2)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     rake (12.3.0)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     xml-simple (1.1.5)
 
 PLATFORMS

data/lib/sablon/content.rb

@@ -173,8 +173,9 @@ module Sablon
     end
 
     # Handles reading image data and inserting it into the document
-    class Image < Struct.new(:name, :data, :local_rid)
+    class Image < Struct.new(:name, :data, :properties)
       attr_reader :rid_by_file
+      attr_accessor :local_rid
 
       def self.id; :image end
       def self.wraps?(value) false end
@@ -196,11 +197,23 @@ module Sablon
         #
         super name, img_data
         @attributes = attributes
+        @properties = @attributes.fetch("properties", {})
+
         # rId's are separate for each XML file but I want to be able
         # to reuse the actual image file itself.
         @rid_by_file = {}
       end
 
+      def width
+        return unless (width_str = @properties[:width])
+        convert_to_emu(width_str)
+      end
+
+      def height
+        return unless (height_str = @properties[:height])
+        convert_to_emu(height_str)
+      end
+
       def append_to(paragraph, display_node, env) end
 
       private
@@ -223,6 +236,22 @@ module Sablon
         #
         [File.basename(name), source.read]
       end
+
+      # Convert centimeters or inches to Word specific emu format
+      def convert_to_emu(dim_str)
+        value, unit = dim_str.match(/(^\.?\d+\.?\d*)(\w+)/).to_a[1..-1]
+        value = value.to_f
+
+        if unit == "cm"
+          value = value * 360000
+        elsif unit == "in"
+          value = value * 914400
+        else
+          throw ArgumentError, "Unsupported unit '#{unit}', only 'cm' and 'in' are permitted."
+        end
+
+        value.round()
+      end
     end
 
     register Sablon::Content::String

data/lib/sablon/html/ast.rb

@@ -480,7 +480,7 @@ module Sablon
     class Run < Node
       PROPERTIES = %w[b i caps color dstrike emboss imprint highlight outline
                       rStyle shadow shd smallCaps strike sz u vanish
-                      vertAlign].freeze
+                      vertAlign rFonts].freeze
 
       def initialize(_env, node, properties)
         super

data/lib/sablon/processor/document/blocks.rb

@@ -102,6 +102,17 @@ module Sablon
               pic_prop.attributes['name'].value = image.name if pic_prop
               blip = node.at_xpath('.//a:blip', a: 'http://schemas.openxmlformats.org/drawingml/2006/main')
               blip.attributes['embed'].value = image.local_rid if blip
+              drawing_size = node.at_xpath('.//wp:extent')
+
+          # if image properties are defined, the size of the placeholder image
+          # should be replaced with the actual values
+              if image.width && image.height
+                drawing_size.attributes['cx'].value = image.width.to_s if drawing_size
+                drawing_size.attributes['cy'].value = image.height.to_s if drawing_size
+                pic_size = node.at_xpath('.//a:xfrm//a:ext', a: 'http://schemas.openxmlformats.org/drawingml/2006/main')
+                pic_size.attributes['cx'].value = image.width.to_s if pic_size
+                pic_size.attributes['cy'].value = image.height.to_s if pic_size
+              end
             end
           end
           #

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/content_test.rb

@@ -287,4 +287,23 @@ class ContentImageTest < Sablon::TestCase
       Sablon.content(:image, data)
     end
   end
+
+  def test_width_conversion
+    img = Sablon.content(:image, @image_path.to_s, properties: {width: '1.0cm'})
+    assert_equal 360000, img.width
+    assert_nil img.height
+  end
+
+  def test_height_conversion
+    img = Sablon.content(:image, @image_path.to_s, properties: {height: '1.0in'})
+    assert_nil img.width
+    assert_equal 914400, img.height
+  end
+
+  def test_invalid_unit_conversion
+    img = Sablon.content(:image, @image_path.to_s, properties: {width: '100px'})
+    assert_raises ArgumentError do
+      img.width
+    end
+  end
 end

data/test/sablon_test.rb

@@ -150,12 +150,12 @@ class SablonImagesTest < Sablon::TestCase
     template = Sablon.template @template_path
     #
     # setup two image contents to allow quick reuse
-    r2d2 = Sablon.content(:image, @image_fixtures.join('r2d2.jpg').to_s)
+    r2d2 = Sablon.content(:image, @image_fixtures.join('r2d2.jpg').to_s, properties: {height: '1cm', width: '1cm'})
     c3po = Sablon.content(:image, @image_fixtures.join('c3po.jpg'))
     darth = Sablon.content(:image, @image_fixtures.join('darth_vader.jpg'))
     #
     im_data = StringIO.new(IO.binread(@image_fixtures.join('clone.jpg')))
-    trooper = Sablon.content(:image, im_data, filename: 'clone.jpg')
+    trooper = Sablon.content(:image, im_data, filename: 'clone.jpg', properties: {height: '8cm', width: '4cm'})
     #
     # with the following context setup all trooper should be reused and
     # only a single file added to media. R2D2 should get duplicated in the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri