fuji_markdown 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 632b78dfc503f004c7dbcbbe42ddc2fd27d9c55ffb467e509db4e7e553a5a595
-  data.tar.gz: dc2eb533dbfdc304ec9734ad846f5851bea494350603159905b6f26d22ef62c1
+  metadata.gz: 7da8dd0aaeba4f74a917ee80a9dd367dcbc1c36d8c7aed1b2d16a007cb8e21ec
+  data.tar.gz: 8225eff80f86cc29e08998a20d4501fb6a339dc034599f12627e006479a11b65
 SHA512:
-  metadata.gz: 0377d1d841768d569b70b5c27110f34b9468a16719ec1b588215268c9413b6ebd0362f8f7b6064e788fee1e3ab141ee4020f0c565c8d19a241e7d46b01a2984d
-  data.tar.gz: d9d8cb1a60aaa1bf72987d511f68ea5a8bcccde1da7678129477d94d9ba70318642e399021007ae8e2d1e09f7e703adbef88f72578cbca1e4af20c3563f1a611
+  metadata.gz: 925fe47b95cbc571167e91fd5727f04372b8d92ee326b34f85be67b6e43e3d7274c9a7cbe2ff2fa9fedffceff08557a9d7325abcc693924ff383b044c06a60cd
+  data.tar.gz: f94d570d92109c5435a41c02413bd2e833b2edeae304354f72c1e0f9174b88608f3d73d75e35e30780ed17252c96f1b9dd56c40b7a8521288f1ce502d7816fa9

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.1
+  - 2.5
+  - 2.4
+  - 2.3
 before_install: gem install bundler -v 1.16.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuji_markdown (0.1.1)
+    fuji_markdown (0.2.0)
       commonmarker (~> 0.17)
 
 GEM

data/exe/fujimd

@@ -3,16 +3,24 @@
 require 'optparse'
 require 'fuji_markdown'
 
+option = :HTML
+
 OptionParser.new do |opts|
-  opts.banner = 'Usage: fujimd [options] [FILE]'
+  opts.banner = 'Usage: fujimd [--output <format>] <file>...'
+
+  opts.on('-o', '--output FORMAT', 'Specify output format: html or kakuyomu') do |fmt|
+    option = fmt.upcase.to_sym
+  end
+
   opts.on_tail('-v', '--version', 'Display the current version') do
     puts FujiMarkdown::VERSION
     exit
   end
+
   opts.on_tail('-h', '--help', 'Display this help message') do
     puts opts
     exit
   end
 end.parse!
 
-puts FujiMarkdown.render(ARGF.read)
+puts FujiMarkdown.render(ARGF.read, option)

data/lib/fuji_markdown/postprocessors/ruby.rb

@@ -0,0 +1,49 @@
+module FujiMarkdown
+  module Postprocessors
+    class Ruby
+      attr_reader :omit_start_symbol
+
+      def initialize(omit_start_symbol: false)
+        @ruby = false
+        @omit_start_symbol = omit_start_symbol
+      end
+
+      def call(doc)
+        doc.walk do |node|
+          if node.type == :inline_html
+            process_ruby_node!(node)
+          end
+        end
+      end
+
+      private
+
+      def process_ruby_node!(node)
+        case node.string_content
+        when '<ruby>'
+          @ruby = true
+          node.delete
+        when '</ruby>'
+          @ruby = false
+          node.delete
+        when '<rt>'
+          kanji_node = node.previous
+          kana_node = node.next
+          if @ruby && kana_node.next.string_content == '</rt>'
+            convert_to_kakuyomu_ruby!(kanji_node, kana_node)
+          end
+          node.delete
+        when '</rt>'
+          node.delete
+        else
+          # do nothing
+        end
+      end
+
+      def convert_to_kakuyomu_ruby!(kanji_node, kana_node)
+        kanji_node.string_content = "|#{kanji_node.string_content}" if kanji_node.type == :text && !(omit_start_symbol && kanji_node.string_content.match(/\A[一-龠々]+\z/))
+        kana_node.string_content = "《#{kana_node.string_content}》" if kana_node.type == :text
+      end
+    end
+  end
+end

data/lib/fuji_markdown/preprocessors/ruby.rb

@@ -6,14 +6,25 @@ module FujiMarkdown
             {
             (?<kanji>[^{}|]*)
             \|
-            (?<kana>[^{}|]*)
+            (?<kana>[^{}]*)
             }
           )x
 
       def call(text)
