tdiary 5.4.0 → 5.5.0.beta1

data/lib/tdiary/dispatcher/update_main.rb

@@ -1,16 +1,16 @@
 module TDiary
 	class Dispatcher
 		class UpdateMain
-			def self.run( request, cgi )
-				new( request, cgi ).run
+			def self.run( request )
+				new( request ).run
 			end
 
 			attr_reader :request, :cgi, :conf, :tdiary, :params
 
-			def initialize( request, cgi )
+			def initialize( request )
 				@request = request
-				@cgi = cgi
-				@conf = TDiary::Configuration::new( cgi, request )
+				@cgi = request.cgi_compat
+				@conf = TDiary::Configuration::new( request )
 				@params = request.params
 			end
 
@@ -53,28 +53,28 @@ module TDiary
 			def create_tdiary
 				begin
 					if params['plugin']
-						tdiary = TDiary::TDiaryFormPlugin::new( cgi, 'update.rhtml', conf )
+						tdiary = TDiary::TDiaryFormPlugin::new( request, 'update.rhtml', conf )
 					elsif params['append']
-						tdiary = TDiary::TDiaryAppend::new( cgi, nil, conf )
+						tdiary = TDiary::TDiaryAppend::new( request, nil, conf )
 					elsif params['edit']
-						tdiary = TDiary::TDiaryEdit::new( cgi, 'update.rhtml', conf )
+						tdiary = TDiary::TDiaryEdit::new( request, 'update.rhtml', conf )
 					elsif params['replace']
-						tdiary = TDiary::TDiaryReplace::new( cgi, nil, conf )
+						tdiary = TDiary::TDiaryReplace::new( request, nil, conf )
 					elsif params['appendpreview'] or params['replacepreview']
-						tdiary = TDiary::TDiaryPreview::new( cgi, 'preview.rhtml', conf )
+						tdiary = TDiary::TDiaryPreview::new( request, 'preview.rhtml', conf )
 					elsif params['comment']
-						tdiary = TDiary::TDiaryShowComment::new( cgi, 'update.rhtml', conf )
+						tdiary = TDiary::TDiaryShowComment::new( request, 'update.rhtml', conf )
 					elsif params['saveconf']
-						tdiary = TDiary::TDiarySaveConf::new( cgi, 'conf.rhtml', conf )
+						tdiary = TDiary::TDiarySaveConf::new( request, 'conf.rhtml', conf )
 					elsif params['conf']
-						tdiary = TDiary::TDiaryConf::new( cgi, 'conf.rhtml', conf )
+						tdiary = TDiary::TDiaryConf::new( request, 'conf.rhtml', conf )
 					elsif params['referer']
-						tdiary = TDiary::TDiaryConf::new( cgi, 'referer.rhtml', conf )
+						tdiary = TDiary::TDiaryConf::new( request, 'referer.rhtml', conf )
 					else
-						tdiary = TDiary::TDiaryForm::new( cgi, 'update.rhtml', conf )
+						tdiary = TDiary::TDiaryForm::new( request, 'update.rhtml', conf )
 					end
 				rescue TDiary::TDiaryError
-					tdiary = TDiary::TDiaryForm::new( cgi, 'update.rhtml', conf )
+					tdiary = TDiary::TDiaryForm::new( request, 'update.rhtml', conf )
 				end
 				tdiary
 			end

data/lib/tdiary/dispatcher.rb

@@ -16,32 +16,13 @@ module TDiary
 		end
 
 		def call( env )
-			req = adopt_rack_request_to_plain_old_tdiary_style( env )
-			dispatch_cgi(req, RackCGI.new)
-		end
-
-		# FIXME rename method name to more suitable one.
-		def dispatch_cgi(request, cgi)
-			result = @target.run( request, cgi )
+			request = adopt_rack_request_to_plain_old_tdiary_style( env )
+			result = @target.run( request )
 			result.headers.reject!{|k,v| k.to_s.downcase == "status" }
 			result.to_a
 		end
 
 		class << self
