tdiary 5.4.0 → 5.5.0.beta1

data/lib/tdiary/request.rb

@@ -3,359 +3,17 @@ module TDiary
 	class Request < ::Rack::Request
 		include RequestExtension
 
-		attr_reader :env, :cgi
-
-		def initialize( env, cgi = nil )
-			@env = env
-			@cgi = cgi
-		end
-
-		def params
-			if @cgi
-				return @params if @params
-				@params = { }
-				@cgi.params.each{|k, v|
-					v = v.uniq
-					case v.size
-					when 0
-						@params[k] = nil
-					when 1
-						@params[k] = v[0]
-					else
-						@params[k] = v
-					end
-				}
-				@params
-			else
-				super
-			end
-		end
-
-		def []( key )
-			if @cgi
-				params[key.to_s]
-			else
-				super
-			end
-		end
-
-		def []=( key, val )
-			if @cgi
-				params[key.to_s] = val
-			else
-				super
-			end
-		end
-
-		def request_method
-			if @cgi
-				@env['REQUEST_METHOD']
-			else
-				super
-			end
-		end
-
-		def header( header )
-			if @cgi
-				@cgi.header( header )
-			else
-				super
-			end
-		end
-
-		def get?
-			if @cgi
-				request_method == 'GET'
-			else
-				super
-			end
-		end
-
-		def head?
-			if @cgi
-				request_method == 'HEAD'
-			else
-				super
-			end
-		end
-
-		def post?
-			if @cgi
-				request_method == 'POST'
-			else
-				super
-			end
-		end
-
-		def put?
-			if @cgi
-				request_method == 'PUT'
-			else
-				super
-			end
-		end
-
-		def delete?
-			if @cgi
-				request_method == 'DELETE'
-			else
-				super
-			end
-		end
-
-		def xhr?
-			if @cgi
-				@env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
-			else
-				super
-			end
-		end
-
-		def accept_encoding
-			if @cgi
-				raise NameError, 'not implemented : accept_encoding'
-			else
-				super
-			end
-		end
-
-		def body
-			if @cgi
-				raise NameError, 'not implemented : body'
-			else
-				super
-			end
-		end
-
-		def content_charset
-			if @cgi
-				@env['CONTENT_CHARSET']
-			else
-				super
-			end
-		end
-
-		def content_length
-			if @cgi
-				@env['CONTENT_LENGTH']
-			else
-				super
-			end
-		end
-
-		def content_type
-			if @cgi
-				@env['CONTENT_TYPE']
-			else
-				super
-			end
-		end
-
-		def remote_addr
-			if @cgi
-				@env['REMOTE_ADDR']
-			else
-				super
-			end
-		end
-
-		def cookies
-			if @cgi
-				return @cookies if @cookies
-				@cookies = { }
-				@cgi.cookies.each{|k, v|
-					case v.size
-					when 0
-						@cookies[k] = nil
-					when 1
-						@cookies[k] = v[0]
-					else
-						@cookies[k] = v
-					end
-				}
-				@cookies
-			else
-				super
-			end
-		end
-
-		def form_data?
-			if @cgi
-				raise NameError, 'not implemented : form_data?'
-			else
-				super
-			end
-		end
-
-		def fullpath
-			if @cgi
-				raise NameError, 'not implemented : fullpath'
-			else
-				super
-			end
-		end
-
-		def host
-			if @cgi
-				# Remove port number.from Rack::Response
-				( @env["HTTP_HOST"] || @env["SERVER_NAME"] ).gsub( /:\d+\z/, '' )
-			else
-				super
-			end
-		end
-
-		def ip
-			if @cgi
-				raise NameError, 'not implemented : ip'
-			else
-				super
-			end
-		end
-		alias remote_addr ip
-
-		def media_type
-			if @cgi
-				raise NameError, 'not implemented : madia_type'
-			else
-				super
-			end
-		end
-
-		def media_type_params
-			if @cgi
-				raise NameError, 'not implemented : media_type_params'
-			else
-				super
-			end
-		end
-
-		def openid_request
-			if @cgi
-				raise NameError, 'not implemented : openid_request'
-			else
-				super
-			end
-		end
-
-		def openid_response
-			if @cgi
-				raise NameError, 'not implemented : openid_response'
-			else
-				super
-			end
-		end
-
-		def parseable_data?
-			if @cgi
-				raise NameError, 'not implemented : parseable_data?'
-			else
-				super
-			end
-		end
-
-		def path
-			if @cgi
-				raise NameError, 'not implemented : path'
-			else
-				super
-			end
-		end
-
-		def path_info
-			if @cgi
-				raise NameError, 'not implemented : path'
-			else
-				super
-			end
-			w		end
-
-		def path_info=( s )
-			if @cgi
-				raise NameError, 'not implemented : path_info='
-			else
-				super
-			end
-		end
-
-		def port
-			if @cgi
-				raise NameError, 'not implemented : port'
-			else
-				super
-			end
-		end
-
-		def query_string
-			if @cgi
-				raise NameError, 'not implemented : query_string'
-			else
-				super
-			end
-		end
-
-		def referer
-			if @cgi
-				raise NameError, 'not implemented : referer'
-			else
-				super
-			end
-		end
-		alias referrer referer
-
-		def schema
-			if @cgi
-				raise NameError, 'not implemented : schema'
-			else
-				super
-			end
-		end
-
-		def script_name
-			if @cgi
-				@env['SCRIPT_NAME']
-			else
-				super
-			end
-		end
-
-		def session_options
-			if @cgi
-				raise NameError, 'not implemented : session_options'
-			else
-				super
-			end
-		end
-
-		def url
-			if @cgi
-				raise NameError, 'not implemented : url'
-			else
-				super
-			end
-		end
-
-		def user_agent
-			if @cgi
-				@cgi.user_agent
-			else
-				super
-			end
-		end
-
-		def base_url
-			if @cgi
-				@cgi.base_url
-			else
-				super
-			end
-		end
-
-		def values_at( *keys )
-			if @cgi
-				raise NameError, 'not implemented : values_at'
-			else
-				super
-			end
+		# the @cgi object handed to plugins: a facade over this request.
+		# Endpoints behind a web server (CGI/FCGI) set tdiary.static_assets in
+		# the env to get the base CGICompat, so @cgi.is_a?(RackCGI) is false and
+		# plugins keep the static js/theme URLs served by the web server.
+		def cgi_compat
+			@cgi_compat ||=
+				if env['tdiary.static_assets']
+					TDiary::CGICompat.new( self )
+				else
+					::RackCGI.new( self )
+				end
 		end
 	end
 end

