tdiary 5.5.1 → 5.6.1

data/lib/tdiary/view.rb

@@ -7,12 +7,12 @@ module TDiary
 		def initialize( cgi, rhtml, conf )
 			super
 
-			unless referer_filter( @cgi.referer )
-				def @cgi.referer; nil; end
+			unless referer_filter( @request.referer )
+				@request.hide_referer!
 			end
 
 			# save referer to latest
-			if (!@conf.referer_day_only or (@cgi.params['date'][0] and @cgi.params['date'][0].length == 8)) and @cgi.referer then
+			if (!@conf.referer_day_only or (@request.param('date') and @request.param('date').length == 8)) and @request.referer then
 				ym = latest_month
 				@date = ym ? Time::local( ym[0], ym[1] ) : Time::now
 				@io.transaction( @date ) do |diaries|
@@ -23,7 +23,7 @@ module TDiary
 						break if @diary.visible?
 					end
 					if @diary then
-						@diary.add_referer( @cgi.referer )
+						@diary.add_referer( @request.referer )
 						dirty = DIRTY_REFERER
 					end
 					dirty
@@ -121,7 +121,7 @@ module TDiary
 
 			begin
 				# time is noon for easy to calc leap second.
-				@date = Time::local( *@cgi.params['date'][0].scan( /^(\d{4})(\d\d)(\d\d)$/ )[0] ) + 12*60*60
+				@date = Time::local( *@request.param('date').scan( /^(\d{4})(\d\d)(\d\d)$/ )[0] ) + 12*60*60
 				load( @date )
 			rescue ArgumentError, NameError
 				raise TDiaryError, 'bad date'
@@ -149,8 +149,8 @@ module TDiary
 					@diaries = diaries
 					dirty = DIRTY_NONE
 					@diary = self[date]
-					if @diary and @cgi.referer then
-						@diary.add_referer( @cgi.referer )
+					if @diary and @request.referer then
+						@diary.add_referer( @request.referer )
 						dirty = DIRTY_REFERER
 					end
 					dirty
@@ -161,11 +161,11 @@ module TDiary
 		end
 
 		def cookie_name
-			@cgi.cookies['tdiary'][0] or ''
+			@request.cgi_cookies['tdiary'][0] or ''
 		end
 
 		def cookie_mail
-			@cgi.cookies['tdiary'][1] or ''
+			@request.cgi_cookies['tdiary'][1] or ''
 		end
 	end
 
@@ -189,9 +189,9 @@ module TDiary
 
 		def load( date )
 			@date = date
-			@name = @cgi.params['name'][0]
-			@mail = @cgi.params['mail'][0]
-			@body = @cgi.params['body'][0]
+			@name = @request.param('name')
+			@mail = @request.param('mail')
+			@body = @request.param('body')
 			@name = @conf.to_native( @name )
 			@body = @conf.to_native( @body )
 			@comment = Comment::new( @name, @mail, @body )
@@ -203,13 +203,18 @@ module TDiary
 				if @diary and comment_filter( @diary, @comment ) then
 					@diary.add_comment( @comment )
 					dirty = DIRTY_COMMENT
-					cookie_path = File::dirname( @cgi.script_name )
+					script_name = @request.script_name
+					cookie_path = script_name.empty? ? '/' : File::dirname( script_name )
 					cookie_path += '/' if cookie_path !~ /\/$/
-					@cookies << CGI::Cookie::new( {
-						'name' => 'tdiary',
-						'value' => [@name,@mail],
-						'path' => cookie_path,
-						'expires' => Time::now.gmtime + 90*24*60*60 # 90days
+					# the escaped 'name&mail' multi-value format must be kept;
+					# CGI::Cookie.parse on the reading side splits on '&'
+					@cookies << ::Rack::Utils.set_cookie_header( 'tdiary', {
+						value: [@name, @mail],
+						path: cookie_path,
+						expires: Time::now.gmtime + 90*24*60*60, # 90days
+						secure: @request.ssl?,
+						http_only: true,
+						same_site: :lax
 					} )
 					@io.clear_cache( /(latest|#{@date.strftime( '%Y%m' )})/ )
 				else
@@ -254,7 +259,7 @@ module TDiary
 			super
 
 			begin
-				date = Time::local( *@cgi.params['date'][0].scan( /^(\d{4})(\d\d)$/ )[0] )
+				date = Time::local( *@request.param('date').scan( /^(\d{4})(\d\d)$/ )[0] )
 				d1 = @date.dup.gmtime if @date
 				d2 = date.dup.gmtime
 				if not @date or d1.year != d2.year or d1.month != d2.month then
@@ -280,7 +285,7 @@ module TDiary
 			super
 
 			@diaries = {}
-			month, day = @cgi.params['date'][0].scan(/^(\d\d)(\d\d)$/)[0]
+			month, day = @request.param('date').scan(/^(\d\d)(\d\d)$/)[0]
 			nyear(month).each do |y, m|
 				@date = Time::local(y, m)
 				@io.transaction(@date) do |diaries|
@@ -318,8 +323,8 @@ module TDiary
 		def initialize( cgi, rhtml, conf )
 			super
 
-			if @cgi.params['date'][0] then
-				ym = [@cgi.params['date'][0][0,4].to_i, @cgi.params['date'][0][4,2].to_i]
+			if @request.param('date') then
+				ym = [@request.param('date')[0,4].to_i, @request.param('date')[4,2].to_i]
 				@date = nil
 			else
 				ym = latest_month
@@ -329,8 +334,8 @@ module TDiary
 				@date = ym ? Time::local( ym[0], ym[1] ) : Time::now
 				@io.transaction( @date ) do |diaries|
 					@diaries = diaries
-					if @cgi.params['date'][0] then
-						@diary = @diaries[@cgi.params['date'][0][0,8]]
+					if @request.param('date') then
+						@diary = @diaries[@request.param('date')[0,8]]
 						@date = @diary.date if @diary
 					end
 					unless @diary then
@@ -442,16 +447,16 @@ module TDiary
 		end
 
 		def start_date
-			if @cgi.params['date'][0] then
-				@cgi.params['date'][0][0,8]
+			if @request.param('date') then
+				@request.param('date')[0,8]
 			else
 				'99999999' # max of date string
 			end
 		end
 
 		def limit_size( default_limit )
-			if @cgi.params['date'][0] then
-				date = @cgi.params['date'][0]
+			if @request.param('date') then
+				date = @request.param('date')
 				limit = date[9,date.length-9].to_i
 				limit = 30 if limit > 30
 				limit

data/lib/tdiary/view_helper.rb

@@ -1,15 +1,23 @@
 module TDiary
   module ViewHelper
 		def bot?
-			@conf.bot =~ @cgi.user_agent
+			@conf.bot =~ view_helper_request.user_agent
 		end
 
     def base_url
       if @conf.options['base_url'] && @conf.options['base_url'].length > 0
         @conf.options['base_url']
       else
-        @cgi.base_url
+        view_helper_request.tdiary_base_url
       end
     end
+
+  private
+
+    # plugins include this helper into objects that hold only the @cgi
+    # facade (misc/plugin/makerss.rb); fall back to its wrapped request
+    def view_helper_request
+      @request || @cgi.request
+    end
   end
 end

data/lib/tdiary.rb

@@ -16,6 +16,12 @@ $:.unshift File.join(File::dirname(__FILE__), '../misc/lib')
 	Dir[File.join(File.dirname(__FILE__), path)].each {|dir| $:.unshift dir }
 end
 
+# Set up the bundle before requiring anything that ships as a default gem.
+# A CGI process starts without RUBYOPT or BUNDLE_GEMFILE (WEBrick's CGI runner
+# wipes the environment), so requiring 'cgi' first activates the version bundled
+# with Ruby and Bundler then fails on the version the Gemfile asks for.
+require 'tdiary/environment'
+
 gem 'cgi' if RUBY_VERSION >= '4.0'
 require 'cgi'
 require 'uri'
@@ -23,7 +29,6 @@ require 'fileutils'
 require 'pstore'
 require 'json'
 require 'erb'
-require 'tdiary/environment'
 require 'tdiary/core_ext'
 
 #

data/misc/plugin/amazon.rb

@@ -92,11 +92,12 @@ def amazon_detail_html(item)
 	image = amazon_image(item)
 	@conf['amazon.imgsize'] = size_orig
 
+	size = %Q|height="#{h image[:height]}" width="#{h image[:width]}"| if image[:height]
 	url = amazon_url(item)
 	<<-HTML
 	<a class="amazon-detail" href="#{url}"><span class="amazon-detail">
 		<img class="amazon-detail left" src="#{h image[:src]}"
-		height="#{h image[:height]}" width="#{h image[:width]}"
+		#{size}
 		alt="">
 		<span class="amazon-detail-desc">
 			<span class="amazon-title">#{h title}</span><br>
@@ -125,7 +126,7 @@ def amazon_to_html(item, with_image = true, label = nil, pos = 'amazon')
 		unless image[:src] then
 			img = ''
 		else
-			size = %Q|height="#{h image[:height]}" width="#{h image[:width]}"|
+			size = %Q|height="#{h image[:height]}" width="#{h image[:width]}"| if image[:height]
 			img = <<-HTML
 			<img class="#{h pos}" src="#{h image[:src]}"
 			#{size} alt="#{h alt}">
@@ -138,6 +139,18 @@ def amazon_to_html(item, with_image = true, label = nil, pos = 'amazon')
 	%Q|<a href="#{h url}">#{img}#{h label}</a>|
 end
 
+# Books Amazon doesn't answer for are asked of a plugin defining amazon_book_item(isbn), like amazon_rakuten.rb.
+def amazon_book_json(item_id)
+	return nil unless defined?(amazon_book_item) && /\A(?:\d{9}[\dX]|97[89]\d{10})\z/i =~ item_id
+	item = amazon_book_item(item_id)
+	{'ItemsResult' => {'Items' => [item]}}.to_json if item
+end
+
+def amazon_dp_link(asin, label)
+	url = "https://www.amazon.co.jp/dp/#{asin}"
+	%Q|<a href="#{h url}">#{h(label || url)}</a>|
+end
+
 def amazon_get(asin, with_image = true, label = nil, pos = 'amazon')
 	asin = asin.to_s.strip.gsub(/-/, '')
 	country, item_id = asin.scan(/\A(..):(.*)/).flatten
@@ -149,16 +162,31 @@ def amazon_get(asin, with_image = true, label = nil, pos = 'amazon')
 	begin
 		cache = "#{@cache_path}/amazon"
 		Dir::mkdir( cache ) unless File::directory?( cache )
+		file = "#{cache}/#{country}#{item_id}.json"
 		begin
-			json = File::read("#{cache}/#{country}#{item_id}.json")
+			json = File::read(file)
+			raise Errno::ENOENT if json.empty?
 		rescue Errno::ENOENT
 			access_key = @conf['amazon.access_key']
 			secret_key = @conf['amazon.secret_key']
-			return asin unless access_key && secret_key
-			partner_tag = @conf['amazon.aid']
-			paapi = AWS::PAAPI.new(access_key, secret_key, partner_tag)
-			json = paapi.get_items(item_id, country.to_sym)
-			File::open("#{cache}/#{country}#{item_id}.json", 'wb'){|f| f.write(json)}
+			if access_key && secret_key && !File::exist?(file)
+				begin
+					partner_tag = @conf['amazon.aid']
+					paapi = AWS::PAAPI.new(access_key, secret_key, partner_tag)
+					json = paapi.get_items(item_id, country.to_sym)
+				rescue Net::HTTPExceptions => e
+					# An empty cache records a 403, which PA-API keeps answering, so the item isn't asked about again until the cache is cleared
+					File::write(file, '') if e.response.code == '403'
+					json = amazon_book_json(item_id)
+					raise unless json
+				end
+			else
+				json = amazon_book_json(item_id)
+				unless json
+					return File::exist?(file) ? amazon_dp_link(asin, label) : asin
+				end
+			end
+			File::open(file, 'wb'){|f| f.write(json)}
 		end
 		item = JSON.parse(json)["ItemsResult"]["Items"][0]
 		if pos == 'detail' then
@@ -185,9 +213,7 @@ def amazon_get(asin, with_image = true, label = nil, pos = 'amazon')
 		message = ''
 		# Handle 429 "Too Many Requests" and 403 "Forbidden"
 		if /^429|^403/ =~ e.message then
-			url = "https://www.amazon.co.jp/dp/#{h asin}"
-			label ||= url
-			message << %Q|<a href="#{h url}">#{h label}</a>|
+			message << amazon_dp_link(asin, label)
 		end
 		if @mode == 'preview' then
 			message << %Q|<span class="message">(#{h e.message})</span>|

data/misc/plugin/amazon_rakuten.rb

@@ -0,0 +1,75 @@
+#
+# amazon_rakuten.rb: look books of amazon.rb up in Rakuten Books
+#
+# PA-API refuses Associates accounts that don't meet its eligibility
+# requirements, which leaves amazon.rb without titles and images. With
+# this plugin, books given by ISBN come from Rakuten Books Book Search
+# API instead, and link to Rakuten Books as its terms require.
+#
+# options:
+#   @options['rakuten.app_id']       : application ID of Rakuten Web Service
+#   @options['rakuten.access_key']   : access key of the application
+#   @options['rakuten.affiliate_id'] : Rakuten Affiliate ID for the links (optional)
+#
+# Register the application as an API/backend service allowing the IP
+# address of the server. Rakuten requires the credit this plugin puts in
+# the footer.
+#
+# Copyright (c) 2026 Hiroshi SHIBATA <hsbt@ruby-lang.org>
+# Distributed under the GPL2 or any later version.
+#
+require 'json'
+require 'net/http'
+
+def amazon_book_item(isbn)
+	app_id = @conf['rakuten.app_id']
+	access_key = @conf['rakuten.access_key']
+	return nil unless app_id && access_key
+
+	uri = URI('https://openapi.rakuten.co.jp/services/api/BooksBook/Search/20170404')
+	params = {applicationId: app_id, accessKey: access_key, isbn: isbn, outOfStockFlag: 1, formatVersion: 2}
+	params[:affiliateId] = @conf['rakuten.affiliate_id'] if @conf['rakuten.affiliate_id']
+	uri.query = URI.encode_www_form(params)
+	# Rakuten answers 429 to more than one request a second
+	sleep 1 if @amazon_rakuten_requested
+	@amazon_rakuten_requested = true
+	response = Net::HTTP.get_response(uri)
+	response.value
+	book = JSON.parse(response.body)['Items'][0]
+	return nil unless book
+
+	{
+		'DetailPageURL' => book['affiliateUrl'].to_s.empty? ? book['itemUrl'] : book['affiliateUrl'],
+		'ItemInfo' => {
+			'Title' => {'DisplayValue' => book['title']},
+			'ByLineInfo' => {
+				'Contributors' => [{'Name' => book['author'][%r{[^/]*}]}],
+				'Manufacturer' => {'DisplayValue' => book['publisherName']}
+			}
+		},
+		'Images' => {
+			'Primary' => {
+				'Small' => {'URL' => book['smallImageUrl']},
+				'Medium' => {'URL' => book['mediumImageUrl']},
+				'Large' => {'URL' => book['largeImageUrl']}
+			}
+		},
+		'OffersV2' => {
+			'Listings' => [{'Price' => {'Money' => {'DisplayAmount' => "￥#{book['itemPrice'].to_s.gsub(/(\d)(?=(\d{3})+\z)/, '\1,')}"}}}]
+		}
+	}
+rescue => e
+	@logger.error "amazon_rakuten.rb: #{e.message}"
+	nil
+end
+
+add_footer_proc do
+	%Q|<div class="footer"><a href="https://developers.rakuten.com/">Supported by Rakuten Developers</a></div>|
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/plugin/draft.rb

@@ -1,11 +1,85 @@
 #
 # draft.rb: save draft data to Web Storage automatically
+#           and keep a copy of them on the server
+#
+# options:
+#   @options['draft.sync_interval'] : seconds between uploads to the server (default 300)
 #
 # Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
 # Distributed under the GPL2 or any later version.
 #
+require 'json'
+
+def draft_max_count
+	10
+end
+
+def draft_restore( db )
+	%w(drafts deleted).map {|key| JSON.parse( db.get( key ) || '[]' ) }
+end
+
+def draft_id?( id )
+	id.kind_of?( String ) and /\A[0-9a-z]{1,32}\z/.match?( id )
+end
+
+def draft_valid?( item )
+	item.kind_of?( Hash ) and
+		draft_id?( item['id'] ) and
+		item['date'].kind_of?( Integer ) and
+		item['value'].kind_of?( String ) and !item['value'].empty?
+end
+
+def draft_sync( items )
+	transaction( 'draft' ) do |db|
+		drafts, deleted = draft_restore( db )
+		items.each do |item|
+			# a draft submitted as a diary must not come back from another browser
+			next if !draft_valid?( item ) or deleted.include?( item['id'] )
+			stored = drafts.find {|d| d['id'] == item['id'] }
+			if !stored
+				drafts << item.slice( 'id', 'date', 'value' )
+			elsif stored['date'] < item['date']
+				stored.update( item.slice( 'date', 'value' ) )
+			end
+		end
+		db.set( 'drafts', drafts.sort_by {|d| d['date'] }.last( draft_max_count ).to_json )
+	end
+end
+
+def draft_delete( id )
+	transaction( 'draft' ) do |db|
+		drafts, deleted = draft_restore( db )
+		db.set( 'drafts', drafts.reject {|d| d['id'] == id }.to_json )
+		db.set( 'deleted', (deleted - [id] + [id]).last( 100 ).to_json )
+	end
+end
+
 if /\A(form|edit|preview|showcomment)\z/ === @mode then
 	enable_js('draft.js')
+	server = nil
+	transaction( 'draft' ) do |db|
+		drafts, deleted = draft_restore( db )
+		server = { 'drafts' => drafts, 'deleted' => deleted, 'max' => draft_max_count }
+	end
+	add_js_setting( '$tDiary.plugin.draft' )
+	# keep the drafts from closing the script element
+	add_js_setting( '$tDiary.plugin.draft.server', server.to_json.gsub( '<', '\\u003c' ) )
+	add_js_setting( '$tDiary.plugin.draft.interval', (@conf['draft.sync_interval'] || 300).to_i )
+end
+
+if @mode == 'formplugin' and @cgi.params['plugin_draft_sync'][0] then
+	begin
+		items = JSON.parse( @cgi.params['plugin_draft_sync'][0] )
+		draft_sync( items ) if items.kind_of?( Array )
+	rescue JSON::ParserError
+	end
+end
+
+add_update_proc do
+	id = @cgi.params['plugin_draft_id'][0]
+	if /\A(append|replace)\z/ =~ @mode and draft_id?( id ) then
+		draft_delete( id )
+	end
 end
 
 add_edit_proc do
@@ -14,6 +88,7 @@ add_edit_proc do
 		下書き:
 		<select name="drafts"></select>
 		<button type="button" id="draft_load">読み込み</button>
+		<input type="hidden" name="plugin_draft_id" value="">
 	</div>
 	EOS
 end

data/misc/plugin/en/image.rb

@@ -27,6 +27,10 @@
 #     URL of the image directory. Default is './images/'.
 #  @options['image.maxwidth']
 #     Max display width of image without specified 'size' parameter.
+#  @options['image.resize']
+#     Images are shrunk on upload so that the longer side fits in this
+#     many pixels. Default is 1600. Exif, including the location, is
+#     dropped at the same time (except GIF).
 #
 def image_error_num( max ); "You can add images upto #{h max} par a day."; end
 def image_error_size( max ); "You can add images upto #{h max} bytes par an image."; end
@@ -38,6 +42,7 @@ def image_label_delete; 'Delete checked images'; end
 def image_label_only_jpeg; 'Only JPEG'; end
 def image_label_add_image; 'Upload the image'; end
 def image_label_drop_here; 'Drop files here'; end
+def image_label_upload_failed; 'Could not upload the image'; end
 
 # Local Variables:
 # mode: ruby

data/misc/plugin/en/makerss.rb

@@ -16,6 +16,10 @@ def makerss_conf_html
 		<option value="f"#{' selected' unless @conf['makerss.hidecontent']}>Include</option>
 		<option value="t"#{' selected' if @conf['makerss.hidecontent']}>Hide</option></select>
 		encoded contents of your diary in the feed.
+	<li><select name="makerss.hidesubtitle">
+		<option value="f"#{' selected' unless @conf['makerss.hidesubtitle']}>Include</option>
+		<option value="t"#{' selected' if @conf['makerss.hidesubtitle']}>Hide</option></select>
+		subtitles in the encoded contents.
 	<li>Include summary of your contents<select name="makerss.shortdesc">
 		<option value="f"#{' selected' unless @conf['makerss.shortdesc']}>as long as possible</option>
 		<option value="t"#{' selected' if @conf['makerss.shortdesc']}>only some portion</option></select>

data/misc/plugin/image.rb

@@ -36,6 +36,9 @@
 #  @options['image.maxwidth']
 #     sizeを指定しなかった場合に指定できる画像の最大表示幅。無指定時はnil
 #     表示のたびにファイルアクセスが入るので、重くなるかも?
+#  @options['image.resize']
+#     アップロード時に縮小する画像の長辺のピクセル数。無指定時は1600
+#     縮小と同時に位置情報などのExifも取り除かれます(GIFを除く)。
 #
 # ライセンスについて:
 # Copyright (c) 2002,2003 Daisuke Kato <dai@kato-agri.com>
@@ -55,6 +58,7 @@ unless @resource_loaded then
 	def image_label_only_jpeg; 'JPEGのみ'; end
 	def image_label_add_image; 'この画像をアップロードする'; end
 	def image_label_drop_here; 'ここにファイルをドロップ'; end
+	def image_label_upload_failed; '画像をアップロードできませんでした'; end
 end
 
 def image( id, alt = 'image', thumbnail = nil, size = nil, place = 'photo' )
@@ -101,7 +105,7 @@ end
 #
 # initialize
 #
-@image_dir = (@options && @options['image.dir']) || File.join(TDiary.server_root, @cgi.is_a?(RackCGI) ? 'public/images' : 'images')
+@image_dir = (@options && @options['image.dir']) || File.join(TDiary.server_root, @cgi.static_assets? ? 'images' : 'public/images')
 @image_dir.chop! if /\/$/ =~ @image_dir
 FileUtils.mkdir_p @image_dir unless File.exist?(@image_dir)
 
@@ -142,17 +146,22 @@ def image_list( date )
 	list
 end
 
-if /^(form|edit|formplugin|showcomment)$/ =~ @mode then
+if /^(form|edit|formplugin|showcomment|preview)$/ =~ @mode then
 	enable_js( 'image.js' )
 	add_js_setting( '$tDiary.plugin.image' )
 	add_js_setting( '$tDiary.plugin.image.alt', %Q|'#{image_label_description}'| )
 	add_js_setting( '$tDiary.plugin.image.drop_here', %Q|'#{image_label_drop_here}'| )
+	add_js_setting( '$tDiary.plugin.image.failed', %Q|'#{image_label_upload_failed}'| )
+	add_js_setting( '$tDiary.plugin.image.date', %Q|'#{@date.strftime( '%Y%m%d' )}'| )
+	resize = @options['image.resize'].to_i
+	add_js_setting( '$tDiary.plugin.image.resize', resize > 0 ? resize : 1600 )
 end
 
 if /^formplugin$/ =~ @mode then
    maxnum = @options['image.maxnum'] || 1
    maxsize = @options['image.maxsize'] || 10000
 
+	@image_added = []
 	begin
 	   date = @date.strftime( "%Y%m%d" )
 		images = image_list( date )
@@ -167,7 +176,9 @@ if /^formplugin$/ =~ @mode then
 					rescue NameError
 						size = file.stat.size
 					end
-					output = "#{@image_dir}/#{date}_#{images.length}.#{extension}"
+					number = images.length + @image_added.length
+					output = "#{@image_dir}/#{date}_#{number}.#{extension}"
+					@image_added << number
 					File::umask( 022 )
 					File::open( output, "wb" ) do |f|
 						f.print file.read
@@ -204,7 +215,7 @@ add_form_proc do |date|
 	   images.each_with_index do |img,id|
 			next unless img
 			_, img_w, img_h = image_info(File.join(@image_dir,img))
-			r << %Q[<td><img id="image-index-#{id}" class="image-img form" src="#{h @image_url}/#{h img}" alt="#{id}" width="#{h( (img_w && img_w > 160) ? 160 : (img_w ? img_w : 160) )}"></td>]
+			r << %Q[<td><img id="image-index-#{id}" class="image-img form"#{' data-added="true"' if @image_added&.include?( id )} src="#{h @image_url}/#{h img}" alt="#{id}" width="#{h( (img_w && img_w > 160) ? 160 : (img_w ? img_w : 160) )}"></td>]
 			img_info = ''
 			if img_w && img_h
 				img_info << %Q|<span class="image-width">#{img_w}</span> x <span class="image-height">#{img_h}</span>|

data/misc/plugin/ja/makerss.rb

@@ -14,6 +14,9 @@ def makerss_conf_html
 	<li>フィードに本文全体を<select name="makerss.hidecontent">
 		<option value="f"#{' selected' unless @conf['makerss.hidecontent']}>含める</option>
 		<option value="t"#{' selected' if @conf['makerss.hidecontent']}>含めない</option></select></li>
+	<li>フィードの本文にサブタイトルを<select name="makerss.hidesubtitle">
+		<option value="f"#{' selected' unless @conf['makerss.hidesubtitle']}>含める</option>
+		<option value="t"#{' selected' if @conf['makerss.hidesubtitle']}>含めない</option></select></li>
 	<li>フィードに含める説明を<select name="makerss.shortdesc">
 		<option value="f"#{' selected' unless @conf['makerss.shortdesc']}>できるだけ長くする</option>
 		<option value="t"#{' selected' if @conf['makerss.shortdesc']}>最初だけにする</option></select></li>

data/misc/plugin/makerss.rb

@@ -4,6 +4,7 @@
 #
 # options configurable through settings:
 #   @conf['makerss.hidecontent'] : hide full-text content. default: false
+#   @conf['makerss.hidesubtitle'] : hide subtitle in full-text content. default: false
 #   @conf['makerss.shortdesc'] : shorter description. default: false
 #   @conf['makerss.comment_link'] : insert tsukkomi's link. default: false
 #
@@ -177,10 +178,10 @@ class MakeRssFull
 	end
 
 	def document_root
-		if @cgi.is_a?(RackCGI)
-			File.join(TDiary.server_root, 'public')
-		else
+		if @cgi.static_assets?
 			TDiary.server_root
+		else
+			File.join(TDiary.server_root, 'public')
 		end
 	end
 end
@@ -395,7 +396,7 @@ def makerss_body( uri, rdfsec )
 		rdf << %Q|<description>#{h makerss_desc_shorten( desc )}</description>\n|
 		unless @conf['makerss.hidecontent']
 			text = ''
-			text << '<h3>' + apply_plugin( subtitle.sub( /^(\[([^\]]+)\])+ */, '' ) ).strip + '</h3>' if subtitle and not subtitle.empty?
+			text << '<h3>' + apply_plugin( subtitle.sub( /^(\[([^\]]+)\])+ */, '' ) ).strip + '</h3>' if subtitle and not subtitle.empty? and not @conf['makerss.hidesubtitle']
 			text << body_enter
 			text << body
 			text << body_leave
@@ -451,7 +452,7 @@ add_header_proc {
 
 add_conf_proc( 'makerss', @makerss_conf_label, 'update' ) do
 	if @mode == 'saveconf' then
-		%w( hidecontent shortdesc comment_link no_comments).each do |s|
+		%w( hidecontent hidesubtitle shortdesc comment_link no_comments).each do |s|
 			item = "makerss.#{s}"
 			@conf[item] = ( 't' == @cgi.params[item][0] )
 		end

data/tdiary.conf.sample

@@ -75,6 +75,14 @@
 #   必要です。blog-category プラグイン利用時は自動的に無効になります。
 #@options['plugin.cache'] = true
 
+# 静的アセットの配信元URL【オプション】
+#   テーマやJavaScriptなどの静的ファイルを、CDNや別ホストなど任意のURLから
+#   配信する場合に指定します。指定すると、Rack・CGI・FCGIのどの実行形態でも
+#   このURLを元にテーマやJavaScriptのURLを生成します。配信元には、Rackアプ
+#   リのassets配下と同じ構成(jsディレクトリとthemeディレクトリの内容をひと
+#   つのディレクトリにまとめた構成)でファイルを配置してください。
+#@options['assets_url'] = 'https://assets.example.org/tdiary'
+
 # プラグインに渡すオプション【オプション】
 #   プラグインによっては、tdiary.conf経由でオプションを渡すことで挙動を
 #   変更できるものがあります。@optionsはそのオプションを指定する時に使う

data/tdiary.conf.sample-en

@@ -62,6 +62,14 @@
 #   any directory for cache files by this variable.
 #@cache_path = 'path of cache files'
 
+# base URL of static assets. (optional)
+#   Set this to serve theme and JavaScript files from another URL, such
+#   as a CDN. When set, every hosting mode (Rack, CGI and FCGI) builds
+#   theme and JavaScript URLs from it. The serving location must use the
+#   same merged layout as the assets/ mount of the Rack application (the
+#   contents of the js and theme directories under one root).
+#@options['assets_url'] = 'https://assets.example.org/tdiary'
+
 # options for plugins. (optional)
 #   Some plugins can receive options from tdiary.conf.
 #     ex: a option "foo" of plugin "sample".