-			# stolen from Rack::Handler::CGI.send_headers
-			def send_headers(status, headers)
-				begin
-					headers['type'] = headers.delete('content-type')
-					$stdout.print CGI.new.header({'Status'=>status}.merge(headers))
-				rescue EOFError
-					charset = headers.delete('charset')
-					headers['content-type'] ||= headers.delete( 'type' )
-					headers['content-type'] += "; charset=#{charset}" if charset
-					$stdout.print headers.map{|k,v| "#{k}: #{v}\r\n"}.join << "\r\n"
-				end
-				$stdout.flush
-			end
-
 			# FIXME temporary method during (scratch) refactoring
 			def extract_status_for_legacy_tdiary( head )
 				status_str = head.delete('status')
@@ -68,19 +49,14 @@ module TDiary
 	private
 
 		def adopt_rack_request_to_plain_old_tdiary_style( env )
+			# rebuffer rack.input into a rewindable StringIO; both
+			# Rack::Request and CGICompat read the body from it
 			body = env["rack.input"]&.read || ""
 			env["rack.input"] = StringIO.new(body)
 			req = TDiary::Request.new( env )
 			req.params # fill params to tdiary_request
-			$RACK_ENV = req.env
-			fake_stdin_as_params(body)
 			req
 		end
-
-		# FIXME dirty hack
-		def fake_stdin_as_params(body)
-			$stdin = StringIO.new(body)
-		end
 	end
 end
 

data/lib/tdiary/environment.rb

@@ -5,6 +5,16 @@ module TDiary::Cache; end
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __FILE__)
 
+# Load pure-ruby gems vendored in the full tarball. They are stored in a
+# single flat directory (no per-ABI subdir), so one copy is shared by every
+# supported Ruby. Native gems are not vendored; date is provided by Ruby as a
+# default gem and cgi falls back to its pure-ruby implementation.
+vendor_gems = File.expand_path('../../../vendor/bundle', __FILE__)
+if File.directory?(vendor_gems)
+  ENV['GEM_PATH'] = [vendor_gems, *Gem.path].uniq.join(File::PATH_SEPARATOR)
+  Gem.clear_paths
+end
+
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 # FIXME: workaround fix for tainted path from Gemfile.local
@@ -14,6 +24,8 @@ if defined?(Bundler)
   env = [:default, :rack]
   env << :development if ENV['RACK_ENV'].nil? || ENV['RACK_ENV'].empty?
   env << ENV['RACK_ENV'].intern if ENV['RACK_ENV']
+  # optional groups enabled via BUNDLE_WITH (:heroku, :docker)
+  env |= (Bundler.settings.with rescue Bundler.settings[:with])
   env = env.reject{|e|
 	  (Bundler.settings.without rescue Bundler.settings[:without]).include? e
   }

data/lib/tdiary/filter.rb

@@ -10,8 +10,11 @@ module TDiary
 			DEBUG_SPAM = 1
 			DEBUG_FULL = 2
 
-			def initialize( cgi, conf )
-				@cgi, @conf = cgi, conf
+			def initialize( request, conf )
+				@request = request
+				# filter subclasses read the request through the @cgi facade
+				@cgi = request.cgi_compat
+				@conf = conf
 
 				if @conf.options.include?('filter.debug_mode')
 					@debug_mode = @conf.options['filter.debug_mode']

data/lib/tdiary/io/pstore.rb

@@ -73,9 +73,12 @@ class Comment
 	end
 
 	def shorten( len = 120 )
-		lines = NKF::nkf( "-e -m0 -f#{len}", @body.gsub( /\n/, ' ' ) ).split( /\n/ )
-		lines[0].concat( '..' ) if lines[0] and lines[1]
-		lines[0] || ''
+		matched = @body.gsub( /\n/, ' ' ).scan( /^.{0,#{len - 2}}/u )[0]
+		if $'.nil? || $'.empty?
+			matched
+		else
+			matched + '..'
+		end
 	end
 
 	def visible?; @show; end

data/lib/tdiary/plugin/00default.rb

@@ -235,11 +235,12 @@ def calc_links
 		yms.unshift(nil).push(nil)
 		yms[yms.index(this_month) - 1, 3].each do |ym|
 			next unless ym
-			now = @cgi.params['date'] # backup
-			cgi = @cgi.clone
-			cgi.params['date'] = [ym]
-			m = TDiaryMonthWithoutFilter.new(cgi, '', @conf)
-			@cgi.params['date'] = now # restore
+			# look up the neighbour month with a request whose query carries
+			# the month instead of the current date
+			env = @request.env.dup
+			env['REQUEST_METHOD'] = 'GET'
+			env['QUERY_STRING'] = "date=#{ym}"
+			m = TDiaryMonthWithoutFilter.new(TDiary::Request.new(env), '', @conf)
 			m.diaries.delete_if {|date,diary| !diary.visible?}
 			days += m.diaries.keys.sort
 		end
@@ -367,10 +368,6 @@ end
 enable_js( '00default.js', async: false )
 add_js_setting( '$tDiary.style', "'#{@conf.style.downcase.sub( /\Ablog/, '' )}'" )
 
-if /^form|edit|preview|showcomment/ =~ @mode
-	enable_js( '02edit.js', async: true )
-end
-
 def script_tag_query_string
 	"?#{TDIARY_VERSION}#{Time::now.strftime('%Y%m%d')}"
 end
@@ -649,9 +646,8 @@ end
 # service methods for comment_mail
 #
 def comment_mail_mime( str )
-	require 'nkf'
-	NKF::nkf("-w -m0 -f30", str).lines.map do |s|
-		%Q|=?UTF-8?B?#{[s.chomp].pack('m').gsub(/\n/, '')}?=|
+	str.chars.each_slice(10).map do |chunk|
+		%Q|=?UTF-8?B?#{[chunk.join].pack('m0')}?=|
 	end
 end
 
@@ -695,13 +691,13 @@ def comment_mail_send
 	rmail = File::open("#{TDiary::PATH}/../views/mail.rtxt").read
 	header = ERB::new(rmail).result(binding)
 
-	text = NKF.nkf('-w -MB', [
+	text = [[
 		body,
 		"-- ",
 		"#{@conf.index =~ %r|^https?://|i ? '': @conf.base_url}#{@conf.index.sub(%r|^\./|, '')}#{anchor(@date.strftime('%Y%m%d') + ('#c%02d' % serial))}",
 		"IP: #{@cgi.remote_addr}",
 		"Status: #{@comment.visible? ? 'shown' : 'hidden'}"
-	].join("\r\n"))
+	].join("\r\n")].pack('m')
 	comment_mail([header, text].join("\r\n"), receivers)
 end
 

data/lib/tdiary/plugin/05referer.rb

@@ -55,7 +55,7 @@ class RefererDiary
 	alias :add_referer_orig :add_referer
 	def add_referer( ref, count = 1 )
 		return nil unless ref
-		current = @current_date || @refs.keys.sort[-1] || '00000101'
+		current = @current_date || @refs.keys.max || '00000101'
 		ref_info = add_referer_orig( ref, count )
 		uref = CGI::unescape( ref )
 		@refs[current] ||= {}
@@ -67,10 +67,10 @@ class RefererDiary
 	end
 
 	def clear_oldest_referer( newest )
-		return if (@refs.keys.sort[-1] || '') > newest
+		return if (@refs.keys.max || '') > newest
 		@refs[newest] = {} unless @refs[newest]
 		return if @refs.keys.size <= @keep
-		@refs.delete( @refs.keys.sort[0] )
+		@refs.delete( @refs.keys.min )
 	end
 
 	alias :each_referer_orig :each_referer
@@ -97,9 +97,9 @@ end
 
 def latest_day?( diary )
 	return false unless diary
-	y = @years.keys.sort[-1]
-	m = @years[y].sort[-1]
-	diary.date.year == y.to_i and diary.date.month == m.to_i and diary.date.day == @diaries.keys.sort[-1][6,2].to_i
+	y = @years.keys.max
+	m = @years[y].max
+	diary.date.year == y.to_i and diary.date.month == m.to_i and diary.date.day == @diaries.keys.max[6,2].to_i
 end
 
 def referer_update( diary )

data/lib/tdiary/plugin/60sf.rb

@@ -127,7 +127,7 @@ if sf_option( 'selected' ) && !@sf_filters then
 			if File.readable?( path ) then
 				begin
 					require File.expand_path( path )
-					@sf_filters << TDiary::Filter::const_get("#{File::basename(filename, ".rb").capitalize}Filter")::new(@cgi, @conf)
+					@sf_filters << TDiary::Filter::const_get("#{File::basename(filename, ".rb").capitalize}Filter")::new(@request, @conf)
 					plugin_path = "#{dir}/plugin/#{filename}"
 					load_plugin(plugin_path) if File.readable?(plugin_path)
 				rescue Exception

data/lib/tdiary/plugin.rb

@@ -12,6 +12,26 @@ module TDiary
 		attr_reader :cookies
 		attr_writer :comment, :date, :diaries, :last_modified
 
+		#
+		# Process-wide cache of loaded plugin instances, keyed by the caller.
+		# Used only when the @options['plugin.cache'] option is enabled. tDiary
+		# handles one request at a time per process (the dispatcher mutates
+		# process globals), so a plain Hash is sufficient here.
+		#
+		class << self
+			def cache_fetch( key )
+				( @instance_cache ||= {} )[key]
+			end
+
+			def cache_store( key, plugin )
+				( @instance_cache ||= {} )[key] = plugin
+			end
+
+			def cache_clear
+				@instance_cache = {}
+			end
+		end
+
 		def initialize( params )
 			@header_procs = []
 			@footer_procs = []
@@ -35,22 +55,7 @@ module TDiary
 			@javascripts = {}
 			@javascript_setting = []
 
-			params.each do |key, value|
-				instance_variable_set( "@#{key}", value )
-			end
-
-			# for 1.4 compatibility
-			@index = @conf.index
-			@update = @conf.update
-			@author_name = @conf.author_name || ''
-			@author_mail = @conf.author_mail || ''
-			@index_page = @conf.index_page || ''
-			@html_title = @conf.html_title || ''
-			@theme = @conf.theme
-			@css = @conf.css
-			@date_format = @conf.date_format
-			@referer_table = @conf.referer_table
-			@options = @conf.options
+			apply_request_params( params )
 
 			# setup plugin storage
 			unless @conf.io_class.method_defined?(:plugin_open)
@@ -74,6 +79,22 @@ module TDiary
 			rescue Exception
 				raise PluginError::new( "Plugin error in '#{File::basename( plugin_file )}'.\n#{$!}\n#{$!.backtrace[0]}" )
 			end
+
+			# remember the post-load state so the instance can be reused for
+			# another request without re-reading and re-parsing plugin files.
+			snapshot_reusable_state
+		end
+
+		#
+		# Re-use a fully-loaded plugin instance for a new request. Refreshes the
+		# request-scoped data and rolls the per-request accumulators back to the
+		# state right after plugins were loaded. This skips load_plugin (file
+		# read + instance_eval), which is the dominant cost of rendering.
+		#
+		def prepare_for_reuse( params )
+			apply_request_params( params )
+			restore_reusable_state
+			self
 		end
 
 		def load_plugin( file )
@@ -98,6 +119,45 @@ module TDiary
 		end
 
 	private
+		def apply_request_params( params )
+			params.each do |key, value|
+				instance_variable_set( "@#{key}", value )
+			end
+
+			# for 1.4 compatibility
+			@index = @conf.index
+			@update = @conf.update
+			@author_name = @conf.author_name || ''
+			@author_mail = @conf.author_mail || ''
+			@index_page = @conf.index_page || ''
+			@html_title = @conf.html_title || ''
+			@theme = @conf.theme
+			@css = @conf.css
+			@date_format = @conf.date_format
+			@referer_table = @conf.referer_table
+			@options = @conf.options
+		end
+
+		# Accumulators that plugins fill while rendering a single request. Their
+		# post-load values are captured so a reused instance starts each request
+		# from the same baseline (usually empty, but a plugin may seed them at
+		# load time via enable_js / add_js_setting).
+		def snapshot_reusable_state
+			@reusable_state = {
+				cookies:            @cookies.dup,
+				section_index:      @section_index.dup,
+				javascripts:        @javascripts.dup,
+				javascript_setting: @javascript_setting.map( &:dup ),
+			}
+		end
+
+		def restore_reusable_state
+			@cookies            = @reusable_state[:cookies].dup
+			@section_index      = @reusable_state[:section_index].dup
+			@javascripts        = @reusable_state[:javascripts].dup
+			@javascript_setting = @reusable_state[:javascript_setting].map( &:dup )
+		end
+
 		def transaction(plugin_name)
 			@conf.io_class.plugin_transaction(@storage, plugin_name) do |db|
 				yield db