sablon 0.0.18 → 0.0.19.beta1

data/test/html_test.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require "test_helper"
+require "support/xml_snippets"
+
+class SablonHTMLTest < Sablon::TestCase
+  include Sablon::Test::Assertions
+
+  def setup
+    super
+    @base_path = Pathname.new(File.expand_path("../", __FILE__))
+
+    @sample_path = @base_path + "fixtures/html_sample.docx"
+  end
+
+  def test_generate_document_from_template_with_styles_and_html
+    template_path = @base_path + "fixtures/insertion_template.docx"
+    output_path = @base_path + "sandbox/html.docx"
+    template = Sablon.template template_path
+    context = {'html:content' => content}
+    template.render_to_file output_path, context
+
+    assert_docx_equal @sample_path, output_path
+  end
+
+  def test_generate_document_from_template_without_styles_and_html
+    template_path = @base_path + "fixtures/insertion_template_no_styles.docx"
+    output_path = @base_path + "sandbox/html_no_styles.docx"
+    template = Sablon.template template_path
+    context = {'html:content' => content}
+
+    e = assert_raises(ArgumentError) do
+      template.render_to_file output_path, context
+    end
+    assert_equal 'Could not find w:abstractNum definition for style: "ListNumber"', e.message
+
+    skip 'implement default styles'
+  end
+
+  private
+  def content
+    <<-HTML
+<div>Lorem&nbsp;<strong>ipsum</strong>&nbsp;<em>dolor</em>&nbsp;<strong>sit</strong>&nbsp;<em>amet</em>,&nbsp;<strong>consectetur adipiscing elit</strong>.&nbsp;<em>Suspendisse a tempus turpis</em>. Duis urna justo, vehicula vitae ultricies vel, congue at sem. Fusce turpis turpis, aliquet id pulvinar aliquam, iaculis non elit. Nulla feugiat lectus nulla, in dictum ipsum cursus ac. Quisque at odio neque. Sed ac tortor iaculis, bibendum leo ut, malesuada velit. Donec iaculis sed urna eget pharetra. Praesent ornare fermentum turpis, placerat iaculis urna bibendum vitae. Nunc in quam consequat, tristique tellus in, commodo turpis. Curabitur ullamcorper odio purus, lobortis egestas magna laoreet vitae. Nunc fringilla velit ante, eu aliquam nisi cursus vitae. Suspendisse sit amet dui egestas, volutpat nisi vel, mattis justo. Nullam pellentesque, ipsum eget blandit pharetra, augue elit aliquam mauris, vel mollis nisl augue ut ipsum.</div><ol><li>Vestibulum&nbsp;<ol><li>ante ipsum primis&nbsp;</li></ol></li><li>in faucibus orci luctus&nbsp;<ol><li>et ultrices posuere cubilia Curae;&nbsp;<ol><li>Aliquam vel dolor&nbsp;</li><li>sed sem maximus&nbsp;</li></ol></li><li>fermentum in non odio.&nbsp;<ol><li>Fusce hendrerit ornare mollis.&nbsp;</li></ol></li><li>Nunc scelerisque nibh nec turpis tempor pulvinar.&nbsp;</li></ol></li><li>Donec eros turpis,&nbsp;</li><li>aliquet vel volutpat sit amet,&nbsp;<ol><li>semper eu purus.&nbsp;</li><li>Proin ac erat nec urna efficitur vulputate.&nbsp;<ol><li>Quisque varius convallis ultricies.&nbsp;</li><li>Nullam vel fermentum eros.&nbsp;</li></ol></li></ol></li></ol><div>Pellentesque nulla leo, auctor ornare erat sed, rhoncus congue diam. Duis non porttitor nulla, ut eleifend enim. Pellentesque non tempor sem.</div><div>Mauris auctor egestas arcu,&nbsp;</div><ol><li>id venenatis nibh dignissim id.&nbsp;</li><li>In non placerat metus.&nbsp;</li></ol><ul><li>Nunc sed consequat metus.&nbsp;</li><li>Nulla consectetur lorem consequat,&nbsp;</li><li>malesuada dui at, lacinia lectus.&nbsp;</li></ul><ol><li>Aliquam efficitur&nbsp;</li><li>lorem a mauris feugiat,&nbsp;</li><li>at semper eros pellentesque.&nbsp;</li></ol><div>Nunc lacus diam, consectetur ut odio sit amet, placerat pharetra erat. Sed commodo ut sem id congue. Sed eget neque elit. Curabitur at erat tortor. Maecenas eget sapien vitae est sagittis accumsan et nec orci. Integer luctus at nisl eget venenatis. Nunc nunc eros, consectetur at tortor et, tristique ultrices elit. Nulla in turpis nibh.</div><ul><li>Nam consectetur&nbsp;<ul><li>venenatis tempor.&nbsp;</li></ul></li><li>Aenean&nbsp;<ul><li>blandit<ul><li>porttitor massa,&nbsp;<ul><li>non efficitur&nbsp;<ul><li>metus.&nbsp;</li></ul></li></ul></li></ul></li></ul></li><li>Duis faucibus nunc nec venenatis faucibus.&nbsp;</li><li>Aliquam erat volutpat.&nbsp;</li></ul><div><strong>Quisque non neque ut lacus eleifend volutpat quis sed lacus. Praesent ultrices purus eu quam elementum, sit amet faucibus elit interdum. In lectus orci, elementum quis dictum ac, porta ac ante. Fusce tempus ac mauris id cursus. Phasellus a erat nulla. Mauris dolor orci, malesuada auctor dignissim non, posuere nec odio. Etiam hendrerit justo nec diam ullamcorper, nec blandit elit sodales.</strong></div>
+HTML
+  end
+end

data/test/{processor_test.rb → processor/document_test.rb}

@@ -3,13 +3,13 @@ require "test_helper"
 require "support/document_xml_helper"
 require "support/xml_snippets"
 
-class ProcessorTest < Sablon::TestCase
+class ProcessorDocumentTest < Sablon::TestCase
   include DocumentXMLHelper
   include XMLSnippets
 
   def setup
     super
-    @processor = Sablon::Processor
+    @processor = Sablon::Processor::Document
   end
 
   def test_simple_field_replacement

data/test/test_helper.rb

@@ -11,4 +11,8 @@ require "sablon"
 require "sablon/test"
 
 class Sablon::TestCase < MiniTest::Test
+  def teardown
+    super
+    Sablon::Numbering.instance.reset!
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19.beta1
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -129,9 +129,14 @@ files:
 - lib/sablon.rb
 - lib/sablon/content.rb
 - lib/sablon/context.rb
+- lib/sablon/html/ast.rb
+- lib/sablon/html/converter.rb
+- lib/sablon/html/visitor.rb
+- lib/sablon/numbering.rb
 - lib/sablon/operations.rb
 - lib/sablon/parser/mail_merge.rb
-- lib/sablon/processor.rb
+- lib/sablon/processor/document.rb
+- lib/sablon/processor/numbering.rb
 - lib/sablon/processor/section_properties.rb
 - lib/sablon/redcarpet/render/word_ml.rb
 - lib/sablon/template.rb
@@ -151,6 +156,9 @@ files:
 - test/fixtures/conditionals_template.docx
 - test/fixtures/cv_sample.docx
 - test/fixtures/cv_template.docx
+- test/fixtures/html_sample.docx
+- test/fixtures/insertion_template.docx
+- test/fixtures/insertion_template_no_styles.docx
 - test/fixtures/recipe_context.json
 - test/fixtures/recipe_sample.docx
 - test/fixtures/recipe_template.docx
@@ -169,8 +177,10 @@ files:
 - test/fixtures/xml/simple_fields.xml
 - test/fixtures/xml/table_multi_row_loop.xml
 - test/fixtures/xml/table_row_loop.xml
+- test/html/converter_test.rb
+- test/html_test.rb
 - test/mail_merge_parser_test.rb
-- test/processor_test.rb
+- test/processor/document_test.rb
 - test/redcarpet_render_word_ml_test.rb
 - test/sablon_test.rb
 - test/sandbox/.gitkeep
@@ -193,9 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1
@@ -211,6 +221,9 @@ test_files:
 - test/fixtures/conditionals_template.docx
 - test/fixtures/cv_sample.docx
 - test/fixtures/cv_template.docx
+- test/fixtures/html_sample.docx
+- test/fixtures/insertion_template.docx
+- test/fixtures/insertion_template_no_styles.docx
 - test/fixtures/recipe_context.json
 - test/fixtures/recipe_sample.docx
 - test/fixtures/recipe_template.docx
@@ -229,8 +242,10 @@ test_files:
 - test/fixtures/xml/simple_fields.xml
 - test/fixtures/xml/table_multi_row_loop.xml
 - test/fixtures/xml/table_row_loop.xml
+- test/html/converter_test.rb
+- test/html_test.rb
 - test/mail_merge_parser_test.rb
-- test/processor_test.rb
+- test/processor/document_test.rb
 - test/redcarpet_render_word_ml_test.rb
 - test/sablon_test.rb
 - test/sandbox/.gitkeep

data/lib/sablon/processor.rb

@@ -1,191 +0,0 @@
-# -*- coding: utf-8 -*-
-module Sablon
-  class Processor
-    def self.process(xml_node, context, properties = {})
-      processor = new(parser)
-      processor.manipulate xml_node, Sablon::Context.transform(context)
-      processor.write_properties xml_node, properties if properties.any?
-      xml_node
-    end
-
-    def self.parser
-      @parser ||= Sablon::Parser::MailMerge.new
-    end
-
-    def initialize(parser)
-      @parser = parser
-    end
-
-    def manipulate(xml_node, context)
-      operations = build_operations(@parser.parse_fields(xml_node))
-      operations.each do |step|
-        step.evaluate context
-      end
-      cleanup(xml_node)
-      xml_node
-    end
-
-    def write_properties(xml_node, properties)
-      if start_page_number = properties[:start_page_number] || properties["start_page_number"]
-        section_properties = SectionProperties.from_document(xml_node)
-        section_properties.start_page_number = start_page_number
-      end
-    end
-
-    private
-    def build_operations(fields)
-      OperationConstruction.new(fields).operations
-    end
-
-    def cleanup(xml_node)
-      fill_empty_table_cells xml_node
-    end
-
-    def fill_empty_table_cells(xml_node)
-      xml_node.xpath("//w:tc[count(*[name() = 'w:p'])=0 or not(*)]").each do |blank_cell|
-        filler = Nokogiri::XML::Node.new("w:p", xml_node.document)
-        blank_cell.add_child filler
-      end
-    end
-
-    class Block < Struct.new(:start_field, :end_field)
-      def self.enclosed_by(start_field, end_field)
-        @blocks ||= [RowBlock, ParagraphBlock, InlineParagraphBlock]
-        block_class = @blocks.detect { |klass| klass.encloses?(start_field, end_field) }
-        block_class.new start_field, end_field
-      end
-
-      def process(context)
-        replaced_node = Nokogiri::XML::Node.new("tmp", start_node.document)
-        replaced_node.children = Nokogiri::XML::NodeSet.new(start_node.document, body.map(&:dup))
-        Processor.process replaced_node, context
-        replaced_node.children
-      end
-
-      def replace(content)
-        content.each { |n| start_node.add_next_sibling n }
-        remove_control_elements
-      end
-
-      def remove_control_elements
-        body.each &:remove
-        start_node.remove
-        end_node.remove
-      end
-
-      def body
-        return @body if defined?(@body)
-        @body = []
-        node = start_node
-        while (node = node.next_element) && node != end_node
-          @body << node
-        end
-        @body
-      end
-
-      def start_node
-        @start_node ||= self.class.parent(start_field).first
-      end
-
-      def end_node
-        @end_node ||= self.class.parent(end_field).first
-      end
-
-      def self.encloses?(start_field, end_field)
-        parent(start_field).any? && parent(end_field).any?
-      end
-    end
-
-    class RowBlock < Block
-      def self.parent(node)
-        node.ancestors ".//w:tr"
-      end
-
-      def self.encloses?(start_field, end_field)
-        super && parent(start_field) != parent(end_field)
-      end
-    end
-
-    class ParagraphBlock < Block
-      def self.parent(node)
-        node.ancestors ".//w:p"
-      end
-
-      def self.encloses?(start_field, end_field)
-        super && parent(start_field) != parent(end_field)
-      end
-    end
-
-    class InlineParagraphBlock < Block
-      def self.parent(node)
-        node.ancestors ".//w:p"
-      end
-
-      def remove_control_elements
-        body.each &:remove
-        start_field.remove
-        end_field.remove
-      end
-
-      def start_node
-        @start_node ||= start_field.end_node
-      end
-
-      def end_node
-        @end_node ||= end_field.start_node
-      end
-
-      def self.encloses?(start_field, end_field)
-        super && parent(start_field) == parent(end_field)
-      end
-    end
-
-    class OperationConstruction
-      def initialize(fields)
-        @fields = fields
-        @operations = []
-      end
-
-      def operations
-        while @fields.any?
-          @operations << consume(true)
-        end
-        @operations.compact
-      end
-
-      def consume(allow_insertion)
-        @field = @fields.shift
-        return unless @field
-        case @field.expression
-        when /^=/
-          if allow_insertion
-            Statement::Insertion.new(Expression.parse(@field.expression[1..-1]), @field)
-          end
-        when /([^ ]+):each\(([^ ]+)\)/
-          block = consume_block("#{$1}:endEach")
-          Statement::Loop.new(Expression.parse($1), $2, block)
-        when /([^ ]+):if\(([^)]+)\)/
-          block = consume_block("#{$1}:endIf")
-          Statement::Condition.new(Expression.parse($1), block, $2)
-        when /([^ ]+):if/
-          block = consume_block("#{$1}:endIf")
-          Statement::Condition.new(Expression.parse($1), block)
-        end
-      end
-
-      def consume_block(end_expression)
-        start_field = end_field = @field
-        while end_field && end_field.expression != end_expression
-          consume(false)
-          end_field = @field
-        end
-
-        if end_field
-          Block.enclosed_by start_field, end_field
-        else
-          raise TemplateError, "Could not find end field for «#{start_field.expression}». Was looking for «#{end_expression}»"
-        end
-      end
-    end
-  end
-end