htot_conv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d55ad5f2d58f0e79c06559e63d2a8916b34aa31
-  data.tar.gz: c08cb89b3d16f61f9a529fd78eb69d4eda2979ae
+  metadata.gz: 5d5f671f2c6eb3e7bc5c8ba10c10b7dfba0417a3
+  data.tar.gz: 051cd8132c24bb1e640171f747a25342f8b59d45
 SHA512:
-  metadata.gz: 3437bfd4648e1b5422a84ac848fd7271bb1b2f71b6a98080864af56e1dc4800a749cce2f30e1327c456ad1f802a855e27f16083d9e0a56215b5ae26e13ca8b3c
-  data.tar.gz: 1147a7ad351c344f6b1e53cdb5e5330ae23a24ffe5e6b8b94f1e2eb718c4bf5c6481ba739920f17f2a78edefad6bd84de0bbf1a593bf0f56b2d291da2db2ed9f
+  metadata.gz: 3b658635745828831f4fdb86a97e14eb3aaddca9a8fe606ad8ea3ce366f743de8e100350dc82e278fa3832d2464585dff1ffddc41c0ebb60984b3db8543ad6e9
+  data.tar.gz: 4521c421e386868aee477c20a6f7a33a78d225304be6e8f894560963f2862d9fde61f8c3cd915555f5c7964b7888b68f9c38dde662c91143e5771d2c2b8b6837

data/lib/htot_conv/generator/xlsx_type4.rb

@@ -30,10 +30,9 @@ module HTOTConv
             item = node.item
 
             key_cell = Array.new(max_level, nil)
-            key_cell[node.item.level - 1] = item.key
-            node.ancestors.each do |ancestor|
-              key_cell[ancestor.item.level - 1] = ancestor.item.key if ancestor.item
-              break if ancestor.prev
+            [node].concat(node.ancestors.to_a).each do |c_node|
+              key_cell[c_node.item.level - 1] = c_node.item.key if c_node.item
+              break if c_node.prev
             end
 
             value_cell = HTOTConv::Util.pad_array(item.value, max_value_length)
@@ -41,14 +40,15 @@ module HTOTConv
             ws.add_row(key_cell.concat(value_cell),
                        :style => Axlsx::STYLE_THIN_BORDER)
 
-            [node].concat(node.ancestors.to_a).each do |ancestor|
-              if (ancestor.parent && ancestor.parent.item && ancestor.parent.item.level)
+            node.ancestors.each_with_object([node]) do |c_node, descendants|
+              if (c_node.item && c_node.item.level)
                 edges = [:left, :right]
-                edges << :top unless ancestor.prev
-                edges << :bottom unless ancestor.next
-                ws.rows.last.cells[ancestor.parent.item.level - 1].style = ws.styles.add_style(
+                edges << :top unless (descendants.any? { |v| v.prev })
+                edges << :bottom unless (descendants.any? { |v| v.next })
+                ws.rows.last.cells[c_node.item.level - 1].style = ws.styles.add_style(
                   :border => { :style => :thin, :color => "00", :edges => edges })
               end
+              descendants.unshift(c_node)
             end
             (item.level..max_level).each do |level|
               edges = [:top, :bottom]
@@ -64,17 +64,17 @@ module HTOTConv
               end
             end
 
-            node.ancestors.inject(node) do |c_node, a_node|
-              rowspan_cells[a_node.item.level - 1] << ws.rows.last.cells[a_node.item.level - 1]
-              unless c_node.next # if c_node is last?
+            node.ancestors.each_with_object([node]) do |c_node, descendants|
+              rowspan_cells[c_node.item.level - 1] << ws.rows.last.cells[c_node.item.level - 1]
+              unless (descendants.any? { |v| v.next })
                 if [:rowspan, :both].include?(@option[:integrate_cells])
-                  if rowspan_cells[a_node.item.level - 1].length > 1
-                    ws.merge_cells(rowspan_cells[a_node.item.level - 1])
+                  if rowspan_cells[c_node.item.level - 1].length > 1
+                    ws.merge_cells(rowspan_cells[c_node.item.level - 1])
                   end
                 end
-                rowspan_cells[a_node.item.level - 1].clear 
+                rowspan_cells[c_node.item.level - 1].clear
               end
-              a_node
+              descendants.unshift(c_node)
             end
           end
         end

data/lib/htot_conv/parser/dir_tree.rb

@@ -6,17 +6,27 @@ module HTOTConv
     class DirTree < Base
       def self.option_help
         {
+          :key_header => {
+            :default => [],
+            :pat => Array,
+            :desc => "key header",
+          },
           :glob_pattern => {
             :default => "**/*",
             :pat => String,
             :desc => "globbing pattern (default: \"**/*\")",
           },
+          :dir_indicator => {
+            :default => "",
+            :pat => String,
+            :desc => "append directory indicator",
+          },
         }
       end
 
       def parse(input=Dir.pwd)
         outline = HTOTConv::Outline.new
-        outline.key_header = []
+        outline.key_header = @option[:key_header]
         outline.value_header = []
 
         outline_item = Set.new
@@ -28,14 +38,15 @@ module HTOTConv
               file_path
             end
           end
-        end
 
-        outline_item.sort.each do |file_path|
-          key = File.basename(file_path)
-          level = file_path.split(File::SEPARATOR).length
-          outline.add_item(key, level, [])
+          outline_item.sort.each do |file_path|
+            key = File.basename(file_path)
+            key << "#{option[:dir_indicator]}" if FileTest.directory?(file_path)
+            level = file_path.split(File::SEPARATOR).length
+            outline.add_item(key, level, [])
+          end
         end
-
+        
         outline
       end
     end

data/lib/htot_conv/parser/html_list.rb

@@ -4,9 +4,19 @@ require 'htot_conv/parser/base'
 module HTOTConv
   module Parser
     class HtmlList < Base
+      def self.option_help
+        {
+          :key_header => {
+            :default => [],
+            :pat => Array,
+            :desc => "key header",
+          },
+        }
+      end
+
       def parse(input)
         outline = HTOTConv::Outline.new
-        outline.key_header = []
+        outline.key_header = @option[:key_header]
         outline.value_header = []
 
         parser = Nokogiri::HTML::SAX::Parser.new(ListDoc.new(outline))

data/lib/htot_conv/parser/opml.rb

@@ -4,9 +4,19 @@ require 'htot_conv/parser/base'
 module HTOTConv
   module Parser
     class Opml < Base
+      def self.option_help
+        {
+          :key_header => {
+            :default => [],
+            :pat => Array,
+            :desc => "key header",
+          },
+        }
+      end
+
       def parse(input)
         outline = HTOTConv::Outline.new
-        outline.key_header = []
+        outline.key_header = @option[:key_header]
         outline.value_header = []
 
         parser = Nokogiri::XML::SAX::Parser.new(ListDoc.new(outline))

data/lib/htot_conv/parser/simple_text.rb

@@ -17,10 +17,15 @@ module HTOTConv
             :desc => "separator character of additional data",
           },
           :preserve_empty_line => {
-            :defalut => false,
+            :default => false,
             :pat => FalseClass,
             :desc => "preserve empty line as a level-1 item (default: no)",
           },
+          :key_header => {
+            :default => [],
+            :pat => Array,
+            :desc => "key header",
+          },
           :value_header => {
             :default => [],
             :pat => Array,
@@ -33,7 +38,7 @@ module HTOTConv
         indent_regexp = Regexp.new("^(?<indents>(#{Regexp.escape(@option[:indent])})*)")
         delimiter_regexp = (@option[:delimiter].kind_of?(String))? Regexp.new(Regexp.escape(@option[:delimiter])) : @option[:delimiter]
         outline = HTOTConv::Outline.new
-        outline.key_header = []
+        outline.key_header = @option[:key_header]
         outline.value_header = @option[:value_header]
 
         input.each_line do |line|

data/lib/htot_conv/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module HTOTConv
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htot_conv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - "@cat_in_136"
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx