rubyword 1.0.0 → 1.1.0

data/lib/rubyword/element/base.rb

@@ -7,6 +7,18 @@ module Rubyword
         @rubyword = rubyword
         @section = section
       end
+
+      # filter html special char
+      def filter_text(text)
+        text = text.to_s
+        text.gsub('&', '&')
+        text.gsub('\'', ''')
+        text.gsub('"', '"')
+        text.gsub('<', '&lt;')
+        text.gsub('>', '&gt;')
+        text
+      end
+
     end
   end
 end

data/lib/rubyword/element/link.rb

@@ -3,16 +3,17 @@ module Rubyword
     module Element
       class Link < Base
         attr_accessor :links
-        def save(text, link, style)
+        def save(text, link, style=nil)
 					@links ||= Queue.new
-					return if text.nil?
+          return if text.nil?
+          text = filter_text(text)
 					@rubyword.rels_documents << {
 						Id: "rId#{@rubyword.init_rid}",
 						Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
 						Target: link,
 						TargetMode: 'External'
 					}
-					@links << { rId: @rubyword.init_rid, text: text, link: link }
+					@links << { rId: @rubyword.init_rid, text: text, link: link, style: style }
 					@rubyword.init_rid = @rubyword.init_rid + 1
         end
 				
@@ -20,10 +21,10 @@ module Rubyword
 					@xml = xml
           link = self.links.pop
           @xml.send('w:p') {
+            Writer::Style::Paragraph.new(@section, @xml, @rubyword).write(link[:style])
             @xml.send('hyperlink', 'r:id' => "rId#{link[:rId]}", 'w:history' => '1') {
               @xml.send('w:r') {
-                # TODO: add style
-                @xml.send('w:rPr')
+                Writer::Style::Word.new(@section, @xml, @rubyword).write(link[:style])
                 @xml.send('w:t', {'xml:space' => 'preserve'}, link[:text])
               }
             }

data/lib/rubyword/element/list.rb

@@ -7,9 +7,11 @@ module Rubyword
       # write document and numbering
       def save(text, level, style)
         @lists ||= Queue.new
+        text = filter_text(text)
         @lists << {
           level: level.to_i - 1,
-          text: text
+          text: text,
+          style: style
         }
       end
 
@@ -24,7 +26,7 @@ module Rubyword
             }
           }
           @xml.send('w:r') {
-            @xml.send('w:rPr')
+            Writer::Style::Word.new(@section, @xml, @rubyword).write(list[:style])
             @xml.send('w:t', {'xml:space' => 'preserve'}, list[:text])
           }
         }

data/lib/rubyword/element/paragraph.rb

@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+module Rubyword
+  module Element
+    class Paragraph < Text
+      attr_accessor :paragraphs, :style
+      def initialize(rubyword, section=nil, style)
+        super(rubyword, section)
+        @style = style
+      end
+      
+      def text(text, style=nil)
+        @paragraphs ||= []
+        text = filter_text(text)
+        @paragraphs << {
+          text: text,
+          style: style
+        }
+      end
+
+      def write(section=nil, xml=nil)
+        @xml = xml
+        @xml.send('w:p') { 
+          @paragraphs.each do |p|
+            Writer::Style::Paragraph.new(@section, @xml, @rubyword).write(p[:style])
+            @xml.send('w:r') do
+              Writer::Style::Word.new(@section, @xml, @rubyword).write(p[:style])
+              @xml.send('w:t', {'xml:space' => 'preserve'}, p[:text])
+            end
+          end
+        }
+      end
+      
+      def method_missing(name, *arg)
+        @section.send(name.to_sym, *arg)
+      end
+    end
+  end
+end

data/lib/rubyword/element/section.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require_relative 'base'
 require_relative 'text'
 require_relative 'link'
@@ -6,23 +5,37 @@ require_relative 'list'
 require_relative 'image'
 require_relative 'page_break'
 require_relative 'text_break'
+require_relative 'paragraph'
+require_relative 'table'
 module Rubyword
   module Element
     class Section
       attr_accessor :section_id, :style, :rubyword, :section_objects, :objects, :titles
+
       def initialize(section_count, style = nil, rubyword=nil)
 				@section_id = section_count
 				@style = style
         @rubyword = rubyword
         @section_objects = []
         @objects = []
+        @text_blocks = []
+      end
+      
+      def p(style=nil, &block)
+        object ||= Paragraph.new(@rubyword, self, style)
+        return nil unless block_given?
+        object.instance_eval(&block) 
+        @objects << object
       end
 
-      def generate(&block)
-        !block.nil? && block.arity < 1 ? instance_eval(&block) : block[self]
+      def table(style=nil, &block)
+        object ||= Table.new(@rubyword, self, style)
+        return nil unless block_given?
+        object.instance_eval(&block)
+        @objects << object
       end
 
-			def text(text, style=nil)
+      def text(text, style=nil)
         object ||= Text.new(@rubyword, self)
         object.save(text, __callee__.to_s, style)
         @objects << object
@@ -38,18 +51,18 @@ module Rubyword
         @objects << object
       end
 
-      def image(url)
-        object ||= Image.new(@rubyword)
-        object.save(url)
-        @objects << object
-      end
-
       def link(text, link, style=nil)
         object ||= Link.new(@rubyword)
         object.save(text, link, style)
         @objects << object
       end
 
+      def image(url)
+        object ||= Image.new(@rubyword)
+        object.save(url)
+        @objects << object
+      end
+
       def page_break(break_num=1)
         object ||= PageBreak.new(@rubyword)
         object.save(break_num)

data/lib/rubyword/element/table.rb

@@ -0,0 +1,60 @@
+# -*- encoding : utf-8 -*-
+module Rubyword
+  module Element
+    class Table < Base
+      attr_accessor :trs
+      def initialize(rubyword, section=nil, style)
+        super(rubyword, section)
+        @style = style
+        @trs ||= []
+      end
+      
+      def tr(style=nil, &block)
+        return unless block_given?
+        tr = Tr.new
+        tr.instance_eval(&block)
+        @trs << tr
+      end
+
+      def write(section=nil, xml=nil)
+        @xml = xml
+        @xml.send('w:tbl') { 
+          @xml.send('w:tblGrid') {
+            @xml.send('w:gridCol', 'w:w' => '1750', 'w:type' => 'dxa')
+            @xml.send('w:gridCol', 'w:w' => '1750', 'w:type' => 'dxa')
+            @xml.send('w:gridCol', 'w:w' => '1750', 'w:type' => 'dxa')
+          }
+          @trs.each do |tr|
+            @xml.send('w:tr') {
+              @xml.send('w:trPr')
+              tr.texts.each do |text|
+                @xml.send('w:tc') {
+                  @xml.send('w:tcPr') {
+                    @xml.send('w:tcW', 'w:w'=>'1750', 'w:type' => 'dxa')
+                  }
+                  @xml.send('w:p') {
+                    Writer::Style::Paragraph.new(@section, @xml, @rubyword).write(text[:style])
+                    @xml.send('w:r') do
+                      Writer::Style::Word.new(@section, @xml, @rubyword).write(text[:style])
+                      @xml.send('w:t', {'xml:space' => 'preserve'}, text[:text])
+                    end
+                  }
+                }
+              end
+            }
+          end
+        }
+      end
+
+    end
+
+    class Tr
+      attr_accessor :texts
+      def th(text, style=nil)
+        @texts ||= []
+        @texts << { text: text, style: style }
+      end
+    end
+
+  end
+end

data/lib/rubyword/element/text.rb

@@ -1,31 +1,15 @@
-# -*- encoding : utf-8 -*-
 module Rubyword
   module Element
     class Text < Base
       attr_accessor :texts
-      
+      # Toc indent size
       IndentSize = 200
-      WordStyleList = {
-        font_size: 'w:sz',
-        color: 'w:color',
-        underline: 'w:u', 
-        blod: 'w:b', 
-        all_caps: 'w:caps',
-        italic: 'w:i',
-        bgcolor: 'w:highlight'
-      }.freeze
-      ParagraphStyleList = {
-        text_align: 'w:jc',
-        spacing: 'w:spacing',
-        indent_left: 'w:ind',
-        indent_right: 'w:ind',
-        indent_between: 'w:ind'
-      }.freeze
-
-      def save(text, type, style)
+      
+      def save(text, type=nil, style=nil)
         @texts ||= Queue.new
         @section.titles ||= []
-        return if text.nil?
+        return if text.nil? || type.nil?
+        text = filter_text(text)
         if type == 'text'
           text(text, style)
         else
@@ -34,21 +18,21 @@ module Rubyword
       end
 
       def text(text, style)
-        @texts << { size: 'normal', text: text.to_s, style: style }
+        @texts << { size: 'normal', text: text, style: style }
       end
 
       (1..4).each do |num|
         define_method "title_#{num}" do |text, style|
           @rubyword.relation_rids << {rid: @rubyword.init_rid, type: "title_#{num}"}
-          title_hs = {
+          title_info = {
             indent: (num - 1) * IndentSize,
             size: "title_#{num}",
             text: text.to_s,
             rid: @rubyword.init_rid,
             style: style
           }
-          @section.titles << title_hs if (style && !style[:ignore_dir]) || style.nil?
-          @texts << title_hs
+          @section.titles << title_info if (style && !style[:ignore_dir]) || style.nil?
+          @texts << title_info
           @rubyword.init_rid = @rubyword.init_rid + 1
         end
 
@@ -67,68 +51,19 @@ module Rubyword
       end
 
       def write(section=nil, xml=nil)
-        @xml = xml
+        @xml, @section = xml, section
         text = self.texts.pop
+        return if text.to_s.empty?
         eval "write_#{text[:size]}(text)"
       end
 
       def write_normal(text)
-        @xml.send('w:p') do
-          write_paragraph_style(text[:style])
+        @xml.send('w:p') {
+          Writer::Style::Paragraph.new(@section, @xml, @rubyword).write(text[:style])
           @xml.send('w:r') do
-            write_word_style(text[:style])
+            Writer::Style::Word.new(@section, @xml, @rubyword).write(text[:style])
             @xml.send('w:t', {'xml:space' => 'preserve'}, text[:text])
           end
-        end
-      end
-
-      def write_word_style(style)
-        if style.is_a?(Hash)
-          @xml.send('w:rPr') {
-            style.keys.each do |style_name|
-              style_name = style_name.to_sym
-              if WordStyleList.keys.include?(style_name)
-                value =style[style_name]
-                attribute = if !!value != value # not a bool type
-                              {'w:val' => value}
-                            else
-                              nil
-                            end
-                doc_style = WordStyleList[style_name]
-                @xml.send(doc_style, attribute)
-                @xml.send('w:szCs', attribute) if style_name == :font_size
-              end
-            end
-          }
-        end
-      end
-      
-      def write_paragraph_style(style)
-        return unless style.is_a?(Hash)
-        @xml.send('w:pPr') {
-          style.keys.each do |style_name|
-            style_name = style_name.to_sym
-            next unless ParagraphStyleList.keys.include?(style_name)
-            value =style[style_name]
-            attribute = case style_name.to_s
-                        when 'spacing'
-                          {'w:after' => value}
-                        when 'indent_left'
-                          {'w:left' => value}
-                        when 'indent_right'
-                          {'w:right' => value}
-                        when 'indent_between'
-                          v = value.split '-'
-                          next unless v.is_a?(Array)
-                          { 'w:left' => v[0].to_i, 'w:right' => v[1].to_i }
-                        when !!value == value
-                          nil
-                        else
-                          {'w:val' => value}
-                        end
-            doc_style = ParagraphStyleList[style_name]
-            @xml.send(doc_style, attribute)
-          end
         }
       end
 

data/lib/rubyword/style.rb

@@ -0,0 +1,4 @@
+require_relative 'writer/style/base'
+require_relative 'writer/style/section'
+require_relative "writer/style/paragraph"
+require_relative "writer/style/word"

data/lib/rubyword/version.rb

@@ -1,3 +1,3 @@
 module Rubyword
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/rubyword/writer.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require_relative "writer/part/base"
 require_relative "writer/part/toc"
 require_relative "writer/part/content_types"
@@ -16,9 +15,6 @@ require_relative "writer/part/theme"
 require_relative "writer/part/web_settings"
 require_relative "writer/part/footer"
 require_relative "writer/part/header"
-# style file
-require_relative 'writer/style/base'
-require_relative 'writer/style/section'
 
 module Rubyword
   module Writer

data/lib/rubyword/writer/part/document.rb

@@ -1,56 +1,63 @@
 # -*- encoding : utf-8 -*
 module Rubyword
   module Writer
-    class Part::Document < Part::Base
-      include ::Rubyword::Writer::Part::Toc
-      DOCUMENT_ATTR = {
-        'xmlns:ve' => "http://schemas.openxmlformats.org/markup-compatibility/2006",
-        'xmlns:o' => "urn:schemas-microsoft-com:office:office",
-        'xmlns:r' => "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-        'xmlns:m' => "http://schemas.openxmlformats.org/officeDocument/2006/math",
-        'xmlns:v' => "urn:schemas-microsoft-com:vml",
-        'xmlns:wp' => "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
-        'xmlns:w10' => "urn:schemas-microsoft-com:office:word",
-        'xmlns:w' => "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-        'xmlns:wne' => "http://schemas.microsoft.com/office/word/2006/wordml"
-      }
+    module Part
+      class Document < Base
+        include Toc
+        DOCUMENT_ATTR = {
+          'xmlns:ve' => "http://schemas.openxmlformats.org/markup-compatibility/2006",
+          'xmlns:o' => "urn:schemas-microsoft-com:office:office",
+          'xmlns:r' => "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+          'xmlns:m' => "http://schemas.openxmlformats.org/officeDocument/2006/math",
+          'xmlns:v' => "urn:schemas-microsoft-com:vml",
+          'xmlns:wp' => "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
+          'xmlns:w10' => "urn:schemas-microsoft-com:office:word",
+          'xmlns:w' => "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
+          'xmlns:wne' => "http://schemas.microsoft.com/office/word/2006/wordml"
+        }
 
-      def write
-        builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-          xml.send('w:document', DOCUMENT_ATTR) {
-            xml.send('w:body') {
-              section_write(xml)
+        def write
+          builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+            xml.send('w:document', DOCUMENT_ATTR) {
+              xml.send('w:body') {
+                section_write(xml)
+              }
             }
-          }
+          end
+          builder.to_xml
         end
-        builder.to_xml
-      end
 
-      def section_write(xml)
-        @object_blocks = []
-        sections_count = @rubyword.sections.count
-        current_section = 0
-        # write TOC
-        toc_block = write_toc(@rubyword, xml)
-        @object_blocks.push(toc_block) if toc_block
-        @rubyword.sections.each do |section|
-          current_section = current_section + 1
-          # 遍历输出各对象 object 信息
-          section.objects.each{|object| @object_blocks << object.write(section, xml)}
-          if current_section == sections_count
-            @object_blocks << Style::Section.new(section, xml, @rubyword).write
-          else
-            p_block = xml.send('w:p') {
-              xml.send('w:pPr') {
-                @object_blocks << Style::Section.new(section, xml, @rubyword).write
-              }
+        def section_write(xml)
+          @object_blocks = []
+          sections_count = @rubyword.sections.count
+          current_section = 0
+          # write TOC
+          write_toc(@rubyword, xml)
+          # To write all sections xml.
+          @rubyword.sections.each do |section|
+            current_section = current_section + 1
+            section.objects.each{|object| 
+              # text should save in block
+              object.write(section, xml)
             }
-            @object_blocks << p_block
+            # write in the last
+            if current_section == sections_count
+              Style::Section.new(section, xml, @rubyword).write
+            else
+              xml.send('w:p') {
+                xml.send('w:pPr') {
+                  Style::Section.new(section, xml, @rubyword).write
+                }
+              }
+            end
+          end
+
+          if @rubyword.sections.empty?
+            Style::Section.new(section, xml, @rubyword).write 
           end
         end
-        @object_blocks
-      end
-      
-    end # end of class
+        
+      end # end of class
+    end
   end
 end