wizport 0.0.4 → 0.0.5

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

@@ -6,19 +6,13 @@
 require "stringio"
 module Wizport
   module Html
-    class Document
+    class Document < Element
       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)
+        #,:style => "border:1px solid red;width:96%"
+        tag 'div', :class => 'rpt' do
+          block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+        end
       end
 
       def write(txt)
@@ -26,17 +20,23 @@ module Wizport
       end
 
       def to_html
-        @html << '</div>'
         @html.string
       end
 
-      def render
+      def save(file)
+        File.open(file, 'w') { |file| file.write(to_html) }
+      end
+
+      private
 
+      def text(txt,options)
+        Wizport::Html::Text.new(self,txt,options)
       end
 
-      def save(file)
-        File.open(file, 'w') { |file| file.write(to_html) }
+      def table(rows = [], &block)
+        Wizport::Html::Table.new(self, rows, &block)
       end
+
     end
   end
 end

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

@@ -9,6 +9,33 @@ module Wizport
       def initialize(html)
         @html = html
       end
+
+      def tag(name, *args) #text = nil, options = {})
+        text = nil
+        options = {}
+        case args.size
+          when 1
+            if args.first.is_a?(Hash)
+              options = args.first
+            else
+              text = args.first
+            end
+          when 2
+            text = args.first
+            options = args.last
+        end
+        @html.write '<'
+        @html.write name
+        options.each do |k, v|
+          @html.write " #{k}='#{v}'"
+        end
+        @html.write '>'
+        @html.write text if text
+        yield if block_given?
+        @html.write '</'
+        @html.write name
+        @html.write '>'
+      end
     end
   end
 end

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

@@ -6,43 +6,37 @@
 module Wizport
   module Html
     class Table < Element
-      def initialize(html,rows = [],options = {},&block)
+      def initialize(html, rows = [], options = {}, &block)
         super html
-        @html.write '<table><tbody>'
-        rows.each do |row|
-          add_row row, :headed => options[:headed]
+        #{style:'border:1px solid red;'}
+        tag 'table' do
+          tag 'tbody' do
+            rows.each do |row|
+              add_row row, :headed => options[:headed]
+            end
+            block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
+          end
         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
+      private
+
+      def add_row(columns, options = {})
+        name = options[:headed] ? 'thread' : 'tr'
+        tag name do
+          columns.each do |column|
+            add_cell column
+          end
         end
-        @html.write '</'
-        @html.write tag_name
-        @html.write '>'
       end
 
       def add_cell(column)
+        content = 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 '>'
+          tag 'td', column.delete(:content), column #.merge({style:'border:1px solid red;'})
         else
-          @html.write '<td>'
+          tag 'td', content #, {style:'border:1px solid red;'}
         end
-        @html.write column
-        @html.write '</td>'
       end
     end
   end

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

@@ -6,14 +6,11 @@
 module Wizport
   module Html
     class Text < Element
-      def initialize(html,txt)
+      #options = {color:red, 'font-size':24, 'text-align' = left }
+      def initialize(html,txt,options = {})
         super html
-        @html.write '<p>'
-        @html.write txt
-        @html.write '</p>'
+        tag 'p', txt, {:style => options.collect {|k, v| "#{k}:#{v}"}.join(';')}.delete_if {|k,v| v == nil || v == ''}
       end
-
-
     end
   end
 end

data/lib/wizport/version.rb

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

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

@@ -5,10 +5,11 @@ 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
+    html = Wizport::Html::Document.new do
+     text "报表",'text-align' => :center
+     table [[1,2,3]] do
       add_row [4,{content:'ss',colspan:2}]
+     end
     end
 
     p html.to_html

metadata

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