calco 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5707d4a21a4635524c7c6f979f289244416e63d
-  data.tar.gz: 08b02c592036444641c85f22c323b18eccb4bfcb
+  metadata.gz: 45cf19d0e01a187f98e524114e8610aa4283101d
+  data.tar.gz: e9ccc8b9e84b9be3e2f7c2f02334f1a123e8fbdc
 SHA512:
-  metadata.gz: 8aaab8c7481340e72160a003b50c9c5e784f88835b8fb9d46ee7edec95ae187f2eea0f076297e907411cb1d6890b8bdcac0f078dce1982b8e2e37c0cbf5238f1
-  data.tar.gz: 16ee8d319c4931296165f878c623b988c41179f67a34a906322d85dab425fab8e4605de3ec2cdd2db32b0b725164e41067b83d54580065c3128d7578fc54e068
+  metadata.gz: a2331aaf93e90c836a73631d2f0b079fc8b73b95fa84a78f94f97732b4c408e05b658698e316d3d2871cb66b0e231ac34c122d1e3c8c52439050e35efe300f5a
+  data.tar.gz: b1bfb232dcc6157683ee8c62bbd219e0e6fe80758702af3c3b7c839a0d54f25018a066f832e3a3b6ebb36cf6b09b239a945e7028492e4b79bc22dba67f400d8d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calco (0.1.0)
+    calco (0.1.3)
       rubyzip (~> 1.1.0)
 
 GEM

data/README.md

@@ -234,6 +234,60 @@ See specifications
 * [spec/csv_engine_spec.rb](spec/csv_engine_spec.rb)
 * [spec/calculator_engine_spec.rb](spec/calculator_engine_spec.rb)
 
+## LibreOffice engine
+
+The office engine uses a template file when it writes the output file. It 
+searches for each sheet a template sheet in the template file after its name.
+
+If the engine finds a template sheet, it removes the content and inserts the
+generated rows. If the template sheet contains the header, the engine does
+not remove it (using the `has_header` directive).
+
+```ruby
+doc.save($stdout) do
+
+  sheet = doc.current
+  
+  sheet[:some_date] = Date.new(1934, 10, 3)
+  sheet.write_row 3
+  
+  sheet[:some_date] = Date.new(2004, 6, 19)
+  sheet.write_row 5
+  
+end
+```
+
+If the engine does not find a template sheet, it appends a new sheet.
+
+Here is an example:
+
+```ruby
+engine = Calco::OfficeEngine.new('names.ods')
+
+doc = spreadsheet(engine) do
+
+  definitions do
+
+    set name: ''
+    
+  end
+  
+  sheet('Main') do
+
+    has_titles true
+
+    column value_of(:name)
+
+  end
+  
+end
+```
+
+The code creates an office engine and sets a template files named `names.ods`.
+
+The spreadsheet definition defines a sheet named _Main_ and says that the
+template sheet contains the header row (see `has_titles true`).
+
 ## Tips
 
 ### Titles row...
@@ -246,7 +300,7 @@ returns headers or empty if no header is set (see
 [spec/header_row_spec.rb](spec/header_row_spec.rb)).
 
 A sheet is marked as having a header row (a first row with titles) by using
-the `:title` option or the `has_title` method.
+the `:title` option or the `has_titles` method.
 
 The use of the header row depends on the engine (the office engine does not
 write the column titles).
@@ -288,16 +342,14 @@ The time values are real time values, not strings. The formulas are computed.
 
 ## Todo
 
-0. Mutliple sheets and cross-sheet references
-0. office engine
-   * problems with UTF-8
-0. change styles when generating...
+1. cross-sheet references
 2. specs for office engine
    * currencies
    * percentages
    * time
    * date, now
    * absolute $A$5
+   * styles (both formulas and values)
 3. CSV engine (using the calculator)
 
 ## Done
@@ -351,6 +403,8 @@ create `date_functions.rb`, etc.
 23. added `empty_row` (in all engines)
 24. explained examples in top of files
 25. wrote a gem description, reused examples
+26. use formula when applying dynamic styles to values
+27. mutliple sheets
 
 ## Contributing
 

data/examples/report_card.rb

@@ -0,0 +1,97 @@
+require 'date'
+require 'tmpdir'
+
+#
+# Next example uses the office engine.
+#
+# It saves an office file, in the temporary directory, named "res.ods" and uses
+# a template file named "report_cards.ods"
+#
+# Shows applying styles
+#
+# The example fills an academic report card, such a report contains students'
+# grades for different disciplines. Each sheet cover a different period.
+#
+# Here are the grades:
+#    A -> Excellent
+#    B -> Very Good
+#    C -> Good
+#    D -> Acceptable
+#    F -> Fail
+#
+
+require 'calco/engines/office_engine'
+
+output_file = File.join(Dir.tmpdir, "res.ods")
+
+def relative_path file
+  File.join(File.dirname(__FILE__), file)
+end
+
+engine = Calco::OfficeEngine.new(relative_path('report_cards.ods'))
+
+doc = spreadsheet(engine) do
+
+  definitions do
+
+    set name: ''
+    
+    set art: ''
+    set english: ''
+    set geography: ''
+    set history: ''
+    set math: ''
+    set music: ''
+    set physics: ''
+    
+  end
+  
+  sheet('Period 1') do
+
+    has_titles true
+    
+    column value_of(:name)
+    
+    highlight_f = _if(current == '"F"', '"fail"', '"default"')
+    
+    column value_of(:art), style: highlight_f
+    column value_of(:english), style: highlight_f
+    column value_of(:geography), style: highlight_f
+    column value_of(:history), style: highlight_f
+    column value_of(:history), style: highlight_f
+    column value_of(:math), style: highlight_f
+    column value_of(:music), style: highlight_f
+    column value_of(:physics), style: highlight_f
+    
+  end
+  
+end
+
+Strudent = Struct.new(:name, :art, :english, :geography, :history, :math, :music, :physics)
+
+period_1 = [
+  Strudent.new('Alan', 'A', 'B', 'C', 'D', 'B', 'B', 'B'),
+  Strudent.new('Greg', 'A', 'B', 'C', 'C', 'F', 'A', 'F'),
+  Strudent.new('Iñes', 'A', 'A', 'A', 'B', 'A', 'A', 'B'),
+  Strudent.new('Jack', 'C', 'C', 'F', 'C', 'C', 'C', 'C'),
+  Strudent.new( 'Jim', 'C', 'D', 'D', 'F', 'C', 'B', 'D'),
+  Strudent.new('Luis', 'A', 'A', 'D', 'A', 'A', 'B', 'B'),
+  Strudent.new('Phil', 'B', 'A', 'F', 'D', 'D', 'B', 'F'),
+  Strudent.new( 'Tom', 'C', 'F', 'C', 'B', 'B', 'D', 'C'),
+]
+
+doc.save(output_file) do |spreadsheet|
+
+  sheet = doc.sheet["Period 1"]
+  
+  period_1.each_with_index do |student, i|
+  
+    sheet.record_assign student.to_h
+    
+    sheet.write_row i + 1
+    
+  end
+  
+end
+
+puts "Wrote #{output_file} (1st period)"

data/examples/report_cards.rb

@@ -0,0 +1,155 @@
+require 'date'
+require 'tmpdir'
+
+#
+# Next example uses the office engine.
+#
+# It saves an office file, in the temporary directory, named "res.ods" and uses
+# a template file named "report_cards.ods"
+#
+# Shows writing several sheets + applying styles + appending a new sheet (named
+# "Info")
+#
+# The example fills academic report cards, such reports contain students'
+# grades for different disciplines. Each sheet cover a different period.
+#
+# Here are the grades:
+#    A -> Excellent
+#    B -> Very Good
+#    C -> Good
+#    D -> Acceptable
+#    F -> Fail
+#
+
+require 'calco/engines/office_engine'
+
+output_file = File.join(Dir.tmpdir, "res.ods")
+
+def relative_path file
+  File.join(File.dirname(__FILE__), file)
+end
+
+engine = Calco::OfficeEngine.new(relative_path('report_cards.ods'))
+
+doc = spreadsheet(engine) do
+
+  definitions do
+
+    set name: ''
+    
+    set art: ''
+    set english: ''
+    set geography: ''
+    set history: ''
+    set math: ''
+    set music: ''
+    set physics: ''
+    
+    set author: 'Author'
+    set updated_at: 'Last update'
+    
+  end
+  
+  sheet('Period 1') do
+
+    has_titles true
+    
+    column value_of(:name)
+    
+    highlight_f = _if(current == '"F"', '"fail"', '"default"')
+    
+    column value_of(:art), style: highlight_f
+    column value_of(:english), style: highlight_f
+    column value_of(:geography), style: highlight_f
+    column value_of(:history), style: highlight_f
+    column value_of(:history), style: highlight_f
+    column value_of(:math), style: highlight_f
+    column value_of(:music), style: highlight_f
+    column value_of(:physics), style: highlight_f
+    
+  end
+  
+  sheet('Period 2') do
+
+    has_titles true
+
+    column value_of(:name)
+    
+    highlight_f = _if(current == '"F"', '"fail"', '"default"')
+    
+    column value_of(:art), style: highlight_f
+    column value_of(:english), style: highlight_f
+    column value_of(:geography), style: highlight_f
+    column value_of(:history), style: highlight_f
+    column value_of(:history), style: highlight_f
+    column value_of(:math), style: highlight_f
+    column value_of(:music), style: highlight_f
+    column value_of(:physics), style: highlight_f
+    
+  end
+
+  sheet('Info') do
+  
+    column value_of(:author)
+    column value_of(:updated_at)
+    
+  end
+  
+end
+
+Strudent = Struct.new(:name, :art, :english, :geography, :history, :math, :music, :physics)
+
+period_1 = [
+  Strudent.new('Alan', 'A', 'B', 'C', 'D', 'B', 'B', 'B'),
+  Strudent.new('Greg', 'A', 'B', 'C', 'C', 'F', 'A', 'F'),
+  Strudent.new('Iñes', 'A', 'A', 'A', 'B', 'A', 'A', 'B'),
+  Strudent.new('Jack', 'C', 'C', 'F', 'C', 'C', 'C', 'C'),
+  Strudent.new( 'Jim', 'C', 'D', 'D', 'F', 'C', 'B', 'D'),
+  Strudent.new('Luis', 'A', 'A', 'D', 'A', 'A', 'B', 'B'),
+  Strudent.new('Phil', 'B', 'A', 'F', 'D', 'D', 'B', 'F'),
+  Strudent.new( 'Tom', 'C', 'F', 'C', 'B', 'B', 'D', 'C'),
+]
+period_2 = [
+  Strudent.new('Alan', 'B', 'B', 'B', 'C', 'A', 'B', 'B'),
+  Strudent.new('Greg', 'B', 'B', 'C', 'C', 'D', 'A', 'D'),
+  Strudent.new('Iñes', 'A', 'A', 'A', 'B', 'A', 'A', 'B'),
+  Strudent.new('Jack', 'D', 'B', 'B', 'C', 'B', 'C', 'D'),
+  Strudent.new( 'Jim', 'B', 'F', 'D', 'D', 'B', 'B', 'C'),
+  Strudent.new('Luis', 'A', 'A', 'B', 'B', 'A', 'B', 'C'),
+  Strudent.new('Phil', 'A', 'A', 'D', 'B', 'D', 'B', 'F'),
+  Strudent.new( 'Tom', 'C', 'D', 'D', 'D', 'D', 'F', 'B'),
+]
+
+doc.save(output_file) do |spreadsheet|
+
+  sheet = doc.sheet["Period 1"]
+  
+  period_1.each_with_index do |student, i|
+  
+    sheet.record_assign student.to_h
+    
+    sheet.write_row i + 1
+    
+  end
+  
+  sheet = doc.sheet["Period 2"]
+  
+  period_2.each_with_index do |student, i|
+  
+    sheet.record_assign student.to_h
+    
+    sheet.write_row i + 1
+
+  end
+  
+  sheet = doc.sheet["Info"]
+
+  sheet.write_row 0
+  
+  sheet[:author] = 'Jean Lazarou'
+  sheet[:updated_at] = Date.today.to_s
+  sheet.write_row 1
+  
+end
+
+puts "Wrote #{output_file} (3 sheets)"

data/lib/calco/engines/csv_engine.rb

@@ -9,7 +9,7 @@ module Calco
       @col_sep, @quote_char = col_sep, quote_char
     end
 
-    def empty_row
+    def empty_row sheet
       @out_stream.write CSV.generate_line([])
     end
 

data/lib/calco/engines/default_engine.rb

@@ -25,7 +25,7 @@ module Calco
       
     end
 
-    def empty_row
+    def empty_row sheet
     end
 
     def write_row sheet, row_id

data/lib/calco/engines/office_engine.rb

@@ -1,53 +1,31 @@
 require 'date'
 
-require 'zip'
-require 'tmpdir'
-require 'pathname'
-require 'tempfile'
-require 'rexml/document'
-
 require 'calco'
+require 'calco/xml_builder'
+
+require_relative 'office_file_manager'
 
 module Calco
 
   class OfficeEngine < DefaultEngine
 
-    def initialize ods_template, first_row_is_header = true
+    def initialize ods_template
       @ods_template = ods_template
-      @first_row_is_header = first_row_is_header
     end
     
     # output is a String (as a file name)
     def save doc, to_filename, &data_iterator
 
-      content_xml_file = Tempfile.new('office-gen')
-      result_xml_file = Tempfile.new('office-gen')
+      @file_manager = OfficeFileManager.new(@ods_template)
       
-      Zip::File.open(@ods_template) do |zipfile|
-        content = zipfile.read("content.xml")
-        open(content_xml_file, "w") {|out| out.write content}
-      end
-
-      write_result_content doc, content_xml_file, result_xml_file, @first_row_is_header, &data_iterator
-
-      FileUtils.cp(@ods_template, to_filename)
-
-      Zip::File.open(to_filename) do |zipfile|
-
-        zipfile.get_output_stream("content.xml") do |os|
-
-          File.open(result_xml_file).each_line do |line|
-            os.puts line
-          end
-
-        end
-
-      end
+      data_iterator.call(doc)
 
+      @file_manager.save doc, to_filename
+      
     end
 
-    def empty_row
-      @out_stream.write '<table:table-row/>'
+    def empty_row sheet
+      @file_manager.add_empty_row sheet
     end
     
     def write_row sheet, row_id
@@ -58,18 +36,18 @@ module Calco
       
       cells = sheet.row(row_id)
 
-      @out_stream.write '<table:table-row>'
+      @file_manager.add_row sheet do |stream|
+      
+        cells.each_index do |i|
 
-      cells.each_index do |i|
+          cell = cells[i]
 
-        cell = cells[i]
+          stream.write cell
 
-        @out_stream.write cell
+        end
 
       end
-
-      @out_stream.write '</table:table-row>'
-
+      
     end
 
     def generate_cell row_number, column, cell_style, column_style, column_type
@@ -77,67 +55,24 @@ module Calco
       return '<table:table-cell/>' unless column
       return '<table:table-cell/>' if column.absolute_row && column.absolute_row != row_number
 
+      currency = nil
+      
       cell = column.generate(row_number)
 
-      if cell_style
-        cell = cell.to_s + cell_style.generate(row_number)
-      end
-
-      if column_style
-        column_style = %[table:style-name="#{column_style}"]
-      else
-        column_style = ''
-      end
+      cell_style = cell_style.generate(row_number) if cell_style
 
       if column_type
 
         if column_type == '%'
-          column_type = %[office:value-type="percentage"]
+          column_type = 'percentage'
         elsif column_type =~ /\$([A-Z]{3})/
-          column_type = %[office:value-type="currency" office:currency="#{$1}"]
-        else
-          column_type = %[office:value-type="#{column_type}"]
+          currency = "#{$1}"
+          column_type = 'currency' 
         end
 
       end
 
-      if column.is_a?(Formula)
-
-        column_type = 'office:value-type="float"' unless column_type
-
-        %[<table:table-cell #{column_style} #{column_type} table:formula="of:=#{cell}" />]
-
-      elsif column.respond_to?(:value)
-
-        if column.value.nil?
-          
-          "<table:table-cell/>"
-          
-        elsif column.value.is_a?(Numeric)
-
-          column_type = 'office:value-type="float"' unless column_type
-
-          %[<table:table-cell #{column_style} #{column_type} office:value="#{cell}"/>]
-
-        elsif column.value.is_a?(Date)
-
-          column_type = 'office:value-type="date"' unless column_type
-
-          %[<table:table-cell #{column_style} #{column_type} office:date-value="#{cell.to_s}"/>]
-
-        else
-
-          column_type = 'office:value-type="string"' unless column_type
-
-          %[
-            <table:table-cell #{column_style} #{column_type}>
-              <text:p><![CDATA[#{cell}]]></text:p>
-            </table:table-cell>
-          ]
-
-        end
-
-      end
+      office_cell column, column_style, column_type, currency, cell.to_s, cell_style
 
     end
 
@@ -159,7 +94,7 @@ module Calco
     end
 
     def style statement, row
-      "+ORG.OPENOFFICE.STYLE(#{statement.generate(row)})"
+      "&amp;T(ORG.OPENOFFICE.STYLE(#{statement.generate(row)}))"
     end
 
     def operator op
@@ -182,80 +117,66 @@ module Calco
 
     private
 
-    # returns the parent table and removes template/example rows, also returns
-    # the first template/example row (to find cell styles for instance)
-    def retrieve_template_row doc, first_row_is_header
-
-      root = doc.root
-
-      count = 0
-      template_row = nil
-
-      table = root.elements['//table:table']
-      table.each_element('table:table-row') do |row|
-
-        if first_row_is_header && count == 0
-          # keep the header row
-        else
-
-          table.delete_element(row)
-
-          template_row = row unless template_row
-
-        end
-
-        count += 1
-
-      end
-
-      raise "Cannot find template row in #{@ods_template}" unless template_row
-
-      return table, template_row
-
-    end
-
-    def create_temporary xml, to_filename
+    def office_cell column, column_style, column_type, currency, value, cell_style
 
-      to = Pathname.new(to_filename)
-
-      temp_file = Tempfile.new('office-gen', to.dirname.to_s)
-
-      File.open(temp_file, 'w') { |stream| stream.puts xml }
-
-      temp_file
+      xml = XMLBuilder.new('table:table-cell')
+      
+      if column.is_a?(Formula)
 
-    end
+        column_type = 'float' unless column_type
 
-    def write_result_content doc, content_xml_file, result_xml_file, first_row_is_header, &data_iterator
+        xml << {'table:formula' => "of:=#{value}#{cell_style}"}
 
-      file = File.new(content_xml_file)
+      elsif column.respond_to?(:value)
+      
+        if column.value.nil?
+        
+          return xml.build
+        
+        elsif column.value.is_a?(Numeric)
 
-      xml = REXML::Document.new(file)
+          column_type = 'float' unless column_type
 
-      table, template_row = retrieve_template_row(xml, first_row_is_header)
+          xml << {'office:value' => "#{value}#{cell_style}"} unless cell_style
 
-      table.add_text "%%%Insert data here%%%\n"
+        elsif column.value.is_a?(Date)
 
-      temp_file = create_temporary(xml, result_xml_file)
+          column_type = 'date' unless column_type
 
-      File.open(result_xml_file, 'w') do |stream|
+          xml << {'office:date-value' => "#{value}#{cell_style}"} unless cell_style
 
-        @out_stream = stream
+        else
 
-        File.open(temp_file, 'r').each do |line|
+          column_type = 'string' unless column_type
 
-          if line =~ /(.*)%%%Insert data here%%%(.*)/
-            @out_stream.write $1
-            data_iterator.call(doc)
-            @out_stream.write $2
+          if cell_style
+            value = office_string_escape(value)
           else
-            @out_stream.write line
+            xml.add_child 'text:p', office_string_value(value)
           end
-
+          
         end
 
+        if cell_style
+          xml << {'table:formula' => "of:=#{value}#{cell_style}"}
+        end
+        
       end
 
+      xml << {'table:style-name'  => column_style}   if column_style
+      xml << {'office:currency'   => currency}       if currency
+      xml << {'office:value-type' => column_type}
+      
+      xml.build
+      
+    end
+
+    def office_string_value str
+      str.gsub('&quot;', '"') 
+    end
+    
+    def office_string_escape str
+      '"' + str.gsub('&quot;', '""') + '"'
     end
 
   end

data/lib/calco/engines/office_file_manager.rb

@@ -0,0 +1,232 @@
+require 'zip'
+require 'tmpdir'
+require 'pathname'
+require 'stringio'
+require 'tempfile'
+require 'rexml/document'
+
+module Calco
+
+  class OfficeFileManager
+    
+    Descriptor = Struct.new(:stream, :file, :new_sheet, :header)
+    
+    def initialize ods_template
+      
+      @ods_template = ods_template
+      
+      @sheets = Hash.new do |h, k|
+      
+        temp_file = Tempfile.new("office-gen-sheet-")
+
+        stream = open(temp_file, 'w:utf-8')
+        
+        h[k] = Descriptor.new(stream, temp_file, false)
+        
+      end
+      
+    end
+    
+    def save definitions, to_filename
+      
+      @sheets.each do |name, descriptor|
+      
+        descriptor.stream.close
+      
+      end
+      
+      flush_content definitions, to_filename
+      
+    end
+    
+    def add_empty_row sheet
+      @sheets[sheet.sheet_name].stream.write '<table:table-row/>'
+    end
+    
+    def add_row sheet
+    
+      stream = @sheets[sheet.sheet_name].stream
+      
+      stream.write '<table:table-row>'
+
+      yield stream
+
+      stream.write '</table:table-row>'
+      
+    end
+    
+    private
+    
+    def flush_content definitions, to_filename
+
+      content_xml_file = Tempfile.new('office-gen')
+      result_xml_file = Tempfile.new('office-gen')
+      
+      extract_template_content content_xml_file
+
+      prepare_content_file definitions, content_xml_file, result_xml_file
+
+      create_file result_xml_file, to_filename
+      
+    end
+    
+    def extract_template_content content_xml_file
+      
+      Zip::File.open(@ods_template) do |zipfile|
+        content = zipfile.read("content.xml")
+        open(content_xml_file, "w") {|out| out.write content}
+      end
+      
+    end
+    
+    def prepare_content_file definitions, content_xml_file, result_xml_file
+
+      file = File.new(content_xml_file)
+
+      xml = REXML::Document.new(file)
+
+      prepare_xml(xml)
+
+      temp_file = create_temporary(xml, result_xml_file)
+
+      File.open(result_xml_file, 'w') do |stream|
+
+        @out_stream = stream
+
+        File.open(temp_file, 'r').each do |line|
+
+          if line =~ /\A%%%Insert data here \[(.*)\]%%%\Z/
+            
+            write_sheet $1, definitions
+            
+          elsif line =~ /(.*)(<\/office:spreadsheet>)(.*)/
+          
+            @out_stream.write $1
+            
+            write_new_sheets
+          
+            @out_stream.write $2
+            @out_stream.write $3
+            
+          else
+            
+            @out_stream.write line
+            
+          end
+
+        end
+
+      end
+
+    end
+    
+    def create_file result_xml_file, to_filename
+    
+      FileUtils.cp(@ods_template, to_filename)
+
+      Zip::File.open(to_filename) do |zipfile|
+
+        zipfile.get_output_stream("content.xml") do |os|
+
+          File.open(result_xml_file).each_line do |line|
+            os.puts line
+          end
+
+        end
+
+      end
+
+    end
+    
+    def prepare_xml xml_doc
+
+      root = xml_doc.root
+
+      @sheets.each_key do |name|
+      
+        table = root.elements["//table:table[@table:name='#{name}']"]
+        
+        unless table
+          @sheets[name].new_sheet = true
+          next
+        end
+        
+        state = :waiting_header
+
+        table.each_element('table:table-row') do |row|
+
+          @sheets[name].header = stringify(row) if state == :waiting_header
+
+          state = :header_consumed
+
+          table.delete_element(row)
+            
+        end
+        
+        table.add_text marker(name)
+
+      end
+
+    end
+
+    def write_sheet name, definitions
+      
+      sheet = @sheets[name]
+      
+      if definitions[name].has_titles?
+      
+        if sheet.header
+          @out_stream.write sheet.header
+        else
+          $sdterr.puts "Cannot find template row in #{@ods_template} for #{name}"
+        end
+        
+      end
+      
+      @out_stream.write sheet.file.read
+      
+    end
+    
+    def write_new_sheets
+      
+      @sheets.each do |name, descriptor|
+        
+        next unless descriptor.new_sheet
+        
+        @out_stream.write "<table:table table:name='#{name}'>"
+        @out_stream.write descriptor.file.read
+        @out_stream.write '</table:table>'
+        
+      end
+      
+    end
+    
+    def create_temporary xml, to_filename
+
+      to = Pathname.new(to_filename)
+
+      temp_file = Tempfile.new('office-gen', to.dirname.to_s)
+
+      File.open(temp_file, 'w') { |stream| stream.puts xml }
+
+      temp_file
+
+    end
+
+    def marker(name)
+      "\n%%%Insert data here [#{name}]%%%\n"
+    end
+    
+    def stringify(row)
+    
+      buffer = StringIO.new
+    
+      REXML::Formatters::Default.new.write(row, buffer)
+      
+      buffer.string
+      
+    end
+    
+  end
+  
+end

data/lib/calco/sheet.rb

@@ -257,7 +257,7 @@ module Calco
 
     # set "next row" as empty, delegated to current engine
     def empty_row
-      @engine.empty_row
+      @engine.empty_row self
     end
     
     # Calls the passed block for every Element, the cell definition,

data/lib/calco/version.rb

@@ -1,3 +1,3 @@
 module Calco
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/calco/xml_builder.rb

@@ -0,0 +1,67 @@
+module Calco
+
+  class XMLBuilder
+
+    def initialize tag
+      @tag = tag
+      @kids = {}
+      @attributes = {}
+    end
+    
+    # +attributes+ is a hash with key/value pairs, keys are the attribute names
+    def << attributes
+    
+      attributes.each do |attribute, value|
+        @attributes[attribute] = escape(value)
+      end
+      
+    end
+
+    def attribute name, value
+      @attributes[name] = escape(value)
+    end
+    
+    # add a child text-node with the given +tag+/+value+
+    def add_child tag, value
+      @kids[tag] = value
+    end
+    
+    def build
+    
+      buffer = "<#{@tag} "
+      
+      return buffer + '/>' if @kids.empty? && @attributes.empty?
+      
+      @attributes.each do |attribute, value|
+        buffer << "#{attribute}='#{value}' "
+      end
+      
+      if @kids.empty?
+        buffer << '/>'
+      else
+        
+        buffer << '>'
+        
+        @kids.each do |text_tag, value|
+          buffer << "<#{text_tag}><![CDATA[#{value}]]></#{text_tag}>"
+        end
+      
+        buffer << "</#{@tag}>"
+      
+      end
+      
+      buffer
+      
+    end
+    
+    def escape str
+      
+      str = str.to_s
+      
+      str.gsub("'", '&apos;')
+      
+    end
+    
+  end
+  
+end

data/spec/xml_builder_spec.rb

@@ -0,0 +1,89 @@
+require 'calco/xml_builder'
+
+module Calco
+
+  describe XMLBuilder do
+
+    it "generates empty tag" do
+    
+      builder = XMLBuilder.new('hello')
+      
+      expect(builder.build).to eq('<hello />')
+    
+    end
+    
+    it "generates tag + one attribute" do
+    
+      builder = XMLBuilder.new('hello')
+      
+      builder << {:name => 'Max'}
+      
+      expect(builder.build).to eq("<hello name='Max' />")
+    
+    end
+    
+    it "generates tag + many attributes" do
+    
+      builder = XMLBuilder.new('hello')
+      
+      builder << {name: 'Max', greeting: 'Bonjour', today: Date.new(2014, 3, 16)}
+      
+      expect(builder.build).to eq("<hello name='Max' greeting='Bonjour' today='2014-03-16' />")
+    
+    end
+    
+    it "generates tag + many attributes (alternate notation)" do
+    
+      builder = XMLBuilder.new('hello')
+      
+      builder.attribute :name, 'Max'
+      builder.attribute :greeting, 'Bonjour'
+      builder.attribute "today", Date.new(2014, 3, 16)
+      
+      expect(builder.build).to eq("<hello name='Max' greeting='Bonjour' today='2014-03-16' />")
+    
+    end
+    
+    it "overwrites attributes" do
+    
+      builder = XMLBuilder.new('hello')
+      
+      builder.attribute :name, 'Max'
+
+      builder << {:name => 'Joe'}
+      
+      expect(builder.build).to eq("<hello name='Joe' />")
+    
+    end
+    
+    it "generates tag + attributes + text child nodes" do
+    
+      builder = XMLBuilder.new('hello')
+      
+      builder << {name: 'Max', town: 'London'}
+      
+      builder.add_child "comment", "He's Joe's best friend"
+      builder.add_child "info", "He lives somewhere"
+      
+      expect(builder.build).to eq(
+                 "<hello name='Max' town='London' >" + 
+                     "<comment><![CDATA[He's Joe's best friend]]></comment>" + 
+                     '<info><![CDATA[He lives somewhere]]></info>' + 
+                  '</hello>'
+              )
+    
+    end
+    
+    it "escapes attibute values" do
+      
+      builder = XMLBuilder.new('hello')
+      
+      builder << {name: 'Max', last_name: "O'Neil"}
+      
+      expect(builder.build).to eq("<hello name='Max' last_name='O&apos;Neil' />")
+      
+    end
+    
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calco
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean Lazarou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -61,6 +61,9 @@ files:
 - examples/multiplication_tables.ods
 - examples/multiplication_tables.rb
 - examples/register_function.rb
+- examples/report_card.rb
+- examples/report_cards.ods
+- examples/report_cards.rb
 - examples/using_date_functions.rb
 - examples/write_csv.rb
 - examples/write_ods.rb
@@ -88,6 +91,7 @@ files:
 - lib/calco/engines/csv_engine.rb
 - lib/calco/engines/default_engine.rb
 - lib/calco/engines/office_engine.rb
+- lib/calco/engines/office_file_manager.rb
 - lib/calco/engines/simple_calculator_engine.rb
 - lib/calco/math_functions.rb
 - lib/calco/sheet.rb
@@ -96,6 +100,7 @@ files:
 - lib/calco/style.rb
 - lib/calco/time_functions.rb
 - lib/calco/version.rb
+- lib/calco/xml_builder.rb
 - spec/absolute_references_spec.rb
 - spec/builtin_functions_spec.rb
 - spec/calculator_engine_spec.rb
@@ -114,6 +119,7 @@ files:
 - spec/spreadsheet_spec.rb
 - spec/styles_spec.rb
 - spec/variables_spec.rb
+- spec/xml_builder_spec.rb
 homepage: https://github.com/jeanlazarou/calco
 licenses: []
 metadata: {}
@@ -156,3 +162,4 @@ test_files:
 - spec/spreadsheet_spec.rb
 - spec/styles_spec.rb
 - spec/variables_spec.rb
+- spec/xml_builder_spec.rb