nishisuke-blog-syntax 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e13274afecedf181f356c27d03bcd5acc2fd3d3880544ad665ce0727939e096c
-  data.tar.gz: c0a48dde5caeba5685d43efeac06371716e5e95f1093cf0e82a6400f715f5d3e
+  metadata.gz: 0f59386919e11f1189c963eacac6c12106212ca229d681e2df37d85300534d3d
+  data.tar.gz: 4ca04e391a7bc2990ee2070c115923b4018254b85e62f0de22c1c391f8812aed
 SHA512:
-  metadata.gz: 1978a0a7788860b3e8252acc28fd4ece0840e00fb722d9a9bacc9ec90f5fa8b3a3de458100aa64a1293700d20cd7eaba1c2f3c7dfeb59a1631fd7b3e21bc25b3
-  data.tar.gz: b2702596de0dc94c44a2d0d4da68f20f080f5cc7860b30081ff4ec0dcabb53805805685cb4891b8dd62392620d123d1a2fee8ef51dc24b1a3d260997dfcef072
+  metadata.gz: c7f26032b18f8009018c06bdbb6cc587d6ed910651b5fb8f863ef4e5e70672dc1b6522661262feafff83a624213b4cf4d3cf484f36f064293341d0e184571bd4
+  data.tar.gz: a005e9dae3ac33694aefa66bc5759c5f36809ac1bdd1f4f83467a750a87c7d84e485fb350682b118d96da23f5832876ce0e0c042888079c49472c8da55ffd2d5

data/lib/nishisuke_blog_syntax/formatter/code_formatter.rb

@@ -4,46 +4,41 @@ include ERB::Util
 
 module NishisukeBlogSyntax
   module Formatter
-    module CodeFormatter
-      REGEXP = /^SRC```(.*)SRC```$/m
+    class CodeFormatter < FormatterBase
+      SUBSTITUTE_REGEXP = /^SRC```(.*?)SRC```$/m
+      PARSE_REGEXP = /^SRC```(.*)SRC```$/m
 
-      class << self
-        def format(txt)
-          m = txt.match(REGEXP)
-          return txt if m.nil?
+      private
 
-          contents = m[1].split("\n")
-
-          file_name = contents.shift
-
-          content_str = contents.map { |l| wrapped_line(l) }.join('<br>')
-          html = wrapped_content(content_str, file_name)
-
-          txt.gsub(REGEXP, html)
-        end
-
-        private
-
-        def wrapped_line(txt)
-          %Q(<span class="shell__code-line">#{h(txt)}</span>)
-        end
+      def regexp
+        SUBSTITUTE_REGEXP
+      end
 
-        def wrapped_content(content, file_name)
-          has_file_name = !file_name.gsub(/\s/, '').empty?
+      def substitute(matched)
+        content_str = matched.match(PARSE_REGEXP)[1]
+        contents = content_str.split("\n")
+        file_name = contents.shift
+        contents.map! { |l| wrapped_line(l) }
+        wrapped_content(contents.join('<br>'), file_name)
+      end
 
-          html = <<~HTML
-            <div class="shell mdc-elevation--z2">
-            #{%Q(<span class="shell__file">#{file_name}</span>) if has_file_name}
-            <pre class="shell__container">
-            <code class="shell__code">
-            #{content}
-            </code>
-            </pre>
-            </div>
-          HTML
+      def wrapped_line(txt)
+        %Q(<span class="shell__code-line">#{h(txt)}</span>)
+      end
 
-          html.gsub("\n", '')
-        end
+      def wrapped_content(content, file_name)
+        has_file_name = !file_name.gsub(/\s/, '').empty?
+
+        html = <<~HTML.gsub("\n", '')
+          <div class="shell mdc-elevation--z2">
+          #{%Q(<span class="shell__file">#{file_name}</span>) if has_file_name}
+          <pre class="shell__container">
+          <code class="shell__code">
+          #{content}
+          </code>
+          </pre>
+          </div>
+        HTML
       end
     end
   end

data/lib/nishisuke_blog_syntax/formatter/shell_formatter.rb

@@ -4,53 +4,47 @@ include ERB::Util
 
 module NishisukeBlogSyntax
   module Formatter
-    module ShellFormatter
-      REGEXP = /^SHELL```(.*)SHELL```$/m
+    class ShellFormatter < FormatterBase
+      SUBSTITUTE_REGEXP = /^SHELL```(.*?)SHELL```$/m
+      PARSE_REGEXP = /^SHELL```(.*)SHELL```$/m
       INPUT_REGEXP = /\Ain: /
       OUTPUT_REGEXP = /\Aout: /
 
-      class << self
-        def format(txt)
-          m = txt.match(REGEXP)
-          return txt if m.nil?
+      private
 
-          contents = m[1].split("\n")
-
-          file_name = contents.shift
-
-          content_str = contents.reject(&:empty?).map do |l|
-            wrapped_line(l)
-          end.join('<br>')
-
-          html = wrapped_content(content_str)
-
-          txt.gsub(REGEXP, html)
-        end
+      def regexp
+        SUBSTITUTE_REGEXP
+      end
 
-        private
+      def substitute(matched)
+        content_str = matched.match(PARSE_REGEXP)[1]
+        contents = content_str.split("\n")
+        contents.shift # drop first line, this is SRC```xxxxx <-
+        contents.map! { |l| wrapped_line(l) }
+        wrapped_content(contents.join('<br>'))
+      end
 
-        def wrapped_line(txt)
-          if m = txt.match(INPUT_REGEXP)
-            %Q(<kbd class="shell__input">#{h(m.post_match)}</kbd>)
-          elsif m = txt.match(OUTPUT_REGEXP)
-            %Q(<samp class="shell__output">#{h(m.post_match)}</samp>)
-          else
-            h(txt)
-          end
+      def wrapped_line(txt)
+        if m = txt.match(INPUT_REGEXP)
+          %Q(<kbd class="shell__input">#{h(m.post_match)}</kbd>)
+        elsif m = txt.match(OUTPUT_REGEXP)
+          %Q(<samp class="shell__output">#{h(m.post_match)}</samp>)
+        else
+          '' # this means <br><br> finaly.
         end
+      end
 
-        def wrapped_content(content)
-          html = <<~HTML
-            <div class="shell mdc-elevation--z2">
-            <pre class="shell__container">
-            <span class="shell__std">
-            #{content}
-            </span>
-            </pre>
-            </div>
-          HTML
-          html.gsub("\n", '')
-        end
+      def wrapped_content(content)
+        html = <<~HTML
+          <div class="shell mdc-elevation--z2">
+          <pre class="shell__container">
+          <span class="shell__std">
+          #{content}
+          </span>
+          </pre>
+          </div>
+        HTML
+        html.gsub("\n", '')
       end
     end
   end

data/lib/nishisuke_blog_syntax/formatter.rb

@@ -1,7 +1,19 @@
-require 'nishisuke_blog_syntax/formatter/code_formatter'
-require 'nishisuke_blog_syntax/formatter/shell_formatter'
-
-module BlogFormatParser
+module NishisukeBlogSyntax
   module Formatter
+    class FormatterBase
+      def format(txt)
+        txt.gsub(regexp) { |matched| substitute(matched) }
+      end
+
+      private
+
+      def regexp
+        raise NotImplementedError
+      end
+
+      def substitute
+        raise NotImplementedError
+      end
+    end
   end
 end

data/lib/nishisuke_blog_syntax/raw_text.rb

@@ -1,23 +1,27 @@
-require 'nishisuke_blog_syntax/formatter'
+require 'nishisuke_blog_syntax/formatter/code_formatter'
+require 'nishisuke_blog_syntax/formatter/shell_formatter'
 
 module NishisukeBlogSyntax
   class RawText
     def initialize(text)
-      @text = text
+      @text = text.gsub(/\R/, "\n")
     end
 
     def to_html
-      self.class.html_formatters.inject(text.gsub(/\R/, "\n")) do |html, formatter|
-       formatter.format(html)
+      self.class.html_formatters.inject(text) do |html, f|
+        f.format(html)
       end
     end
 
     private
 
     def self.html_formatters
+      # order is important!
+      # Each formatter should be commutative.
+      # But be careful order for the future.
       @@formatters ||= [
-        Formatter::CodeFormatter,
-        Formatter::ShellFormatter,
+        Formatter::ShellFormatter.new,
+        Formatter::CodeFormatter.new,
       ]
     end
 

data/lib/nishisuke_blog_syntax/version.rb

@@ -1,3 +1,3 @@
 module NishisukeBlogSyntax
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nishisuke-blog-syntax
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nishisuke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler