darkmouun 1.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed322d3e05f2d8b117470ead4a7634d6a9c97ae96d059a8a5a8238b6cd91ab70
-  data.tar.gz: 17b36206c87d6f5aa106b35e88eeb942447688875687ceac78881498d4b00eb7
+  metadata.gz: a0e5ba37ba1ee837c723ff67a384a4104f24aa592c1b33d4fa328faaf089a539
+  data.tar.gz: 72e1fbe968e1a41b657918349ea2692516ece783fabfaf762e1ab7cab10b7264
 SHA512:
-  metadata.gz: 43ae3bf99169c3df50ac366cb7966900446d5a0e9f3b9baf573305ab47d22dece7fe06632fd73ae1f7a47b860f871d7860fc9fb19dd94004493482928c11047f
-  data.tar.gz: 2bdb4c000a9725773ef1cbaa2e8c1506b8e9a92c365170addebf71b7b6304fe761d23e9ed95b692e9aaf2612f2465d71d8dfce945ff5f6135709c7b332a7fb52
+  metadata.gz: e208d87f52f188804fd3b25e28313f5d257e703984dc3f8d4091b09c7010e14721d9d64eae1ec799c37fe97ea990d260b8ad686f33f5f2bd19a3c2a54f5ce861
+  data.tar.gz: 0f58155fc090699282ca2020b48eb1a39d78c2bb6b31b619248d98b141bc2c7f8588b6d74540c9bb899e41a2c0bdf9f07f4244121ba0a6da8a8b0c71107fe17c

data/README.md

@@ -95,9 +95,9 @@ dkmn.convert    #=> <p>The Calculation:</p>
 
 Darkmouun has extended to kramdown. Extensions are below;
 
-1. **Plain Span element form.** `[[spanned phrase]]` is converted to `<span>spanned phrase</span>`.
+1. **Plain span element form.** `[spanned phrase]` is converted to `<span>spanned phrase</span>`.
 
-2. **Style attribute abbreviation form.** `%attritute_name:value;` in IAL is converted to `style="attribute_name:value;"`.<br/>**ex.** `{:%color:#ffffff; %font-weight:bold;}` -> `style="color:#ffffff; font-weight:bold;"`<br/>**ATTENSION:** Every attribute must be started from "`%`" and ended with "`;`".
+2. **Style IAL form.** `%attritute_name:value;` in IAL is converted to `style="attribute_name:value;"`.<br/>**ex.** `{:%color:#ffffff; %font-weight:bold;}` -> `style="color:#ffffff; font-weight:bold;"`<br/>**ATTENSION:** Every attribute must be started from "`%`" and ended with "`;`".
 
 ## Development
 

data/lib/darkmouun/{converter/span.rb → kramdown/converter/html.rb}

@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-#
-#--
-# copyright (c) 2017 akinori ichigo <akinori.ichigo@gmail.com>
 
-require 'kramdown/parser'
-require 'kramdown/converter'
-require 'kramdown/utils'
+require 'kramdown'
 
 module Kramdown
   module Converter

data/lib/darkmouun/{parser → kramdown/parser/kramdown}/extensions.rb

@@ -1,11 +1,4 @@
 # -*- coding: utf-8 -*-
-#
-#--
-# Copyright (C) 2017 Akinori Ichigo <akinori.ichigo@gmail.com>
-#
-# This file is part of kramdown which is licensed under the MIT.
-#++
-#
 
 require 'kramdown'
 
@@ -13,8 +6,6 @@ module Kramdown
   module Parser
     class Kramdown
 
-      # Parse the string +str+ and extract all attributes and add all found attributes to the hash
-      # +opts+.
       def parse_attribute_list(str, opts)
         return if str.strip.empty? || str.strip == ':'
         style_attr = []

data/lib/darkmouun/kramdown/parser/kramdown/link.rb

@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+
+require 'kramdown/parser/kramdown/escaped_chars'
+
+module Kramdown
+  module Parser
+    class Kramdown
+      def parse_link
+        start_line_number = @src.current_line_number
+        result = @src.scan(LINK_START)
+        cur_pos = @src.pos
+        saved_pos = @src.save_pos
+
+        link_type = (result =~ /^!/ ? :img : :a)
+
+        # no nested links allowed
+        if link_type == :a && (@tree.type == :img || @tree.type == :a ||
+                               @stack.any? {|t, _| t && (t.type == :img || t.type == :a) })
+          parse_span
+          return
+        end
+        el = Element.new(link_type, nil, nil, location: start_line_number)
+
+        count = 1
+        found = parse_spans(el, LINK_BRACKET_STOP_RE) do
+          count += (@src[1] ? -1 : 1)
+          count - el.children.select {|c| c.type == :img || c.type == :span }.size == 0
+        end
+        unless found
+          @src.revert_pos(saved_pos)
+          add_text(result)
+          return
+        end
+        alt_text = extract_string(cur_pos...@src.pos, @src).gsub(ESCAPED_CHARS, '\1')
+        @src.scan(LINK_BRACKET_STOP_RE)
+
+        # reference style link or no link url
+        if @src.scan(LINK_INLINE_ID_RE) || !@src.check(/\(/)
+          link_id = normalize_link_id(@src[1] || alt_text)
+          if @link_defs.key?(link_id)
+            link_def = @link_defs[link_id]
+            add_link(el, link_def[0], link_def[1], alt_text,
+                     link_def[2] && link_def[2].options[:ial])
+          else
+            @src.revert_pos(saved_pos)
+            parse_span
+          end
+          return
+        end
+
+        # link url in parentheses
+        if @src.scan(/\(<(.*?)>/)
+          link_url = @src[1]
+          if @src.scan(/\)/)
+            add_link(el, link_url, nil, alt_text)
+            return
+          end
+        else
+          link_url = +''
+          nr_of_brackets = 0
+          while (temp = @src.scan_until(LINK_PAREN_STOP_RE))
+            link_url << temp
+            if @src[2]
+              nr_of_brackets -= 1
+              break if nr_of_brackets == 0
+            elsif @src[1]
+              nr_of_brackets += 1
+            else
+              break
+            end
+          end
+          link_url = link_url[1..-2]
+          link_url.strip!
+
+          if nr_of_brackets == 0
+            add_link(el, link_url, nil, alt_text)
+            return
+          end
+        end
+
+        if @src.scan(LINK_INLINE_TITLE_RE)
+          add_link(el, link_url, @src[2], alt_text)
+        else
+          @src.revert_pos(saved_pos)
+          add_text(result)
+        end
+      end
+    end
+  end
+end

data/lib/darkmouun/{parser → kramdown/parser/kramdown}/span.rb

@@ -1,30 +1,24 @@
 # -*- coding: utf-8 -*-
-#
-#--
-# Copyright (C) 2016 Akinori Ichigo <akinori.ichigo@gmail.com>
-#
-# This file is part of kramdown which is licensed under the MIT.
-#++
-#
+
+require 'kramdown'
 
 module Kramdown
   module Parser
     class Kramdown
 
-      SPAN_START = /(?:\[\[\s*?)/
-
       # Parse the span at the current location.
       def parse_span
         start_line_number = @src.current_line_number
         saved_pos = @src.save_pos
 
-        result = @src.scan(SPAN_START)
-        stop_re = /(?:\s*?\]\])/
+        span_start = /(?:\[\s*?)/
+        result = @src.scan(span_start)
+        stop_re = /(?:\s*?\])/
 
-         el = Element.new(:span, nil, nil, :location => start_line_number)
-         found = parse_spans(el, stop_re) do
-           el.children.size > 0
-         end
+        el = Element.new(:span, nil, nil, :location => start_line_number)
+        found = parse_spans(el, stop_re) do
+          el.children.size > 0
+        end
 
         if found
           @src.scan(stop_re)
@@ -35,7 +29,6 @@ module Kramdown
           add_text(result)
         end
       end
-      define_parser(:span, SPAN_START, '\[\[')
 
     end
   end

data/lib/darkmouun/kramdown.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+require_relative "kramdown/parser/kramdown/extensions"
+require_relative "kramdown/parser/kramdown/span"
+require_relative "kramdown/parser/kramdown/link"
+require_relative "kramdown/converter/html"
+
+module Kramdown
+  class Element
+    CATEGORY[:span] = :span
+  end
+end
+

data/lib/darkmouun/main.rb

@@ -1,23 +1,10 @@
+# -*- coding: utf-8 -*-
+
 require "mustache"
 require "Kramdown"
 require "htmlbeautifier"
 
-require "darkmouun/version"
-require "darkmouun/parser/extensions"
-require "darkmouun/parser/span"
-require "darkmouun/converter/span"
-
-module Kramdown
-  module Parser
-    class Kramdown
-      alias_method :super_initialize, :initialize
-      def initialize(source, options)
-        super_initialize(source, options)
-        @span_parsers.insert(5, :span)
-      end
-    end
-  end
-end
+require_relative "kramdown"
 
 module Darkmouun
   class << self
@@ -32,18 +19,7 @@ module Darkmouun
     def initialize(source, options ={}, converter = :html)
       @source, @options = source, options
       @templates = {}
-      begin
-        @converter = case converter
-        when String
-          ('to_' + converter).intern
-        when Symbol
-          ('to_' + (converter.to_s)).intern
-        else
-          Exception.new "Invalid converter: Neither Symbol nor String"
-        end
-      rescue => e
-        p e
-      end
+      @converter = ('to_' + (converter.to_s)).intern
     end
 
     def add_templates(dir, *tmpls)
@@ -80,16 +56,16 @@ module Darkmouun
     end
 
     def apply_mustache
-      begin
       @source = @source.gsub(/<<(.+?)>>\n((?:[# \-]*[\w_][\w\d_]*: *\n?(?: +.+\n)+)+)/) do |s|
-        obj_spot_template, data = (@templates[$1.to_sym]).new, $2
-        YAML.load_stream(data).compact.reduce(&:merge).each do |k, v|
-          obj_spot_template.define_singleton_method(k){ v }
+        begin
+          obj_spot_template, data = (@templates[$1.to_sym]).new, $2
+          YAML.load_stream(data).compact.reduce(&:merge).each do |k, v|
+            obj_spot_template.define_singleton_method(k){ v }
+          end
+          obj_spot_template.render + "\n"
+        rescue => e
+          raise e.class.new("\n#{e.message} in \"Mustache-process\" at *** #{s} ***\n")
         end
-        obj_spot_template.render + "\n"
-      end
-      rescue => e
-        raise e.class.new("\n#{e.message}\n\n>>> ERROR in \"Mustache-process\" <<<\nMaybe, incorrect tags of the template exist.\n")
       end
     end
 

data/lib/darkmouun/version.rb

@@ -1,3 +1,3 @@
 module Darkmouun
-  VERSION = "1.1.0"
+  VERSION = "2.1.0"
 end

data/lib/darkmouun.rb

@@ -1,7 +1,3 @@
-require "darkmouun/version"
-require "darkmouun/main"
+require_relative "darkmouun/version"
+require_relative "darkmouun/main"
 
-module Darkmouun
-  class Error < StandardError; end
-  # Your code goes here...
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darkmouun
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Akinori Ichigo
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,10 +111,12 @@ files:
 - bin/setup
 - darkmouun.gemspec
 - lib/darkmouun.rb
-- lib/darkmouun/converter/span.rb
+- lib/darkmouun/kramdown.rb
+- lib/darkmouun/kramdown/converter/html.rb
+- lib/darkmouun/kramdown/parser/kramdown/extensions.rb
+- lib/darkmouun/kramdown/parser/kramdown/link.rb
+- lib/darkmouun/kramdown/parser/kramdown/span.rb
 - lib/darkmouun/main.rb
-- lib/darkmouun/parser/extensions.rb
-- lib/darkmouun/parser/span.rb
 - lib/darkmouun/version.rb
 homepage: https://github.com/akinori-ichigo/darkmouun
 licenses:
@@ -123,7 +125,7 @@ metadata:
   homepage_uri: https://github.com/akinori-ichigo/darkmouun
   source_code_uri: https://github.com/akinori-ichigo/darkmouun
   changelog_uri: https://github.com/akinori-ichigo/darkmouun
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.14
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: The Processting tool from Markdown to HTML
 test_files: []