wizport 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a392494ed5147a16f3aa27a6021ad3d4a87b4ea
-  data.tar.gz: 9a3260b7d685d2986ac23a1f9ca4b11e55d87327
+  metadata.gz: 53d1e0971467e04e81b02164399415c267f598a1
+  data.tar.gz: b2d5613b850cd95eb5910c240ee0121d0552bc71
 SHA512:
-  metadata.gz: 49784a2cf6cbfe0bd8458b8e43d0b7eb1c06de0c5954a2896ff9b3649a61d4899906d61f5378f29bc487eb7b91f36105caca4444cc859c91b03df0090ddc4a37
-  data.tar.gz: 9ba8ab47e1040c49d3fa3203c81aac565b9beef059b47565692be1044c6d49425ba73c75d281c6e6abdf990b7ef78c2658e8d47b8ed64aad9a408b9347a85467
+  metadata.gz: 4e9882bfc1ec31fc40e5b0cc70576ce9f1c66ceef49c434e8346a8d96fbff8ea2db8c56e7d4d14892fc0bc85190bf60d1b0ffd473396b8b1f8818a89861d85d9
+  data.tar.gz: bced81d48864da8009310f3965069b12fa7fd8427916203e51b4fe74e723c93b81d9f5b8997dea3b4659e1b25f4aa1e1e4de8e455b04a1cb748650cffc211909

data/lib/wizport/document/rtf/document.rb

@@ -8,11 +8,36 @@ module Wizport
   module Rtf
     class Document < Element
       def initialize(file = nil, &block)
-        @rtf = StringIO.new
+        super
         group do
           cmd :rtf, 1
           cmd :ansi
           cmd :ansicpg, 2052
+          cmd :deff, 0
+          group do
+            cmd :fonttbl
+            group do
+              delimit do
+                cmd :f, 0
+                cmd :fcharset, 0
+                write " Courier"
+              end
+            end
+          end
+          group do
+            cmd :colortbl
+            delimit
+            delimit do
+              cmd :red, 0
+              cmd :green, 0
+              cmd :blue, 0
+            end
+            delimit do
+              cmd :red, 255
+              cmd :green, 0
+              cmd :blue,0
+            end
+          end
           block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
         end
         save file if file
@@ -26,14 +51,20 @@ module Wizport
         Wizport::Rtf::Text.new(self, str, styles)
       end
 
+      #creates a new table.
       def table(rows = [],options = {}, &block)
         Wizport::Rtf::Table.new(self, rows, options, &block)
       end
 
+      def image
+
+      end
+
       def line_break
         cmd :par
       end
 
+      #writes a page interruption (new page)
       def page_break
         cmd :page
       end
@@ -53,13 +84,4 @@ module Wizport
 
     end
   end
-end
-
-if __FILE__ == $0
-  #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
-
+end

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

@@ -6,8 +6,8 @@
 module Wizport
   module Rtf
     class Element
-      def initialize(rtf)
-        @rtf = rtf
+      def initialize(rtf = nil)
+        @rtf = rtf || StringIO.new
       end
 
       def cmd(name, value = nil)
@@ -29,6 +29,11 @@ module Wizport
         yield if block_given?
         @rtf.write '}'
       end
+
+      def delimit
+        yield if block_given?
+        @rtf.write ';'
+      end
     end
   end
 end

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

@@ -20,6 +20,19 @@ module Wizport
 
       def add_row(cells = [])
         cmd :trowd
+        cmd :trbrdrt
+        cmd :brdrs
+        cmd :brdrw10
+        cmd :trbrdrl
+        cmd :brdrs
+        cmd :brdrw10
+        cmd :trbrdrb
+        cmd :brdrs
+        cmd :brdrw10
+        cmd :trbrdrr
+        cmd :brdrs
+        cmd :brdrw10
+
         cmd :trautofit1
         cmd :intbl
         @col_offset = 1
@@ -55,6 +68,20 @@ module Wizport
         end
 
         cmd :celld
+
+        cmd :clbrdrt
+        cmd :brdrs
+        cmd :brdrw10
+        cmd :clbrdrl
+        cmd :brdrs
+        cmd :brdrw10
+        cmd :clbrdrb
+        cmd :brdrs
+        cmd :brdrw10
+        cmd :clbrdrr
+        cmd :brdrs
+        cmd :brdrw10
+
         cmd :clvmgf if v_merge == :gf
         cmd :clvmrg if v_merge == :rg
         cmd :cellx, @right_width

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

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

@@ -12,7 +12,7 @@ describe Wizport::Html::Document do
      end
     end
 
-    p html.to_html
+    p html.to_doc
     html.save('c:\h.html')
 
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - songgz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple, extensible reporting system
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Wizport Abstract Interface. Creates text, html, pdf and rtf output, based