tdiary 4.0.2.20140201 → 4.0.3

data/misc/plugin/pb-show.rb

@@ -36,7 +36,7 @@ module ::TDiary
 				yield com,i
 			end
 		end
-	
+
 		def each_visible_pingback_tail( limit = 3 )
 			i = 0
 			@comments.find_all {|com|

data/misc/plugin/recent_comment.rb

@@ -22,7 +22,7 @@ def recent_comment( ob_max = 'OBSOLUTE', sep = 'OBSOLUTE', ob_form = 'OBSOLUTE',
    recent_comment_init
 
    max = @conf['recent_comment.max']
-   form = @conf['recent_comment.date_format'] 
+   form = @conf['recent_comment.date_format']
    except = @conf['recent_comment.except_list']
    format = @conf['recent_comment.format']
    notfound_msg = @conf['recent_comment.notfound_msg']
@@ -34,7 +34,7 @@ def recent_comment( ob_max = 'OBSOLUTE', sep = 'OBSOLUTE', ob_form = 'OBSOLUTE',
    @diaries.each_value do |diary|
       next unless diary.visible?
       diary.each_comment_tail( max ) do |comment, idx|
-         if (except != '') && (/#{except}/ =~ comment.name) 
+         if (except != '') && (/#{except}/ =~ comment.name)
             next
          end
          comments << comment
@@ -42,9 +42,9 @@ def recent_comment( ob_max = 'OBSOLUTE', sep = 'OBSOLUTE', ob_form = 'OBSOLUTE',
          index[comment.date] = idx
       end
    end
-   
+
    result = []
-   
+
    comments.sort{|a,b| (a.date)<=>(b.date)}.reverse.each_with_index do |com,idx|
       break if idx >= max
       a = h(@index) + anchor("#{date[com.date].strftime( '%Y%m%d' )}#c#{'%02d' % index[com.date]}")
@@ -56,7 +56,7 @@ def recent_comment( ob_max = 'OBSOLUTE', sep = 'OBSOLUTE', ob_form = 'OBSOLUTE',
       result << recent_comment_format(format, idx, a, popup, str, date_str)
       result << "</li>\n"
    end
-   
+
    if result.size == 0
       notfound_msg
    else

data/misc/plugin/recent_comment3.rb

@@ -18,7 +18,7 @@ end
 
 def migrate_old_data
 	# backward compatibility
-	if File.exists?("#{@cache_path}/recent_comments") && !File.exists?("{#{@conf.data_path}/recent_comments")
+	if File.exist?("#{@cache_path}/recent_comments") && !File.exist?("{#{@conf.data_path}/recent_comments")
 		FileUtils.mv( "#{@cache_path}/recent_comments", "#{@conf.data_path}/recent_comments" )
 	end
 	# workaround for "/foo//bar" doesn't equal "/foo/bar"
@@ -47,7 +47,7 @@ def recent_comment3(ob_max = 'OBSOLUTE' ,sep = 'OBSOLUTE',ob_date_format = 'OBSO
 	recent_comment3_init
 
 	cache = @conf['recent_comment3.cache'].untaint
-	date_format = @conf['recent_comment3.date_format'] 
+	date_format = @conf['recent_comment3.date_format']
 	excepts = @conf['recent_comment3.except_list'].split(/,/)
 	format = @conf['recent_comment3.format']
 	titlelen = @conf['recent_comment3.titlelen']

data/misc/plugin/recent_namazu.rb

@@ -5,11 +5,11 @@
 # 		 namazi.cgiが作成する検索キーワードログ(NMZ.slog)から
 #		 最新xx件分の検索語を表示します。
 # パラメタ:
-#   file:       検索キーワードログファイル名(絶対パス表記) 
-#   namazu:     なまずcgi名 
-#   limit:      表示件数(未指定時:5) 
+#   file:       検索キーワードログファイル名(絶対パス表記)
+#   namazu:     なまずcgi名
+#   limit:      表示件数(未指定時:5)
 #   sep:        セパレータ(未指定時:空白)
-#   make_link:  <a>を生成するか?(未指定時:生成する)    
+#   make_link:  <a>を生成するか?(未指定時:生成する)
 #
 #
 # Copyright (c) 2002 Hiroyuki Ikezoe <zoe@kasumi.sakura.ne.jp>

data/misc/plugin/recent_rss.rb

@@ -1,5 +1,5 @@
 # -*- indent-tabs-mode: t -*-
-# recent_rss.rb: RSS recent plugin 
+# recent_rss.rb: RSS recent plugin
 #
 # options:
 #   @options['recent_rss.use-image-link'] : use image as link
@@ -35,13 +35,13 @@ def recent_rss( url, max = 5, cache_time = 3600, show_modified = true )
 	cache_file = "#{@cache_path}/recent_rss.#{CGI.escape(url)}"
 
 	recent_rss_cache_rss(url, cache_file, cache_time.to_i)
-	
+
 	return '' unless test(?r, cache_file)
 
 	rv = %Q|<div class="recent-rss">\n|
 
 	site_info, *infos = recent_rss_read_from_cache(cache_file)
-  
+
 	if site_info
 		title, url, time, image = site_info
 		content = recent_rss_entry_to_html( title, url, time, image, show_modified )
@@ -49,9 +49,9 @@ def recent_rss( url, max = 5, cache_time = 3600, show_modified = true )
 		rv << %Q|<span class="#{recent_rss_modified_class(time)}">#{content}</span>\n|
 		rv << "</div>\n"
 	end
-  
+
 	have_entry = infos.size > 0 && max > 0
-  
+
 	rv << %Q|<ol class="recent-rss">\n| if have_entry
 	i = 0
 	infos.each do |title, url, time, image|
@@ -93,14 +93,14 @@ def recent_rss_cache_rss(url, cache_file, cache_time)
 	cached_time = File.mtime(cache_file) if File.exist?(cache_file)
 
 	if cached_time.nil? or Time.now > cached_time + cache_time
-		
+
 		begin
 			uri = URI.parse(url)
 
 			raise URI::InvalidURIError unless uri.is_a?(URI::HTTP)
 
 			rss_source = recent_rss_fetch_rss(uri, cached_time)
-			
+
 			raise InvalidResourceError if rss_source.nil?
 
 			# parse RSS

data/misc/plugin/referer_scheme.rb

@@ -30,12 +30,12 @@ end
 
 unless @conf.referer_table.respond_to?( 'scheme_tdiary', true ) then
 	class << @conf.referer_table
-		TdiaryDates = [ 
+		TdiaryDates = [
 				['(?:\\?date=)?(\d{4})(\d{2})(\d{2})-(\d+)(?:\.html)?.*', '(\1-\2-\3~)'],
 				['(?:\\?date=)?(\d{4})(\d{2})(\d{2})(?:\.html)?.*', '(\1-\2-\3)'],
 				['(?:\\?date=)?(\d{4})(\d{2})(?:\.html)?.*', '(\1-\2)'],
 				['(?:\\?date=)?(\d{2})(\d{2})(?:\.html)?.*', '(\1-\2)'],
-		] 
+		]
 		private
 		def scheme_tdiary( url, name )
 			TdiaryDates.each do |a|

data/misc/plugin/search-default.rb

@@ -233,7 +233,7 @@ end
 
 def search_result
 	unless @conf.io_class == (TDiary.const_defined?('DefaultIO') ? TDiary::DefaultIO : TDiary::IO::Default)
-		return %Q|<p class="message">could not use this plugin under #{@conf.io_class}.</p>| 
+		return %Q|<p class="message">could not use this plugin under #{@conf.io_class}.</p>|
 	end
 
 	query = CGI::unescape( @cgi.params['q'][0] )

data/misc/plugin/sn.rb

@@ -62,13 +62,13 @@
 	* first version
 =end
 
-add_body_enter_proc do |date|   
+add_body_enter_proc do |date|
 	@sn_count = 1
 	@sn_idx = 0
 	""
 end
 
-add_body_leave_proc do |date|   
+add_body_leave_proc do |date|
 	@sn_count = 1
 	@sn_idx = 0
 	""
@@ -94,7 +94,7 @@ def sn( number = nil )
 	@sn_count += 1
 	%Q[#{'%d' % number}]
 end
- 
+
 def sn_anchorid
 	%Q[#{'%d' % @sn_idx}]
 end

data/misc/plugin/speed_comment.rb

@@ -13,7 +13,7 @@
 	* support conf_proc.
 
 2002-03-24 TADA Tadashi <sho@spc.gr.jp>
-	* suppress output in mobile mode. 
+	* suppress output in mobile mode.
 
 2002-03-12 TADA Tadashi <sho@spc.gr.jp>
 	* support insert into @header.

data/misc/plugin/squeeze.rb

@@ -5,13 +5,13 @@
 # Create daily HTML file from tDiary database.
 #
 # See URLs below for more details.
-#   http://ponx.s5.xrea.com/hiki/squeeze.rb.html (English) 
-#   http://ponx.s5.xrea.com/hiki/ja/squeeze.rb.html (Japanese) 
+#   http://ponx.s5.xrea.com/hiki/squeeze.rb.html (English)
+#   http://ponx.s5.xrea.com/hiki/ja/squeeze.rb.html (Japanese)
 #
 # Copyright (C) 2002 MUTOH Masao <mutoh@highway.ne.jp>
 # You can redistribute it and/or modify it under GPL2.
 #
-# The original version of this file was distributed with squeeze 
+# The original version of this file was distributed with squeeze
 # TADA Tadashi <sho@spc.gr.jp> with GPL2.
 #
 unless $tdiary_squeeze_loaded
@@ -77,7 +77,7 @@ if mode == "CMD" || mode == "CGI"
 		$:.unshift tdiary_path
 	else
 		@options = Hash.new
-		File::readlines("tdiary.conf").each {|item| 
+		File::readlines("tdiary.conf").each {|item|
 			if item =~ /@options/
 				begin
 					eval(item)
@@ -114,7 +114,7 @@ module ::TDiary
 	class YATDiarySqueeze < TDiaryBase
 		def initialize(diary, dest, all_data, overwrite, compat, conf, suffix)
 			@ignore_parser_cache = true
-	
+
 			cgi = CGI::new
 			def cgi.referer; nil; end
 			def cgi.user_agent; 'bot'; end
@@ -128,7 +128,7 @@ module ::TDiary
 			@compat = compat
 			@suffix = suffix
 		end
-	
+
 		def execute
 			if @compat
 				dir = @dest
@@ -143,7 +143,7 @@ module ::TDiary
 				File::delete( filename )
 			end
 			if @diary.visible? or @all_data
-				if not FileTest::exist?(filename) or 
+				if not FileTest::exist?(filename) or
 						File::mtime(filename) != @diary.last_modified
 					File::open(filename, 'w'){|f| f.write(eval_rhtml)}
 					File::utime(@diary.last_modified, @diary.last_modified, filename)
@@ -158,7 +158,7 @@ module ::TDiary
 			end
 			name
 		end
-		
+
 		protected
 		def mode
 			'day'

data/misc/plugin/tb-show.rb

@@ -26,7 +26,7 @@
 #		%Q|#{comment_new_tb_backup }</a>]<br>[TrackBack to <a href="#{@tb_url}">#{@tb_url}|
 #	end
 #
- 
+
 # running on only non mobile mode
 unless @cgi.mobile_agent? then
 

data/misc/plugin/theme_online.rb

@@ -0,0 +1,25 @@
+# theme_online.rb: choice theme from online repository on tDiary.org
+#
+# Copyright (C) 2014 by TADA Tadashi <t@tdtds.jp>
+# You can distribute and/or modify it under GPL
+#
+require 'json'
+require 'open-uri'
+
+def theme_list_online(list)
+	begin
+		online_list = JSON.load(open('http://theme.tdiary.org/themes.json', &:read))['themes']
+		list + online_list.keys.map do |t|
+			title = online_list[t]['title']
+			label = t == title ? '' : " (#{title})"
+			["online/#{t}", "#{t}#{label}"]
+		end
+	rescue
+		@logger.error "could not get theme list from online: #$!"
+		list
+	end
+end
+
+def theme_url_online(theme)
+	"http://theme.tdiary.org/#{h theme}/#{h theme}.css"
+end

data/misc/plugin/tlink.rb

@@ -41,7 +41,7 @@
 
 2002-05-16 MUTOH Masao <mutoh@highway.ne.jp>
 	* cache mechanism support.
-	* code cleanup(remove require 'cgi', 
+	* code cleanup(remove require 'cgi',
 		getcomment rename to tlink_getcomment).
 
 2002-05-05 NT <nt@24i.net>
@@ -70,7 +70,7 @@ require 'net/http'
 require 'kconv'
 require 'pstore'
 
-def tlink_initialize 
+def tlink_initialize
   dir = @cache_path + "/tlink"
   @tlink_path = dir + "/tlink.dat"
 

data/misc/plugin/todo.rb

@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2001,2002,2003 Junichiro KITA <kita@kitaj.no-ip.com>
 # Distributed under the GPL
-# 
+#
 
 require 'fileutils'
 require 'time'
@@ -146,7 +146,7 @@ end
 
 # backward compatibility
 def todo_file
-	if File.exists?( "#{@cache_path}/todo" ) then
+	if File.exist?( "#{@cache_path}/todo" ) then
 		FileUtils.mv( "#{@cache_path}/todo", "#{@conf.data_path}/todo")
 	end
 	(@options && @options['todo.path'] || @conf.data_path) + "/todo"

data/misc/plugin/weather.rb

@@ -68,9 +68,17 @@ of GPL version 2 or later.
 require 'net/http'
 require 'cgi'
 require 'timeout'
+require 'date'	# DateTime.strptime
 
 =begin
 == Classes and methods
+=== WeatherParser
+
+--- WeatherParser::parse
+=end
+
+
+=begin
 === WeatherTranslator module
 We want Japanese displayed in a diary written in Japanese.
 
@@ -144,45 +152,61 @@ class Weather
 	# magic numbers
 	WAITTIME = 10
 	MAXREDIRECT = 10
+	AVIATIONWEATHER_STATION_REGEXP = %r|(?:aviationweather.gov/adds/metars/\?.*station_ids=)([A-Z]{4,4})\b|
+	NOAA_STATION_REGEXP = %r|(?:weather.noaa.gov/weather/current/)([A-Z]{4,4})\b|
+	RAW_STATION_REGEXP = %r|\A([A-Z]{4,4})\z|
+	STATION_URL_TEMPLATE = "http://www.aviationweather.gov/adds/metars/?station_ids=%s&std_trans=translated&chk_metars=on&hoursStr=most+recent+only"
+
+	def Weather::extract_station_id(url)
+			[AVIATIONWEATHER_STATION_REGEXP, NOAA_STATION_REGEXP, RAW_STATION_REGEXP].each do |r|
+				m = r.match(url)
+				return m[1] if m and m[1]
+			end
+			return nil
+	end
 
 	# edit this method according to the HTML we will get
 	def parse_html( html, items )
 		htmlitems = Hash.new
 
-		# weather data is in the 4th table in the HTML from weather.noaa.gov
-		table = html.scan( %r[<table.*?>(.*?)</table>]mi )[3][0]
-		table.scan( %r[<tr.*?>(.*?)</tr>]mi ).collect {|a| a[0]}.each do |row|
+		# weather data is in the 1st table in the HTML from aviationweather.gov
+		table = html.scan( %r[<table.*?>(.*?)</table>]mi )
+		return if not table or not table[0] or not table[0][0]
+		table[0][0].scan( %r[<tr.*?>(.*?)</tr>]mi ).collect {|a| a[0]}.each do |row|
 			# <tr><td> *item* -> downcased </td><td> *value* </td></tr>
 			if %r[<td.*?>(.*?)</td>\s*<td.*?>(.*?)</td>]mi =~ row then
 				item = $1
 				value = $2
-				item = item.gsub( /<br>/i, '/' ).gsub( /<.*?>/m , '').strip.downcase
-				value = value.gsub( /<br>/i, '/' ).gsub( /<.*?>/m , '').strip
+				item = item.gsub( /<br>/i, '/' ).gsub( /<.*?>/m , '').strip.sub(/:$/, '').downcase
+				value = value.gsub(/\&(nbsp|#160);/, ' ').gsub(/\&#46;/, '.').gsub(/\&#37/, '%').gsub(/\&deg;/, '').gsub( /<br>/i, '/' ).gsub( /<.*?>/m , '').strip
 
 				# unit conversion settings
 				units = []
 				case item
 				when 'conditions at'
 					# we have to convert the UTC time into UNIX time
-					if /(\d{4}).(\d\d).(\d\d)\s*(\d\d)(\d\d)\s*UTC$/ =~ value then
-						value = Time::utc( $1, $2, $3, $4, $5 ).to_i.to_s
+					if /observed\s+(.*)$/ =~ value then
+						value = DateTime.strptime($1, "%H%M %z %d %B %Y").to_time.to_i.to_s
 					else
 						raise StandardError, 'Parse error in "Conditions at"'
 					end
 				when 'visibility' # we want to preserve adjective phrase if possible
-					if /(.*)([\d.]+)\s*mile(\(s\))?/i =~ value then
-						htmlitems["#{item}(km)"] = sprintf( '%s %.3f', $1.strip, $2.to_f * 1.610 )
-						htmlitems["#{item}(mile)"] = sprintf( '%s %s', $1.strip, $2 )
+					if /(.+)miles?/i =~ value then
+						htmlitems["#{item}(mile)"] = $1.strip
+					end
+					if /([^\(]+)km/i =~ value then
+						htmlitems["#{item}(km)"] = $1.strip
+					end
+				when 'winds' # we want to preserve adjective phrase if possible
+					%w(MPH knots m/s).each do |unit|
+						speed = value.scan( /([\d.]+)\s*#{unit}/i ).collect { |x| x[0] }
+						htmlitems["wind(#{unit})"] = speed.join(',')
 					end
-				when 'wind' # we want to preserve adjective phrase if possible
-					speed = value.scan( /([\d.]+)\s*MPH/i ).collect { |x| x[0] }
-					htmlitems["#{item}(MPH)"] = speed.join(',')
-					htmlitems["#{item}(m/s)"] = speed.collect {|s| sprintf( '%.4f', s.to_f * 0.4472222 ) }.join(',')
 					if /([\d.]+)\s*degrees?/i =~ value then
-						htmlitems["#{item}(deg)"] = $1
+						htmlitems["wind(deg)"] = $1
 					end
 					if /from\s+(the\s+)?(\w+)/i =~ value then
-						htmlitems["#{item}dir"] = $2 + ($3 ? " #{$3}" : '')
+						htmlitems["winddir"] = $2 + ($3 ? " #{$3}" : '')
 					end
 					if /(\(direction variable\))/i =~ value then
 						htmlitems["#{item}dir"] << " #{$1}"
@@ -192,18 +216,19 @@ class Weather
 					units = ['C', 'F']
 				when 'windchill'
 					units = ['C', 'F']
-				when 'dew point'
+				when 'dewpoint'
 					units = ['C', 'F']
 				when 'relative humidity'
 					units = ['%']
 				when 'pressure (altimeter)'
-					units = ['hPa']
+					units = ['mb']	# mb (mbar) and hPa results in same number
 				end
 
 				# parse the value with the units if preferred and possible
 				units.each do |unit|
-					if /(-?[\d.]+)\s*\(?#{unit}\b/i =~ value then
-						htmlitems["#{item}(#{unit})"] = $1
+					if /(-?[\d.]+)\s*\D?\(?#{unit}\b/i =~ value then
+						number = $1
+						htmlitems["#{item}(#{unit})"] = number
 					end
 				end
 
@@ -213,6 +238,18 @@ class Weather
 			end	# if %r[<td.*?>(.*?)</td>\s*<td.*?>(.*?)</td>]mi =~ row
 		end	# table.scan( %r[<tr.*?>(.*?)</tr>]mi ) ... do |row|
 
+		# Obtain weather from Weather: or Clouds:
+		weather = 'Unknown'
+		# e.g.: FG -RA  (fog, light rain)
+		if /\((.*)\)/ =~ htmlitems['weather'] then
+			weather = $1.strip
+		# e.g.: few clouds at 3000 feet AGL
+		elsif /(.*?)\s+at/ =~ htmlitems['clouds'] then
+			weather = $1.strip
+		end
+		# Weather seemed to have been slash divided capitalized string
+		htmlitems['weather'] = weather.split(/,\s*/).map{|e| e.strip.capitalize}.join('/')
+
 		# translate the parsed HTML into the Weather hash with more generic key
 		items.each do |from, to|
 			if htmlitems[from] then
@@ -257,7 +294,7 @@ class Weather
 		px_port = 80 if px_host and !px_port
 		u = URI::parse( url )
 		Net::HTTP::Proxy( px_host, px_port ).start( u.host, u.port ) do |http|
-			case res = http.get( u.path, header )
+			case res = http.get( u.request_uri, header )
 			when Net::HTTPSuccess
 				res.body
 			when Net::HTTPRedirection
@@ -406,9 +443,9 @@ Weather_default_items = {
 	'visibility(km)'            => 'visibility(km)',
 	'temperature(C)'            => 'temperature(C)',
 	'windchill(C)'              => 'windchill(C)',
-	'dew point(C)'              => 'dewpoint(C)',
+	'dewpoint(C)'               => 'dewpoint(C)',
 	'relative humidity(%)'      => 'humidity(%)',
-	'pressure (altimeter)(hPa)' => 'pressure(hPa)',
+	'pressure (altimeter)(mb)'  => 'pressure(hPa)',
 }
 
 # shows weather
@@ -436,6 +473,7 @@ def get_weather
 	w = Weather::restore( path, @date )
 	if not w or w.error then
 		items = @options['weather.items'] || Weather_default_items
+		update_weather_url( @options )
 		w = Weather.new( @date, @options['weather.tz'], @conf )
 		w.get( @options['weather.url'], @options['weather.header'] || {}, items )
 		if @options.has_key?( 'weather.oldest' ) then
@@ -448,11 +486,28 @@ def get_weather
 	end
 end
 
+# Update URL of weather information
+#
+# Around April, 2012, NOAA chnaged the URL of the current weather from
+# http://weather.noaa.gov/weather/current/#{station_id}.html
+# to
+# http://www.aviationweather.gov/adds/metars/?station_ids=#{station_id}&std_trans=translated&chk_metars=on&hoursStr=most+recent+only
+def update_weather_url( hash )
+	if hash['weather.url'] and match = hash['weather.url'].scan(%r[\Ahttp://weather.noaa.gov/weather/current/(\w{4,4}).html\z])[0]
+		hash['weather.url'] = Weather::STATION_URL_TEMPLATE % match[0]
+	end
+end
+
 # www configuration interface
 def configure_weather
 	if( @mode == 'saveconf' ) then
 		# weather.url
-		@conf['weather.url'] = @cgi.params['weather.url'][0]
+		station = Weather::extract_station_id( @cgi.params['weather.url'][0] )
+		if station
+			@conf['weather.url'] = Weather::STATION_URL_TEMPLATE % station
+		else
+			@conf['weather.url'] = @cgi.params['weather.url'][0]
+		end
 		# weather.tz
 		tz = @cgi.params['weather.tz'][0]
 		unless tz.empty? then	# need more checks
@@ -469,6 +524,7 @@ def configure_weather
 			end
 		end
 	end
+	update_weather_url( @conf )
 	weather_configure_html( @conf )
 end
 
@@ -482,13 +538,13 @@ _END
 end
 
 if not feed? and not @options['weather.in_title'] then
-	add_body_enter_proc do |date| 
+	add_body_enter_proc do |date|
 		weather( date )
 	end
 end
 
 if not feed? and @options['weather.in_title'] then
-	add_title_proc do |date, title| 
+	add_title_proc do |date, title|
 		title + weather( date, false )
 	end
 end

data/misc/plugin/whatsnew.rb

@@ -83,7 +83,7 @@ add_footer_proc do
 				'name' => 'tdiary_whats_new',
 				'value' => [@whats_new[:this_time]],
 				'path' => cookie_path,
-				'expires' => Time::now.gmtime + 90*24*60*60 
+				'expires' => Time::now.gmtime + 90*24*60*60
 			})
 			add_cookie(cookie)
 		end

data/misc/plugin/xmlrpc/xmlrpc.rb

@@ -44,7 +44,7 @@ server.add_handler('blogger.newPost') do |appkey, blogid, username, password, co
       title,body = content.split(/\n/,2)
       index = diary.add_section(title, body)
       src = diary.to_src
-      
+
       @cgi.params.delete 'date'
       @cgi.params['old']   = [postid]
       @cgi.params['hide']  = diary.visible? ? [] : ['true']
@@ -78,7 +78,7 @@ server.add_handler('blogger.editPost') do |appkey, postid, username, password, c
     index = index.to_i
     time = Time::local( year, month, day ) + 12*60*60
     diary = tdiary[time]
-    
+
     src = ''
     i = 0
     diary.each_section {|sec|
@@ -90,7 +90,7 @@ server.add_handler('blogger.editPost') do |appkey, postid, username, password, c
       end
       src << sec.to_src
     }
-    
+
     @cgi.params.delete 'date'
     @cgi.params['old']   = [postid[0,8]]
     @cgi.params['hide']  = diary.visible? ? [] : ['true']
@@ -123,10 +123,10 @@ server.add_handler('blogger.deletePost') do |appkey, postid, username, password|
     tdiary = ::TDiary::TDiaryDay::new( @cgi, "day.rhtml", @conf )
     time = Time::local( year, month, day ) + 12*60*60
     diary = tdiary[time]
-    
+
     diary.delete_section(index)
     src = diary.to_src
-    
+
     @cgi.params.delete 'date'
     @cgi.params['old']   = [postid[0,8]]
     @cgi.params['hide']  = diary.visible? ? [] : ['true']
@@ -216,10 +216,10 @@ server.add_handler('metaWeblog.newPost') do |blogid, username, password, content
     tdiary = ::TDiary::TDiaryDay::new( @cgi, "day.rhtml", @conf )
     time = Time::local( year, month, day ) + 12*60*60
     diary = tdiary[time] || tdiary.instance_variable_get(:@io).diary_factory(time, '', '', @conf.style)
-    
+
     index = diary.add_section(content['title'], content['description'])
     src = diary.to_src
-    
+
     @cgi.params.delete 'date'
     @cgi.params['old']   = [postid]
     @cgi.params['hide']  = diary.visible? ? [] : ['true']
@@ -250,7 +250,7 @@ server.add_handler('metaWeblog.editPost') do |postid, username, password, conten
     index = index.to_i
     time = Time::local( year, month, day ) + 12*60*60
     diary = tdiary[time]
-    
+
     src = ''
     i = 0
     diary.each_section {|sec|
@@ -261,7 +261,7 @@ server.add_handler('metaWeblog.editPost') do |postid, username, password, conten
       end
       src << sec.to_src
     }
-    
+
     @cgi.params.delete 'date'
     @cgi.params['old']   = [postid[0,8]]
     @cgi.params['hide']  = diary.visible? ? [] : ['true']
@@ -478,7 +478,7 @@ server.add_handler('mt.setPostCategories') do |postid, username, password, categ
     diary = tdiary[time]
 
     @cgi.params.delete 'date'
-    
+
     src = ''
     i = 0
     diary.each_section {|sec|
@@ -494,7 +494,7 @@ server.add_handler('mt.setPostCategories') do |postid, username, password, categ
       end
       src << sec.to_src
     }
-    
+
     @cgi.params['old']   = [postid[0,8]]
     @cgi.params['hide']  = diary.visible? ? [] : ['true']
     @cgi.params['title'] = [diary.title]

data/misc/theme_convert/theme_convert.rb

@@ -404,14 +404,14 @@ def theme_convert ( fname, hash )
           end
         end
       }
-    end 
+    end
   end
 
   rcss = File::readlines( "append.rcss" ).join
   File.open( fname.sub( /\.css/i, "-2.css" ), "a" ) do |f|
     f.write( ERB::new( rcss ).result( binding ) )
   end
-end 
+end
 
 while cssname = ARGV.shift
   unless cssname
@@ -422,7 +422,7 @@ while cssname = ARGV.shift
   begin
     simplify_css( cssname )
   rescue
-    File.delete( cssname.sub( /\.css/i, "-simple.css" ) ) 
+    File.delete( cssname.sub( /\.css/i, "-simple.css" ) )
     puts "Error!: #{$!}"
     next
   end