darkmouun 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed1b6143ae074a945157a6ae8a448e551bfe3ba62314851a5eb1466e64f4c40
-  data.tar.gz: 8fa7d1c9ddcffe5fc1b0da67deb41b787d0e1cb364c58e57fdd3041d1191ee51
+  metadata.gz: 4402d38faf236b8d8ae285750e9b6711bc8fe10e85090dba4ef04ebcefb21564
+  data.tar.gz: 6093ca51565f4b148a7f5a54043c7ebd6e17f4ff25c3dde1c8797f894e17c363
 SHA512:
-  metadata.gz: 4ae829259c0d4fd85b7032c65a8c7644cc4740d8eec72c445777cc10e661975f6cf185c032845996af439531e067f7a6529eb32fb4fab9e307aad65c20432f2e
-  data.tar.gz: '09b875fad61ab9f544e89c748e91c93f4090c5c6d12b8ad80d04bf6827a920a718a5555f4df6ebcc81f842b42c7fbad6b1bb76927a04ecbb6c001997760e0abb'
+  metadata.gz: 57b91ad4f2d72203bb195b7c8bae10ef43b8f258ca194581a62dea4e2e0acccafab5cfde498c5bb30de9ac4b68d67c0e745339a0ea1b56d803cfe85aca1a2313
+  data.tar.gz: eb212f8d4a899efe746a31731ab2e8a47a46293d8d446530b353904ed81b087bac1e0a4cc94d7c25fb4807e9ba735228c9b282127311e2e298c52e9964903373

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,94 @@
+# -*- 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) })
+          add_text(result)
+          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(/\(/)
+          emit_warning = !@src[1]
+          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
+            if emit_warning
+              warning("No link definition for link ID '#{link_id}' found on line #{start_line_number}")
+            end
+            @src.revert_pos(saved_pos)
+            add_text(result)
+          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,17 +1,12 @@
 # -*- 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*?)/
+      SPAN_START = /(?:\[\s*?)/
 
       # Parse the span at the current location.
       def parse_span
@@ -19,15 +14,20 @@ module Kramdown
         saved_pos = @src.save_pos
 
         result = @src.scan(SPAN_START)
-        stop_re = /(?:\s*?\]\])/
+        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)
+          if @src.check(/\(/)
+            @src.revert_pos(saved_pos)
+            parse_link
+            return
+          end
           @tree.children << el
         else
           @src.revert_pos(saved_pos)
@@ -35,7 +35,7 @@ module Kramdown
           add_text(result)
         end
       end
-      define_parser(:span, SPAN_START, '\[\[')
+      define_parser(:span, SPAN_START, '\[')
 
     end
   end

data/lib/darkmouun/kramdown.rb

@@ -0,0 +1,23 @@
+# -*- 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
+
+  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
+

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)

data/lib/darkmouun/version.rb

@@ -1,3 +1,3 @@
 module Darkmouun
-  VERSION = "1.2.0"
+  VERSION = "2.0.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.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Akinori Ichigo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-09-05 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: