caracal 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7423edb9358ab382c88076980d43f0c9055b52c5
-  data.tar.gz: d564e16cb4c7ee233a8d90e7a173901fddcf59ab
+  metadata.gz: 718806bf68883db5fcc8368a9494bb3235d6b39f
+  data.tar.gz: 617abc80e867466e960ca952c4b12a799741470a
 SHA512:
-  metadata.gz: 6944eb1e2157768ffcdeb4f467fa353cf47d083b8f1fcf66f6323d51adffb5e2c6d11da0fd5b106ec170cfec01186ad6421e8e94a28c46dd8661326b24f89e28
-  data.tar.gz: 36b335578ce968bfc1efd71c1faf821b92d67901157568b8cfd6c500e0fcfe099472593bca3dc276279f3485441b53ff4322d5da355d7833e440ec18a723b2c7
+  metadata.gz: 1a3f5d8804e51338f20f7167c1c14cc01bd9ed57a7d3765df79d29053fb796a2e7b76ed0896a35e90118cb1d22df59db97ac6299a2e7d042f3d1b1a6231d61b4
+  data.tar.gz: a3b4ceeb74433b5a34248a3208f6d5a8d803c0d7dd4eda033068b66708e22cf01e9d1839754e89b243edd28032eebff70c4b49f1e43e3e203759f0b8202d4203

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+#### v1.1.0
+
+* Enhancements
+  * Corrected how renderers output namespaced nodes to ensure jruby compliance. (HUGE thank you to @henrychung for researching and implementing this).
+
+
+#### v1.0.13
+
+* Bug Fixes
+  * Corrected bug where lists were no longer multi-line. (@jdugan h/t @StochasticSpring).
+
+
 #### v1.0.12
 
 * Bug Fixes

data/README.md

@@ -263,8 +263,8 @@ dimensions and the orientation explicitly.
 
 ```ruby
 docx.page_size do
-  width       12240       # sets the page width. units in twips.
-  height      15840       # sets the page height. units in twips.
+  width       15840       # sets the page width. units in twips.
+  height      12240       # sets the page height. units in twips.
   orientation :landscape  # sets the printer orientation. accepts :portrait and :landscape.
 end
 ```

data/lib/caracal/document.rb

@@ -86,7 +86,7 @@ module Caracal
       docx   = new(f_name, &block)
       buffer = docx.render
 
-      File.open("./#{ docx.name }", 'w') { |f| f.write(buffer.string) }
+      File.open("./#{ docx.name }", 'wb') { |f| f.write(buffer.string) }
     end
 
 

data/lib/caracal/renderers/core_renderer.rb

@@ -16,7 +16,7 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'cp:coreProperties', root_options do
+          xml['cp'].coreProperties root_options do
             xml['dc'].title document.name
           end
         end

data/lib/caracal/renderers/document_renderer.rb

@@ -17,9 +17,9 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'w:document', root_options do
-            xml.send 'w:background', { 'w:color' => 'FFFFFF' }
-            xml.send 'w:body' do
+          xml['w'].document root_options do
+            xml['w'].background({ 'w:color' => 'FFFFFF' })
+            xml['w'].body do
 
               #============= CONTENTS ===================================
 
@@ -30,14 +30,14 @@ module Caracal
 
               #============= PAGE SETTINGS ==============================
 
-              xml.send 'w:sectPr' do
+              xml['w'].sectPr do
                 if document.page_number_show
                   if rel = document.find_relationship('footer1.xml')
-                    xml.send 'w:footerReference', { 'r:id' => rel.formatted_id, 'w:type' => 'default' }
+                    xml['w'].footerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
                   end
                 end
-                xml.send 'w:pgSz', page_size_options
-                xml.send 'w:pgMar', page_margin_options
+                xml['w'].pgSz page_size_options
+                xml['w'].pgMar page_margin_options
               end
 
             end
@@ -73,22 +73,22 @@ module Caracal
           if paragraph_level && attrs.empty?
             # skip
           else
-            xml.send 'w:rPr' do
+            xml['w'].rPr do
               unless attrs.empty?
-                xml.send 'w:rStyle',    { 'w:val'  => attrs[:style] }                            unless attrs[:style].nil?
-                xml.send 'w:color',     { 'w:val'  => attrs[:color] }                            unless attrs[:color].nil?
-                xml.send 'w:sz',        { 'w:val'  => attrs[:size]  }                            unless attrs[:size].nil?
-                xml.send 'w:b',         { 'w:val'  => (attrs[:bold] ? '1' : '0') }               unless attrs[:bold].nil?
-                xml.send 'w:i',         { 'w:val'  => (attrs[:italic] ? '1' : '0') }             unless attrs[:italic].nil?
-                xml.send 'w:u',         { 'w:val'  => (attrs[:underline] ? 'single' : 'none') }  unless attrs[:underline].nil?
-                xml.send 'w:shd',       { 'w:fill' => attrs[:bgcolor], 'w:val' => 'clear' }      unless attrs[:bgcolor].nil?
-                xml.send 'w:vertAlign', { 'w:val' => attrs[:vertical_align] }                    unless attrs[:vertical_align].nil?
+                xml['w'].rStyle(    { 'w:val'  => attrs[:style] })                            unless attrs[:style].nil?
+                xml['w'].color(     { 'w:val'  => attrs[:color] })                            unless attrs[:color].nil?
+                xml['w'].sz(        { 'w:val'  => attrs[:size]  })                            unless attrs[:size].nil?
+                xml['w'].b(         { 'w:val'  => (attrs[:bold] ? '1' : '0') })               unless attrs[:bold].nil?
+                xml['w'].i(         { 'w:val'  => (attrs[:italic] ? '1' : '0') })             unless attrs[:italic].nil?
+                xml['w'].u(         { 'w:val'  => (attrs[:underline] ? 'single' : 'none') })  unless attrs[:underline].nil?
+                xml['w'].shd(       { 'w:fill' => attrs[:bgcolor], 'w:val' => 'clear' })      unless attrs[:bgcolor].nil?
+                xml['w'].vertAlign( { 'w:val' => attrs[:vertical_align] })                    unless attrs[:vertical_align].nil?
                 unless attrs[:font].nil?
                   f = attrs[:font]
-                  xml.send 'w:rFonts', { 'w:ascii' => f, 'w:hAnsi' => f, 'w:eastAsia' => f, 'w:cs' => f }
+                  xml['w'].rFonts( { 'w:ascii' => f, 'w:hAnsi' => f, 'w:eastAsia' => f, 'w:cs' => f })
                 end
               end
-              xml.send 'w:rtl',    { 'w:val' => '0' }
+              xml['w'].rtl({ 'w:val' => '0' })
             end
           end
         end
@@ -140,39 +140,39 @@ module Caracal
         rel_id   = rel.relationship_id
         rel_name = rel.formatted_target
 
-        xml.send 'w:p', paragraph_options do
-          xml.send 'w:pPr' do
-            xml.send 'w:spacing', { 'w:lineRule' => 'auto', 'w:line' => ds.style_line }
-            xml.send 'w:contextualSpacing', { 'w:val' => '0' }
-            xml.send 'w:jc', { 'w:val' => model.image_align.to_s }
-            xml.send 'w:rPr'
+        xml['w'].p paragraph_options do
+          xml['w'].pPr do
+            xml['w'].spacing({ 'w:lineRule' => 'auto', 'w:line' => ds.style_line })
+            xml['w'].contextualSpacing({ 'w:val' => '0' })
+            xml['w'].jc({ 'w:val' => model.image_align.to_s })
+            xml['w'].rPr
           end
-          xml.send 'w:r', run_options do
-            xml.send 'w:drawing' do
-              xml.send 'wp:inline', { distR: model.formatted_right, distT: model.formatted_top, distB: model.formatted_bottom, distL: model.formatted_left } do
-                xml.send 'wp:extent', { cx: model.formatted_width, cy: model.formatted_height }
-                xml.send 'wp:effectExtent', { t: 0, b: 0, r: 0, l: 0 }
-                xml.send 'wp:docPr', { id: rel_id, name: rel_name }
-                xml.send 'a:graphic' do
-                  xml.send 'a:graphicData', { uri: 'http://schemas.openxmlformats.org/drawingml/2006/picture' } do
-                    xml.send 'pic:pic' do
-                      xml.send 'pic:nvPicPr' do
-                        xml.send 'pic:cNvPr', { id: rel_id, name: rel_name }
-                        xml.send 'pic:cNvPicPr'
+          xml['w'].r run_options do
+            xml['w'].drawing do
+              xml['wp'].inline({ distR: model.formatted_right, distT: model.formatted_top, distB: model.formatted_bottom, distL: model.formatted_left }) do
+                xml['wp'].extent({ cx: model.formatted_width, cy: model.formatted_height })
+                xml['wp'].effectExtent({ t: 0, b: 0, r: 0, l: 0 })
+                xml['wp'].docPr({ id: rel_id, name: rel_name })
+                xml['a'].graphic do
+                  xml['a'].graphicData({ uri: 'http://schemas.openxmlformats.org/drawingml/2006/picture' }) do
+                    xml['pic'].pic do
+                      xml['pic'].nvPicPr do
+                        xml['pic'].cNvPr({ id: rel_id, name: rel_name })
+                        xml['pic'].cNvPicPr
                       end
-                      xml.send 'pic:blipFill' do
-                        xml.send 'a:blip', { 'r:embed' => rel.formatted_id }
-                        xml.send 'a:srcRect'
-                        xml.send 'a:stretch' do
-                          xml.send 'a:fillRect'
+                      xml['pic'].blipFill do
+                        xml['a'].blip({ 'r:embed' => rel.formatted_id })
+                        xml['a'].srcRect
+                        xml['a'].stretch do
+                          xml['a'].fillRect
                         end
                       end
-                      xml.send 'pic:spPr' do
-                        xml.send 'a:xfrm' do
-                          xml.send 'a:ext', { cx: model.formatted_width, cy: model.formatted_height }
+                      xml['pic'].spPr do
+                        xml['a'].xfrm do
+                          xml['a'].ext({ cx: model.formatted_width, cy: model.formatted_height })
                         end
-                        xml.send 'a:prstGeom', { prst: 'rect' }
-                        xml.send 'a:ln'
+                        xml['a'].prstGeom({ prst: 'rect' })
+                        xml['a'].ln
                       end
                     end
                   end
@@ -180,27 +180,27 @@ module Caracal
               end
             end
           end
-          xml.send 'w:r', run_options do
-            xml.send 'w:rPr' do
-              xml.send 'w:rtl', { 'w:val' => '0' }
+          xml['w'].r run_options do
+            xml['w'].rPr do
+              xml['w'].rtl({ 'w:val' => '0' })
             end
           end
         end
       end
 
       def render_linebreak(xml, model)
-        xml.send 'w:r' do
-          xml.send 'w:br'
+        xml['w'].r do
+          xml['w'].br
         end
       end
 
       def render_link(xml, model)
         rel = document.relationship({ target: model.link_href, type: :link })
 
-        xml.send 'w:hyperlink', { 'r:id' => rel.formatted_id } do
-          xml.send 'w:r', run_options do
+        xml['w'].hyperlink({ 'r:id' => rel.formatted_id }) do
+          xml['w'].r run_options do
             render_run_attributes(xml, model, false)
-            xml.send 'w:t', { 'xml:space' => 'preserve' }, model.link_content
+            xml['w'].t({ 'xml:space' => 'preserve' }, model.link_content)
           end
         end
       end
@@ -220,16 +220,16 @@ module Caracal
         ls      = document.find_list_style(model.list_item_type, model.list_item_level)
         hanging = ls.style_left.to_i - ls.style_indent.to_i - 1
 
-        xml.send 'w:p', paragraph_options do
-          xml.send 'w:pPr' do
-            xml.send 'w:numPr' do
-              xml.send 'w:ilvl', { 'w:val' => model.list_item_level }
-              xml.send 'w:numId', { 'w:val' => list_num }
+        xml['w'].p paragraph_options do
+          xml['w'].pPr do
+            xml['w'].numPr do
+              xml['w'].ilvl({ 'w:val' => model.list_item_level })
+              xml['w'].numId({ 'w:val' => list_num })
             end
-            xml.send 'w:ind', { 'w:left' => ls.style_left, 'w:hanging' => hanging }
-            xml.send 'w:contextualSpacing', { 'w:val' => '1' }
-            xml.send 'w:rPr' do
-              xml.send 'w:u', { 'w:val' => 'none' }
+            xml['w'].ind({ 'w:left' => ls.style_left, 'w:hanging' => hanging })
+            xml['w'].contextualSpacing({ 'w:val' => '1' })
+            xml['w'].rPr do
+              xml['w'].u({ 'w:val' => 'none' })
             end
           end
           model.runs.each do |run|
@@ -241,14 +241,14 @@ module Caracal
 
       def render_pagebreak(xml, model)
         if model.page_break_wrap
-          xml.send 'w:p', paragraph_options do
-            xml.send 'w:r', run_options do
-              xml.send 'w:br', { 'w:type' => 'page' }
+          xml['w'].p paragraph_options do
+            xml['w'].r run_options do
+              xml['w'].br({ 'w:type' => 'page' })
             end
           end
         else
-          xml.send 'w:r', run_options do
-            xml.send 'w:br', { 'w:type' => 'page' }
+          xml['w'].r run_options do
+            xml['w'].br({ 'w:type' => 'page' })
           end
         end
       end
@@ -256,11 +256,11 @@ module Caracal
       def render_paragraph(xml, model)
         run_props = [:color, :size, :bold, :italic, :underline].map { |m| model.send("paragraph_#{ m }") }.compact
 
-        xml.send 'w:p', paragraph_options do
-          xml.send 'w:pPr' do
-            xml.send 'w:pStyle',            { 'w:val' => model.paragraph_style }  unless model.paragraph_style.nil?
-            xml.send 'w:contextualSpacing', { 'w:val' => '0' }
-            xml.send 'w:jc',                { 'w:val' => model.paragraph_align }  unless model.paragraph_align.nil?
+        xml['w'].p paragraph_options do
+          xml['w'].pPr do
+            xml['w'].pStyle({ 'w:val' => model.paragraph_style })  unless model.paragraph_style.nil?
+            xml['w'].contextualSpacing({ 'w:val' => '0' })
+            xml['w'].jc({ 'w:val' => model.paragraph_align })  unless model.paragraph_align.nil?
             render_run_attributes(xml, model, true)
           end
           model.runs.each do |run|
@@ -273,19 +273,19 @@ module Caracal
       def render_rule(xml, model)
         options = { 'w:color' => model.rule_color, 'w:sz' => model.rule_size, 'w:val' => model.rule_line, 'w:space' => model.rule_spacing }
 
-        xml.send 'w:p', paragraph_options do
-          xml.send 'w:pPr' do
-            xml.send 'w:pBdr' do
-              xml.send 'w:top', options
+        xml['w'].p paragraph_options do
+          xml['w'].pPr do
+            xml['w'].pBdr do
+              xml['w'].top options
             end
           end
         end
       end
 
       def render_text(xml, model)
-        xml.send 'w:r', run_options do
+        xml['w'].r run_options do
           render_run_attributes(xml, model, false)
-          xml.send 'w:t', { 'xml:space' => 'preserve' }, model.text_content
+          xml['w'].t({ 'xml:space' => 'preserve' }, model.text_content)
         end
       end
 
@@ -294,15 +294,15 @@ module Caracal
           model.send("table_border_#{ m }_size") > 0
         end
 
-        xml.send 'w:tbl' do
-          xml.send 'w:tblPr' do
-            xml.send 'w:tblStyle',   { 'w:val' => 'DefaultTable' }
-            xml.send 'w:bidiVisual', { 'w:val' => '0' }
-            xml.send 'w:tblW',       { 'w:w'   => model.table_width.to_f, 'w:type' => 'dxa' }
-            xml.send 'w:tblInd',     { 'w:w'   => '0.0', 'w:type' => 'dxa' }
-            xml.send 'w:jc',         { 'w:val' => model.table_align }
+        xml['w'].tbl do
+          xml['w'].tblPr do
+            xml['w'].tblStyle({ 'w:val' => 'DefaultTable' })
+            xml['w'].bidiVisual({ 'w:val' => '0' })
+            xml['w'].tblW({ 'w:w'   => model.table_width.to_f, 'w:type' => 'dxa' })
+            xml['w'].tblInd({ 'w:w'   => '0.0', 'w:type' => 'dxa' })
+            xml['w'].jc({ 'w:val' => model.table_align })
             unless borders.empty?
-              xml.send 'w:tblBorders' do
+              xml['w'].tblBorders do
                 borders.each do |m|
                   options = {
                     'w:color' => model.send("table_border_#{ m }_color"),
@@ -310,35 +310,35 @@ module Caracal
                     'w:sz'    => model.send("table_border_#{ m }_size"),
                     'w:space' => model.send("table_border_#{ m }_spacing")
                   }
-                  xml.send "w:#{ Caracal::Core::Models::BorderModel.formatted_type(m) }", options
+                  xml['w'].method_missing "#{ Caracal::Core::Models::BorderModel.formatted_type(m) }", options
                 end
               end
             end
-            xml.send 'w:tblLayout', { 'w:type' => 'fixed' }
-            xml.send 'w:tblLook',   { 'w:val'  => '0600'  }
+            xml['w'].tblLayout({ 'w:type' => 'fixed' })
+            xml['w'].tblLook({ 'w:val'  => '0600'  })
           end
-          xml.send 'w:tblGrid' do
+          xml['w'].tblGrid do
             model.rows.first.each do |tc|
-              xml.send 'w:gridCol', { 'w:w' => tc.cell_width }
+              xml['w'].gridCol({ 'w:w' => tc.cell_width })
             end
-            xml.send 'w:tblGridChange', { 'w:id' => '0' } do
-              xml.send 'w:tblGrid' do
+            xml['w'].tblGridChange({ 'w:id' => '0' }) do
+              xml['w'].tblGrid do
                 model.rows.first.each do |tc|
-                  xml.send 'w:gridCol', { 'w:w' => tc.cell_width }
+                  xml['w'].gridCol({ 'w:w' => tc.cell_width })
                 end
               end
             end
           end
           model.rows.each do |row|
-            xml.send 'w:tr' do
+            xml['w'].tr do
               row.each do |tc|
-                xml.send 'w:tc' do
-                  xml.send 'tcPr' do
-                    xml.send 'w:shd', { 'w:fill' => tc.cell_background }
-                    xml.send 'w:vAlign', { 'w:val' => tc.cell_vertical_align }
-                    xml.send 'w:tcMar' do
+                xml['w'].tc do
+                  xml['w'].tcPr do
+                    xml['w'].shd({ 'w:fill' => tc.cell_background })
+                    xml['w'].vAlign({ 'w:val' => tc.cell_vertical_align })
+                    xml['w'].tcMar do
                       %w(top left bottom right).each do |d|
-                        xml.send "w:#{ d }", { 'w:w' => tc.send("cell_margin_#{ d }").to_f, 'w:type' => 'dxa' }
+                        xml['w'].method_missing "#{ d }", { 'w:w' => tc.send("cell_margin_#{ d }").to_f, 'w:type' => 'dxa' }
                       end
                     end
                   end

data/lib/caracal/renderers/fonts_renderer.rb

@@ -16,9 +16,9 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'w:fonts', root_options do
+          xml['w'].fonts root_options do
             document.fonts.each do |font|
-              xml.send 'w:font', { 'w:name' => font.font_name }
+              xml['w'].font({ 'w:name' => font.font_name })
             end
           end
         end

data/lib/caracal/renderers/footer_renderer.rb

@@ -16,30 +16,30 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'w:ftr', root_options do
-            xml.send 'w:p', paragraph_options do
-              xml.send 'w:pPr' do
-                xml.send 'w:contextualSpacing', { 'w:val' => '0' }
-                xml.send 'w:jc', { 'w:val' => "#{ document.page_number_align }" }
+          xml['w'].ftr root_options do
+            xml['w'].p paragraph_options do
+              xml['w'].pPr do
+                xml['w'].contextualSpacing({ 'w:val' => '0' })
+                xml['w'].jc({ 'w:val' => "#{ document.page_number_align }" })
               end
               unless document.page_number_label.nil?
-                xml.send 'w:r', run_options do
-                  xml.send 'w:rPr' do
-                    xml.send 'w:rStyle', { 'w:val' => 'PageNumber' }
+                xml['w'].r run_options do
+                  xml['w'].rPr do
+                    xml['w'].rStyle({ 'w:val' => 'PageNumber' })
                   end
-                  xml.send 'w:t', { 'xml:space' => 'preserve' } do
+                  xml['w'].t({ 'xml:space' => 'preserve' }) do
                     xml.text "#{ document.page_number_label } "
                   end
                 end
               end
-              xml.send 'w:fldSimple', { 'w:dirty' => '0', 'w:instr' => 'PAGE', 'w:fldLock' => '0' } do
-                xml.send 'w:r', run_options do
-                  xml.send 'w:rPr'
+              xml['w'].fldSimple({ 'w:dirty' => '0', 'w:instr' => 'PAGE', 'w:fldLock' => '0' }) do
+                xml['w'].r run_options do
+                  xml['w'].rPr
                 end
               end
-              xml.send 'w:r', run_options do
-                xml.send 'w:rPr' do
-                  xml.send 'w:rtl', { 'w:val' => '0' }
+              xml['w'].r run_options do
+                xml['w'].rPr do
+                  xml['w'].rtl({ 'w:val' => '0' })
                 end
               end
             end

data/lib/caracal/renderers/numbering_renderer.rb

@@ -18,25 +18,25 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'w:numbering', root_options do
-
+          xml['w'].numbering root_options do
+            
             # add abstract definitions
             document.toplevel_lists.each_with_index do |model, i|
-              xml.send 'w:abstractNum', { 'w:abstractNumId' => i + 1 } do
-                xml.send 'w:multiLevelType', { 'w:val' => 'hybridMultilevel' }
+              xml['w'].abstractNum({ 'w:abstractNumId' => i + 1 }) do
+                xml['w'].multiLevelType({ 'w:val' => 'hybridMultilevel' })
                 model.level_map.each do |(level, type)|
                   if s = document.find_list_style(type, level)
-                    xml.send 'w:lvl', { 'w:ilvl' => s.style_level } do
-                      xml.send 'w:start',      { 'w:val' => s.style_start }
-                      xml.send 'w:numFmt',     { 'w:val' => s.style_format }
-                      xml.send 'w:lvlRestart', { 'w:val' => s.style_restart }
-                      xml.send 'w:lvlText',    { 'w:val' => s.style_value }
-                      xml.send 'w:lvlJc',      { 'w:val' => s.style_align }
-                      xml.send 'w:pPr' do
-                        xml.send 'w:ind', { 'w:left' => s.style_left, 'w:firstLine' => s.style_indent }
+                    xml['w'].lvl({ 'w:ilvl' => s.style_level }) do
+                      xml['w'].start({ 'w:val' => s.style_start })
+                      xml['w'].numFmt({ 'w:val' => s.style_format })
+                      xml['w'].lvlRestart({ 'w:val' => s.style_restart })
+                      xml['w'].lvlText({ 'w:val' => s.style_value })
+                      xml['w'].lvlJc({ 'w:val' => s.style_align })
+                      xml['w'].pPr do
+                        xml['w'].ind({ 'w:left' => s.style_left, 'w:firstLine' => s.style_indent })
                       end
-                      xml.send 'w:rPr' do
-                        xml.send 'w:u', { 'w:val' => 'none' }
+                      xml['w'].rPr do
+                        xml['w'].u({ 'w:val' => 'none' })
                       end
                     end
                   end
@@ -46,8 +46,8 @@ module Caracal
 
             # bind individual tables to abstract definitions
             document.toplevel_lists.each_with_index do |model, i|
-              xml.send 'w:num', { 'w:numId' => i + 1 } do
-                xml.send 'w:abstractNumId', { 'w:val' => i + 1 }
+              xml['w'].num({ 'w:numId' => i + 1 }) do
+                xml['w'].abstractNumId({ 'w:val' => i + 1 })
               end
             end
           end

data/lib/caracal/renderers/settings_renderer.rb

@@ -16,11 +16,11 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'w:settings', root_options do
-            xml.send 'w:displayBackgroundShape', { 'w:val' => '1' }
-            xml.send 'w:defaultTabStop', { 'w:val' => '720' }
-            xml.send 'w:compat' do
-              xml.send 'w:compatSetting', { 'w:val' => '14', 'w:name' => 'compatibilityMode', 'w:uri' => 'http://schemas.microsoft.com/office/word' }
+          xml['w'].settings root_options do
+            xml['w'].displayBackgroundShape({ 'w:val' => '1' })
+            xml['w'].defaultTabStop({ 'w:val' => '720' })
+            xml['w'].compat do
+              xml['w'].compatSetting({ 'w:val' => '14', 'w:name' => 'compatibilityMode', 'w:uri' => 'http://schemas.microsoft.com/office/word' })
             end
           end
         end

data/lib/caracal/renderers/styles_renderer.rb

@@ -17,46 +17,46 @@ module Caracal
       #
       def to_xml
         builder = ::Nokogiri::XML::Builder.with(declaration_xml) do |xml|
-          xml.send 'w:styles', root_options do
+          xml['w'].styles root_options do
 
             #============ DEFAULT STYLES ================================
 
             unless s = document.default_style
               raise Caracal::Errors::NoDefaultStyleError 'Document must declare a default paragraph style.'
             end
-            xml.send 'w:docDefaults' do
-              xml.send 'w:rPrDefault' do
-                xml.send 'w:rPr' do
-                  xml.send 'w:rFonts',    font_options(s)
-                  xml.send 'w:b',         { 'w:val' => (s.style_bold ? '1' : '0') }
-                  xml.send 'w:i',         { 'w:val' => (s.style_italic ? '1' : '0') }
-                  xml.send 'w:caps',      { 'w:val' => (s.style_caps ? '1' : '0') }
-                  xml.send 'w:smallCaps', { 'w:val' => '0' }
-                  xml.send 'w:strike',    { 'w:val' => '0' }
-                  xml.send 'w:color',     { 'w:val' => s.style_color }
-                  xml.send 'w:sz',        { 'w:val' => s.style_size }
-                  xml.send 'w:u',         { 'w:val' => (s.style_underline ? 'single' : 'none') }
-                  xml.send 'w:vertAlign', { 'w:val' => 'baseline' }
+            xml['w'].docDefaults do
+              xml['w'].rPrDefault do
+                xml['w'].rPr do
+                  xml['w'].rFonts font_options(s)
+                  xml['w'].b({ 'w:val' => (s.style_bold ? '1' : '0') })
+                  xml['w'].i({ 'w:val' => (s.style_italic ? '1' : '0') })
+                  xml['w'].caps({ 'w:val' => (s.style_caps ? '1' : '0') })
+                  xml['w'].smallCaps({ 'w:val' => '0' })
+                  xml['w'].strike({ 'w:val' => '0' })
+                  xml['w'].color({ 'w:val' => s.style_color })
+                  xml['w'].sz({ 'w:val' => s.style_size })
+                  xml['w'].u({ 'w:val' => (s.style_underline ? 'single' : 'none') })
+                  xml['w'].vertAlign({ 'w:val' => 'baseline' })
                 end
               end
-              xml.send 'w:pPrDefault' do
-                xml.send 'w:pPr' do
-                  xml.send 'w:keepNext',     { 'w:val' => '0' }
-                  xml.send 'w:keepLines',    { 'w:val' => '0' }
-                  xml.send 'w:widowControl', { 'w:val' => '1' }
-                  xml.send 'w:spacing',      spacing_options(s, true)
-                  xml.send 'w:ind',          indentation_options(s, true)
-                  xml.send 'w:jc',           { 'w:val' => s.style_align.to_s }
+              xml['w'].pPrDefault do
+                xml['w'].pPr do
+                  xml['w'].keepNext({ 'w:val' => '0' })
+                  xml['w'].keepLines({ 'w:val' => '0' })
+                  xml['w'].widowControl({ 'w:val' => '1' })
+                  xml['w'].spacing(spacing_options(s, true))
+                  xml['w'].ind(indentation_options(s, true))
+                  xml['w'].jc({ 'w:val' => s.style_align.to_s })
                 end
               end
             end
-            xml.send 'w:style', { 'w:styleId' => s.style_id, 'w:type' => 'paragraph', 'w:default' => '1' } do
-              xml.send 'w:name', { 'w:val' => s.style_name }
+            xml['w'].style({ 'w:styleId' => s.style_id, 'w:type' => 'paragraph', 'w:default' => '1' }) do
+              xml['w'].name({ 'w:val' => s.style_name })
             end
-            xml.send 'w:style', { 'w:styleId' => 'TableNormal', 'w:type' => 'table', 'w:default' => '1' } do
-              xml.send 'w:name', { 'w:val' => 'Table Normal'}
-              xml.send 'w:pPr' do
-                xml.send 'w:spacing', { 'w:lineRule' => 'auto', 'w:line' => (s.style_size * 20 * 1.15), 'w:before' => '0', 'w:after' => '0' }
+            xml['w'].style({ 'w:styleId' => 'TableNormal', 'w:type' => 'table', 'w:default' => '1' }) do
+              xml['w'].name({ 'w:val' => 'Table Normal'})
+              xml['w'].pPr do
+                xml['w'].spacing({ 'w:lineRule' => 'auto', 'w:line' => (s.style_size * 20 * 1.15), 'w:before' => '0', 'w:after' => '0' })
               end
             end
             default_id = s.style_id
@@ -65,47 +65,47 @@ module Caracal
             #============ PARAGRAPH STYLES ================================
 
             document.styles.reject { |s| s.style_id == default_id }.each do |s|
-              xml.send 'w:style', { 'w:styleId' => s.style_id, 'w:type' => 'paragraph' } do
-                xml.send 'w:name',    { 'w:val' => s.style_name }
-                xml.send 'w:basedOn', { 'w:val' => s.style_base }
-                xml.send 'w:next',    { 'w:val' => s.style_next }
-                xml.send 'w:pPr' do
-                  xml.send 'w:keepNext',          { 'w:val' => '0' }
-                  xml.send 'w:keepLines',         { 'w:val' => '0' }
-                  xml.send 'w:widowControl',      { 'w:val' => '1' }
-                  xml.send 'w:spacing',           spacing_options(s)                              unless spacing_options(s).nil?
-                  xml.send 'w:contextualSpacing', { 'w:val' => '1' }
-                  xml.send 'w:jc',                { 'w:val' => s.style_align.to_s }               unless s.style_align.nil?
-                  xml.send 'w:ind',               indentation_options(s)                          unless indentation_options(s).nil?
+              xml['w'].style({ 'w:styleId' => s.style_id, 'w:type' => 'paragraph' }) do
+                xml['w'].name({ 'w:val' => s.style_name })
+                xml['w'].basedOn({ 'w:val' => s.style_base })
+                xml['w'].next({ 'w:val' => s.style_next })
+                xml['w'].pPr do
+                  xml['w'].keepNext({ 'w:val' => '0' })
+                  xml['w'].keepLines({ 'w:val' => '0' })
+                  xml['w'].widowControl({ 'w:val' => '1' })
+                  xml['w'].spacing(spacing_options(s)) unless spacing_options(s).nil?
+                  xml['w'].contextualSpacing({ 'w:val' => '1' })
+                  xml['w'].jc({ 'w:val' => s.style_align.to_s }) unless s.style_align.nil?
+                  xml['w'].ind(indentation_options(s)) unless indentation_options(s).nil?
                 end
-                xml.send 'w:rPr' do
-                  xml.send 'w:rFonts',    font_options(s)                                         unless s.style_font.nil?
-                  xml.send 'w:b',         { 'w:val' => (s.style_bold ? '1' : '0') }               unless s.style_bold.nil?
-                  xml.send 'w:i',         { 'w:val' => (s.style_italic ? '1' : '0') }             unless s.style_italic.nil?
-                  xml.send 'w:caps',      { 'w:val' => (s.style_caps ? '1' : '0') }               unless s.style_caps.nil?
-                  xml.send 'w:color',     { 'w:val' => s.style_color }                            unless s.style_color.nil?
-                  xml.send 'w:sz',        { 'w:val' => s.style_size }                             unless s.style_size.nil?
-                  xml.send 'w:u',         { 'w:val' => (s.style_underline ? 'single' : 'none') }  unless s.style_underline.nil?
+                xml['w'].rPr do
+                  xml['w'].rFonts(font_options(s)) unless s.style_font.nil?
+                  xml['w'].b({ 'w:val' => (s.style_bold ? '1' : '0') } ) unless s.style_bold.nil?
+                  xml['w'].i({ 'w:val' => (s.style_italic ? '1' : '0') }) unless s.style_italic.nil?
+                  xml['w'].caps({ 'w:val' => (s.style_caps ? '1' : '0') }) unless s.style_caps.nil?
+                  xml['w'].color({ 'w:val' => s.style_color }) unless s.style_color.nil?
+                  xml['w'].sz({ 'w:val' => s.style_size }) unless s.style_size.nil?
+                  xml['w'].u({ 'w:val' => (s.style_underline ? 'single' : 'none') }) unless s.style_underline.nil?
                 end
               end
             end
 
             #============ TABLE STYLES ================================
 
-            xml.send 'w:style', { 'w:styleId' => 'DefaultTable', 'w:type' => 'table' } do
-              xml.send 'w:basedOn', { 'w:val' => 'TableNormal' }
-              xml.send 'w:tblPr' do
-                xml.send 'w:tblStyleRowBandSize', { 'w:val' => '1' }
-                xml.send 'w:tblStyleColBandSize', { 'w:val' => '1' }
+            xml['w'].style({ 'w:styleId' => 'DefaultTable', 'w:type' => 'table' }) do
+              xml['w'].basedOn({ 'w:val' => 'TableNormal' })
+              xml['w'].tblPr do
+                xml['w'].tblStyleRowBandSize({ 'w:val' => '1' })
+                xml['w'].tblStyleColBandSize({ 'w:val' => '1' })
               end
               %w(band1Horz band1Vert band2Horz band2Vert).each do |type|
-                xml.send 'w:tblStylePr', { 'w:type' => type }
+                xml['w'].tblStylePr({ 'w:type' => type })
               end
               %w(firstCol firstRow lastCol lastRow).each do |type|
-                xml.send 'w:tblStylePr', { 'w:type' => type }
+                xml['w'].tblStylePr({ 'w:type' => type })
               end
               %w(neCell nwCell seCell swCell).each do |type|
-                xml.send 'w:tblStylePr', { 'w:type' => type }
+                xml['w'].tblStylePr({ 'w:type' => type })
               end
             end
 

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.0.13'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - Trade Infomatics