wiz_rtf 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59f873180f1945187a00d6270f8cf970040d2bbd
-  data.tar.gz: aee4737b8f3339ed9cebdb4f5adaad9e77de7dca
+  metadata.gz: 5bdfb9f57957a4df13b3a1868ebae1e08fffb311
+  data.tar.gz: b9c674c3b322a70f1cbeb4e9edf2bb2f8a8d1ffa
 SHA512:
-  metadata.gz: 4391c7456a972ada2a975514a10c4fe93ca86f39e34b405418e7c0c70db0c8d1b9f000a5a5b662bdd23cfde33783cae0c94895c7751430c593e4005148f38589
-  data.tar.gz: baaf60c8f954792771d4e46e3b95f15736a5cf725d46b29ca3efda65221d72866e4ef3e0c2b558121e4b9af92255ec19370f734a2b0e6e1c9f6daf4b78b5ceee
+  metadata.gz: 47a68b671a2a4b6d1ea99286bf0b2fdfbc5b10940739f0a6341ceaa84c0017219086044b82a929caf124874ce02e875c54aa68c23b0ef9aaf44c62aee475942c
+  data.tar.gz: 54ffa1244939ebce8a17ed3da0053a0e1162ae7ba7963965433b97273b7a3567d2e1e797960b0b985c34a3b73f7c11b0980ae6b7102fe8b922a9055df3244042

data/lib/wiz_rtf/cell.rb

@@ -9,14 +9,14 @@ module WizRtf
     attr_accessor :colspan, :rowspan, :content, :v_merge, :right_width
 
     def initialize(cell)
-      unless cell.is_a?(Hash)
-        @colspan = 1
-        @rowspan = 1
-        @content = cell
-      else
+      if cell.is_a?(Hash)
         @colspan = cell[:colspan] || 1
         @rowspan = cell[:rowspan] || 1
         @content = cell[:content] || ''
+      else
+        @colspan = 1
+        @rowspan = 1
+        @content = cell
       end
     end
 
@@ -36,7 +36,14 @@ module WizRtf
       io.cmd :brdrw10
       io.cmd  v_merge if v_merge
       io.cmd :cellx, right_width
-      io.txt content
+      contents = [@content] unless @content.is_a?(Array)
+      contents.each do |c|
+        if c.respond_to?(:render)
+          c.render(io)
+        else
+          io.txt c
+        end
+      end
       io.cmd :cell
     end
 

data/lib/wiz_rtf/document.rb

@@ -15,6 +15,7 @@ module WizRtf
       font 2, 'fnil', '宋体', 2, 2
       color 0, 0, 0
       color 255, 0, 0
+      color 255, 0, 255
       block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
     end
 
@@ -46,7 +47,6 @@ module WizRtf
       @parts << WizRtf::Cmd.new(:par)
     end
 
-    #writes a page interruption (new page)
     def page_break
       @parts << WizRtf::Cmd.new(:page)
     end

data/lib/wiz_rtf/text.rb

@@ -6,19 +6,25 @@
 
 module WizRtf
   class Text
-    ALIGN_MAP = {left:'ql',center:'qc',right:'qr'}
-    FONT_MAP = {'font-size' => :fs}
+    TEXT_ALIGN_MAP = {left:'ql',center:'qc',right:'qr'}
 
     def initialize(str = '', styles = {})
       @str = str
-      @styles = {:align => :left,'font-size' => 24}.merge(styles)
+      @styles = {'text-align' => :left, 'font-size' => 24, 'font-bold' => false, 'font-italic' => false, 'font-underline' => false, 'foreground-color' => 1, 'background-color' => 0 }.merge(styles)
     end
 
     def render(io)
       io.group do
         io.cmd :pard
-        io.cmd ALIGN_MAP[@styles[:align]]
-        io.cmd FONT_MAP[@styles['font-size']]
+        io.cmd TEXT_ALIGN_MAP[@styles['text-align']]
+        io.cmd :fs, @styles['font-size']
+        io.cmd @styles['font-bold'] ? 'b' : 'b0'
+        io.cmd @styles['font-italic'] ? 'i' : 'i0'
+        io.cmd @styles['font-underline'] ? 'ul' : 'ulnone'
+        io.cmd :cf, @styles['foreground-color']
+        io.cmd :cb, @styles['background-color']
+        io.cmd :chcfpat, @styles['foreground-color']
+        io.cmd :chcbpat, @styles['background-color']
         io.txt @str
         io.cmd :par
       end

data/lib/wiz_rtf/version.rb

@@ -1,3 +1,3 @@
 module WizRtf
-  VERSION = "0.5.0"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiz_rtf
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - songgz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler