ruby-dita 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1513f432d5b1035ecd0a8e75a36b95f2ed4686
-  data.tar.gz: bb2d391e1c78bfdd228d88a579e75546dc4f0584
+  metadata.gz: 83ece111fe0ac7b5650bb2a3ca496ee8ac8a27a6
+  data.tar.gz: 4b1b28b1bc0dc917a426bb80ef951a3c390e627b
 SHA512:
-  metadata.gz: b9593df6c0a1ca54198c376413f7ab36d0562e808ea1ca8f50fcb60eeed43ad251c53d52ad32416502f8bcf18a3d98bf64b9adfb4666c84b88b1921d0c9eded0
-  data.tar.gz: 9f54b6c8a3d6528831343661b419abc268fbc797998ececfde64cae862f3c8f0f5ead45736283f99181e73115ec6a926b97564e2765e5547106fb5e2bfdf9714
+  metadata.gz: ce8b7933ddbfd7e051d65ed2de3a94086252c87347770172566cf60def113d6334cd89e78bfe26c4229ca3e59b3e563333d84fa2eb864a246d2c19cd80033b6b
+  data.tar.gz: 4580b04dba50973ee5c13d01f7987427ec59f21dee9cfda345ea9c2b3cca4179013cce874b683c4f64cc2b1df230b4501436e38814f61a28802e05acab11d6fe

data/lib/ruby-dita/table.rb

@@ -9,11 +9,11 @@ module Dita
   def row(ary)
     return ary if ary.all? do |a| a.respond_to?(:name) and a.name == 'row' end
     Element.new('row') <<
-        ary.collect do |entry|
-          if entry.is_a?(Element) and entry.name == 'entry'
-            entry
+        ary.collect do |e|
+          if e.is_a?(Element) and e.name == 'entry'
+            e
           else
-            Element.new('entry') << entry
+            entry e
           end
         end
   end
@@ -25,16 +25,21 @@ module Dita
     t = Element.new('table')
     headings = []
     tgroup = Element.new('tgroup')
+    num_cols = column_info.size.to_s
     case column_info
       when Array
         headings = column_info if column_info.first.is_a?(String)
-        tgroup << column_info if column_info.first.is_a?(Element)
+        colspecs = column_info if column_info.first.is_a?(Element) and column_info.first.name == 'colspec'
       when Hash
         headings = column_info.keys
-        tgroup << column_info.values
+        colspecs = column_info.values
       else
         # TODO raise error?
     end
+    if colspecs
+      colspecs.each_with_index do |c, index| c[:colname] = index.to_s end
+      tgroup << colspecs
+    end
     if headings.any?
       tgroup << Element.new('thead', [Element.new('row')])
       headings.each do |h|
@@ -42,9 +47,19 @@ module Dita
       end
     end
 
-    tgroup[:cols] = column_info.size.to_s
+    tgroup[:cols] = num_cols
     tgroup << Element.new('tbody')
     tgroup.tbody << rows.collect do |r| row r end
     t << tgroup
   end
-end # end of module Table
+
+  def colspec(attrs)
+    Element.new('colspec', attrs)
+  end
+
+  # @param content [String, Element] content of
+  def entry(content, attrs={})
+    Element.new('entry', attrs, [content])
+  end
+end # end of module Table
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dita
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Peter Kong