wizport 0.0.3 → 0.0.4

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 #gem 'rspec'
 gem 'bson_ext'
 gem 'mongoid'
+gem "prawn", :git => "git://github.com/sandal/prawn.git"
 

data/lib/wizport/builder/rtf.rb

@@ -8,7 +8,7 @@ module Wizport
     class Rtf
       def initialize(report)
         @rpt = report
-        @rtf = Wizport::Document::Rtf.new
+        @rtf = Wizport::Rtf::Document.new
       end
 
       def header

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

@@ -6,30 +6,29 @@
 module Wizport
   module Rtf
     class Cell
-      attr_accessor :col_span, :row_span
+      attr_accessor :colspan, :rowspan
 
       def initialize(data, row = nil)
         @row = row
         @index = @row.cells.size
-        @col_span = 1
-        @row_span = 1
-        @text = ""
+        @colspan = 1
+        @rowspan = 1
+        @content = data
+        #:content => "2x1", :colspan
         if data.is_a?(Hash)
-          @col_span = data[:col_span] if data[:col_span]
-          @row_span = data[:row_span] if data[:row_span]
-          @text = data[:text]
-        else
-          @text = data
+          @colspan = data[:colspan] if data[:colspan]
+          @rowspan = data[:rowspan] if data[:rowspan]
+          @content = data[:content]
         end
 
-        unless col_spanned?
+        #unless col_spanned?
           @row.table.elements << Command.new(:celld)
-          @row.table.elements << Command.new(:clvmgf) if @row_span > 1
+          @row.table.elements << Command.new(:clvmgf) if @rowspan > 1
           @row.table.elements << Command.new(:clvmrg) if row_spanned?
-          @row.table.elements << Command.new(:cellx, (@index+@col_span)*1000)
-          @row.table.elements << Plaintext.new(@text.to_s)
+          @row.table.elements << Command.new(:cellx, (col_spanned)*1000)
+          @row.table.elements << Plaintext.new(@content.to_s)
           @row.table.elements << Command.new(:cell)
-        end
+        #end
 
         #@row.cellx_command Command.new(:clvmgf) if @row_span > 1
         #@row.cellx_command Command.new(:clvmrg) if row_spanned?
@@ -39,17 +38,24 @@ module Wizport
       end
 
       def col_spanned?
-        @index.times do |c|
-          return true if @row.cells[c].col_span + c > @index
+        col_spanned >= (@index + 1) && colspan == 1
+      end
+
+      def col_spanned
+        cols = 0
+        (@index).times do |c|
+          cols +=  @row.cells[c].colspan
         end
-        return false
+        cols += colspan
       end
 
+
       def row_spanned?
-        @row.index.times do |r|
-          return true if @row.table.rows[r].cells[@index].row_span + r > @row.index
-        end
-        return false
+        @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
 
 

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

@@ -59,16 +59,6 @@ module Wizport
 end
 
 if __FILE__ == $0
-  require "../../visitor"
-  require "./element"
-  require "./plaintext"
-  require "./command"
-  require "./group"
-  require "./text"
-  require "./cell"
-  require "./row"
-  require "./table"
-  require "./rtf_builder"
 
   d = Wizport::Rtf::Document.new('c:/file.rtf') do
     text "我们", :align => :center, :size => 48

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

@@ -18,11 +18,45 @@ module Wizport
         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

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

@@ -0,0 +1,42 @@
+# 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 Html
+    class Document
+      def initialize(&block)
+        @html = StringIO.new
+        @html << "<div class='rpt'>"
+        block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+      end
+
+      def text(txt)
+        Wizport::Html::Text.new(self,txt)
+      end
+
+      def table(rows = [], &block)
+        Wizport::Html::Table.new(self, rows, &block)
+      end
+
+      def write(txt)
+        @html << txt
+      end
+
+      def to_html
+        @html << '</div>'
+        @html.string
+      end
+
+      def render
+
+      end
+
+      def save(file)
+        File.open(file, 'w') { |file| file.write(to_html) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Html
+    class Element
+      def initialize(html)
+        @html = html
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Html
+    class Table < Element
+      def initialize(html,rows = [],options = {},&block)
+        super html
+        @html.write '<table><tbody>'
+        rows.each do |row|
+          add_row row, :headed => options[:headed]
+        end
+        block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+        @html.write '</tbody></table>'
+      end
+
+      def add_row(columns,options = {})
+        tag_name = options[:headed] ? 'thread' : 'tr'
+        @html.write '<'
+        @html.write tag_name
+        @html.write '>'
+        columns.each do |column|
+          add_cell column
+        end
+        @html.write '</'
+        @html.write tag_name
+        @html.write '>'
+      end
+
+      def add_cell(column)
+        if column.is_a?(Hash)
+          colspan = column[:colspan]
+          rowspan = column[:rowspan]
+          column = column[:content]
+          @html.write '<td'
+          @html.write " colspan='#{colspan}'" if colspan
+          @html.write " rowspan='#{rowspan}'" if rowspan
+          @html.write '>'
+        else
+          @html.write '<td>'
+        end
+        @html.write column
+        @html.write '</td>'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Html
+    class Text < Element
+      def initialize(html,txt)
+        super html
+        @html.write '<p>'
+        @html.write txt
+        @html.write '</p>'
+      end
+
+
+    end
+  end
+end

data/lib/wizport/document/pdf/catalog.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Pdf
+    class Catalog < Element
+      def initialize(id, ver)
+        super(id, ver)
+        dict '/Type', '/Catalog'
+      end
+    end
+  end
+end

data/lib/wizport/document/pdf/document.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Pdf
+    class Document < Element
+      attr_reader :objs
+      def initialize
+        @objs = []
+        @objs << @catalog = Catalog.new(make_id, 0)
+        @objs << @pages = Pages.new(make_id, 0)
+        @catalog.dict '/Pages', @pages
+        @objs << @page = Page.new(make_id, 0)
+        @page.dict '/Parent', @pages
+      end
+
+      def make_id
+        @objs.size + 1
+      end
+
+      def to_pdf
+        builder = PdfBuilder.new
+        accept(builder)
+        builder.to_pdf
+      end
+
+      def save(file)
+        File.open(file, 'w') { |file| file.write(to_pdf) }
+      end
+
+    end
+  end
+end

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

@@ -6,9 +6,34 @@
 module Wizport
   module Pdf
     class Element
-      def initialize
-        @id = nil
-        @ver = nil
+      include Wizport::Visitable
+      attr_reader :id, :ver, :dicts
+      def initialize(id = nil,ver = 0, &block)
+        @id = id
+        @ver = ver
+        @dicts = {}
+        @streams = {}
+        block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+      end
+
+      def type
+
+      end
+
+      def parent
+
+      end
+
+      def dict(k, v)
+        @dicts[k] = v
+      end
+
+      def stream(k, v)
+        @streams[k] = v
+      end
+
+      def to_s
+        "#{id} #{ver} R"
       end
     end
   end

data/lib/wizport/document/pdf/page.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Pdf
+    class Page < Element
+      def initialize(id, ver)
+        super(id, ver)
+        dict '/Type', '/Page'
+      end
+    end
+  end
+end

data/lib/wizport/document/pdf/pages.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Pdf
+    class Pages < Element
+      def initialize(id, ver)
+        super(id,ver)
+        dict '/Type', '/Pages'
+      end
+    end
+  end
+end

data/lib/wizport/document/pdf/pdf_builder.rb

@@ -0,0 +1,63 @@
+# 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 Pdf
+    class PdfBuilder
+      include Wizport::Visitor
+
+      def initialize
+        @pdf = StringIO.new
+      end
+
+      visit Document do |obj|
+        xref = XRefTbl.new(obj.objs.size)
+        @pdf << "%PDF-1.4\n"
+        obj.objs.each do |o|
+          o.accept(self)
+          xref.add(@pdf.pos)
+        end
+        xref_pos = @pdf.pos
+        @pdf << xref.to_s
+        @pdf << "trailer <<\n"
+        @pdf << "/Size #{obj.objs.size}\n"
+        @pdf << "/Root #{obj.objs.first}\n"
+        @pdf << ">>\n"
+        @pdf << "startxref\n"
+        @pdf << "#{xref_pos}\n"
+        @pdf << "%%EOF\n"
+      end
+
+      visit Catalog do |obj|
+        @pdf << "#{obj.id} #{obj.ver} obj <<\n"
+        obj.dicts.each do |k, v|
+          @pdf << "#{k} #{v.to_s}\n"
+        end
+        @pdf << ">>endobj\n"
+      end
+
+      visit Pages do |obj|
+        @pdf << "#{obj.id} #{obj.ver} obj <<\n"
+        obj.dicts.each do |k, v|
+          @pdf << "#{k} #{v.to_s}\n"
+        end
+        @pdf << ">>endobj\n"
+      end
+
+      visit Page do |obj|
+        @pdf << "#{obj.id} #{obj.ver} obj <<\n"
+        obj.dicts.each do |k, v|
+          @pdf << "#{k} #{v.to_s}\n"
+        end
+        @pdf << ">>endobj\n"
+      end
+
+      def to_pdf
+        @pdf.string
+      end
+    end
+  end
+end

data/lib/wizport/document/pdf/x_ref_tbl.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Pdf
+    class XRefTbl
+      def initialize(count)
+        @tbl = StringIO.new
+        @tbl << "xref\n0 #{count}\n0000000000 65535 f \n";
+      end
+
+      def add(pos, ver = '00000', used = 'n')
+        @tbl.printf "%010d #{ver} #{used} \n", pos
+      end
+
+      def to_s
+        @tbl.string
+      end
+
+    end
+  end
+end

data/lib/wizport/document/pdf.rb

@@ -16,7 +16,8 @@ module Wizport
       end
 
       def table(rows,options={}, &block)
-        @pdf.table(rows,options.merge({:width => @pdf.bounds.width}), &block)
+        tbl = PdfTable.new(rows,&block)
+        @pdf.table(tbl.rows,options.merge({:width => @pdf.bounds.width}))
       end
 
       def make_table(rows)

data/lib/wizport/document/pdf_table.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+module Wizport
+  module Document
+    class PdfTable
+      attr_accessor :rows
+      def initialize(rows = nil,&block)
+        @rows = rows || []
+        block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+      end
+
+      def row(cells)
+        @rows << cells
+      end
+    end
+  end
+end
+

data/lib/wizport/document/rtf.rb

@@ -19,12 +19,11 @@ module Wizport
         r = rows.length
         c = rows.first && rows.first.length
         tbl = @rtf.table r, c
-        tbl[0][2] << "sss"
-        #rows.each_index do |row|
-        #  rows[row].each_index do |col|
-        #    tbl[row][col] << rows[row][col].to_s
-        #  end
-        #end
+        rows.each_index do |row|
+          rows[row].each_index do |col|
+            tbl[row][col] << rows[row][col].to_s
+          end
+        end
         tbl
       end
 

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/wizport.rb

@@ -2,8 +2,14 @@ require "prawn"
 
 require "wizport/version"
 
+require "wizport/document/pdf_table"
 require "wizport/document/pdf"
 
+require "wizport/document/html/element"
+require "wizport/document/html/text"
+require "wizport/document/html/table"
+require "wizport/document/html/document"
+
 require "wizport/visitor"
 require "wizport/document/rtf/element"
 require "wizport/document/rtf/plaintext"
@@ -13,9 +19,18 @@ require "wizport/document/rtf/text"
 require "wizport/document/rtf/cell"
 require "wizport/document/rtf/row"
 require "wizport/document/rtf/table"
-require "wizport/document/rtf/rtf_builder"
 require "wizport/document/rtf/document"
 require "wizport/document/rtf"
+require "wizport/document/rtf/rtf_builder"
+
+require "wizport/document/pdf/element"
+require "wizport/document/pdf/catalog"
+require "wizport/document/pdf/pages"
+require "wizport/document/pdf/page"
+require "wizport/document/pdf/document"
+require "wizport/document/pdf/x_ref_tbl"
+require "wizport/document/pdf/pdf_builder"
+
 
 require "wizport/builder/pdf"
 require "wizport/builder/rtf"

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require "../../../../spec/spec_helper"
+
+describe Wizport::Html::Document do
+
+  it "should do something" do
+    html = Wizport::Html::Document.new
+    html.text "报表"
+    html.table [[1,2,3]] do
+      add_row [4,{content:'ss',colspan:2}]
+    end
+
+    p html.to_html
+    html.save('c:\h.html')
+
+
+  end
+end

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

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+require "../../../../spec/spec_helper"
+
+describe Wizport::Pdf::Document do
+
+  it "a simple example of pdf" do
+    pdf = Wizport::Pdf::Document.new
+
+    pdf.save('c:\t.pdf')
+    pdf.to_pdf.each_line do |line|
+      p line
+    end
+  end
+
+  it "ss" do
+    str = StringIO.new
+    str << "hello"
+    p str.pos
+    printf("%010d", str.pos)
+  end
+end

data/spec/wizport/document/pdf_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+# Wizport: A gem for creating reports by specifying columns, groups, styles, etc.
+# Copyright 2012 by sgzhe@163.com
+
+require "../../../spec/spec_helper"
+
+describe "My behaviour" do
+
+  it "should do something" do
+
+    pdf = Wizport::Document::Pdf.new
+    pdf.text "hello sgz"
+    pdf.table([
+        ["A", {:content => "2x1", :colspan => 2}, "B"],
+        [{:content => "1x2", :rowspan => 2}, "C", "D", "E"],
+        [{:content => "2x2", :colspan => 2, :rowspan => 2}, "F"]
+      ]) do
+      row ["G", "H"]
+    end
+    pdf.save('c:/p.pdf')
+  end
+end

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

@@ -7,7 +7,10 @@ describe Wizport::Rtf::Document do
   it "a simple example of Rtf" do
       rtf = Wizport::Rtf::Document.new
       rtf.text "学生综合素质评价"
-      rtf.table [[1,1,1,"综合"],[1,1,1,2],[1,1,1,3]]
+      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.save('c:/r.rtf')
   end
 end

data/spec/wizport/document/rtf_spec.rb

@@ -8,7 +8,7 @@ require "../../../spec/spec_helper"
 describe Wizport::Rtf::Document do
 
   it "a simple example of Rtf" do
-    rtf = Wizport::Rtf::Document.new
+    rtf = Wizport::Document::Rtf.new
     rtf.text "hello sgz"
     rtf.table [[1,1,1,""],[1,1,1,2],[1,1,1,3]]
     rtf.save('c:/r.rtf')

data/wizport.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_runtime_dependency "prawn"
+  #s.add_runtime_dependency "prawn", :git => "git://github.com/sandal/prawn.git"
   s.add_runtime_dependency "rtf"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: prawn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rtf
   requirement: !ruby/object:Gem::Requirement
@@ -83,8 +67,19 @@ files:
 - lib/wizport/document/Rtf/spec.rb
 - lib/wizport/document/Rtf/table.rb
 - lib/wizport/document/Rtf/text.rb
+- lib/wizport/document/html/document.rb
+- lib/wizport/document/html/element.rb
+- lib/wizport/document/html/table.rb
+- lib/wizport/document/html/text.rb
 - lib/wizport/document/pdf.rb
+- lib/wizport/document/pdf/catalog.rb
+- lib/wizport/document/pdf/document.rb
 - lib/wizport/document/pdf/element.rb
+- lib/wizport/document/pdf/page.rb
+- lib/wizport/document/pdf/pages.rb
+- lib/wizport/document/pdf/pdf_builder.rb
+- lib/wizport/document/pdf/x_ref_tbl.rb
+- lib/wizport/document/pdf_table.rb
 - lib/wizport/document/rtf.rb
 - lib/wizport/document/txt.rb
 - lib/wizport/engine/active_source.rb
@@ -97,6 +92,9 @@ files:
 - lib/wizport/version.rb
 - lib/wizport/visitor.rb
 - spec/spec_helper.rb
+- spec/wizport/document/html/document_spec.rb
+- spec/wizport/document/pdf/document_spec.rb
+- spec/wizport/document/pdf_spec.rb
 - spec/wizport/document/rtf/document_spec.rb
 - spec/wizport/document/rtf/text_spec.rb
 - spec/wizport/document/rtf_spec.rb