tdiary-contrib 5.0.13 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009c64dc97147efc63990a7ec5fa8983f91cb178d0387ac6e0386fe55063f610'
-  data.tar.gz: '093f3a82c16051eceef19bd33510e340e9f7c6a4a5d4acedf7070339e2158f9b'
+  metadata.gz: f7589d91925dead78181297d0bfb4e994d79d2d362cbc822084367b85a593b56
+  data.tar.gz: 424a594824fad56caf9c40825d96c1c7eac62857dd0b04bad7028f4a7a7a5685
 SHA512:
-  metadata.gz: 1be1619494878bffa267f790e6ce32a93219ced0b67d1da7423f39ac5facaa2d3bc223fca5757b2f09e431363da0eb6a19262b2fd2a6f9c06bb8dc50e489b98a
-  data.tar.gz: a8fa7adf819b51d781c53a75e3596b9464194215401f8a6e5ce2d173bc4523d20f0772eef8b243e47ecd0b6ff9bc54f5c8693dcc31e6db7dfd3d056ae4688a10
+  metadata.gz: 656e6bdfc9982c2744c0a323e7b46037dbcf0eab0750add8b4b84807cf1ba99e6ce82f6f130c1e26139ee74dff629bdc7a14390f23537741680a0185ecef7925
+  data.tar.gz: '0463607988a55b8575c9fa62e16786e7f51e139f3f3cf9c461a7b3930d2efa9b782afaf52a08279e499bcc027399e4040f9a4f221cb306bcfcc7dba1d56e84a8'

data/js/gyazo.js

@@ -0,0 +1,23 @@
+/*
+ * gyazo.js: gyazo plugin for tDiary
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+$(function() {
+	$('.gyazo-images img')
+	.on({
+		'mouseenter': function(){
+			$(this).css('cursor', 'pointer');
+		},
+		'mouseleave': function(){
+			$(this).css('cursor', 'default');
+		},
+		'click': function(){
+			var url = $(this).attr('data-url');
+			var text = $.makePluginTag('gyazo', function(){
+				return ["'" + url + "'", "'[description]'"]
+			})
+			$('#body').insertAtCaret(text);
+		}
+	})
+})

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.13"
+    VERSION = "5.1.4"
   end
 end

data/plugin/add_bookmark.rb

@@ -20,7 +20,7 @@ add_subtitle_proc do |date, index, subtitle|
 	section_url = @conf.base_url + anchor(date.strftime('%Y%m%d')) + '#p' + ('%02d' % index)
 
 	if @conf['add.bookmark.delicious'] == 't' then
-		escaped_url = URI.escape(section_url, /[^-.!~*'()\w]/n)
+		escaped_url = CGI.escape(section_url)
 		caption += %Q|<a href="http://delicious.com/save?url=#{escaped_url}" onclick="window.open('http://delicious.com/save?v=5;noui;jump=close;url=#{escaped_url};title='+encodeURIComponent(document.title), 'delicious', 'toolbar=no,width=550,height=550'); return false">|
 		caption += %Q|<img src="http://static.delicious.com/img/delicious.small.gif" width="10" height="10" style="border: 0 none;vertical-align: middle;" alt="#{@caption_delicious}">|
 		caption += %Q|</a> |

data/plugin/gyazo.rb

@@ -0,0 +1,90 @@
+#
+# gyazo.rb: gyazo plugin for tDiary
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+require 'net/http'
+require 'json'
+
+if /^(form|edit|formplugin|showcomment)$/ =~ @mode then
+	enable_js('gyazo.js')
+end
+
+def gyazo(permalink_url, alt = '[description]', style = 'photo')
+	size = @conf['gyazo_max_size'] || 512
+	begin
+		oembed = JSON.parse(Net::HTTP.get(URI("https://api.gyazo.com/api/oembed?url=#{permalink_url}")), symbolize_names: true)
+	rescue => e
+		@logger.error(e)
+		return ''
+	end
+	url = oembed[:url].gsub(%r|/thumb/\d+/|, "/thumb/#{size}/")
+	width = oembed[:width].to_i
+	height = oembed[:height].to_i
+	if width > 0 && height > 0
+		if width > height
+			height = size * height / width
+			width = size
+		else
+			width = size * width / height
+			height = size
+		end
+		%Q[<img src="#{url}" class="#{style}" width=#{width} height=#{height} alt="#{alt}" title="#{alt}">]
+	else # no size informations in API
+		%Q[<img src="#{url}" class="#{style}" width=#{size} alt="#{alt}" title="#{alt}">]
+	end
+end
+
+def gyazo_right(permalink_url, alt = '[description]')
+	gyazo(permalink_url, alt, 'right')
+end
+
+def gyazo_left(permalink_url, alt = '[description]')
+	gyazo(permalink_url, alt, 'left')
+end
+
+def gyazo_list
+	endpoint = "https://api.gyazo.com/api/images"
+	access_token = @conf['gyazo_token']
+	return [] if access_token == nil || access_token.empty?
+	per_page = @conf['gyazo_max_images'] || 5
+	uri = "#{endpoint}?access_token=#{access_token};per_page=#{per_page}"
+	begin
+		JSON.parse(Net::HTTP.get(URI(uri)), symbolize_names: true).map{|i|
+			[i[:permalink_url], i[:thumb_url]]
+		}.delete_if{|is|
+			is[1].empty?
+		}
+	rescue => e
+		@logger.error(e)
+		return []
+	end
+end
+
+add_form_proc() do |date|
+	'<div class="form"><div class="caption">Gyazo</div><div class="gyazo-images">' +
+	gyazo_list.map{|i|
+		%Q[<img src="#{i[1]}" data-url="#{i[0]}"> ]
+	}.join +
+	'</div></div>'
+end
+
+add_conf_proc('gyazo', 'Gyazo') do
+	if @mode == 'saveconf'
+		@conf['gyazo_token'] = @cgi.params['gyazo_token'][0]
+		@conf['gyazo_max_images'] = @cgi.params['gyazo_max_images'][0].to_i
+		@conf['gyazo_max_size'] = @cgi.params['gyazo_max_size'][0].to_i
+	end
+	@conf['gyazo_max_images'] = 5 if @conf['gyazo_max_images'].to_i < 1
+	@conf['gyazo_max_size'] = 512 if @conf['gyazo_max_size'].to_i < 1
+
+	r = ''
+	r << %Q|<h3 class="subtitle">Gyazo API Access Token</h3>|
+	r << %Q|<p>Get your token from <a href="https://gyazo.com/oauth/applications">Gyazo Applications</a></p>|
+	r << %Q|<p><input name="gyazo_token" value="#{h @conf['gyazo_token']}" size=64></p>|
+	r << %Q|<h3 class="subtitle">Max images in list</h3>|
+	r << %Q|<p><input name="gyazo_token" value="#{h @conf['gyazo_max_images']}" size=3></p>|
+	r << %Q|<h3 class="subtitle">Max image size</h3>|
+	r << %Q|<p><input name="gyazo_token" value="#{h @conf['gyazo_max_size']}" size=4> px</p>|
+	r
+end

data/plugin/hb_footer.rb

@@ -8,7 +8,7 @@
 # Author: ishinao <ishinao@ishinao.net>
 #
 
-add_body_leave_proc(Proc.new do |date|
+add_body_leave_proc do |date|
   if @mode == 'day' or @mode == 'latest'
     diary = @diaries[date.strftime('%Y%m%d')]
     pnum = 1
@@ -33,7 +33,7 @@ add_body_leave_proc(Proc.new do |date|
   else
     ''
   end
-end)
+end
 
 # rss-recent.rb: RSS recent plugin
 #

data/plugin/image_ex.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # image_plugin_ex.rb
 # version 0.3
 # -pv-
@@ -86,11 +87,11 @@
 
 enable_js("image_ex.js")
 
-add_body_enter_proc(Proc.new do |date|
+add_body_enter_proc do |date|
 	@image_date = date.strftime("%Y%m%d")
 	@image_year = date.strftime("%Y")
 	""
-end)
+end
 
 
 def image( id, alt = "image", id2 = nil, width = nil, place="none" )
@@ -199,7 +200,7 @@ add_form_proc do |date|
 					imageex_convertedsize = %Q[#{imageex_convertedheight}x#{imageex_convertedwidth}]
 					imageex_convertedsize
 				end
-				system(imageex_convertpath , "-geometry", imageex_convertedsize , orig, new)
+				system(imageex_convertpath , "-auto-orient", "-geometry", imageex_convertedsize , orig, new)
 				if FileTest::size?( new ) == 0
 					File::delete( new )
 				end
@@ -373,7 +374,7 @@ add_form_proc do |date|
 		posttable << %Q[</TR></TABLE>]
 	end
 
-	if @conf.respond_to?(:style) and @conf.style =~ /Wiki$/i
+	if @conf.respond_to?(:style) and @conf.style =~ /(Wiki|GFM)$/i
 		image_plugin_tag1 = "{{"
 		image_plugin_tag2 = "}}"
 	elsif @conf.respond_to?(:style) and @conf.style =~ /RD$/i

data/plugin/instagram.rb

@@ -10,7 +10,6 @@ require 'uri'
 require 'net/http'
 require 'open-uri'
 
-
 def instagram(*args)
    uri = URI::parse(args[0])
    return instagram_iframe(*args) if uri.scheme.nil?
@@ -19,7 +18,9 @@ end
 
 def instagram_iframe(code, width=612, height=700)
   return <<-BODY
-<iframe src="//instagram.com/p/#{code}/embed/" width="#{width}" height="#{height}" frameborder="0" scrolling="no" allowtransparency="true"></iframe>
+   <div class="embed embed-instagram">
+   <iframe src="//instagram.com/p/#{code}/embed/" width="#{width}" height="#{height}" frameborder="0" scrolling="no" allowtransparency="true"></iframe>
+   </div>
   BODY
 end
 

data/plugin/ja/openbd.rb

@@ -0,0 +1,40 @@
+#
+# Japanese resource of openBD plugin
+#
+# Copyright (C) 2020 OGAWA KenIchi <kenichi@ice.email.ne.jp>
+# You can redistribute it and/or modify it under GPL2 or any later version.
+#
+
+@openbd_label_title = 'isbn_imageプラグインで商品名を'
+@openbd_label_title_hide = '表示しない'
+@openbd_label_title_show = '表示する'
+@openbd_label_clearcache = 'キャッシュの削除'
+@openbd_label_clearcache_desc = '書籍情報のキャッシュを削除する'
+
+@openbd_label_default_image = 'デフォルトの画像ファイル'
+@openbd_label_default_image_desc =
+	'書影がない場合に表示する画像ファイルのパスを指定します。' \
+	'未指定の場合はデフォルトの画像が表示されます。'
+
+@openbd_label_image_width = '書影の表示幅'
+@openbd_label_image_width_desc =
+	'数値を指定すると書影を表すimg要素のwidth属性に値が出力されます。'
+
+@openbd_label_image_height = '書影の表示高'
+@openbd_label_image_height_desc =
+	'数値を指定すると書影を表すimg要素のheight属性に値が出力されます。'
+
+@openbd_label_detail_image_width = 'isbn_detail使用時の書影の表示幅'
+@openbd_label_detail_image_width_desc =
+	'数値を指定すると書影を表すimg要素のwidth属性に値が出力されます。'
+
+@openbd_label_detail_image_height = 'isbn_detail使用時の書影の表示高'
+@openbd_label_detail_image_height_desc =
+	'数値を指定すると書影を表すimg要素のheight属性に値が出力されます。'
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/plugin/mm_footer.rb

@@ -9,7 +9,7 @@
 
 require 'nkf'
 
-add_body_leave_proc(Proc.new do |date|
+add_body_leave_proc do |date|
 
   oldest_date = Time.local(2005, 1, 11)
   if date > oldest_date
@@ -38,7 +38,7 @@ add_body_leave_proc(Proc.new do |date|
 		''
 	 end
   end
-end)
+end
 
 require "rss/rss"
 

data/plugin/my_hotentry.rb

@@ -39,7 +39,7 @@ class MyHotEntry
     # RSSを取得
     rss = nil
     rss_url = 'http://b.hatena.ne.jp/entrylist?mode=rss&url='
-    rss_url << URI.escape(base_url, /[^-.!~*'()\w]/n)
+    rss_url << CGI.escape(base_url)
     rss_url << "&sort=#{options[:sort]}&threshold=#{options[:threshold]}"
     begin
       Timeout.timeout(5) do

data/plugin/notify_miniblog.rb

@@ -53,7 +53,7 @@ def notify_miniblog
 
 	# strip category
 	sectitle.gsub!(/\[[^\]]+\] */, '')
-	url = URI.encode(@conf.base_url + anchor("#{date}p%02d" % index), /[^-.!~*'()\w]/n)
+	url = CGI.escape(@conf.base_url + anchor("#{date}p%02d" % index))
 	prefix = @conf['miniblog.notify.prefix']
 	format = @conf['miniblog.notify.format']
 	source = 'tdiary/notify_miniblog.rb'

data/plugin/openbd.rb

@@ -0,0 +1,306 @@
+# openbd.rb
+#
+# Copyright (C) 2020 OGAWA KenIchi <kenichi@ice.email.ne.jp>
+# You can redistribute it and/or modify it under GPL2 or any later version.
+#
+
+require "net/http"
+require "json"
+require "uri"
+
+module OpenBD
+	class Item
+		attr_reader :isbn
+
+		def initialize(isbn, json)
+			@isbn = isbn
+			@data = JSON.parse(json)[0] || {}
+		end
+
+		def normalized_isbn
+			nil_if_empty(@data.dig("summary", "isbn"))
+		end
+
+		def image_url
+			nil_if_empty(@data.dig("summary", "cover"))
+		end
+
+		def title
+			nil_if_empty(@data.dig("summary", "title"))
+		end
+
+		def author
+			nil_if_empty(@data.dig("summary", "author"))
+		end
+
+		def title_and_author
+			author ? "#{title}(#{author})" : title
+		end
+
+		def publisher
+			nil_if_empty(@data.dig("summary", "publisher"))
+		end
+
+		def price
+			price = @data.dig("onix", "ProductSupply", "SupplyDetail", "Price", 0)
+			return nil unless price
+			value = price["PriceAmount"]
+			currency_code = price["CurrencyCode"]
+			case currency_code
+			when "JPY"
+				"#{value}円"
+			else
+				"#{currency_code} #{value}"
+			end
+		end
+
+		private def nil_if_empty(s)
+			s&.empty? ? nil : s
+		end
+	end
+
+	class Cache
+		def initialize(cache_path)
+			@dir = File.join(cache_path, "openbd")
+		end
+
+		def load(isbn)
+			File.read(path_for(isbn))
+		rescue Errno::ENOENT
+			nil
+		end
+
+		def save(isbn, json)
+			Dir.mkdir(@dir) unless File.directory?(@dir)
+			File.write(path_for(isbn), json)
+		end
+
+		def clear
+			Dir.glob("#{@dir}/*").each { |f| File.delete(f) }
+		end
+
+		private def path_for(isbn)
+			File.join(@dir, "#{isbn}.json")
+		end
+	end
+
+	module_function
+
+	def get_item(isbn, cache_path, mode)
+		cache = OpenBD::Cache.new(cache_path)
+		json = cache.load(isbn) if mode != "preview"
+		unless json
+			uri = URI("https://api.openbd.jp/v1/get?isbn=#{isbn}")
+			response = Net::HTTP.get_response(uri)
+			response.value # raise on errors
+			json = response.body
+			cache.save(isbn, json)
+		end
+		OpenBD::Item.new(isbn, json)
+	end
+
+	def reference_url(item)
+		isbn13 = item.normalized_isbn
+		if isbn13
+			"https://www.hanmoto.com/bd/isbn/#{isbn13}"
+		else
+			isbn = item.isbn.length == 13 ? isbn13to10(item.isbn) : item.isbn
+			"https://www.amazon.co.jp/dp/#{isbn}"
+		end
+	end
+
+	def image_info(item, conf)
+		width = conf["openbd.image_width"]
+		height = conf["openbd.image_height"]
+		url = item.image_url || conf["openbd.default_image"]
+		if !url || url.empty?
+			url = <<~EOS
+				data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAECAIAAADETxJQAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
+				jwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAXSURBVBhXYzx8+DADGDBBKCDAZDEwAABXngJR
+				1c/tyAAAAABJRU5ErkJggg==
+			EOS
+			url.rstrip!
+			width = 200 if !width && !height
+		end
+		{ url: url, width: width, height: height }
+	end
+
+	# from tdiary-core/lib/aws/pa_api.rb
+	def isbn13to10(isbn13)
+		sum, = isbn13[3, 9].split(//).map(&:to_i).reduce([0,10]){|s,d|[s[0] + d * s[1], s[1]-1]}
+		return isbn13[3, 9] + %w(0 1 2 3 4 5 6 7 8 9 X 0)[11 - sum % 11]
+	end
+end
+
+def openbd_image(item, label, css_class)
+	label ||= item.title_and_author || item.isbn
+	href = OpenBD.reference_url(item)
+	if @mode == "categoryview"
+		img = ""
+	else
+		alt = ""
+		if @conf["amazon.hidename"] || css_class != "amazon"
+			label, alt = alt, label
+		end
+		image = OpenBD.image_info(item, @conf)
+		width = image[:width]
+		height = image[:height]
+		img_width = width && %Q|width="#{h width}"|
+		img_height = height && %Q|height="#{h height}"|
+		img = <<~EOS
+			<img class="#{h css_class}"
+				src="#{h image[:url]}" #{img_width} #{img_height}
+				alt="#{h alt}">
+		EOS
+	end
+	%Q|<a href="#{h href}">#{img.rstrip}#{h label}</a>|
+end
+
+def openbd_process(isbn, &block)
+	isbn = isbn.to_s.strip.gsub("-", "")
+	block.call(OpenBD.get_item(isbn, @cache_path, @mode))
+rescue => e
+	@logger.error "openbd.rb: isbn=#{isbn}, message=#{e.message}"
+	message = "[openBD plugin error]"
+	if @mode == "preview"
+		message << %Q|<span class="message">(#{h e.message})</span>|
+	end
+	message
+end
+
+def isbn_image(isbn, label = nil )
+	openbd_process(isbn) do |item|
+		openbd_image(item, label, "amazon")
+	end
+end
+
+def isbn_image_left(isbn, label = nil)
+	openbd_process(isbn) do |item|
+		openbd_image(item, label, "left")
+	end
+end
+
+def isbn_image_right(isbn, label = nil)
+	openbd_process(isbn) do |item|
+		openbd_image(item, label, "right")
+	end
+end
+
+def isbn(isbn, label = nil)
+	openbd_process(isbn) do |item|
+		label ||= item.title_and_author || item.isbn
+		%Q|<a href="#{h OpenBD.reference_url(item)}">#{h label}</a>|
+	end
+end
+
+def isbn_detail(isbn)
+	openbd_process(isbn) do |item|
+		image = OpenBD.image_info(item, @conf)
+		width = @conf["openbd.detail_image_width"]
+		height = @conf["openbd.detail_image_height"]
+		width = 57 if !width && !height
+		img_width = width && %Q|width="#{h width}"|
+		img_height = height && %Q|height="#{h height}"|
+		url = OpenBD.reference_url(item)
+		<<-EOS
+			<a class="amazon-detail" href="#{h url}"><span class="amazon-detail">
+				<img class="amazon-detail left"
+					src="#{h image[:url]}" #{img_width} #{img_height} alt="">
+				<span class="amazon-detail-desc">
+					<span class="amazon-title">#{h item.title}</span><br>
+					<span class="amazon-author">#{h item.author || "-"}</span><br>
+					<span class="amazon-label">#{h item.publisher || "-"}</span><br>
+					<span class="amazon-price">#{h item.price || "-"}</span>
+				</span>
+			</span></a>
+		EOS
+	end
+end
+
+# for compatibility
+alias isbnImgLeft isbn_image_left
+alias isbnImgRight isbn_image_right
+alias isbnImg isbn_image
+alias amazon isbn_image
+
+add_conf_proc("openbd", "openBD") do
+	if @mode == "saveconf" then
+		@conf["amazon.hidename"] = (@cgi.params["openbd.hidename"][0] == "true")
+		@conf["openbd.default_image"] = @cgi.params["openbd.default_image"][0]
+
+		to_px = lambda do |v|
+			i = v.to_i
+			i > 0 ? i : nil
+		end
+		@conf["openbd.image_width"] =
+			to_px[@cgi.params["openbd.image_width"][0]]
+		@conf["openbd.image_height"] =
+			to_px[@cgi.params["openbd.image_height"][0]]
+		@conf["openbd.detail_image_width"] =
+			to_px[@cgi.params["openbd.detail_image_width"][0]]
+		@conf["openbd.detail_image_height"] =
+			to_px[@cgi.params["openbd.detail_image_height"][0]]
+
+		if @cgi.params["openbd.clearcache"][0] == "true"
+			OpenBD::Cache.new(@cache_path).clear
+		end
+	end
+
+	hidename = @conf["amazon.hidename"]
+	<<-EOS
+		<h3>#{h @openbd_label_title}</h3>
+		<p><select name="openbd.hidename">
+			<option value="true"#{" selected" if hidename}>
+				#{h @openbd_label_title_hide}
+			</option>
+			<option value="false"#{" selected" unless hidename}>
+				#{h @openbd_label_title_show}
+			</option>
+		</select></p>
+
+		<h3>#{h @openbd_label_clearcache}</h3>
+		<p><label for="openbd.clearcache">
+			<input type="checkbox" id="openbd.clearcache" name="openbd.clearcache" value="true">
+			#{h @openbd_label_clearcache_desc}
+		</label></p>
+
+		<h3>#{h @openbd_label_default_image}</h3>
+		<p>#{h @openbd_label_default_image_desc}</p>
+		<p><input type="text" name="openbd.default_image" value="#{h @conf["openbd.default_image"]}" size="70"></p>
+
+		<h3>#{h @openbd_label_image_width}</h3>
+		<p>#{h @openbd_label_image_width_desc}</p>
+		<p>
+			<input type="text" name="openbd.image_width" value="#{h @conf["openbd.image_width"]}" size="5">
+			<label for="openbd.image_width">px</label>
+		</p>
+
+		<h3>#{h @openbd_label_image_height}</h3>
+		<p>#{h @openbd_label_image_height_desc}</p>
+		<p>
+			<input type="text" name="openbd.image_height" value="#{h @conf["openbd.image_height"]}" size="5">
+			<label for="openbd.image_height">px</label>
+		</p>
+
+		<h3>#{h @openbd_label_detail_image_width}</h3>
+		<p>#{h @openbd_label_detail_image_width_desc}</p>
+		<p>
+			<input type="text" name="openbd.detail_image_width" value="#{h @conf["openbd.detail_image_width"]}" size="5">
+			<label for="openbd.detail_image_width">px</label>
+		</p>
+
+		<h3>#{h @openbd_label_detail_image_height}</h3>
+		<p>#{h @openbd_label_detail_image_height_desc}</p>
+		<p>
+			<input type="text" name="openbd.detail_image_height" value="#{h @conf["openbd.detail_image_height"]}" size="5">
+			<label for="openbd.detail_image_height">px</label>
+		</p>
+	EOS
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/plugin/puboo.rb

@@ -3,7 +3,7 @@
 # Original code from tatsu_zine.rb by KADO Masanori <kdmsnr@gmail.com>
 # You can redistribute it and/or modify it under GPL.
 #
-# display book info in http://p.booklog.jp/ like amazon.rb
+# display book info in https://puboo.jp/ like amazon.rb
 # USAGE: {{puboo 9999}}
 
 require 'open-uri'
@@ -33,12 +33,12 @@ def puboo( id, doc = nil )
 		return result
 	end
 
-	link = "http://p.booklog.jp/book/#{id}"
-	doc ||= open( link ).read.force_encoding('UTF-8')
-	title = doc.match(%r|<meta property="og:title"\s*content="(.*)"|).to_a[1]
+	link = "https://puboo.jp/book/#{id}"
+	doc ||= URI.open( link ).read.force_encoding('UTF-8')
+	title = doc.match(%r|<meta property="og:title"\s*content="(.*)"|).to_a[1].split(/｜/)[0]
 	image = doc.match(%r|<meta property="og:image"\s*content="(.*)"|).to_a[1]
-	price = doc.match(%r|<th class="th_2">価格</th>.*?<span>(.*?)</span>.*?<br />|m).to_a[1]
-	author = doc.match(%r|<th>作者</th>(.*?)</td>|m).to_a[1].gsub(/<.*?>/, '').strip
+	price = doc.match(%r|<span\s*class="h2">(.*?)</span>|m).to_a[1]
+	author = doc.match(%r|著: <a.*?>(.*?)</a>|m).to_a[1]
 
 	result = <<-EOS
 	<a class="amazon-detail" href="#{h link}"><span class="amazon-detail">
@@ -61,7 +61,7 @@ end
 
 if __FILE__ == $0
 	require 'test/unit'
-	class TestTatsuZine < Test::Unit::TestCase
+	class TestPuboo < Test::Unit::TestCase
 		def setup
 			@conf = Struct.new("Conf", :secure).new(true)
 			def h(str); str; end
@@ -69,14 +69,14 @@ if __FILE__ == $0
 
 		def test_puboo
 			expect = <<-EOS
-	<a class="amazon-detail" href="http://p.booklog.jp/book/70667"><span class="amazon-detail">
-		<img class="amazon-detail left" src="http://img.booklog.jp/667BDD9E-B13E-11E2-82F3-6425FFDA975F_l.jpg"
+	<a class="amazon-detail" href="https://puboo.jp/book/70667"><span class="amazon-detail">
+		<img class="amazon-detail left" src="https://img.puboo.jp/667BDD9E-B13E-11E2-82F3-6425FFDA975F_l.jpg"
 		height="150" width="100"
 		alt="入門Puppet - Automate Your Infrastructure">
 		<span class="amazon-detail-desc">
 			<span class="amazon-title">入門Puppet - Automate Your Infrastructure</span><br>
 			<span class="amazon-author">栗林健太郎</span><br>
-			<span class="amazon-price">890円（税込）</span>
+			<span class="amazon-price">890円</span>
 		</span><br style="clear: left">
 	</span></a>
 EOS

data/plugin/socialbutton.rb

@@ -52,9 +52,9 @@ end
 if @mode =~ /^(latest|day|month|nyear)$/
 	socialbutton_footer = Proc.new { %Q|<div class="socialbuttons"></div>| }
 	if respond_to?(:blogkit?) && blogkit?
-		add_body_leave_proc(socialbutton_footer)
+		add_body_leave_proc(&socialbutton_footer)
 	else
-		add_section_leave_proc(socialbutton_footer)
+		add_section_leave_proc(&socialbutton_footer)
 	end
 
 	# load javascript

data/plugin/tweet_quote.rb

@@ -29,7 +29,6 @@ end
 
 def twitter_statuses_show_api( tweet_id )
 	url = "https://api.twitter.com/1.1/statuses/show.json"
-	unsafe = /[^a-zA-Z0-9\-\.\_\~]/
 	parameters = {
 		:id => tweet_id
 	}
@@ -41,11 +40,11 @@ def twitter_statuses_show_api( tweet_id )
 		:oauth_token => @conf["twitter_quote.oauth_token"],
 		:oauth_version => "1.0"
 	}
-	data = "GET&#{URI.escape( url, unsafe )}&"
-	data << URI.escape( oauth_parameters.merge( parameters ).sort.map{|k, v| "#{k}=#{v}" }.join( "&" ), unsafe )
+	data = "GET&#{CGI.escape( url )}&"
+	data << CGI.escape( oauth_parameters.merge( parameters ).sort.map{|k, v| "#{k}=#{v}" }.join( "&" ) )
 	oauth_parameters[:oauth_signature] = [OpenSSL::HMAC.digest(
 		OpenSSL::Digest::SHA1.new,
-		URI.escape( "#{@conf["twitter_quote.oauth_consumer_secret"]}&#{@conf["twitter_quote.oauth_token_secret"]}" ),
+		CGI.escape( "#{@conf["twitter_quote.oauth_consumer_secret"]}&#{@conf["twitter_quote.oauth_token_secret"]}" ),
 		data
 	)].pack( "m" ).chomp
 
@@ -53,7 +52,7 @@ def twitter_statuses_show_api( tweet_id )
 	proxy = 'http://' + proxy if proxy
 
 	headers = {
-		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{URI.escape( k.to_s, unsafe )}=\"#{URI.escape( v, unsafe )}\""}.join( "," )}],
+		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{CGI.escape( k.to_s )}=\"#{CGI.escape( v )}\""}.join( "," )}],
 		:proxy => proxy
 	}
 	Timeout.timeout( 20 ) do

data/plugin/twitter.rb

@@ -1,45 +1,9 @@
-# twitter.rb $Revision: 1.1 $
-# Copyright (C) 2007 Michitaka Ohno <elpeo@mars.dti.ne.jp>
-# You can redistribute it and/or modify it under GPL2.
-
-require 'timeout'
-require 'time'
-require 'open-uri'
-require 'rexml/document'
-
-@twitter_statuses = []
-
-if /^(latest|day)$/ =~ @mode then
-	add_header_proc do
-		xml = nil
-		Timeout.timeout( 5 ) do
-			begin
-				xml = open( "http://twitter.com/statuses/user_timeline/#{@conf['twitter.user']}.xml" ){|f| f.read}
-			rescue Exception
-			end
-		end
-		doc = REXML::Document.new( xml ).root if xml
-		if doc then
-			doc.elements.each( 'status' ) do |e|
-				@twitter_statuses << [@conf.to_native( e.elements['text'].text ), Time.parse( e.elements['created_at'].text ).localtime]
-			end
-		end
-		''
-	end
-end
-
+#
+# twitter plugin is deprecate
+#
 add_body_leave_proc do |date|
-	today_statuses = []
-	@twitter_statuses.each do |t, d|
-		 today_statuses << [t, d] if d.to_a[3,3] == date.to_a[3,3]
-	end
-	if !today_statuses.empty?
-		r = %Q[<div class="section">]
-		r << %Q[<h3><a href="http://twitter.com/#{@conf['twitter.user']}">Twitter statuses</a></h3>]
-		today_statuses.sort{|a, b| b.last<=>a.last}.each do |t, d|
-			r << %Q[<p><strong>#{CGI::escapeHTML( t )}</strong> (#{d.strftime( '%H:%M:%S' )})</p>]
-		end
-		r << %Q[</div>]
+	if @mode == 'preview'
+		%Q[<p class="message">twitter plugin was deprecated.</p>]
 	else
 		''
 	end

data/plugin/twitter_js.rb

@@ -1,59 +1,10 @@
-# twitter_js.rb $Revision: 1.1 $
-# Copyright (C) 2007 Michitaka Ohno <elpeo@mars.dti.ne.jp>
-# You can redistribute it and/or modify it under GPL2.
-
-if /\A(?:latest|day)\z/ =~ @mode then
-	if @conf['twitter.user'] then
-		twitter_user = @conf['twitter.user']
-		add_header_proc do
-			result = <<-HTML
-			<script type="text/javascript"><!--
-			function twitter_cb(a){
-				var f=function(n){return (n<10?'0':'')+n};
-				for(var i=0,l=a.length;i<l;i++){
-					var d=new Date(a[i]['created_at'].replace('+0000','UTC'));
-					var id='twitter_statuses_'+f(d.getFullYear())+f(d.getMonth()+1)+f(d.getDate());
-					var e=document.getElementById(id);
-					if(!e) continue;
-					if(!e.innerHTML) e.innerHTML='<h3><a href="http://twitter.com/#{h twitter_user}">Twitter statuses</a></h3>';
-					e.innerHTML+='<p><strong>'+a[i]['text']+'</strong> ('+f(d.getHours())+':'+f(d.getMinutes())+':'+f(d.getSeconds())+')</p>';
-				}
-			}
-			function twitter_js(){
-				var e=document.createElement('script');
-				e.type='text/javascript';
-				e.src='http://twitter.com/statuses/user_timeline/#{h twitter_user}.json?callback=twitter_cb&amp;count=20';
-				document.documentElement.appendChild(e);
-			}
-			if(window.addEventListener){
-				window.addEventListener('load',twitter_js,false);
-			}else if(window.attachEvent){
-				window.attachEvent('onload',twitter_js);
-			}else{
-				window.onload=twitter_js;
-			}
-			// --></script>
-			HTML
-			result.gsub( /^\t\t/, '' )
-		end
-
-		add_body_leave_proc do |date|
-			result = <<-HTML
-			<div id="twitter_statuses_#{date.strftime( "%Y%m%d" )}" class="section"></div>
-			HTML
-			result.gsub( /^\t\t/, '' )
-		end
+#
+# twitter_js plugin is deprecate
+#
+add_body_leave_proc do |date|
+	if @mode == 'preview'
+		%Q[<p class="message">twitter_js plugin was deprecated.</p>]
+	else
+		''
 	end
 end
-
-add_conf_proc( 'twitter_js', 'Twitter' ) do
-
-	if @mode == 'saveconf' then
-		@conf['twitter.user'] = @cgi.params['twitter.user'][0]
-	end
-
-	<<-HTML
-   <h3 class="subtitle">Account Name</h3>
-   <p><input name="twitter.user" value="#{h @conf['twitter.user']}"></p>
-	HTML
-end

data/plugin/yahoo_kousei.rb

@@ -26,7 +26,7 @@ Net::HTTP.version_1_2
 def kousei_api( sentence )
 	appid = @conf['yahoo_kousei.appid']
 
-	query = "appid=#{appid}&sentence=#{URI.encode( sentence.gsub( /\n/, '' ) )}"
+	query = "appid=#{appid}&sentence=#{CGI.escape( sentence.gsub( /\n/, '' ) )}"
 	query << "&filter_group=" + @conf['yahoo_kousei.filter_group'] if @conf['yahoo_kousei.filter_group']
 	query << "&no_filter=" + @conf['yahoo_kousei.no_filter'] if @conf['yahoo_kousei.no_filter']
 

data/plugin/yo_update.rb

@@ -100,7 +100,7 @@ def yo_update_subscribers_count
 		raise YoUpdateError, "Yo API Key is not set"
 	end
 	req = Net::HTTP::Get.new(
-		URI("http://api.justyo.co/subscribers_count/?api_token=#{URI.escape(api_key)}")
+		URI("http://api.justyo.co/subscribers_count/?api_token=#{CGI.escape(api_key)}")
 	)
 	res = yo_update_access_api(req)
 	data = res.body

data/spec/spec_helper.rb

@@ -49,19 +49,19 @@ class PluginFake
 		@conf_procs << block
 	end
 
-	def add_edit_proc( block = Proc::new )
+	def add_edit_proc(&block)
 		@edit_procs << block
 	end
 
-	def add_header_proc( block = Proc::new )
+	def add_header_proc(&block)
 		@header_procs << block
 	end
 
-	def add_footer_proc( block = Proc::new )
+	def add_footer_proc(&block)
 		@footer_procs << block
 	end
 
-	def add_update_proc( block = Proc::new )
+	def add_update_proc(&block)
 		@update_procs << block
 	end
 
@@ -89,7 +89,7 @@ class PluginFake
 		r.join.chomp
 	end
 
-	def add_body_enter_proc( block = Proc::new )
+	def add_body_enter_proc(&block)
 		@body_enter_procs << block
 	end
 
@@ -101,7 +101,7 @@ class PluginFake
 		r.join.chomp
 	end
 
-	def add_body_leave_proc( block = Proc::new )
+	def add_body_leave_proc(&block)
 		@body_leave_procs << block
 	end
 
@@ -200,7 +200,7 @@ def fake_plugin( name_sym, cgi=nil, base=nil, &block )
 	plugin.instance_variable_set(:@cache_path, @cache_path)
 
 	plugin.instance_eval do
-		eval( File.read( file_path ), binding,
+		eval( File.open(file_path, 'r:utf-8').read, binding,
 			"(#{File.basename(file_path)})", 1 )
 	end
 	plugin_sym = plugin_name.to_sym

data/style/hatena_style.rb

@@ -844,7 +844,7 @@ class Hatena::Google
   end
 
   def convert(mode)
-    uri = 'http://www.google.com/search?q=%s&ie=euc-jp&oe=euc-jp' % URI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)
+    uri = 'http://www.google.com/search?q=%s&ie=euc-jp&oe=euc-jp' % CGI.escape(@str)
     return uri unless @tag_p
     template=nil
     if mode == :CHTML
@@ -889,7 +889,7 @@ class Hatena::Keyword
   end
 
   def convert(mode)
-    uri = '%skeyword/%s' % [@group, URI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
+    uri = '%skeyword/%s' % [@group, CGI.escape(@str)]
     return uri unless @tag_p
     template=nil
     if mode == :CHTML
@@ -958,7 +958,7 @@ class Hatena::AmazonSearch
   end
 
   def convert(mode)
-    uri = 'http://www.amazon.co.jp/exec/obidos/external-search?mode=blended&tag=%s&encoding-string-jp=%%c6%%fc%%cb%%dc%%b8%%ec&keyword=%s' % [Hatena.conf['amazon.aid'] || '', URI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
+    uri = 'http://www.amazon.co.jp/exec/obidos/external-search?mode=blended&tag=%s&encoding-string-jp=%%c6%%fc%%cb%%dc%%b8%%ec&keyword=%s' % [Hatena.conf['amazon.aid'] || '', CGI.escape(@str)]
     return uri unless @tag_p
     template=nil
     if mode == :CHTML

data/util/image-gallery/misc/plugin/recent_image.rb

@@ -259,10 +259,10 @@ end
 #  Callback Functions
 
 # this is for view_exif().
-add_body_enter_proc(Proc.new do |date|
+add_body_enter_proc do |date|
   @image_date_exif = date.strftime("%Y%m%d")
   ""
-end)
+end
 
 #  Update Proc of the plugin
 add_update_proc do

data/util/image-gallery/misc/plugin/view_exif.rb

@@ -49,7 +49,7 @@ end
 
 #  Callback Functions
 
-add_body_enter_proc(Proc.new do |date| 
+add_body_enter_proc do |date| 
   @image_date_exif = date.strftime("%Y%m%d")
   ""
-end)
+end

data/util/tdiary-grep/grep.rb

@@ -439,7 +439,7 @@ def escape(str)
 end
 
 def escape_url(u)
-  escape(URI.encode(u))
+	escape(CGI.escape(u))
 end
 
 main

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.13
+  version: 5.1.4
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +129,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debase
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,6 +222,7 @@ files:
 - js/editor.js
 - js/flickr.js
 - js/google_photos.js
+- js/gyazo.js
 - js/hide_sidebar_smartphone.js
 - js/image_ex.js
 - js/jquery.socialbutton.js
@@ -268,6 +297,7 @@ files:
 - plugin/google_sitemaps.rb
 - plugin/google_universal_analytics.rb
 - plugin/google_webmaster.rb
+- plugin/gyazo.rb
 - plugin/hatena_bookmark_nocomment.rb
 - plugin/hatena_star.rb
 - plugin/hb_footer.rb
@@ -290,6 +320,7 @@ files:
 - plugin/ja/livedoor_weather.rb
 - plugin/ja/microsummary.rb
 - plugin/ja/nicovideo.rb
+- plugin/ja/openbd.rb
 - plugin/ja/openid.rb
 - plugin/ja/section_footer.rb
 - plugin/ja/section_footer2.rb
@@ -319,6 +350,7 @@ files:
 - plugin/notify_miniblog.rb
 - plugin/ogp.rb
 - plugin/ohmsha_estore.rb
+- plugin/openbd.rb
 - plugin/openid.rb
 - plugin/opensearch_ad.rb
 - plugin/picasa.rb
@@ -401,7 +433,6 @@ files:
 - spec/rcov.opts
 - spec/spec_helper.rb
 - spec/title_anchor_spec.rb
-- spec/twitter_js_spec.rb
 - spec/youtube_spec.rb
 - style/hatena_style.rb
 - style/markdown_style.rb
@@ -513,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package
@@ -541,5 +572,4 @@ test_files:
 - spec/rcov.opts
 - spec/spec_helper.rb
 - spec/title_anchor_spec.rb
-- spec/twitter_js_spec.rb
 - spec/youtube_spec.rb

data/spec/twitter_js_spec.rb

@@ -1,116 +0,0 @@
-$:.unshift(File.dirname(__FILE__))
-require 'spec_helper'
-require 'time'
-
-describe "twitter_js plugin" do
-	def setup_twitter_js_plugin(mode, user_id)
-		fake_plugin(:twitter_js) { |plugin|
-			plugin.mode = mode
-			plugin.conf['twitter.user'] = user_id
-			plugin.date = Time.parse("20080124")
-		}
-	end
-
-	describe "should render javascript and div tag in day" do
-		before do
-			@plugin = setup_twitter_js_plugin("day", "123456789")
-		end
-
-		it "for header" do
-			snippet = @plugin.header_proc
-			expect(snippet).to eq(expected_html_header_snippet("123456789"))
-		end
-
-		it "for body leave" do
-			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			expect(snippet).to eq(expected_html_body_snippet)
-		end
-	end
-
-	describe "should render javascript and div tag in latest" do
-		before do
-			@plugin = setup_twitter_js_plugin("latest", "123456789")
-		end
-
-		it "for header" do
-			snippet = @plugin.header_proc
-			expect(snippet).to eq(expected_html_header_snippet("123456789"))
-		end
-
-		it "for body leave" do
-			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			expect(snippet).to eq(expected_html_body_snippet)
-		end
-	end
-
-	describe "should not render in edit" do
-		before do
-			@plugin = setup_twitter_js_plugin("edit", "123456789")
-		end
-
-		it "for header" do
-			snippet = @plugin.header_proc
-			expect(snippet).to be_empty
-		end
-
-		it "for body leave" do
-			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			expect(snippet).to be_empty
-		end
-	end
-
-	describe "should not render when user_id is empty" do
-		before do
-			@plugin = setup_twitter_js_plugin("edit", "")
-		end
-
-		it "for header" do
-			snippet = @plugin.header_proc
-			expect(snippet).to be_empty
-		end
-
-		it "for body leave" do
-			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			expect(snippet).to be_empty
-		end
-	end
-
-	def expected_html_header_snippet(user_id)
-		expected = <<-EXPECTED
-		<script type="text/javascript"><!--
-		function twitter_cb(a){
-			var f=function(n){return (n<10?'0':'')+n};
-			for(var i=0,l=a.length;i<l;i++){
-				var d=new Date(a[i]['created_at'].replace('+0000','UTC'));
-				var id='twitter_statuses_'+f(d.getFullYear())+f(d.getMonth()+1)+f(d.getDate());
-				var e=document.getElementById(id);
-				if(!e) continue;
-				if(!e.innerHTML) e.innerHTML='<h3><a href="http://twitter.com/#{user_id}">Twitter statuses</a></h3>';
-				e.innerHTML+='<p><strong>'+a[i]['text']+'</strong> ('+f(d.getHours())+':'+f(d.getMinutes())+':'+f(d.getSeconds())+')</p>';
-			}
-		}
-		function twitter_js(){
-			var e=document.createElement('script');
-			e.type='text/javascript';
-			e.src='http://twitter.com/statuses/user_timeline/#{user_id}.json?callback=twitter_cb&amp;count=20';
-			document.documentElement.appendChild(e);
-		}
-		if(window.addEventListener){
-			window.addEventListener('load',twitter_js,false);
-		}else if(window.attachEvent){
-			window.attachEvent('onload',twitter_js);
-		}else{
-			window.onload=twitter_js;
-		}
-		// --></script>
-		EXPECTED
-		expected.gsub(/^\t/, '').chomp
-	end
-
-	def expected_html_body_snippet
-		expected = <<-HTML
-		<div id="twitter_statuses_20080124" class="section"></div>
-		HTML
-		expected.gsub( /^\t/, '' ).chomp
-	end
-end