md2key 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9344258d896f70f623b6297cd04a23d5f89dfd4c
-  data.tar.gz: 21aecf4aee086196aac28d1ddb49b519e86d8375
+  metadata.gz: efa4d3efc0863de76d19919aac701aad63c74c46
+  data.tar.gz: e815643322bd2208cd170327ec11960ef4909653
 SHA512:
-  metadata.gz: 0e99d47cfe441d711a6a3bf5de5214df354b3b1a291a902679acfb2ada90ecf59613fc72dac76588a16dded595bf36a2239c82f41f2719d3ad9e5dd38737b26b
-  data.tar.gz: cfda1467a4bd799182cc7955420512fbe2d457716227fc52b740ce12fe5459ae12cc4e5cc9da3f4ca73a1d0d9dae8211e1d363683461d4a3a598767ba1e5b0f9
+  metadata.gz: 07f933c45cf47dc98c57d1582872c368f8f99698a6dcc91e2829add256b2aaa54f07e023677ff0f8b14ead0bdfbddfd61f9acfa1221f9b2330c43932f8412b35
+  data.tar.gz: bea355914ebb893f337a55f279d8f35c6baaf6eca3c5cc6ab1e2aeab447aee087a47622d22b26d73cc6f8b1fcc35ed3bcec2bcc4be202f08e5aacf991d1cc696

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+# v0.2.1
+
+- Don't skip a nested list
+  - But still flattened
+
 # v0.2.0
 
 - Use redcarpet as markdown parser
-  - Support `*` list
+  - Support list starting with `*`
 
 # v0.1.2
 

data/lib/md2key/markdown.rb

@@ -38,13 +38,8 @@ module Md2key
           slides << slide
           slide.title = node.text
         when 'ul'
-          node.children.each do |child_node|
-            next unless child_node.is_a?(Oga::XML::Element)
-            next if child_node.name != 'li'
-
-            # TODO: implement nested list
-            slide.lines << child_node.inner_text.strip
-          end
+          # FIXME: support nested list
+          slide.lines += li_texts(node).flatten
         when 'p'
           slide.lines << node.text
         when 'hr'
@@ -54,6 +49,29 @@ module Md2key
       slides
     end
 
+    def li_texts(ul_node)
+      return [] unless ul_node.is_a?(Oga::XML::Element)
+      return [] if ul_node.name != 'ul'
+
+      texts = []
+      ul_node.children.each do |li_node|
+        next unless li_node.is_a?(Oga::XML::Element)
+        next if li_node.name != 'li'
+
+        li_node.children.each do |node|
+          case node
+          when Oga::XML::Text
+            text = node.text.strip
+            texts << text unless text.empty?
+          when Oga::XML::Element
+            next if node.name != 'ul'
+            texts << li_texts(node)
+          end
+        end
+      end
+      texts
+    end
+
     def to_xhtml(markdown)
       redcarpet = Redcarpet::Markdown.new(Redcarpet::Render::XHTML)
       redcarpet.render(markdown)

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takashi Kokubun