rodf 1.1.1 → 1.2.0

data/lib/rodf/spreadsheet.rb

@@ -1,34 +1,35 @@
-require_relative 'data_style'
-require_relative 'document'
-require_relative 'hyperlink'
-require_relative 'span'
-require_relative 'table'
-
 module RODF
   class Spreadsheet < Document
-    contains :tables, :data_styles
-
     def xml
-      b = Builder::XmlMarkup.new
-
-      b.instruct! :xml, version: '1.0', encoding: 'UTF-8'
-      b.tag! 'office:document-content',
-              'xmlns:office' => "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-              'xmlns:table' => "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-              'xmlns:text' => "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-              'xmlns:oooc' => "http://openoffice.org/2004/calc",
-              'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-              'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-              'xmlns:number' => "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
-              'xmlns:xlink' => "http://www.w3.org/1999/xlink" do
-      |xml|
-        xml.tag! 'office:styles' do
-          xml << default_styles_xml
-        end unless default_styles.empty?
-        xml.tag! 'office:automatic-styles' do
-          xml << styles_xml
-          xml << data_styles_xml
-        end unless styles.empty? && data_styles.empty?
+      builder = Builder::XmlMarkup.new
+
+      builder.instruct!(:xml, version: '1.0', encoding: 'UTF-8')
+  
+      attrs = {
+        'xmlns:office' => "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+        'xmlns:table' => "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+        'xmlns:text' => "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+        'xmlns:oooc' => "http://openoffice.org/2004/calc",
+        'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+        'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+        'xmlns:number' => "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
+        'xmlns:xlink' => "http://www.w3.org/1999/xlink",
+      }
+
+      builder.tag!('office:document-content', attrs) do |xml|
+        if !default_styles.empty?
+          xml.tag! 'office:styles' do
+            xml << default_styles_xml
+          end
+        end
+
+        if !styles.empty? || !data_styles.empty?
+          xml.tag! 'office:automatic-styles' do
+            xml << styles_xml
+            xml << data_styles_xml
+          end
+        end
+
         xml.office:body do
           xml.office:spreadsheet do
             xml << tables_xml
@@ -36,6 +37,76 @@ module RODF
         end
       end
     end
+
+    def set_column_widths(table:, column_widths:)
+      table.instance_variable_set(:@columns, []) ### Reset completely
+
+      column_widths.each_with_index do |width, i|
+        name = "col-width-#{i}"
+
+        self.style(name, family: :column) do
+          property(:column, {'column-width' => width})
+        end
+
+        table.columns << RODF::Column.new(style: name)
+      end
+    end
+
+    def tables
+      @tables ||= []
+    end
+
+    def table(*args, column_widths: nil, &block)
+      x = Table.new(*args, &block)
+
+      tables << x
+
+      if column_widths
+        set_column_widths(table: x, column_widths: column_widths)
+      end
+
+      return x
+    end
+
+    def tables_xml
+      tables.map(&:xml).join
+    end
+
+    def add_tables(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        table(element)
+      end
+    end
+
+    def data_styles
+      @data_styles ||= []
+    end
+
+    def data_style(*args, &block)
+      x = DataStyle.new(*args, &block)
+
+      data_styles << x
+
+      return x
+    end
+
+    def data_styles_xml
+      data_styles.map(&:xml).join
+    end
+
+    def add_data_styles(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        data_style(element)
+      end
+    end
   end
 
   SpreadSheet = Spreadsheet

data/lib/rodf/style.rb

@@ -1,18 +1,16 @@
-require 'builder'
-
-require_relative 'container'
-require_relative 'property'
-
 module RODF
   class Style < Container
-    contains :properties
-
-    FAMILIES = {cell: 'table-cell', column: 'table-column', row: 'table-row'}
+    FAMILIES = {
+      "cell" => 'table-cell',
+      "column" => 'table-column',
+      "row" => 'table-row',
+    }
 
     def initialize(name='', opts={}, node_tag='style:style')
       super
 
       @name, @node_tag = name, node_tag
+
       @elem_attrs = make_element_attributes(@name, opts)
     end
 
@@ -25,16 +23,47 @@ module RODF
     def make_element_attributes(name, opts)
       attrs = {
         'style:name' => name,
-        'style:family' => (FAMILIES[opts[:family]] || opts[:family])}
+        'style:family' => (FAMILIES[opts[:family].to_s] || opts[:family]),
+      }
+
       attrs['style:data-style-name'] = opts[:data_style] unless opts[:data_style].nil?
+
       attrs['style:parent-style-name'] = opts[:parent].to_s unless opts[:parent].nil?
+
       attrs['style:master-page-name'] = opts[:master_page] unless opts[:master_page].nil?
+
       attrs
     end
 
     def to_s
       @name
     end
+
+    def properties
+      @properties ||= []
+    end
+
+    def property(*args, &block)
+      x = Property.new(*args, &block)
+
+      properties << x
+
+      return x
+    end
+
+    def properties_xml
+      properties.map(&:xml).join
+    end
+
+    def add_properties(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        property(element)
+      end
+    end
   end
 
   class OfficeStyle < Style

data/lib/rodf/style_section.rb

@@ -1,9 +1,8 @@
-require 'builder'
-
 module RODF
   class StyleSection
     def initialize(type, second = {})
       @type = type
+
       if second.instance_of?(Hash)
         @elem_attrs = make_element_attributes(second)
       else
@@ -19,9 +18,13 @@ module RODF
       attrs = {}
 
       attrs['number:decimal-places'] = opts[:decimal_places] unless opts[:decimal_places].nil?
+
       attrs['number:grouping'] = opts[:grouping] unless opts[:grouping].nil?
+
       attrs['number:min-integer-digits'] = opts[:min_integer_digits] unless opts[:min_integer_digits].nil?
+
       attrs['number:style'] = opts[:style] unless opts[:style].nil?
+
       attrs['number:textual'] = opts[:textual] unless opts[:textual].nil?
 
       attrs

data/lib/rodf/tab.rb

@@ -1,7 +1,3 @@
-require 'builder'
-
-require_relative 'paragraph_container'
-
 module RODF
   class Tab
     def xml
@@ -12,7 +8,9 @@ module RODF
   class ParagraphContainer < Container
     def tab(*args)
       t = Tab.new
+
       content_parts << t
+
       t
     end
   end

data/lib/rodf/table.rb

@@ -1,21 +1,43 @@
-require 'builder'
-
-require_relative 'column'
-require_relative 'container'
-require_relative 'row'
-
 module RODF
   class Table < Container
-    contains :rows, :columns
-
-    def initialize(title = nil)
+    def initialize(title = nil, opts ={})
       @title = title
+
       @last_row = 0
 
+      @elem_attrs = {}
+
+      @elem_attrs['table:style-name'] = opts[:style] unless opts[:style].nil?
+
+      @elem_attrs['table:name'] = @title
+
+      if opts[:attributes]
+        @elem_attrs.merge!(opts[:attributes])
+      end
+
       super
     end
 
-    alias create_row row
+    def style=(style_name)
+      @elem_attrs['table:style-name'] = style_name
+    end
+
+    def rows
+      @rows ||= []
+    end
+
+    def create_row(*args, &block)
+      x = Row.new(*args, &block)
+
+      rows << x
+
+      return x
+    end
+
+    def rows_xml
+      rows.map(&:xml).join
+    end
+
     def row(options = {}, &contents)
       create_row(next_row, options) do |row|
         if contents
@@ -29,22 +51,45 @@ module RODF
     end
 
     def add_rows(*rows)
-      rows = rows.first if rows.first.first.is_a?(Array)
+      if rows.first.first.is_a?(Array)
+        rows = rows.first
+      end
+
       rows.each do |row|
-        created = self.row
-        created.add_cells row
+        new_row = self.row
+
+        new_row.add_cells(row)
       end
     end
 
+    def columns
+      @columns ||= []
+    end
+
+    def column(options = {})
+      x = Column.new(options)
+
+      columns << x
+
+      return x
+    end
+
+    def columns_xml
+      columns.map(&:xml).join
+    end
+
     def xml
-      Builder::XmlMarkup.new.table:table, 'table:name' => @title do |xml|
+      Builder::XmlMarkup.new.table :table, @elem_attrs do |xml|
         xml << columns_xml
         xml << rows_xml
       end
     end
-  private
+
+    private
+
     def next_row
       @last_row += 1
     end
+
   end
 end

data/lib/rodf/text.rb

@@ -1,40 +1,40 @@
-require 'builder'
-
-require_relative 'document'
-require_relative 'master_page'
-require_relative 'page_layout'
-require_relative 'paragraph'
-require_relative 'span'
-require_relative 'hyperlink'
-
 module RODF
   class Text < Document
-    contains :paragraphs, :page_layouts, :master_pages
-
-    alias :p :paragraph
-
     def xml
       b = Builder::XmlMarkup.new
 
       b.instruct! :xml, version: '1.0', encoding: 'UTF-8'
-      b.tag! 'office:document-content', 'xmlns:office' => "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-                                        'xmlns:table' => "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-                                        'xmlns:text' => "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-                                        'xmlns:oooc' => "http://openoffice.org/2004/calc",
-                                        'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-                                        'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-                                        'xmlns:xlink' => "http://www.w3.org/1999/xlink" do
-      |xml|
-        xml.tag! 'office:styles' do
-          xml << default_styles_xml
-        end unless default_styles.empty?
-        xml.tag! 'office:automatic-styles' do
-          xml << styles_xml
-          xml << page_layouts_xml
-        end unless styles.empty? && page_layouts.empty?
-        xml.tag! 'office:master-styles' do
-          xml << master_pages_xml
-        end unless master_pages.empty?
+    
+      attrs = {
+        'xmlns:office' => "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+        'xmlns:table' => "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+        'xmlns:text' => "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+        'xmlns:oooc' => "http://openoffice.org/2004/calc",
+        'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+        'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+        'xmlns:xlink' => "http://www.w3.org/1999/xlink",
+      }
+
+      b.tag! 'office:document-content', attrs do |xml|
+        unless default_styles.empty?
+          xml.tag! 'office:styles' do
+            xml << default_styles_xml
+          end
+        end
+
+        unless styles.empty? && page_layouts.empty?
+          xml.tag! 'office:automatic-styles' do
+            xml << styles_xml
+            xml << page_layouts_xml
+          end
+        end
+
+        unless master_pages.empty?
+          xml.tag! 'office:master-styles' do
+            xml << master_pages_xml
+          end
+        end
+
         xml.office:body do
           xml.office:text do
             xml << paragraphs_xml
@@ -42,5 +42,85 @@ module RODF
         end
       end
     end
+
+    def paragraphs
+      @paragraphs ||= []
+    end
+
+    def paragraph(*args, &block)
+      x = Paragraph.new(*args, &block)
+
+      paragraphs << x
+
+      return x
+    end
+    alias p paragraph
+
+    def paragraphs_xml
+      paragraphs.map(&:xml).join
+    end
+
+    def add_paragraphs(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        paragraph(element)
+      end
+    end
+
+    def page_layouts
+      @page_layouts ||= []
+    end
+
+    def page_layout(*args, &block)
+      x = PageLayout.new(*args, &block)
+
+      page_layouts << x
+
+      return x
+    end
+
+    def page_layouts_xml
+      page_layouts.map(&:xml).join
+    end
+
+    def add_page_layouts(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        page_layout(element)
+      end
+    end
+
+    def master_pages
+      @master_pages ||= []
+    end
+
+    def master_page(*args, &block)
+      x = MasterPage.new(*args, &block)
+
+      master_pages << x
+
+      return x
+    end
+
+    def master_pages_xml
+      master_pages.map(&:xml).join
+    end
+
+    def add_master_pages(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        master_pages(element)
+      end
+    end
+
   end
 end

data/lib/rodf/version.rb

@@ -1,3 +1,3 @@
 module RODF
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/rodf.rb

@@ -1,5 +1,30 @@
 require 'builder'
-require_relative 'rodf/spreadsheet'
+require 'zip'
+require 'erb'
+
+require 'rodf/version'
+
+require 'rodf/container'
+require 'rodf/document'
+require 'rodf/paragraph_container'
+
+require 'rodf/cell'
+require 'rodf/column'
+require 'rodf/data_style'
+require 'rodf/hyperlink'
+require 'rodf/master_page'
+require 'rodf/page_layout'
+require 'rodf/paragraph'
+require 'rodf/property'
+require 'rodf/row'
+require 'rodf/skeleton'
+require 'rodf/span'
+require 'rodf/spreadsheet'
+require 'rodf/style'
+require 'rodf/style_section'
+require 'rodf/table'
+require 'rodf/tab'
+require 'rodf/text'
 
 module RODF
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodf
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Weston Ganger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: dry-inflector
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +124,6 @@ files:
 - lib/rodf.rb
 - lib/rodf/cell.rb
 - lib/rodf/column.rb
-- lib/rodf/compatibility.rb
 - lib/rodf/container.rb
 - lib/rodf/data_style.rb
 - lib/rodf/document.rb
@@ -161,7 +146,8 @@ files:
 - lib/rodf/text.rb
 - lib/rodf/version.rb
 homepage: https://github.com/thiagoarrais/rodf
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -178,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: This is a library for writing to ODF output from Ruby. It mainly focuses

data/lib/rodf/compatibility.rb

@@ -1,9 +0,0 @@
-require 'builder'
-
-if !String.method_defined? :to_xs
-  class String
-    def to_xs
-      Builder::XChar.encode(self)
-    end
-  end
-end