ruby-dita 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8112cf72fa44fe758766f114e0803b07e1a09b3e
-  data.tar.gz: f7c6af95c20666ebb70cdebc5902393d8652760e
+  metadata.gz: 7f41ece3ad990f2f6fdf3b602d36ef3bac139cb1
+  data.tar.gz: 1c504ab70a19959676cab6fb51d87eca32abd123
 SHA512:
-  metadata.gz: 6659ca96b56a8ff7c2ce81ec82ab55d2fd3d17d6aae35dec48ca72a8fa59eaf1ea1cf923940fcd860bff2f9c6ec8e814b0c9829e31fc732be60c655f57bf031d
-  data.tar.gz: c3656c7632ec1731cd7cf229f84f117e6a735fc4d4f8a2eea629f0989caaab9fd05f3bbfe68731c1d7f42166559281ca4815d6ab2939e00cd781d4077629f132
+  metadata.gz: 6a0ff8cf76f4d57a3f27b5dcf2439a4bdbb04cbbe8f7f6ac619ef1dbd0ab9890ad9aa557a62b3461b0f96b4848996213c813f93e17edd64698ba9a8f67e58314
+  data.tar.gz: 70e259e5a7fbf820f6f6f215b2ff045ee66aa5925fa5d2ecd9b8cb443cf7418de908fedbb70222ec2a02122f28b1eb9ad1841d3c9562c87878bbe491bc2fb9b3

data/lib/ruby-dita/table.rb

@@ -1,49 +1,48 @@
 require 'duxml'
 
 module Dita
-  module Table
-    include Duxml
-    # @param column_info [Array, Hash] if Array of Strings, column headings; if Array of Elements, colspecs; if Hash, keys are strings for column headings; values are <colspec> elements
-    # @param rows [Array] array of rows with which to populate table; can either be XML <row> elements or Strings representing values
-    # @return [Element] valid Dita <table>
-    def table(column_info, rows=[])
-      t = Element.new('table')
-      headings = []
-      case column_info
-        when Array
-          headings = column_info if column_info.first.is_a?(String)
-          t << column_info if column_info.first.is_a?(Element)
-        when Hash
-          headings = column_info.keys
-          t << column_info.values
-        else
-          # TODO raise error?
-      end
-      tgroup = Element.new('tgroup')
-      if headings.any?
-        tgroup << Element.new('thead', [Element.new('row')])
-        headings.each do |h|
-          tgroup.thead.row << Element.new('entry', [h])
-        end
+  include Duxml
+  # @param column_info [Array, Hash] if Array of Strings, column headings; if Array of Elements, colspecs; if Hash, keys are strings for column headings; values are <colspec> elements
+  # @param rows [Array] array of rows with which to populate table; can either be XML <row> elements or Strings representing values
+  # @return [Element] valid Dita <table>
+  def self.table(column_info, rows=[])
+    t = Element.new('table')
+    headings = []
+    case column_info
+      when Array
+        headings = column_info if column_info.first.is_a?(String)
+        t << column_info if column_info.first.is_a?(Element)
+      when Hash
+        headings = column_info.keys
+        t << column_info.values
+      else
+        # TODO raise error?
+    end
+    tgroup = Element.new('tgroup')
+    if headings.any?
+      tgroup << Element.new('thead', [Element.new('row')])
+      headings.each do |h|
+        tgroup.thead.row << Element.new('entry', [h])
       end
-
-      tgroup[:cols] = column_info.size.to_s
-      tgroup << Element.new('tbody')
-      tgroup.tbody << rows.collect do |r| row r end
-      t << tgroup
     end
 
-    # @param ary [Array] array of row entries or entry values
-    # @return [Element] correctly formatted row
-    def row(ary)
-      Element.new('row') <<
-          ary.collect do |entry|
-            if entry.is_a?(Element) and entry.name == 'entry'
-              entry
-            else
-              Element.new('entry') << entry
-            end
+    tgroup[:cols] = column_info.size.to_s
+    tgroup << Element.new('tbody')
+    tgroup.tbody << rows.collect do |r| row r end
+    t << tgroup
+  end
+
+  # @param ary [Array] array of row entries or entry values
+  # @return [Element] correctly formatted row
+  def self.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
+          else
+            Element.new('entry') << entry
           end
-    end
-  end # end of module Table
-end # end of module Dita
+        end
+  end
+end # end of module Table

data/lib/ruby-dita/topic.rb

@@ -1,17 +1,15 @@
 require 'duxml'
 
 module Dita
-  module Topic
+  include Duxml
 
-    include Duxml
-
-    # @param title [String, Element] string or XML rich-text
-    # @param id [String] optional document-unique, XML-valid id string
-    # @return [Element] valid Dita <topic>
-    def topic(title, id=nil)
-      t = Element.new('topic')
-      t[:id] = id || "topic#{t.object_id.to_s}"
-      t << Element.new('title', [title])
-    end
+  # @param title [String, Element] string or XML rich-text
+  # @param content [Array] optional topic body content in array form
+  # @return [Element] valid Dita <topic>
+  def self.topic(title, content=nil)
+    t = Element.new('topic')
+    t[:id] = "topic#{t.object_id.to_s}"
+    t << Element.new('title', [title])
+    t << Element.new('body', content) if content
   end
 end

data/lib/ruby-dita.rb

@@ -4,9 +4,6 @@ require_relative 'ruby-dita/topic'
 require_relative 'ruby-dita/table'
 
 module Dita
-  include Topic
-  include Table
-
   GRAMMAR_PATH = File.expand_path(File.dirname(__FILE__) + '/../xml/dita_grammar.xml')
   include Duxml
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dita
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Peter Kong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: duxml