-        text.gsub(RUBY_PATTERN) do |match|
-          kanji, kana = match.slice(1...-1).split('|')
-          "<ruby>#{kanji}<rt>#{kana}</rt></ruby>"
+        text.gsub!(RUBY_PATTERN) do |match|
+          kanji, *kanas = match.slice(1...-1).split('|')
+          return "<ruby>#{kanji}<rt></rt></ruby>" if kanas.empty?
+
+          pairs = []
+          kanas.each_with_index do |kana, i|
+            if i == kanas.size - 1
+              pairs << [kanji.slice(i..-1), kana]
+            else
+              pairs << [kanji.slice(i), kana]
+            end
+          end
+
+          "<ruby>#{pairs.map { |k, kana| "#{k}<rt>#{kana}</rt>" }.join}</ruby>"
         end
       end
     end

data/lib/fuji_markdown/processor.rb

@@ -0,0 +1,34 @@
+require 'commonmarker'
+
+module FujiMarkdown
+  class Processor
+    attr_reader :preprocessors, :parser, :postprocessors, :renderer
+
+    def initialize(preprocessors: [], parser: CommonMarker, postprocessors: [], renderer: CommonMarker::HtmlRenderer.new)
+      @preprocessors = preprocessors
+      @parser = parser
+      @postprocessors = postprocessors
+      @renderer = renderer
+    end
+
+    def parse(text)
+      processed_text = text.dup
+
+      preprocessors.each do |preprocessor|
+        preprocessor.call(processed_text)
+      end
+
+      parser.render_doc(processed_text)
+    end
+
+    def render(text)
+      doc = parse(text)
+
+      postprocessors.each do |postprocessor|
+        postprocessor.call(doc)
+      end
+
+      renderer.render(doc)
+    end
+  end
+end

data/lib/fuji_markdown/renderers/kakuyomu_renderer.rb

@@ -0,0 +1,37 @@
+require 'commonmarker'
+
+module FujiMarkdown
+  module Renderers
+    class KakuyomuRenderer < CommonMarker::HtmlRenderer
+      def header(node)
+        out("\n") if node.previous&.type&.==(:paragraph)
+        block do
+          out('#' * node.header_level, ' ', :children)
+        end
+        out("\n")
+      end
+
+      def paragraph(node)
+        block do
+          out(:children)
+        end
+      end
+
+      def hrule(_)
+        out("\n")
+      end
+
+      def emph(_)
+        out('《《', :children, '》》')
+      end
+
+      def link(node)
+        out(:children)
+      end
+
+      def softbreak(_)
+        out("\n")
+      end
+    end
+  end
+end

data/lib/fuji_markdown/version.rb

@@ -1,3 +1,3 @@
 module FujiMarkdown
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/fuji_markdown.rb

@@ -1,23 +1,45 @@
+require_relative 'fuji_markdown/processor'
 require_relative 'fuji_markdown/version'
 
+require_relative 'fuji_markdown/postprocessors/ruby'
 require_relative 'fuji_markdown/preprocessors/ruby'
+require_relative 'fuji_markdown/renderers/kakuyomu_renderer'
 
 require 'commonmarker'
 
 module FujiMarkdown
-  def self.parse(text)
-    preprocessors = [Preprocessors::Ruby.new]
+  class << self
+    def parse(text, option = :HTML)
+      processor(option).parse(text)
+    end
 
-    processed_text = text.dup
-    preprocessors.each do |filter|
-      processed_text = filter.call(processed_text)
+    def render(text, option = :HTML)
+      processor(option).render(text)
     end
 
-    CommonMarker.render_doc(processed_text)
-  end
+    private
 
-  def self.render(text)
-    doc = parse(text)
-    doc.to_html(:HARDBREAKS)
+    def processor(option)
+      args = processor_args(option)
+      Processor.new(args)
+    end
+
+    def processor_args(option)
+      case option
+      when :HTML
+        {
+          preprocessors: [Preprocessors::Ruby.new],
+          renderer: CommonMarker::HtmlRenderer.new(options: :HARDBREAKS),
+        }
+      when :KAKUYOMU
+        {
+          preprocessors: [Preprocessors::Ruby.new, Proc.new { |text| text.gsub!(/《/, '|《') }],
+          postprocessors: [Postprocessors::Ruby.new],
+          renderer: Renderers::KakuyomuRenderer.new,
+        }
+      else
+        raise ArgumentError, "Invalid option #{option}"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuji_markdown
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Fuji Nakahara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -118,7 +118,10 @@ files:
 - exe/fujimd
 - fuji_markdown.gemspec
 - lib/fuji_markdown.rb
+- lib/fuji_markdown/postprocessors/ruby.rb
 - lib/fuji_markdown/preprocessors/ruby.rb
+- lib/fuji_markdown/processor.rb
+- lib/fuji_markdown/renderers/kakuyomu_renderer.rb
 - lib/fuji_markdown/version.rb
 homepage: https://github.com/fuji-nakahara/fuji_markdown
 licenses: