tdiary-contrib 3.2.2.20130518

data/util/section_link/misc/plugin/section_link.rb

@@ -0,0 +1,68 @@
+# Copyright (C) 2011, KADO Masanori <kdmsnr@gmail.com>
+# You can redistribute it and/or modify it under GPL.
+#
+# section_link.rb
+# - enables section link and shows section title
+# - depends on:
+#   - tdiary/tdiary_day_ext.rb
+#   - tdiary/tdiaryext_style.rb
+#   - tdiary/wikiext_style.rb
+
+alias :_orig_subtitle_link :subtitle_link
+def subtitle_link( date, index, subtitle )
+	if @cgi.params['section'].join('') != ''
+		index = @cgi.params['section'][0]
+	end
+	r = _orig_subtitle_link( date, index, subtitle )
+	r.gsub(/#p(\d+)/){"&section=#{$1}"}
+end
+
+alias :_orig_title_tag :title_tag
+def title_tag
+	if @cgi.params['section'].join('') != '' and
+			@mode == 'day' and diary = @diaries[@date.strftime('%Y%m%d')]
+		sec = []
+		diary.each_section do |s|
+			sec << s
+		end
+		site_title = " - #{_orig_title_tag.gsub( /<.*?>/, '')}"
+		title = sec[@cgi.params['section'][0].to_i - 1].stripped_subtitle_to_html
+		return "<title>#{apply_plugin(title, true).gsub(/[\r\n]/, '')}#{h site_title }</title>"
+
+	else
+		_orig_title_tag
+	end
+end
+
+if @cgi.params["section"].join('') != ""
+	add_section_leave_proc do
+		diary = @diaries[@date.strftime("%Y%m%d")]
+
+		i = 1
+		sections = []
+		diary.each_section do |s|
+			unless i == @cgi.params["section"][0].to_i
+				sections << [i, s]
+			end
+			i += 1
+		end
+
+		unless sections.empty?
+			"<hr>\n<ol>\n" +
+			sections.map{|i, s|
+				[i, my(@date.strftime("%Y%m%d") + "p" + sprintf("%02d", i),
+					apply_plugin(s.stripped_subtitle_to_html, true))]
+			}.map{|i, s|
+				"<li value='#{i}'>#{s}</li>"
+			}.join("\n") + "\n</ol>\n"
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/util/section_link/misc/plugin/section_link_anchor.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2011, KADO Masanori <kdmsnr@gmail.com>
+# You can redistribute it and/or modify it under GPL.
+#
+# section_link_anchor.rb
+# - enables section link with mod_rewrite
+# - depends on section_link.rb
+#
+# sample .htaccess:
+# <IfModule mod_rewrite.c>
+#    RewriteEngine on
+#    RewriteRule ^([0-9\-]+)p?([0-9]*)\.html$ ?date=$1&section=$2 [L]
+# </IfModule>
+
+def anchor( s )
+	if /^([\-\d]+)#?([pct]\d*)?$/ =~ s then
+		if $2 then
+			s1 = $1
+			s2 = $2
+			if $2 =~ /^p/
+				"#{s1}p#{s2.gsub(/p/, '')}.html"
+			else
+				"#{s1}.html##{s2}"
+			end
+		else
+			"#$1.html"
+		end
+	else
+		""
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/util/section_link/tdiary/tdiary_day_ext.rb

@@ -0,0 +1,21 @@
+# Copyright (C) 2011, KADO Masanori <kdmsnr@gmail.com>
+# You can redistribute it and/or modify it under GPL.
+module TDiary
+	class TDiaryDay
+		alias :_orig_eval_rhtml :eval_rhtml
+		def eval_rhtml
+			if @cgi.params['section'].join('') != ""
+				@diary.section_no = @cgi.params['section'][0]
+			end
+			_orig_eval_rhtml
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/util/section_link/tdiary/tdiaryext_style.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 2011, KADO Masanori <kdmsnr@gmail.com>
+# You can redistribute it and/or modify it under GPL.
+require 'tdiary/tdiary_day_ext'
+
+module TDiary
+	class TdiaryextDiary; end
+
+	class TdiaryDiary
+		attr_accessor :section_no
+		alias :_orig_to_html4 :to_html4
+		def to_html4( opt )
+			if @section_no
+				idx = @section_no.to_i
+				@sections = [@sections[idx - 1]]
+			end
+			_orig_to_html4 opt
+		end
+
+		alias :_orig_to_chtml :to_chtml
+		def to_chtml( opt )
+			if @section_no
+				idx = @section_no.to_i
+				@sections = [@sections[idx - 1]]
+			end
+			_orig_to_chtml opt
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/util/section_link/tdiary/wikiext_style.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 2011, KADO Masanori <kdmsnr@gmail.com>
+# You can redistribute it and/or modify it under GPL.
+require 'tdiary/tdiary_day_ext'
+
+module TDiary
+	class WikiextDiary; end
+
+	class WikiDiary
+		attr_accessor :section_no
+		alias :_orig_to_html4 :to_html4
+		def to_html4( opt )
+			if @section_no
+				idx = @section_no.to_i
+				return @sections[idx - 1].html4( date, idx, opt )
+			end
+			_orig_to_html4 opt
+		end
+
+		alias :_orig_to_chtml :to_chtml
+		def to_chtml( opt )
+			if @section_no
+				idx = @section_no.to_i
+				return @sections[idx - 1].html4( date, idx, opt )
+			end
+			_orig_to_chtml opt
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/util/tdiary-for-ruby1.9/compatible.rb

@@ -0,0 +1,97 @@
+# = for Ruby1.9.0 compatible =
+#
+# == 前提条件 ==
+#
+#  * Ruby1.9 の場合は --encoding=Binary オプションで動作させること
+
+# --------------------------------------------------------
+# 汎用的な設定
+# --------------------------------------------------------
+
+# for Ruby1.9.0
+
+unless "".respond_to?('to_a')
+  class String
+    def to_a
+      [ self ]
+    end
+  end
+end
+
+unless "".respond_to?('each')
+  class String
+    alias each each_line
+  end
+end
+
+# Ruby1.9では String が Enumerable ではなくなった
+class String
+  def method_missing(name, *args, &block)
+    each_line.__send__(name, *args, &block)
+  end
+end
+
+
+# for Ruby1.8.X
+
+unless "".respond_to?('force_encoding')
+  class String
+    def force_encoding(encoding)
+      self
+    end
+  end
+end
+
+unless "".respond_to?('bytesize')
+  class String
+    alias bytesize size
+  end
+end
+
+unless "".respond_to?('ord')
+  class String
+    def ord
+      self[0]
+    end
+  end
+
+  class Integer
+    def ord
+      self
+    end
+  end
+end
+
+# --------------------------------------------------------
+# tDiary 用の設定
+# --------------------------------------------------------
+
+# Ruby1.9でNKF::nkfを呼ぶと文字列のencodingが変わってしまう。
+# そのため、encodingがBinaryの環境で動かすと
+# "character encodings differ" エラーとなる。
+begin
+  require 'nkf'
+  module NKF
+    alias :_nkf :nkf
+    def nkf(option, src)
+      r = _nkf(option, src)
+      r.force_encoding('Binary')
+    end
+    module_function :nkf, :_nkf
+  end
+rescue
+end
+
+# 日本語を含むツッコミを入れると diary.last_modified が String になる (原因不明)
+# (PStore 保存前は Time だが, 保存後に String となる)
+# 暫定的に String だったら Time へ変換する
+module TDiary
+  class WikiDiary
+    def last_modified
+      if @last_modified.instance_of? String
+        @last_modified = Time.at(0)
+      end
+      @last_modified
+    end
+  end
+end

data/util/tdiary-for-ruby1.9/tdiary-2.2.0.patch

@@ -0,0 +1,98 @@
+Index: update.rb
+===================================================================
+--- update.rb	(revision 97)
++++ update.rb	(working copy)
+@@ -5,7 +5,7 @@
+ # Copyright (C) 2001-2003, TADA Tadashi <sho@spc.gr.jp>
+ # You can redistribute it and/or modify it under GPL2.
+ #
+-BEGIN { $defout.binmode }
++BEGIN { $stdout.binmode }
+ $KCODE = 'n'
+ 
+ begin
+Index: misc/lib/hikidoc.rb
+===================================================================
+--- misc/lib/hikidoc.rb	(revision 97)
++++ misc/lib/hikidoc.rb	(working copy)
+@@ -476,7 +476,7 @@
+ 
+   def escape_meta_char( text )
+     text.gsub( META_CHAR_RE ) do |s|
+-      '&#x%x;' % s[1]
++      '&#x%x;' % s[1].ord
+     end
+   end
+ 
+Index: misc/plugin/amazon.rb
+===================================================================
+--- misc/plugin/amazon.rb	(revision 97)
++++ misc/plugin/amazon.rb	(working copy)
+@@ -205,6 +205,7 @@
+ 				xml =  amazon_call_ecs( asin, id_type )
+ 				File::open( "#{cache}/#{asin}.xml", 'wb' ) {|f| f.write( xml )}
+ 			end
++			xml.force_encoding('UTF-8')
+ 			doc = REXML::Document::new( xml ).root
+ 			item = doc.elements.to_a( '*/Item' )[0]
+ 			if pos == 'detail' then
+Index: tdiary.rb
+===================================================================
+--- tdiary.rb	(revision 97)
++++ tdiary.rb	(working copy)
+@@ -11,6 +11,7 @@
+ 
+ $:.insert( 1, File::dirname( __FILE__ ) + '/misc/lib' )
+ 
++require 'compatible'
+ require 'cgi'
+ require 'uri'
+ begin
+@@ -466,6 +467,7 @@
+ 			load
+ 
+ 			instance_variables.each do |v|
++				v = v.to_s
+ 				v.sub!( /@/, '' )
+ 				instance_eval( <<-SRC
+ 					def #{v}
+@@ -631,11 +633,10 @@
+ 				cgi_conf.untaint unless @secure
+ 				def_vars = ""
+ 				variables.each do |var| def_vars << "#{var} = nil\n" end
+-				eval( def_vars )
++				extend_vars = 'variables.each do |var| eval "@#{var} = #{var} if #{var} != nil" end'
+ 				Safe::safe( @secure ? 4 : 1 ) do
+-					eval( cgi_conf, binding, "(TDiary::Config#cgi_conf)", 1 )
++					eval( def_vars + cgi_conf + extend_vars, binding, "(TDiary::Config#cgi_conf)", 1 )
+ 				end
+-				variables.each do |var| eval "@#{var} = #{var} if #{var} != nil" end
+ 			rescue IOError, Errno::ENOENT
+ 			end
+ 		end
+Index: plugin/ja/05referer.rb
+===================================================================
+--- plugin/ja/05referer.rb	(revision 97)
++++ plugin/ja/05referer.rb	(working copy)
+@@ -31,7 +31,7 @@
+ 	<p>→<a href="#{h @update}?referer=volatile" target="referer">既存設定はこちら</a></p>
+ 	<p><textarea name="only_volatile" cols="70" rows="10">#{h @conf.only_volatile2.join( "\n" )}</textarea></p>
+ 	<h3 class="subtitle">#{label_referer_table}</h3>
+-	#{"<p>リンク元リストのURLを、特定の文字列に変換する対応表を指定できます。1件につき、URLと表示文字列を空白で区切って指定します。正規表現が使えるので、URL中に現れた「(～)」は、置換文字列中で「\\1」のような「\数字」で利用できます。</p>" unless @conf.mobile_agent?}
++	#{"<p>リンク元リストのURLを、特定の文字列に変換する対応表を指定できます。1件につき、URLと表示文字列を空白で区切って指定します。正規表現が使えるので、URL中に現れた「(～)」は、置換文字列中で「\\\\1」のような「\\数字」で利用できます。</p>" unless @conf.mobile_agent?}
+ 	<p>→<a href="#{h @update}?referer=table" target="referer">既存設定はこちら</a></p>
+ 	<p><textarea name="referer_table" cols="70" rows="10">#{h @conf.referer_table2.collect{|a|a.join( " " )}.join( "\n" )}</textarea></p>
+ 	HTML
+Index: index.rb
+===================================================================
+--- index.rb	(revision 97)
++++ index.rb	(working copy)
+@@ -5,7 +5,7 @@
+ # Copyright (C) 2001-2006, TADA Tadashi <sho@spc.gr.jp>
+ # You can redistribute it and/or modify it under GPL2.
+ #
+-BEGIN { $defout.binmode }
++BEGIN { $stdout.binmode }
+ $KCODE = 'n'
+ 
+ begin

data/util/tdiary-for-ruby1.9/tdiary-2.3.1.patch

@@ -0,0 +1,212 @@
+=== index.rb
+==================================================================
+--- index.rb	(revision 27329)
++++ index.rb	(local)
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env ruby
+ #
+-# index.rb $Revision: 1.35 $
++# index.rb
+ #
+-# Copyright (C) 2001-2006, TADA Tadashi <sho@spc.gr.jp>
++# Copyright (C) 2001-2008, TADA Tadashi <sho@spc.gr.jp>
+ # You can redistribute it and/or modify it under GPL2.
+ #
+-BEGIN { $defout.binmode }
++BEGIN { $stdout.binmode }
+ $KCODE = 'n'
+ 
+ begin
+@@ -70,7 +70,7 @@
+ 			if @cgi.mobile_agent? then
+ 				body = conf.to_mobile( tdiary.eval_rhtml( 'i.' ) )
+ 				head['charset'] = conf.mobile_encoding
+-				head['Content-Length'] = body.size.to_s
++				head['Content-Length'] = body.bytesize.to_s
+ 			else
+ 				require 'digest/md5'
+ 				body = tdiary.eval_rhtml
+@@ -80,7 +80,7 @@
+ 					body = ''
+ 				else
+ 					head['charset'] = conf.encoding
+-					head['Content-Length'] = body.size.to_s
++					head['Content-Length'] = body.bytesize.to_s
+ 				end
+ 				head['Pragma'] = 'no-cache'
+ 				head['Cache-Control'] = 'no-cache'
+=== plugin/00default.rb
+==================================================================
+--- plugin/00default.rb	(revision 27329)
++++ plugin/00default.rb	(local)
+@@ -697,7 +697,7 @@
+ 	mail_header = (@conf['comment_mail.header'] || '').dup
+ 	mail_header << ":#{@conf.date_format}" unless /%[a-zA-Z%]/ =~ mail_header
+ 	mail_header = @date.strftime( mail_header )
+-	mail_header = comment_mail_mime( @conf.to_mail( mail_header ) ).join( "\n " ) if /[\x80-\xff]/ =~ mail_header
++	mail_header = comment_mail_mime( @conf.to_mail( mail_header ) ).join( "\n " ) 
+ 
+ 	rmail = ''
+ 	begin
+=== plugin/05referer.rb
+==================================================================
+--- plugin/05referer.rb	(revision 27329)
++++ plugin/05referer.rb	(local)
+@@ -159,7 +159,7 @@
+ 
+ def referer_add_to_diary( diary, body )
+ 	return unless body
+-	body.each do |r|
++	body.each_line do |r|
+ 		count, ref = r.chomp.split( / /, 2 )
+ 		next unless ref
+ 		diary.add_referer( ref.chomp, count.to_i )
+=== plugin/ja/05referer.rb
+==================================================================
+--- plugin/ja/05referer.rb	(revision 27329)
++++ plugin/ja/05referer.rb	(local)
+@@ -31,7 +31,7 @@
+ 	<p>→<a href="#{h @update}?referer=volatile" target="referer">既存設定はこちら</a></p>
+ 	<p><textarea name="only_volatile" cols="70" rows="10">#{h @conf.only_volatile2.join( "\n" )}</textarea></p>
+ 	<h3 class="subtitle">#{label_referer_table}</h3>
+-	#{"<p>リンク元リストのURLを、特定の文字列に変換する対応表を指定できます。1件につき、URLと表示文字列を空白で区切って指定します。正規表現が使えるので、URL中に現れた「(〜)」は、置換文字列中で「\\1」のような「\数字」で利用できます。</p>" unless @conf.mobile_agent?}
++	#{"<p>リンク元リストのURLを、特定の文字列に変換する対応表を指定できます。1件につき、URLと表示文字列を空白で区切って指定します。正規表現が使えるので、URL中に現れた「(〜)」は、置換文字列中で「\\\\1」のような「\\数字」で利用できます。</p>" unless @conf.mobile_agent?}
+ 	<p>→<a href="#{h @update}?referer=table" target="referer">既存設定はこちら</a></p>
+ 	<p><textarea name="referer_table" cols="70" rows="10">#{h @conf.referer_table2.collect{|a|a.join( " " )}.join( "\n" )}</textarea></p>
+ 	HTML
+=== tdiary/defaultio.rb
+==================================================================
+--- tdiary/defaultio.rb	(revision 27329)
++++ tdiary/defaultio.rb	(local)
+@@ -13,7 +13,7 @@
+ 		header, body = data.split( /\r?\n\r?\n/, 2 )
+ 		headers = {}
+ 		if header then
+-			header.each do |l|
++			header.each_line do |l|
+ 				l.chomp!
+ 				key, val = l.scan( /([^:]*):\s*(.*)/ )[0]
+ 				headers[key] = val ? val.chomp : nil
+=== tdiary/tdiary_style.rb
+==================================================================
+--- tdiary/tdiary_style.rb	(revision 27329)
++++ tdiary/tdiary_style.rb	(local)
+@@ -22,7 +22,7 @@
+ 			if lines.size > 1 then
+ 				if /^<</ =~ lines[0]
+ 					@subtitle = lines.shift.chomp.sub( /^</, '' )
+-				elsif /^[　 <]/u !~ lines[0]
++				elsif /^[ <]/u !~ lines[0]
+ 					@subtitle = lines.shift.chomp
+ 				end
+ 			end
+@@ -190,10 +190,10 @@
+ 				if /^</ =~ section.body then
+ 					r << %Q[#{section.body}]
+ 				elsif section.subtitle
+-					r << %Q[<p>#{section.body.collect{|l|l.chomp.sub( /^[　 ]/u, '')}.join( "</p>\n<p>" )}</p>\n]
++					r << %Q[<p>#{section.body.collect{|l|l.chomp.sub( /^[ ]/u, '')}.join( "</p>\n<p>" )}</p>\n]
+ 				else
+ 					r << %Q[<p><%= subtitle_proc( Time::at( #{date.to_i} ), nil ) %>]
+-					r << %Q[#{section.body.collect{|l|l.chomp.sub( /^[　 ]/u, '' )}.join( "</p>\n<p>" )}</p>]
++					r << %Q[#{section.body.collect{|l|l.chomp.sub( /^[ ]/u, '' )}.join( "</p>\n<p>" )}</p>]
+ 				end
+ 				r << %Q[<%= section_leave_proc( Time::at( #{date.to_i} ) ) %>\n]
+ 				r << %Q[</div>]
+@@ -211,10 +211,10 @@
+ 				if /^</ =~ section.body then
+ 					r << section.body
+ 				elsif section.subtitle
+-					r << %Q[<P>#{section.body.collect{|l|l.chomp.sub( /^[　 ]/u, '' )}.join( "</P>\n<P>" )}</P>\n]
++					r << %Q[<P>#{section.body.collect{|l|l.chomp.sub( /^[ ]/u, '' )}.join( "</P>\n<P>" )}</P>\n]
+ 				else
+ 					r << %Q[<P><%= subtitle_proc( Time::at( #{date.to_i} ), nil ) %>]
+-					r << %Q[#{section.body.collect{|l|l.chomp.sub( /^[　 ]/u, '' )}.join( "</P>\n<P>" )}</P>\n]
++					r << %Q[#{section.body.collect{|l|l.chomp.sub( /^[ ]/u, '' )}.join( "</P>\n<P>" )}</P>\n]
+ 				end
+ 				r << %Q[<%= section_leave_proc( Time::at( #{date.to_i} ) ) %>\n]
+ 			end
+=== tdiary.rb
+==================================================================
+--- tdiary.rb	(revision 27329)
++++ tdiary.rb	(local)
+@@ -6,10 +6,11 @@
+ You can redistribute it and/or modify it under GPL2.
+ =end
+ 
+-TDIARY_VERSION = '2.3.1'
++TDIARY_VERSION = '2.3.1.20081115'
+ 
+ $:.insert( 1, File::dirname( __FILE__ ) + '/misc/lib' )
+ 
++require 'compatible'
+ require 'cgi'
+ require 'uri'
+ begin
+@@ -460,6 +461,7 @@
+ 			load
+ 
+ 			instance_variables.each do |v|
++				v = v.to_s
+ 				v.sub!( /@/, '' )
+ 				instance_eval( <<-SRC
+ 					def #{v}
+@@ -660,11 +662,10 @@
+ 				cgi_conf.untaint unless @secure
+ 				def_vars = ""
+ 				variables.each do |var| def_vars << "#{var} = nil\n" end
+-				eval( def_vars )
++				extend_vars = 'variables.each do |var| eval "@#{ var} = #{var} if #{var} != nil" end'
+ 				Safe::safe( @secure ? 4 : 1 ) do
+-					eval( cgi_conf, binding, "(TDiary::Config#cgi_conf)", 1 )
++					eval( def_vars + cgi_conf + extend_vars, binding, "(TDiary::Config#cgi_conf)", 1 )
+ 				end
+-				variables.each do |var| eval "@#{var} = #{var} if #{var} != nil" end
+ 			rescue IOError, Errno::ENOENT
+ 			end
+ 		end
+@@ -776,6 +777,7 @@
+ 			@subtitle_procs.taint
+ 			@section_leave_procs.taint
+ 			return Safe::safe( secure ? 4 : 1 ) do
++				src.force_encoding('UTF-8')
+ 				eval( src, binding, "(TDiary::Plugin#eval_src)", 1 )
+ 			end
+ 		end
+=== update.rb
+==================================================================
+--- update.rb	(revision 27329)
++++ update.rb	(local)
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env ruby
+ #
+-# update.rb $Revision: 1.22 $
++# update.rb
+ #
+-# Copyright (C) 2001-2003, TADA Tadashi <sho@spc.gr.jp>
++# Copyright (C) 2001-2008, TADA Tadashi <sho@spc.gr.jp>
+ # You can redistribute it and/or modify it under GPL2.
+ #
+-BEGIN { $defout.binmode }
++BEGIN { $stdout.binmode }
+ $KCODE = 'n'
+ 
+ begin
+@@ -55,7 +55,7 @@
+ 				'status' => '200 OK',
+ 				'type' => 'text/html',
+ 				'charset' => conf.mobile_encoding,
+-				'Content-Length' => body.size.to_s,
++				'Content-Length' => body.bytesize.to_s,
+ 				'Vary' => 'User-Agent'
+ 			)
+ 		else
+@@ -64,7 +64,7 @@
+ 				'status' => '200 OK',
+ 				'type' => 'text/html',
+ 				'charset' => conf.encoding,
+-				'Content-Length' => body.size.to_s,
++				'Content-Length' => body.bytesize.to_s,
+ 				'Vary' => 'User-Agent'
+ 			)
+ 		end

data/util/tdiary-grep/README

@@ -0,0 +1,4 @@
+■■このツールは最新のtDiaryに追従していません。
+■■検索機能はプラグインとして実装されるようになったため、
+■■同等の機能はplugin/search-default.rbで実現しています。
+■■このツールは近々削除する予定です。