data/lib/tdiary/tasks/db.rake

@@ -3,10 +3,23 @@ namespace :db do
 	task :import do
 		$:.unshift '.'
 		require 'tdiary'
+		require 'rack'
+		require 'stringio'
 
-		cgi = CGI.new
-		conf = TDiary::Config.new(cgi)
-		base = TDiary::TDiaryBase.new(cgi, 'day.rhtml', conf)
+		# TDiaryBase expects a TDiary::Request; build one from a minimal
+		# Rack env, there is no real HTTP request in a rake task
+		env = {
+			'REQUEST_METHOD'  => 'GET',
+			'SCRIPT_NAME'     => '',
+			'PATH_INFO'       => '/',
+			'QUERY_STRING'    => '',
+			'SERVER_NAME'     => 'localhost',
+			'SERVER_PORT'     => '80',
+			'rack.url_scheme' => 'http',
+			'rack.input'      => StringIO.new('')
+		}
+		conf = TDiary::Config.new
+		base = TDiary::TDiaryBase.new(TDiary::Request.new(env), 'day.rhtml', conf)
 		io = conf.io_class.new(base)
 		io.load_styles
 
@@ -94,7 +107,7 @@ namespace :db do
 
 	desc "drop database"
 	task :drop do
-		conf = TDiary::Config.new(CGI.new)
+		conf = TDiary::Config.new
 		Sequel.connect(conf.database_url || ENV['DATABASE_URL']) do |db|
 			db.drop_table :diaries, :comments, :conf
 		end

data/lib/tdiary/tasks/heroku.rake

@@ -22,6 +22,15 @@ namespace :heroku do
 		raise NotImplementedError
 	end
 
+	task :update_gemfile do
+		FileUtils.cp 'misc/paas/heroku/Gemfile.local', 'Gemfile.local'
+		FileUtils.cp 'misc/paas/heroku/Gemfile.lock', 'Gemfile.lock'
+		sh "bundle update"
+		FileUtils.cp 'Gemfile.local', 'misc/paas/heroku/Gemfile.local'
+		FileUtils.cp 'Gemfile.lock', 'misc/paas/heroku/Gemfile.lock'
+		sh "git checkout Gemfile.lock"
+	end
+
 	task :clean do
 		sh "git checkout master"
 		sh "git branch -D deploy"