wikitxt 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a7f8a4f7884dc145db8acf0da6b5fd903557d7f159ebd52f58caf61e562973
-  data.tar.gz: 9d1ee801e37d098694d897352c320009d88024c13c57d75c13d593ca4eaddf75
+  metadata.gz: 2d7d36aaac23a1d7ba85f0c1b966722702fb988545fa7f4f1550eb0bfad2423e
+  data.tar.gz: 141d7bdcfe59efb10c1f3be0295c370fc9aaefbb94dd973cadb7968d76c13971
 SHA512:
-  metadata.gz: d44e3f321afc81084d90310da0b2a538b31db20c32a88113934dfb644844e4626b4e4307813292a756e92570330dea6c77626114386043e08e2dba59fc6aa4e5
-  data.tar.gz: ebcaf7464d7ee0405c03eb6372b522bcfa74a790872c45189fd8a410b85625bd5d18ec2f56e4ce63ace5bc73f272c670a6aec0e00f686930ddd9629447b80ae9
+  metadata.gz: 0ad58a00cd43a4ded7bb066000774095e39eb52eba0a5fdd5ee1827868868a7e830efc836d7afaaedc04c0db59b22615e4c604b13a8de71b77a5b25dbdb29319
+  data.tar.gz: 9b014e93d894663b6ac222361cd01b0906c84666f207917185a190a5cb10477c0a40e292af7f9b8daef6b11cba102309df414639c43c188f8fcd4194ef2db9b5

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    wikitxt (0.1.5)
+    wikitxt (0.1.7)
       rackup (~> 2.1)
-      rerun (~> 0.14)
       sinatra (~> 4.0)
       thor (~> 1.3)
 
@@ -55,8 +54,6 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rerun (0.14.0)
-      listen (~> 3.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)

data/README.md

@@ -80,6 +80,18 @@ External Images:
 #<https://example.com/image.png Example Image>
 ```
 
+Pre Blocks:
+
+```
+---
+class Foo
+  def bar
+    p "bar"
+  end
+end
+---
+```
+
 ## Usage
 
 ### Render HTML
@@ -123,6 +135,14 @@ Access to http://localhost:4567 .
 $ wikitxt build wiki
 ```
 
+### Search references
+
+Install [ripgrep (rg)](https://github.com/BurntSushi/ripgrep)
+
+```
+$ rg "#RDB" .
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/wikitxt/node.rb

@@ -39,13 +39,13 @@ module Wikitxt
 
   class TextNode < BaseNode
     def to_html
-      "<span>#{attrs[:text]}</span>"
+      "<span>#{CGI.escapeHTML(attrs[:text])}</span>"
     end
   end
 
   class LinkNode < BaseNode
     def to_html
-      " <a href=\"#{attrs[:url]}\">#{attrs[:title]}</a> "
+      " <a href=\"#{attrs[:url]}\">#{CGI.escapeHTML(attrs[:title])}</a> "
     end
   end
 
@@ -54,4 +54,32 @@ module Wikitxt
       "<img src=\"#{attrs[:url]}\" title=\"#{attrs[:title]}\" />"
     end
   end
+
+  class CodeNode < BaseNode
+    def to_html
+      <<~HTML
+        <div class="line">
+        <code><pre>#{CGI.escapeHTML(attrs[:text])}</pre></code>
+        </div>
+      HTML
+    end
+  end
+
+  class PreStartNode < BaseNode
+    def to_html
+      "<pre>"
+    end
+  end
+
+  class PreEndNode < BaseNode
+    def to_html
+      "</pre>\n"
+    end
+  end
+
+  class PreNode < BaseNode
+    def to_html
+      CGI.escapeHTML(attrs[:text])
+    end
+  end
 end

data/lib/wikitxt/parser.rb

@@ -11,8 +11,21 @@ module Wikitxt
 
       def body
         b = BodyNode.new
+        in_pre = false
 
         text.lines.each do |line|
+          if line == "---\n"
+            node = !in_pre ? PreStartNode.new : PreEndNode.new
+            b.children << node
+            in_pre = !in_pre
+            next
+          end
+
+          if in_pre
+            b.children << PreNode.new(text: line)
+            next
+          end
+
           if match = line.match(/^(?<indent> {2,})(?<text>.*)$/)
             b.children << ListNode.new(text: match[:text], indent: match[:indent].length - 2)
             next

data/lib/wikitxt/version.rb

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

data/lib/wikitxt/views/layout.erb

@@ -7,6 +7,7 @@
   body {
     background: #ddd;
     padding: 1rem;
+    word-break: break-all;
   }
 
   .content {
@@ -37,6 +38,19 @@
     border-radius: 100%;
   }
 
+  pre, code {
+    background: #eee;
+    margin: 0;
+    width: 100%;
+    padding: 0.5rem;
+    box-sizing: border-box;
+  }
+
+  blockquote {
+    background: #eee;
+    font-style: italic;
+  }
+
   img {
     max-width: 100%;
   }

data/samples/Wikitxt.txt

@@ -18,3 +18,11 @@ In summary, it's like this:
 Absolute url is parsed as external link: #<https://example.com Example Domain>
 
 #woman.jpg
+
+---
+class Foo
+  def bar
+    p "bar"
+  end
+end
+---

data/wikitxt.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 1.3"
   spec.add_dependency "sinatra", "~> 4.0"
-  spec.add_dependency "rerun", "~> 0.14"
   spec.add_dependency "rackup", "~> 2.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikitxt
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Moeki Kawakami
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rerun
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rackup
   requirement: !ruby/object:Gem::Requirement