wizport 0.0.5 → 0.0.6

data/lib/wizport/document/Rtf/document.rb

@@ -3,51 +3,40 @@
 # Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
 # Copyright 2012 by sgzhe@163.com
 
-
-
+require "stringio"
 module Wizport
   module Rtf
-    class Document < Group
+    class Document < Element
       def initialize(file = nil, &block)
-        super()
-        elements << Command.new(:rtf, 1)
-        elements << Command.new(:ansi)
-        elements << Command.new(:ansicpg, 2052)
-        block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+        @rtf = StringIO.new
+        group do
+          cmd :rtf, 1
+          cmd :ansi
+          cmd :ansicpg, 2052
+          block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+        end
         save file if file
       end
 
-      #styles = {align,font,font_size,color }
-      def text(txt, styles = {:align => :left})
-        elements << Text.new(txt,styles)
-      end
-
-      def table(rows = [],&block)
-        elements << Table.new(rows, &block)
+      def write(txt)
+        @rtf << txt
       end
 
-      def colors(colours = ['ffffff'])
-
-
+      def text(str, styles = {:align => :left})
+        Wizport::Rtf::Text.new(self, str, styles)
       end
 
-      def style(txt, styles)
-
+      def table(rows = [], &block)
+        Wizport::Rtf::Table.new(self, rows, &block)
       end
 
 
-      def method_missing(id, *args, &block)
-        cmd id, *args, &block
-      end
-
       def to_s
 
       end
 
       def to_rtf
-        builder = RtfBuilder.new
-        accept(builder)
-        builder.to_rtf
+        @rtf.string
       end
 
       def save(file)
@@ -59,18 +48,10 @@ module Wizport
 end
 
 if __FILE__ == $0
-
-  d = Wizport::Rtf::Document.new('c:/file.rtf') do
-    text "我们", :align => :center, :size => 48
-    text "春风不度玉门关", :align => :left, :font => 24
-    table [[{text:'eee',row_span:2},'s',{text:'ww',col_span:2},'d'],[nil,'s','d','d']]  do
-      row ['f','s','d','d']
-    end
-
-  end
-
-  #p d.to_rtf
-
-
+  #rtf = Wizport::Rtf::Document.new do
+  #  text "学生综合素质评价"
+  #  table [[1, {content :'1', colspan: 2}], [3, {content :'4', rowspan: 2, colspan: 2}], [1]]
+  #end
+  #rtf.save('c:/r.rtf')
 end
 

data/lib/wizport/document/Rtf/element.rb

@@ -6,7 +6,29 @@
 module Wizport
   module Rtf
     class Element
-      include Wizport::Visitable
+      def initialize(rtf)
+        @rtf = rtf
+      end
+
+      def cmd(name, value = nil)
+        @rtf.write '\\'
+        @rtf.write name
+        @rtf.write value if value
+      end
+
+      def txt(str)
+        str = str.to_s
+        str = str.gsub("{", "\\{").gsub("}", "\\}").gsub("\\", "\\\\")
+        str = str.encode("UTF-16LE", :undef=>:replace).each_codepoint.map {|n| n < 128 ? n.chr : "\\u#{n}\\'3f"}.join('')
+        @rtf.write ' '
+        @rtf.write str
+      end
+
+      def group
+        @rtf.write '{'
+        yield if block_given?
+        @rtf.write '}'
+      end
     end
   end
 end

data/lib/wizport/document/Rtf/table.rb

@@ -5,33 +5,71 @@
 
 module Wizport
   module Rtf
-    class Table < Group
-      attr_accessor :rows, :cells
-
-      #options = {header:[],widths:[]}
-      def initialize(rows = [],options = {}, &block)
-        super()
-        @rows = []
-        #@cells = {}
-        rows.each do |cells|
-          row cells
+    class Table < Element
+
+      def initialize(rtf, rows = [], options = {}, &block)
+        super(rtf)
+        @row_spans = {}
+        rows.each_index do |index|
+          add_row rows[index]
         end
         block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
       end
 
-      def row(cells = [], &block)
-        r = Row.new(cells,self, &block)
-        @rows << r
+      def add_row(cells = [])
+        cmd :trowd
+        cmd :trautofit1
+        cmd :intbl
+        @col_offset = 1
+        cells.each do |cell|
+          if row_spanned? @col_offset
+            add_cell ""
+            add_cell cell
+          elsif row_spanned? @col_offset + 1
+            add_cell cell
+            add_cell ""
+          else
+            add_cell cell
+          end
+        end
+        cmd :row
+      end
+
+      def add_cell(cell)
+        if cell.is_a?(Hash)
+          rowspan = cell[:rowspan]
+          colspan = cell[:colspan]
+          content = cell[:content]
+          @row_spans[@col_offset] = cell if cell[:rowspan]
+        end
+        colspan = colspan || 1
+        rowspan = rowspan || 1
+        content = content || cell
+
+        cmd :celld
+        if rowspan > 1
+          cmd :clvmgf
+          @col_offset += colspan
+        elsif row_spanned? @col_offset
+          cmd :clvmrg
+          @row_spans[@col_offset][:rowspan] -= 1
+          @col_offset += row_spans_with_colspan
+        else
+          @col_offset += colspan
+        end
+        cmd :cellx, (@col_offset - 1)* 2000
+        txt content
+        cmd :cell
+      end
+
+      def row_spanned?(offset)
+        @row_spans[offset] && @row_spans[offset][:rowspan].to_i > 1
+      end
 
+      def row_spans_with_colspan
+        return @row_spans[@col_offset][:colspan] || 1
       end
 
-      #def [](r,c)
-      #  @cells["#{r},#{c}"]
-      #end
-      #
-      #def [](r,c,v)
-      #  @cells["#{r},#{c}"] = v
-      #end
     end
   end
 end

data/lib/wizport/document/Rtf/text.rb

@@ -5,35 +5,20 @@
 
 module Wizport
   module Rtf
-    class Text < Group
+    class Text < Element
       ALIGN_MAP = {left:'ql',center:'qc'}
 
-      def initialize(txt = '', styles = {})
-        super()
+      def initialize(rtf, str = '', styles = {})
+        super(rtf)
         styles = {:align => :left,:size => 24}.merge(styles)
-        elements << Command.new(:pard)
-        elements << @align = Command.new(ALIGN_MAP[styles[:align]])
-        elements << @size = Command.new(:fs,styles[:size])
-        elements << @txt = Plaintext.new(txt)
-        elements << Command.new(:par)
+        group do
+          cmd :part
+          cmd ALIGN_MAP[styles[:align]]
+          cmd :fs,styles[:size]
+          txt str
+          cmd :par
+        end
       end
-
-      def size=(value)
-        @size.value = value
-      end
-
-      def size
-        @size.value
-      end
-
-      def align=(value)
-        @align.name = ALIGN_MAP[styles[value]]
-      end
-
-      def align
-        ALIGN_MAP.invert[@align.name]
-      end
-
     end
   end
 end

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/wizport/document/rtf/document_spec.rb

@@ -5,12 +5,14 @@ require "../../../../spec/spec_helper"
 describe Wizport::Rtf::Document do
 
   it "a simple example of Rtf" do
-      rtf = Wizport::Rtf::Document.new
-      rtf.text "学生综合素质评价"
-      rtf.table [[{content:'s',rowspan:3},{content:'s',colspan:2},{content:'s',colspan:2},{content:'s',rowspan:2},"ss"],
-                 [1,2,3,4,11,6],
-                 [1,2,3,4,11,6],
-                 [0,1,2,3,4,11,6]]
+      rtf = Wizport::Rtf::Document.new do
+        text "学生综合素质评价"
+        table [[1,{content:'1',colspan:2}],[3,{content:'4',rowspan:2,colspan:2}],[11]] do
+          add_row [1,1,1]
+        end
+      end
+
       rtf.save('c:/r.rtf')
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,14 +56,8 @@ files:
 - lib/wizport.rb
 - lib/wizport/builder/pdf.rb
 - lib/wizport/builder/rtf.rb
-- lib/wizport/document/Rtf/cell.rb
-- lib/wizport/document/Rtf/command.rb
 - lib/wizport/document/Rtf/document.rb
 - lib/wizport/document/Rtf/element.rb
-- lib/wizport/document/Rtf/group.rb
-- lib/wizport/document/Rtf/plaintext.rb
-- lib/wizport/document/Rtf/row.rb
-- lib/wizport/document/Rtf/rtf_builder.rb
 - lib/wizport/document/Rtf/spec.rb
 - lib/wizport/document/Rtf/table.rb
 - lib/wizport/document/Rtf/text.rb

data/lib/wizport/document/Rtf/cell.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-
-# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
-# Copyright 2012 by sgzhe@163.com
-
-module Wizport
-  module Rtf
-    class Cell
-      attr_accessor :colspan, :rowspan
-
-      def initialize(data, row = nil)
-        @row = row
-        @index = @row.cells.size
-        @colspan = 1
-        @rowspan = 1
-        @content = data
-        #:content => "2x1", :colspan
-        if data.is_a?(Hash)
-          @colspan = data[:colspan] if data[:colspan]
-          @rowspan = data[:rowspan] if data[:rowspan]
-          @content = data[:content]
-        end
-
-        #unless col_spanned?
-          @row.table.elements << Command.new(:celld)
-          @row.table.elements << Command.new(:clvmgf) if @rowspan > 1
-          @row.table.elements << Command.new(:clvmrg) if row_spanned?
-          @row.table.elements << Command.new(:cellx, (col_spanned)*1000)
-          @row.table.elements << Plaintext.new(@content.to_s)
-          @row.table.elements << Command.new(:cell)
-        #end
-
-        #@row.cellx_command Command.new(:clvmgf) if @row_span > 1
-        #@row.cellx_command Command.new(:clvmrg) if row_spanned?
-        #@row.cellx_command Command.new(:cellx, (@index+@col_span)*1000)
-        #@row.cellt_command Plaintext.new(@text)
-        #@row.cellt_command Command.new(:cell)
-      end
-
-      def col_spanned?
-        col_spanned >= (@index + 1) && colspan == 1
-      end
-
-      def col_spanned
-        cols = 0
-        (@index).times do |c|
-          cols +=  @row.cells[c].colspan
-        end
-        cols += colspan
-      end
-
-
-      def row_spanned?
-        @row.row_spanned?(col_spanned - colspan)
-        #@row.index.times do |r|
-        #  return true if  @row.table.rows[r].cells[@index] && @row.table.rows[r].cells[@index].rowspan + r > @row.index
-        #end
-        #return false
-      end
-
-
-    end
-  end
-end

data/lib/wizport/document/Rtf/command.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
-# Copyright 2012 by sgzhe@163.com
-
-module Wizport
-  module Rtf
-    class Command < Element
-      attr_accessor :name,:value
-
-      def initialize(name,value = nil)
-        @name = name
-        @value = value
-      end
-
-      def ctrl
-        @name.to_s + @value.to_s
-      end
-
-    end
-  end
-end

data/lib/wizport/document/Rtf/group.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-
-# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
-# Copyright 2012 by sgzhe@163.com
-
-
-module Wizport
-  module Rtf
-    class Group < Element
-      attr_accessor :elements
-      def initialize()
-        @elements = []
-      end
-
-    end
-  end
-end

data/lib/wizport/document/Rtf/plaintext.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
-# Copyright 2012 by sgzhe@163.com
-
-module Wizport
-  module Rtf
-    class Plaintext < Element
-      attr_accessor :txt
-
-      def initialize(txt)
-        txt = txt.gsub("{", "\\{").gsub("}", "\\}").gsub("\\", "\\\\")
-        txt = txt.encode("UTF-16LE", :undef=>:replace).each_codepoint.map {|n| n < 128 ? n.chr : "\\u#{n}\\'3f"}.join('')
-        @txt = txt
-      end
-
-    end
-  end
-end

data/lib/wizport/document/Rtf/row.rb

@@ -1,74 +0,0 @@
-# encoding: utf-8
-
-# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
-# Copyright 2012 by sgzhe@163.com
-
-module Wizport
-  module Rtf
-    class Row
-      attr_accessor :table, :cells, :index
-      def initialize(columns,tbl = nil)
-        @table = tbl
-        @cells = []
-        @index = @table.rows.size
-
-        @table.elements << Command.new(:trowd)
-        @table.elements << Command.new(:trautofit1)
-        @table.elements << Command.new(:intbl)
-        columns.each_index do |i|
-          @cellx_index = nil
-          @cellt_index = nil
-          temp = 0
-          if columns[i].is_a?(Hash)
-            temp += columns[i][:colspan].to_i
-          else
-            temp += 1
-          end
-
-          if row_spanned?(temp)
-            @cells << Cell.new("",self)
-          end
-          @cells << Cell.new(columns[i],self)
-          #if columns[i].is_a?(Hash)
-          #  if columns[i][:colspan] && columns[i][:colspan] > 1
-          #    (columns[i][:colspan]-1).times do
-          #      @cells << Cell.new("",self)
-          #    end
-          #  end
-          #end
-        end
-        @table.elements << Command.new(:row)
-      end
-
-      def row_spanned?(c_i)
-        rs = 0
-
-        (@index).times do |r|
-          t = 0
-          @table.rows[r].cells.each do |c|
-            t += c.colspan
-            if t == c_i + 1
-              rs += c.rowspan
-            end
-          end
-
-          #rs += @table.rows[r].cells[c_i].rowspan if @table.rows[r].cells[c_i] && @table.rows[r].cells[c_i].rowspan > 1
-        end
-        rs >= (@index + 1)
-      end
-
-      def cellx_command(cmd)
-        @cellx_index = @cellx_index || @table.elements.size
-        @table.elements.insert @cellx_index, cmd
-        @cellx_index += 1
-      end
-
-      def cellt_command(cmd)
-        @cellt_index = @cellt_index || @table.elements.size
-        @table.elements.insert @cellt_index, cmd
-        @cellt_index += 1
-      end
-
-    end
-  end
-end

data/lib/wizport/document/Rtf/rtf_builder.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
-# Copyright 2012 by sgzhe@163.com
-
-require "stringio"
-module Wizport
-  module Rtf
-    class RtfBuilder
-      include Wizport::Visitor
-
-      def initialize
-        @rtf = StringIO.new
-      end
-
-      visit Group do |element|
-        @rtf << '{'
-        element.elements.each do |el|
-          el.accept(self)
-        end if element.is_a?(Wizport::Rtf::Group)
-        @rtf << '}'
-      end
-
-      visit Command do |element|
-        @rtf << '\\'
-        @rtf << element.ctrl
-      end
-
-      visit Plaintext do |element|
-        @rtf << ' '
-        @rtf << element.txt
-      end
-
-      def to_rtf
-        @rtf.string
-      end
-
-    end
-  end
-end