improved regular expressions in blockquote plugin
This commit is contained in:
parent
a93c959950
commit
6a6de74aad
@ -1,17 +1,17 @@
|
||||
#
|
||||
# Author: Brandon Mathis
|
||||
# Based on the work of: Josediaz Gonzalez - https://github.com/josegonzalez/josediazgonzalez.com/blob/master/_plugins/blockquote.rb
|
||||
# A full rewrite based on the work of: Josediaz Gonzalez - https://github.com/josegonzalez/josediazgonzalez.com/blob/master/_plugins/blockquote.rb
|
||||
#
|
||||
# Outputs a string with a given attribution as a quote
|
||||
#
|
||||
# {% blockquote Bobby Willis http://google.com/blah the search for bobby's mom %}
|
||||
# {% blockquote Bobby Willis http://google.com/search?q=pants the search for bobby's pants %}
|
||||
# Wheeee!
|
||||
# {% endblockquote %}
|
||||
# ...
|
||||
# <blockquote>
|
||||
# <p>Wheeee!</p>
|
||||
# <footer>
|
||||
# <strong>Bobby Willis</strong><cite><a href="http://google.com/blah">The Search For Bobby's Mom</a>
|
||||
# <strong>Bobby Willis</strong><cite><a href="http://google.com/search?q=pants">The Search For Bobby's Pants</a>
|
||||
# </blockquote>
|
||||
#
|
||||
require './plugins/titlecase.rb'
|
||||
@ -19,9 +19,9 @@ require './plugins/titlecase.rb'
|
||||
module Jekyll
|
||||
|
||||
class Blockquote < Liquid::Block
|
||||
FullCiteWithTitle = /([\w\s]+)(https?:\/\/)(\S+\s)([\w\s]+)/i
|
||||
FullCite = /([\w\s]+)(https?:\/\/)(\S+)/i
|
||||
Author = /([\w\s]+)/
|
||||
FullCiteWithTitle = /(\S[\S\s]*)\s+(https?:\/\/)(\S+)\s+(.+)/i
|
||||
FullCite = /(\S[\S\s]*)\s+(https?:\/\/)(\S+)/i
|
||||
Author = /(\S[\S\s]*)/
|
||||
|
||||
def initialize(tag_name, markup, tokens)
|
||||
@by = nil
|
||||
@ -55,14 +55,14 @@ module Jekyll
|
||||
source << '/…' unless source == @source
|
||||
end
|
||||
cite = "<cite><a href='#{@source}'>#{(@title || source)}</a></cite>"
|
||||
reply = if @by.nil?
|
||||
result = if @by.nil?
|
||||
output
|
||||
elsif !@source.nil?
|
||||
"#{output}<footer>#{author + cite}</footer>"
|
||||
else
|
||||
"#{output}<footer>#{author}</footer>"
|
||||
end
|
||||
"<blockquote>#{reply}</blockquote>"
|
||||
"<blockquote>#{result}</blockquote>"
|
||||
end
|
||||
|
||||
def paragraphize(input)
|
||||
|
Loading…
Reference in New Issue
Block a user