fuji_markdown 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f9cfdc66de8703b71d832884c6e49fb55e184a5778e5debfab45d09b395301
-  data.tar.gz: 6c29e72866b53062eda0c06df826bf7cbed8aa42770f6b8f57a39def7f5d1a28
+  metadata.gz: 4ec58909236c9cff6ddf2e3c280f62f41548ea3e62e1d2336ef825b8a18ed5ff
+  data.tar.gz: 4fbfd254823a2ae17baebc17e8d8ca49a8077b1738f47ffb17d12f0b3409ab74
 SHA512:
-  metadata.gz: 379f8d82e98fe52ef0a5a698bb587b1b43464ec69a587863a1df0e87e00ab37922153712174bdda6d092aa4644997a328ac86629f9b937165e4eda4ea66ff3b0
-  data.tar.gz: 12af8845e2a6d4fb5a5285532326e1de8c03745b6eeaf89417ed8d1a297781e6b7bdada31dc011114ac89f647e019530d13fd29647767c6c53514523af760ab0
+  metadata.gz: '01829618095700ddb3bc36a1bb07436e724115dd4c29a5ad9d314ced11bf707e6b99b677fcabf814725d768b6adb11ec32313cecb597c9898be5fc42ca5b3327'
+  data.tar.gz: 6b4b5b47ae5471eb6370b9e80ede54b7bffbef0cea0df32b77e2a987cf6e52ce439ed795bf6528defb4803ce65ed5b587f21a7319704dbf890ca6741870b20ad

data/Gemfile.lock

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

data/README.md

@@ -21,9 +21,26 @@ Or install it yourself as:
 
 ## Usage
 
-Just type `fujimd` and give your FujiMarkdown file:
+```ruby
+require 'fuji_markdown'
+
+FujiMarkdown.render('山へ*柴刈り*に出かけたおじいさんは{紅蓮の炎|ヘルフレイム}に焼かれ果てた。')
+# => "<p>山へ<em>柴刈り</em>に出かけたおじいさんは<ruby>紅蓮の炎<rt>ヘルフレイム</rt></ruby>に焼かれ果てた。</p>\n"
+
+FujiMarkdown.render('山へ*柴刈り*に出かけたおじいさんは{紅蓮の炎|ヘルフレイム}に焼かれ果てた。', :KAKUYOMU)
+# => "山へ《《柴刈り》》に出かけたおじいさんは|紅蓮の炎《ヘルフレイム》に焼かれ果てた。\n"
+
+FujiMarkdown.render('山へ*柴刈り*に出かけたおじいさんは{紅蓮の炎|ヘルフレイム}に焼かれ果てた。', :NAROU)
+# => "山へ|柴《・》|刈《・》|り《・》に出かけたおじいさんは|紅蓮の炎《ヘルフレイム》に焼かれ果てた。\n"
+```
+
+See [spec](spec/fuji_markdown_spec.rb) for more detail.
+
+---
+
+In addition, you can use `fujimd` command from CLI:
 
-    $ fujimd your-fuji_markdown-file.md
+    $ fujimd your-FujiMarkdown-file.md [--output kakuyomu]
 
 ## Development
 
@@ -41,4 +58,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the FujiMarkdown project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/fuji_markdown/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the FujiMarkdown project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fuji-nakahara/fuji_markdown/blob/master/CODE_OF_CONDUCT.md).

data/exe/fujimd

@@ -8,7 +8,7 @@ option = :HTML
 OptionParser.new do |opts|
   opts.banner = 'Usage: fujimd [--output <format>] <file>...'
 
-  opts.on('-o', '--output FORMAT', 'Specify output format: html or kakuyomu') do |fmt|
+  opts.on('-o', '--output FORMAT', 'Specify output format: kakuyomu, narou or html') do |fmt|
     option = fmt.upcase.to_sym
   end
 

data/lib/fuji_markdown.rb

@@ -1,11 +1,14 @@
+require 'commonmarker'
+
 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/preprocessors/escape_narou'
+require_relative 'fuji_markdown/renderers/text_renderer'
 require_relative 'fuji_markdown/renderers/kakuyomu_renderer'
-
-require 'commonmarker'
+require_relative 'fuji_markdown/renderers/narou_renderer'
 
 module FujiMarkdown
   class << self
@@ -29,13 +32,19 @@ module FujiMarkdown
       when :HTML
         {
           preprocessors: [Preprocessors::Ruby.new],
-          renderer: CommonMarker::HtmlRenderer.new(options: [:HARDBREAKS, :UNSAFE]),
+          renderer:      CommonMarker::HtmlRenderer.new(options: [:HARDBREAKS, :UNSAFE]),
         }
       when :KAKUYOMU
         {
-          preprocessors: [Preprocessors::Ruby.new, Proc.new { |text| text.gsub!(/《/, '|《') }],
+          preprocessors:  [Preprocessors::Ruby.new, Proc.new { |text| text.gsub!(/《/, '|《') }],
+          postprocessors: [Postprocessors::Ruby.new],
+          renderer:       Renderers::KakuyomuRenderer.new,
+        }
+      when :NAROU
+        {
+          preprocessors:  [Preprocessors::Ruby.new, Preprocessors::EscapeNarou.new],
           postprocessors: [Postprocessors::Ruby.new],
-          renderer: Renderers::KakuyomuRenderer.new,
+          renderer:       Renderers::NarouRenderer.new,
         }
       else
         raise ArgumentError, "Invalid option #{option}"

data/lib/fuji_markdown/postprocessors/ruby.rb

@@ -4,7 +4,7 @@ module FujiMarkdown
       attr_reader :omit_start_symbol
 
       def initialize(omit_start_symbol: false)
-        @ruby = false
+        @ruby              = false
         @omit_start_symbol = omit_start_symbol
       end
 
@@ -28,7 +28,7 @@ module FujiMarkdown
           node.delete
         when '<rt>'
           kanji_node = node.previous
-          kana_node = node.next
+          kana_node  = node.next
           if @ruby && kana_node.next.string_content == '</rt>'
             convert_to_kakuyomu_ruby!(kanji_node, kana_node)
           end
@@ -42,7 +42,7 @@ module FujiMarkdown
 
       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
+        kana_node.string_content  = "《#{kana_node.string_content}》" if kana_node.type == :text
       end
     end
   end

data/lib/fuji_markdown/preprocessors/escape_narou.rb

@@ -0,0 +1,11 @@
+module FujiMarkdown
+  module Preprocessors
+    class EscapeNarou
+      def call(text)
+        text.gsub!(/([一-龠々])（([\p{Hiragana}\p{Katakana}]+)）/, '\1|（\2）')
+        text.gsub!(/([一-龠々])\(([\p{Hiragana}\p{Katakana}]+)\)/, '\1|(\2)')
+        text.gsub!(/《([\p{Hiragana}\p{Katakana}]+)》/, '|《\1》')
+      end
+    end
+  end
+end

data/lib/fuji_markdown/preprocessors/ruby.rb

@@ -1,14 +1,7 @@
 module FujiMarkdown
   module Preprocessors
     class Ruby
-      RUBY_PATTERN =
-        %r(
-            {
-            (?<kanji>[^{}|]*)
-            \|
-            (?<kana>[^{}]*)
-            }
-          )x
+      RUBY_PATTERN = %r({(?<kanji>[^{}|]*)\|(?<kana>[^{}]*)})
 
       def call(text)
         text.gsub!(RUBY_PATTERN) do |match|

data/lib/fuji_markdown/processor.rb

@@ -1,14 +1,12 @@
-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
+      @preprocessors  = preprocessors
+      @parser         = parser
       @postprocessors = postprocessors
-      @renderer = renderer
+      @renderer       = renderer
     end
 
     def parse(text)

data/lib/fuji_markdown/renderers/kakuyomu_renderer.rb

@@ -1,36 +1,6 @@
-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)
-        return out(:children) if node.parent.type == :blockquote
-
-        block do
-          out(:children)
-        end
-      end
-
-      def blockquote(node)
-        out("\n") if node.previous&.type&.==(:paragraph)
-        block do
-          out('> ', :children)
-        end
-        out("\n")
-      end
-
-      def hrule(_)
-        out("\n")
-      end
-
+    class KakuyomuRenderer < TextRenderer
       def code_block(node)
         out("\n") if node.previous&.type&.==(:paragraph)
         block do
@@ -46,16 +16,6 @@ module FujiMarkdown
       def link(node)
         out(:children)
       end
-
-      def code(node)
-        out('`')
-        out(escape_html(node.string_content))
-        out('`')
-      end
-
-      def softbreak(_)
-        out("\n")
-      end
     end
   end
 end

data/lib/fuji_markdown/renderers/narou_renderer.rb

@@ -0,0 +1,26 @@
+module FujiMarkdown
+  module Renderers
+    class NarouRenderer < TextRenderer
+      def code_block(node)
+        out("\n") if node.previous&.type&.==(:paragraph)
+        block do
+          out(escape_html(node.string_content))
+        end
+        out("\n")
+      end
+
+      def emph(node)
+        node.walk do |n|
+          if n.type == :text
+            n.string_content = n.string_content.chars.map { |char| "|#{char}《・》"}.join
+          end
+        end
+        out(:children)
+      end
+
+      def link(node)
+        out(:children)
+      end
+    end
+  end
+end

data/lib/fuji_markdown/renderers/text_renderer.rb

@@ -0,0 +1,61 @@
+module FujiMarkdown
+  module Renderers
+    class TextRenderer < 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)
+        return out(:children) if node.parent.type == :blockquote
+
+        block do
+          out(:children)
+        end
+      end
+
+      def blockquote(node)
+        out("\n") if node.previous&.type&.==(:paragraph)
+        block do
+          out('> ', :children)
+        end
+        out("\n")
+      end
+
+      def hrule(_)
+        out("\n")
+      end
+
+      def code_block(node)
+        out("\n") if node.previous&.type&.==(:paragraph)
+        out('```')
+        block do
+          out(escape_html(node.string_content))
+        end
+        out('```')
+        out("\n")
+      end
+
+      def emph(_)
+        out('*', :children, '*')
+      end
+
+      def link(node)
+        out('[', :children, '](', node.url.nil? ? '' : escape_href(node.url), ')')
+      end
+
+      def code(node)
+        out('`')
+        out(escape_html(node.string_content))
+        out('`')
+      end
+
+      def softbreak(_)
+        out("\n")
+      end
+    end
+  end
+end

data/lib/fuji_markdown/version.rb

@@ -1,3 +1,3 @@
 module FujiMarkdown
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuji_markdown
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Fuji Nakahara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -119,9 +119,12 @@ files:
 - fuji_markdown.gemspec
 - lib/fuji_markdown.rb
 - lib/fuji_markdown/postprocessors/ruby.rb
+- lib/fuji_markdown/preprocessors/escape_narou.rb
 - lib/fuji_markdown/preprocessors/ruby.rb
 - lib/fuji_markdown/processor.rb
 - lib/fuji_markdown/renderers/kakuyomu_renderer.rb
+- lib/fuji_markdown/renderers/narou_renderer.rb
+- lib/fuji_markdown/renderers/text_renderer.rb
 - lib/fuji_markdown/version.rb
 homepage: https://github.com/fuji-nakahara/fuji_markdown
 licenses: