tdiary/tdiary-core [master] split to core extension module

[<nul...@cl...>]

SHIBATA Hiroshi	2011-05-01 23:34:03 +0000 (Sun, 01 May 2011)

  New Revision: 3ee8eb2de5a73cc4e4c0d2d612ceafae1c66e92b

  Log:
    split to core extension module

  Added files:
    tdiary/core_ext.rb
  Modified files:
    tdiary.rb

  Modified: tdiary.rb (+1 -94)
===================================================================
--- tdiary.rb    2011-05-01 13:33:29 +0000 (dde9ac8)
+++ tdiary.rb    2011-05-01 23:34:03 +0000 (58f9986)
@@ -22,100 +22,7 @@ rescue LoadError
 	require 'erb'
 end
 require 'tdiary/compatible'
-
-=begin
-== String class
-enhanced String class
-=end
-class String
-	def make_link
-		r = %r<(((http[s]{0,1}|ftp)://[\(\)%#!/0-9a-zA-Z_$@.&+-,'"*=;?:~-]+)|([0-9a-zA-Z_.-]+@[\(\)%!0-9a-zA-Z_$.&+-,'"*-]+\.[\(\)%!0-9a-zA-Z_$.&+-,'"*-]+))>
-		return self.
-			gsub( / /, "\001" ).
-			gsub( /</, "\002" ).
-			gsub( />/, "\003" ).
-			gsub( /&/, '&amp;' ).
-			gsub( /\"/, "\004").
-			gsub( r ){ $1 == $2 ? "<a href=\"#$2\">#$2</a>" : "<a href=\"mailto:#$4\">#$4</a>" }.
-			gsub( /\004/, '&quot;' ).
-			gsub( /\003/, '&gt;' ).
-			gsub( /\002/, '&lt;' ).
-			gsub( /^\001+/ ) { $&.gsub( /\001/, '&nbsp;' ) }.
-			gsub( /\001/, ' ' ).
-			gsub( /\t/, '&nbsp;' * 8 )
-	end
-end
-
-=begin
-== CGI class
-enhanced CGI class
-=end
-class CGI
-	def valid?( param, idx = 0 )
-		self.params[param] and self.params[param][idx] and self.params[param][idx].length > 0
-	end
-
-	def mobile_agent?
-		self.user_agent =~ %r[(DoCoMo|J-PHONE|Vodafone|MOT-|UP\.Browser|DDIPOCKET|ASTEL|PDXGW|Palmscape|Xiino|sharp pda browser|Windows CE|L-mode|WILLCOM|SoftBank|Semulator|Vemulator|J-EMULATOR|emobile|mixi-mobile-converter)]i
-	end
-
-	def smartphone?
-		self.user_agent =~ /iPhone|iPod|Opera Mini|Android.*Mobile|NetFront|PSP/
-	end
-
-	def https?
-		return false if env_table['HTTPS'].nil? or /off/i =~ env_table['HTTPS']
-		true
-	end
-
-	def request_uri
-		_request_uri = env_table['REQUEST_URI']
-		_script_name = env_table['SCRIPT_NAME']
-		if !_request_uri || _request_uri == '' || _request_uri == _script_name then
-			_path_info    = env_table['PATH_INFO'] || ''
-			_query_string = env_table['QUERY_STRING'] || ''
-			# Workaround for IIS-style PATH_INFO ('/dir/script.cgi/path', not '/path')
-			# See http://support.microsoft.com/kb/184320/
-			_request_uri = _path_info.include?(_script_name) ? '' : _script_name.dup
-			_request_uri << _path_info
-			_request_uri << '?' + _query_string if _query_string != ''
-		end
-		_request_uri
-	end
-
-	def redirect_url
-		env_table['REDIRECT_URL']
-	end
-
-	if RUBY_VERSION >= '1.8.0' && RUBY_VERSION < '1.8.2'
-		module QueryExtension
-			%w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
-				define_method(env.sub(/^HTTP_/n, '').downcase) do
-					(val = env_table[env]) && Integer(val)
-				end
-			end
-		end
-	end
-end
-
-=begin
-== Safe module
-=end
-module Safe
-	def safe( level = 4 )
-		result = nil
-		if $SAFE < level then
-			Proc.new {
-				$SAFE = level
-				result = yield
-			}.call
-		else
-			result = yield
-		end
-		result
-	end
-	module_function :safe
-end
+require 'tdiary/core_ext'
 
 #
 # module TDiary

  Added: tdiary/core_ext.rb (+93 -0) 100644
===================================================================
--- /dev/null
+++ tdiary/core_ext.rb    2011-05-01 23:34:03 +0000 (4517803)
@@ -0,0 +1,93 @@
+=begin
+== String class
+enhanced String class
+=end
+class String
+	def make_link
+		r = %r<(((http[s]{0,1}|ftp)://[\(\)%#!/0-9a-zA-Z_$@.&+-,'"*=;?:~-]+)|([0-9a-zA-Z_.-]+@[\(\)%!0-9a-zA-Z_$.&+-,'"*-]+\.[\(\)%!0-9a-zA-Z_$.&+-,'"*-]+))>
+		return self.
+			gsub( / /, "\001" ).
+			gsub( /</, "\002" ).
+			gsub( />/, "\003" ).
+			gsub( /&/, '&amp;' ).
+			gsub( /\"/, "\004").
+			gsub( r ){ $1 == $2 ? "<a href=\"#$2\">#$2</a>" : "<a href=\"mailto:#$4\">#$4</a>" }.
+			gsub( /\004/, '&quot;' ).
+			gsub( /\003/, '&gt;' ).
+			gsub( /\002/, '&lt;' ).
+			gsub( /^\001+/ ) { $&.gsub( /\001/, '&nbsp;' ) }.
+			gsub( /\001/, ' ' ).
+			gsub( /\t/, '&nbsp;' * 8 )
+	end
+end
+
+=begin
+== CGI class
+enhanced CGI class
+=end
+class CGI
+	def valid?( param, idx = 0 )
+		self.params[param] and self.params[param][idx] and self.params[param][idx].length > 0
+	end
+
+	def mobile_agent?
+		self.user_agent =~ %r[(DoCoMo|J-PHONE|Vodafone|MOT-|UP\.Browser|DDIPOCKET|ASTEL|PDXGW|Palmscape|Xiino|sharp pda browser|Windows CE|L-mode|WILLCOM|SoftBank|Semulator|Vemulator|J-EMULATOR|emobile|mixi-mobile-converter)]i
+	end
+
+	def smartphone?
+		self.user_agent =~ /iPhone|iPod|Opera Mini|Android.*Mobile|NetFront|PSP/
+	end
+
+	def https?
+		return false if env_table['HTTPS'].nil? or /off/i =~ env_table['HTTPS']
+		true
+	end
+
+	def request_uri
+		_request_uri = env_table['REQUEST_URI']
+		_script_name = env_table['SCRIPT_NAME']
+		if !_request_uri || _request_uri == '' || _request_uri == _script_name then
+			_path_info    = env_table['PATH_INFO'] || ''
+			_query_string = env_table['QUERY_STRING'] || ''
+			# Workaround for IIS-style PATH_INFO ('/dir/script.cgi/path', not '/path')
+			# See http://support.microsoft.com/kb/184320/
+			_request_uri = _path_info.include?(_script_name) ? '' : _script_name.dup
+			_request_uri << _path_info
+			_request_uri << '?' + _query_string if _query_string != ''
+		end
+		_request_uri
+	end
+
+	def redirect_url
+		env_table['REDIRECT_URL']
+	end
+
+	if RUBY_VERSION >= '1.8.0' && RUBY_VERSION < '1.8.2'
+		module QueryExtension
+			%w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
+				define_method(env.sub(/^HTTP_/n, '').downcase) do
+					(val = env_table[env]) && Integer(val)
+				end
+			end
+		end
+	end
+end
+
+=begin
+== Safe module
+=end
+module Safe
+	def safe( level = 4 )
+		result = nil
+		if $SAFE < level then
+			Proc.new {
+				$SAFE = level
+				result = yield
+			}.call
+		else
+			result = yield
+		end
+		result
+	end
+	module_function :safe
+end