wikitxt 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7d36aaac23a1d7ba85f0c1b966722702fb988545fa7f4f1550eb0bfad2423e
-  data.tar.gz: 141d7bdcfe59efb10c1f3be0295c370fc9aaefbb94dd973cadb7968d76c13971
+  metadata.gz: d4681e7a7528c3ae501f20cb3b6ba334686e403bd54fbda8c07a62dc2826ec39
+  data.tar.gz: de019304d4c52ffcbe8b2cf8462023134842c7b6cd5cb346ee15e96ddd6dff63
 SHA512:
-  metadata.gz: 0ad58a00cd43a4ded7bb066000774095e39eb52eba0a5fdd5ee1827868868a7e830efc836d7afaaedc04c0db59b22615e4c604b13a8de71b77a5b25dbdb29319
-  data.tar.gz: 9b014e93d894663b6ac222361cd01b0906c84666f207917185a190a5cb10477c0a40e292af7f9b8daef6b11cba102309df414639c43c188f8fcd4194ef2db9b5
+  metadata.gz: 2bb59f7935afca149a4ea47bb0210eb26051acf04fc1e54037baf196c55fe8892378c3e35022063e5c92d609c1a86eb1ce5814c41900206eddbcdeb0eca87334
+  data.tar.gz: a0c849923b6381bad63c91fb7b8070f96075a7c1cab3cca15ce2d4020e201c68e05006e282e7882e1230fc633c8988064aa29fac704e6c1e772108b4c0a987d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wikitxt (0.1.7)
+    wikitxt (0.1.9)
       rackup (~> 2.1)
       sinatra (~> 4.0)
       thor (~> 1.3)

data/README.md

@@ -71,13 +71,13 @@ Internal Images:
 External Links:
 
 ```
-#<https://example.com Example Domain>
+https://example.com
 ```
 
 External Images:
 
 ```
-#<https://example.com/image.png Example Image>
+https://example.com/image.png
 ```
 
 Pre Blocks:

data/lib/wikitxt/node.rb

@@ -30,7 +30,7 @@ module Wikitxt
     def to_html
       <<~HTML
         <div class="line">
-        <div class="dot" style="margin-left: #{attrs[:indent] * 5}px;"></div>
+        <div style="margin-left: #{attrs[:indent] * 10}px;"></div>
         <div class="list">#{Parser::Inline.new(self).to_html}</div>
         </div>
       HTML
@@ -45,13 +45,13 @@ module Wikitxt
 
   class LinkNode < BaseNode
     def to_html
-      " <a href=\"#{attrs[:url]}\">#{CGI.escapeHTML(attrs[:title])}</a> "
+      " <a href=\"#{attrs[:url]}\">#{attrs[:title] ? CGI.escapeHTML(attrs[:title]) : attrs[:url]}</a> "
     end
   end
 
   class ImageNode < BaseNode
     def to_html
-      "<img src=\"#{attrs[:url]}\" title=\"#{attrs[:title]}\" />"
+      "<img src=\"#{attrs[:url]}\" />"
     end
   end
 

data/lib/wikitxt/parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri'
+
 module Wikitxt
   class Parser
     class Block
@@ -51,15 +53,14 @@ module Wikitxt
         scanner = StringScanner.new(parent.attrs[:text])
 
         until scanner.eos? do
-          if result = scanner.scan(/ ?#<.+>/)
+          if result = scanner.scan(URI.regexp(["http", "https"]))
             parent.children << pending if pending
             pending = nil
-            match = result.match(/#<(?<title>.*) *(?<url>https?:\/\/.+\.\S+) *(?<title>.*)>/)
-            if match[:url].match(/\.(png|jpg|jpeg|svg)/)
-              parent.children << ImageNode.new(url: match[:url], title: match[:title])
+            if result.match(/\.(png|jpg|jpeg|svg)/)
+              parent.children << ImageNode.new(url: result)
               next
             end
-            parent.children << LinkNode.new(url: match[:url], title: match[:title])
+            parent.children << LinkNode.new(url: result)
             next
           end
 

data/lib/wikitxt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wikitxt
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/lib/wikitxt/views/layout.erb

@@ -31,13 +31,6 @@
     min-height: 1rem;
   }
 
-  .dot {
-    width: 5px;
-    height: 5px;
-    background: #333;
-    border-radius: 100%;
-  }
-
   pre, code {
     background: #eee;
     margin: 0;

data/samples/Wikitxt.txt

@@ -15,7 +15,7 @@ In summary, it's like this:
     Text decoration is limited to links.
     Words you want to emphasize should be expressed as wiki pages.
 
-Absolute url is parsed as external link: #<https://example.com Example Domain>
+Absolute url is parsed as external link: https://example.com
 
 #woman.jpg
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikitxt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Moeki Kawakami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor