beardown 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241cb8bce5c4963e0bfb4887d9475f82c7fdeb659b54d503b70918eb962d71d9
-  data.tar.gz: eef7af6534abf40446ac1986598708c84eb386768cc41197ea376ceeea7b7295
+  metadata.gz: a3a96777ab347a7fb7b5d93bebd441c889dc6000bc46bff99bce5fd7b7ceaee7
+  data.tar.gz: cff24bcc9ad8b5d4eed7a561a9f9006800538f06809f2fd13c932ed960c24aef
 SHA512:
-  metadata.gz: 4dcd7c0e8bcaf56fed1f720bb356bb1d964165be5c497505493689af10df40106389f3de97083357dcfaa61343b270aea9740a80dcfe6fbdbf114243cada781b
-  data.tar.gz: ac93399ee689d413cd10190a265f2bb716c8d0c009896585295915d62c80b8d0b35da9f490648b2798cfec83967fd4a5dd3b5d45869e3895f96b10e5a03dfd7f
+  metadata.gz: c11e20a9873bcb194310629f58d692b20006f66bf764900ce933b2013766fea25e3d96beb378d8ac39f52e4d92e9749fa52e490eea0c043f34fa0299479fd36b
+  data.tar.gz: f228ac926db0d7a7f04a495f6c35179c3f8788adb41a97b2faa022d6c79368c2bceb3ba05393248a9b3df8526eec45378fd4ca3606b682728bf5842f70b96eee

data/lib/beardown/blocks/head.rb

@@ -10,7 +10,7 @@ module Beardown
     end
 
     def render_head(id, content)
-      @title << content if id==1
+      @title << content if id==1&&@title.empty?
     end
 
     def convert_head(id,content)

data/lib/beardown/document.rb

@@ -4,7 +4,7 @@ module Beardown
   class Document
 
     def initialize(text)
-      @text = text
+      @text = text.gsub(/(?<!^)>/, "&gt").gsub("<", "&lt")
 
       # These orders are important
       @blocks = [:head, :line_separator, :list_unordered, :list_ordered,
@@ -12,7 +12,7 @@ module Beardown
       @spans  = [:codespan, :hashtag_full, :hashtag_full_nospace, :hashtag, :linkpost, :linkurl,
                  :bold, :italic, :underline, :strike, :mark_nospace, :mark]
 
-      @extensions = Array.new
+      @extensions = []
       @title = String.new
       @tags = Array.new
 

data/lib/beardown/spans/hashtag.rb

@@ -6,7 +6,7 @@ module Beardown
     REGEXP_HASHTAG_FULL_NOSPACE = /#([^#^\s]+)#/
     REGEXP_HASHTAG = /#([^#\s\,]+)/
 
-    ["", "_full", "_full_nospace"].each do |attr|
+    ["_full", "_full_nospace"].each do |attr|
       define_method :"scan_hashtag#{attr}" do |s|
         tag = s[1]
         send "convert_hashtag#{attr}", tag
@@ -15,14 +15,34 @@ module Beardown
       define_method :"convert_hashtag#{attr}" do |tag|
         tag = tag.downcase
         render_hashtag tag
-        sym = case attr
-              when "" then ""
-              else "#"
-              end
-      %(<a href="../tag/#{tag}/" class="hashtag">##{tag+sym}</a>)
+        %(<a href="../tag/#{tag}/" class="hashtag">##{tag}#</a>)
       end
     end
 
+    def scan_hashtag(s)
+      tag = s[1]
+      if check_color(tag)
+        convert_hashcolor tag
+      else
+        convert_hashtag tag
+      end
+    end
+
+    def convert_hashtag(tag)
+      tag = tag.downcase
+      render_hashtag tag
+      %(<a href="../tag/#{tag}/" class="hashtag">##{tag}</a>)
+    end
+
+    def check_color(tag)
+      return false if(tag.length!=6)
+      return tag.match? /[0-9a-fA-F]{6}/
+    end
+
+    def convert_hashcolor(hex)
+      %(<span class='color-preview' style='background-color:##{hex}'></span><span class='color-code'><span class='color-hash'>#</span>#{hex}</span></span>)
+    end
+
     def render_hashtag(tag)
       tag = tag.downcase
       tags = tag.split "/"

data/lib/beardown/version.rb

@@ -1,3 +1,3 @@
 module Beardown
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beardown
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - wuusn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler