wizport 0.1.1 → 0.1.2

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

@@ -30,6 +30,14 @@ module Wizport
         Wizport::Rtf::Table.new(self, rows, options, &block)
       end
 
+      def line_break
+        cmd :par
+      end
+
+      def page_break
+        cmd :page
+      end
+
 
       def to_s
 

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

@@ -6,11 +6,12 @@
 module Wizport
   module Rtf
     class Table < Element
+      DEFAULT_COLUMN_WIDTH = 40
 
       def initialize(rtf, rows = [], options = {}, &block)
         super(rtf)
         @row_spans = {}
-        @column_widths = options[:column_widths] || 800
+        @column_widths = options[:column_widths] || DEFAULT_COLUMN_WIDTH
         rows.each_index do |index|
           add_row rows[index]
         end
@@ -24,15 +25,12 @@ module Wizport
         @col_offset = 1
         @right_width = 0
         cells.each do |cell|
-
           add_cell cell
-
         end
         cmd :row
       end
 
       def add_cell(cell,merge = false)
-        p row_spanned?(@col_offset)
         add_cell "",true if !merge && row_spanned?(@col_offset)
         if cell.is_a?(Hash)
           rowspan = cell[:rowspan]
@@ -43,23 +41,22 @@ module Wizport
         colspan = colspan || 1
         rowspan = rowspan || 1
         content = content || cell
-        p @row_spans
-        cmd :celld
+
         if rowspan > 1
-          cmd :clvmgf
+          v_merge = :gf
         elsif row_spanned? @col_offset
-          cmd :clvmrg
+          v_merge = :rg
           @row_spans[@col_offset][:rowspan] -= 1
-          #if @row_spans[@col_offset][:rowspan] < 2
-          #    @row_spans[@col_offset].delete(:rowspan)
-          #end
           colspan = @row_spans[@col_offset][:colspan] || colspan
         end
-        p @row_spans
         colspan.times do
           @right_width += column_width(@col_offset)
           @col_offset += 1
         end
+
+        cmd :celld
+        cmd :clvmgf if v_merge == :gf
+        cmd :clvmrg if v_merge == :rg
         cmd :cellx, @right_width
         txt content
         cmd :cell
@@ -71,13 +68,9 @@ module Wizport
         @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 column_width(offset)
-        return @column_widths[offset] || 800 if @column_widths.is_a?(Hash)
-        @column_widths
+        return 20 * (@column_widths[offset] || DEFAULT_COLUMN_WIDTH) if @column_widths.is_a?(Hash)
+        @column_widths * 20
       end
 
     end

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

@@ -6,15 +6,16 @@
 module Wizport
   module Rtf
     class Text < Element
-      ALIGN_MAP = {left:'ql',center:'qc'}
+      ALIGN_MAP = {left:'ql',center:'qc',right:'qr'}
+      FONT_MAP = {'font-size' => :fs}
 
       def initialize(rtf, str = '', styles = {})
         super(rtf)
-        styles = {:align => :left,:size => 24}.merge(styles)
+        styles = {:align => :left,'font-size' => 24}.merge(styles)
         group do
-          cmd :part
+          cmd :pard
           cmd ALIGN_MAP[styles[:align]]
-          cmd :fs,styles[:size]
+          cmd FONT_MAP[styles['font-size']]
           txt str
           cmd :par
         end

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

@@ -6,8 +6,10 @@
 module Wizport
   module Html
     class Table < Element
+      DEFAULT_COLUMN_WIDTH = 40
       def initialize(html, rows = [], options = {}, &block)
         super html
+        @column_widths = options[:column_widths]
         #{style:'border:1px solid red;'}
         tag 'table' do
           tag 'tbody' do

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

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

@@ -6,21 +6,23 @@ describe Wizport::Rtf::Document do
 
   it "a simple example of Rtf" do
       rtf = Wizport::Rtf::Document.new do
-        text "学生综合素质评价"
-        #table [[{content:'4',rowspan:4},1,{content:'1',colspan:2}],
-        #       [{content:'4',rowspan:3,colspan:2},8],
-        #       [11]],column_widths:1000 do
-        #  add_row [1]
-        #end
+        text "学生综合素质评价", :align => :center, 'font-size' => 48
+        page_break
+        text "ss"
+        table [[{content:'e',rowspan:4},{content:'4',rowspan:4},1,{content:'1',colspan:2}],
+               [{content:'4',rowspan:3,colspan:2},8],
+               [11]],column_widths:{1=>100,2 => 100,3 => 50,4 => 50,5 => 50} do
+          add_row [1]
+        end
 
         #table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
         #      ["民族", {content: "{Core}", colspan: 2}, "入队(团)时间", {content: '', colspan: 5}],
         #      ["家庭住址", {content: "person", colspan: 8}]]
 
 
-        table [["入学身高", "", "体重", "", "视力", "左", "", "右", "", "血型", ""],
-              [{content:"简历", rowspan: 3}, {content:"日期", colspan: 2}, {content: "升(入)学前所在学校", colspan: 6}, {content: "担任何职务", colspan: 2}],
-              [{content:"", colspan: 2}, {content:"", colspan: 6}, {content:"", colspan: 2}]]
+        #table [["入学身高", "", "体重", "", "视力", "左", "", "右", "", "血型", ""],
+        #      [{content:"简历", rowspan: 3}, {content:"日期", colspan: 2}, {content: "升(入)学前所在学校", colspan: 6}, {content: "担任何职务", colspan: 2}],
+        #      [{content:"", colspan: 2}, {content:"", colspan: 6}, {content:"", colspan: 2}]]
       end
 
       rtf.save('c:/r.rtf')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec