tdiary-contrib 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077a15f87d9312e2fd05c48aecdb4ea89bfeb7ef8e73b197eea443a0b628f75e
-  data.tar.gz: c488339e3f3dd2d99ea88d06e0f2fe35cebc7aa24dd3b66e5557e43535c3a392
+  metadata.gz: e197ac500c058bedf4550b8348befa06bf061335dd95e70aebed756de26ce461
+  data.tar.gz: 32eb86bd9e7c014e1dc1b0a5fd046810cf494c26ed508a2708e70d00eff42917
 SHA512:
-  metadata.gz: 6e438aaf3632d87cc666fd3d7f54b56e7962959501652f825cdf027b043e1c64540d5c0b382a92e88bdc8fb16d0f5146262664afc94a78650028b9173071bd6f
-  data.tar.gz: 3a31c1283e905e1880fe15f991ffc50c65eedf22a4471dad95b2b68a9af47f5fc2e75162617f5a2195fb0de9c9e328dfb6af276f3e83beda5484a4af2b318875
+  metadata.gz: '08910590a8a4409a832c67f9e2105fc39f25a2b9515fcc86a247990267d3ccd5410d181ae23e68b68362a66b91d2bd1c4cc3ffeaebd90cf8c55c6837ff74b25d'
+  data.tar.gz: ff83cf724de444e5f1c61518d2be03457eb1cf65aa3c9ff7fd58109a763f902bb6180abc7c3a7fad78c8524c68e44e9751406fa14e5c424701cd6c88c50882bf

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.1.2"
+    VERSION = "5.1.3"
   end
 end

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/image_ex.rb

@@ -374,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/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/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/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/spec/spec_helper.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-08-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
@@ -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