tdiary 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fde70ef07f181c74d9ecf4e7c2623cd8b94add
-  data.tar.gz: 1fffaefa079eb029ffd1936f507efdf2e47eb16c
+  metadata.gz: 81e91db326489ae1530ad483470a8124f6835a38
+  data.tar.gz: e42ec452449cccfc8e42fc467b9de52e9e13b419
 SHA512:
-  metadata.gz: 9f134da57cffb3350118401ef23a7cc97b3237281e349522223b9e686c547c6fa37372803e65d36b3fa8cc0d1599c8711eb8d9d74826bcbc6d732d2ec7575200
-  data.tar.gz: 98129b50e818a21ff936b14297d112579eec7ede81e00da1f26a126bd062985a75bec80dcb417bccf054ecbe2d5521a1c02589001251af50426807b4ad0cbfa3
+  metadata.gz: eeac59a8654d182474b91d2acca85b7802d27082985e24331b19cde681b11faec7d838bb7ae0b6886aa9e05118ee3f2a1b0f4c69ac2bf539bc17042d1123b74e
+  data.tar.gz: cd1454d727a9f1a1a077ffdfc612e814c03d54765ca52730fff253e2b6bb0da5ff15ee7cbbb2b87014704db0d2942485740bc3f2d1f0d992ea7f948cce3332ed

data/Gemfile.lock

@@ -2,9 +2,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    byebug (4.0.5)
+    byebug (5.0.0)
       columnize (= 0.9.0)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -28,15 +28,15 @@ GEM
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    execjs (2.5.2)
+    execjs (2.6.0)
     fastimage (1.7.0)
       addressable (~> 2.3, >= 2.3.5)
-    ffi (1.9.9)
+    ffi (1.9.10)
     gemoji (2.1.0)
     hikidoc (0.1.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    jasmine (2.3.0)
+    jasmine (2.3.1)
       jasmine-core (~> 2.3)
       phantomjs
       rack (>= 1.2.1)
@@ -44,25 +44,25 @@ GEM
     jasmine-core (2.3.4)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.9)
+    libv8 (3.16.14.11)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     phantomjs (1.9.8.0)
     pit (0.0.7)
-    power_assert (0.2.3)
-    pry (0.10.1)
+    power_assert (0.2.4)
+    pry (0.10.2)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
       pry (~> 0.10)
     rack (1.6.4)
     rack-test (0.6.3)
@@ -71,8 +71,8 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (10.4.2)
-    redcarpet (3.3.2)
-    ref (1.0.5)
+    redcarpet (3.3.3)
+    ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -81,40 +81,40 @@ GEM
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     rubyzip (1.1.7)
-    selenium-webdriver (2.46.2)
+    selenium-webdriver (2.47.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sequel (4.23.0)
+    sequel (4.26.0)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    sprockets (3.2.0)
-      rack (~> 1.0)
+    sprockets (3.3.5)
+      rack (> 1, < 3)
     sqlite3 (1.3.10)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    test-unit (3.1.2)
+    test-unit (3.1.4)
       power_assert
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    tins (1.5.4)
+    tins (1.6.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
@@ -136,7 +136,6 @@ DEPENDENCIES
   launchy
   mail
   pit
-  pry
   pry-byebug
   rack
   racksh
@@ -152,4 +151,4 @@ DEPENDENCIES
   therubyracer
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/js/amazon.js

@@ -1,43 +1,13 @@
 /*
- * amazon.js : replace amazon URL using bit.ly (amzn.to).
+ * amazon.js :
+ *   * remove height / width infomation of images
  *
- * Copyright (C) 2011 by TADA Tadashi <t@tdtds.jp>
+ * Copyright (C) 2015 by TADA Tadashi <t@tdtds.jp>
  * You can distribute it under GPL2 or any later version.
  */
 
 $(function(){
-	function shorten(link){
-		var url = link.attr('href');
-		var api = 'http://api.bit.ly/v3/shorten'
-				+ '?format=json'
-				+ '&longUrl=' + encodeURIComponent(url)
-				+ '&login=' + $tDiary.plugin.bitly.login
-				+ '&apiKey=' + $tDiary.plugin.bitly.apiKey;
-
-		$.ajax({
-			type: 'GET',
-			url: api,
-			dataType: 'jsonp',
-			success: function(data){
-				if (data['data']){
-					link.attr('href',data['data']['url']);
-				}
-				else{
-					//console.warn('fail to short: ' + link.attr('href'));
-				}
-			}
-		});
+	if($(window).width() <= 360) {
+		$('img.amazon').attr('height', null).attr('width', null);
 	}
-
-	$(window).bind('scroll', function(event){
-		var bottom = $(window).height() + $(window).scrollTop();
-		//console.warn('window.bottom: ' + bottom);
-		$('a[href*="://www.amazon.co.jp/"]').each(function(){
-			var a = $(this);
-			if (bottom > a.offset().top){
-				//console.warn('appear!: ' + a.text());
-				shorten(a);
-			}
-		});
-	});
 });

data/js/amazon_bitly.js

@@ -0,0 +1,43 @@
+/*
+ * amazon_bitly.js : replace amazon URL using bit.ly (amzn.to).
+ *
+ * Copyright (C) 2011 by TADA Tadashi <t@tdtds.jp>
+ * You can distribute it under GPL2 or any later version.
+ */
+
+$(function(){
+	function shorten(link){
+		var url = link.attr('href');
+		var api = 'http://api.bit.ly/v3/shorten'
+				+ '?format=json'
+				+ '&longUrl=' + encodeURIComponent(url)
+				+ '&login=' + $tDiary.plugin.bitly.login
+				+ '&apiKey=' + $tDiary.plugin.bitly.apiKey;
+
+		$.ajax({
+			type: 'GET',
+			url: api,
+			dataType: 'jsonp',
+			success: function(data){
+				if (data['data']){
+					link.attr('href',data['data']['url']);
+				}
+				else{
+					//console.warn('fail to short: ' + link.attr('href'));
+				}
+			}
+		});
+	}
+
+	$(window).bind('scroll', function(event){
+		var bottom = $(window).height() + $(window).scrollTop();
+		//console.warn('window.bottom: ' + bottom);
+		$('a[href*="://www.amazon.co.jp/"]').each(function(){
+			var a = $(this);
+			if (bottom > a.offset().top){
+				//console.warn('appear!: ' + a.text());
+				shorten(a);
+			}
+		});
+	});
+});

data/lib/tdiary/admin.rb

@@ -73,10 +73,6 @@ module TDiary
 
 			@title = @cgi.params['title'][0]
 			@body = @cgi.params['body'][0]
-			if @cgi.mobile_agent?
-				@title.force_encoding(@conf.mobile_encoding)
-				@body.force_encoding(@conf.mobile_encoding)
-			end
 			@title = @conf.to_native( @title )
 			@body = @conf.to_native( @body )
 			@old_date = @cgi.params['old'][0]
@@ -113,10 +109,6 @@ module TDiary
 		def initialize( cgi, rhtml, conf )
 			@title = cgi.params['title'][0]
 			@body = cgi.params['body'][0]
-			if cgi.mobile_agent?
-				@title.force_encoding(conf.mobile_encoding)
-				@body.force_encoding(conf.mobile_encoding)
-			end
 			@title = conf.to_native( @title )
 			@body = conf.to_native( @body )
 			@hide = cgi.params['hide'][0] == 'true' ? true : false

data/lib/tdiary/configuration.rb

@@ -40,14 +40,14 @@ module TDiary
 			@options2.delete( key )
 		end
 
-		# backword compatibility, you can use @cgi.mobile_agent?
+		# backword compatibility, returns NOT mobile phone always
 		def mobile_agent?
-			@request.mobile_agent?
+			false
 		end
 
-		# backword compatibility, you can use @cgi.smartphone?
+		# backword compatibility, returns NOT smartphone always
 		def smartphone?
-			@request.smartphone?
+			false
 		end
 		alias iphone? smartphone?
 
@@ -138,7 +138,7 @@ module TDiary
 			@secure = true unless @secure
 			@options = {}
 
-			eval( File::open( 'tdiary.conf' ) {|f| f.read }.untaint, b, "(tdiary.conf)", 1 )
+			eval( File::open( 'tdiary.conf' ) {|f| f.read }.untaint, nil, "(tdiary.conf)", 1 )
 
 			# language setup
 			@lang = 'ja' unless @lang

data/lib/tdiary/core_ext.rb

@@ -4,12 +4,14 @@ require 'gemoji'
 
 module TDiary
 	module RequestExtension
+		# backword compatibility, returns NOT mobile phone always
 		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
+			false
 		end
 
+		# backword compatibility, returns NOT smartphone always
 		def smartphone?
-			self.user_agent =~ /iPhone|iPod|Opera Mini|Android.*Mobile|NetFront|PSP/
+			false
 		end
 	end
 end
@@ -43,7 +45,7 @@ class String
 			if emoji_alias == 'plus1' or emoji_alias == '+1'
 				emoji_url % (['plus1']*3)
 			elsif emoji = Emoji.find_by_alias(emoji_alias)
-				emoji_url % ([emoji.name]*3)
+				emoji_url % ([CGI.escape(emoji.name)]*3)
 			else
 				match
 			end

data/lib/tdiary/dispatcher/index_main.rb

@@ -34,24 +34,18 @@ module TDiary
 							head['Cache-Control'] = 'no-cache'
 							return TDiary::Response.new( '', 200, head )
 						else
-							if request.mobile_agent?
-								body = conf.to_mobile( tdiary.eval_rhtml( 'i.' ) )
-								head['charset'] = conf.mobile_encoding
-								head['Content-Length'] = body.bytesize.to_s
+							require 'digest/md5'
+							body = tdiary.eval_rhtml
+							head['ETag'] = %Q["#{Digest::MD5.hexdigest( body )}"]
+							if ENV['HTTP_IF_NONE_MATCH'] == head['ETag'] and request.get? then
+								head['status'] = CGI::HTTP_STATUS['NOT_MODIFIED']
 							else
-								require 'digest/md5'
-								body = tdiary.eval_rhtml
-								head['ETag'] = %Q["#{Digest::MD5.hexdigest( body )}"]
-								if ENV['HTTP_IF_NONE_MATCH'] == head['ETag'] and request.get? then
-									head['status'] = CGI::HTTP_STATUS['NOT_MODIFIED']
-								else
-									head['charset'] = conf.encoding
-									head['Content-Length'] = body.bytesize.to_s
-								end
-								head['Pragma'] = 'no-cache'
-								head['Cache-Control'] = 'no-cache'
-								head['X-Frame-Options'] = conf.x_frame_options if conf.x_frame_options
+								head['charset'] = conf.encoding
+								head['Content-Length'] = body.bytesize.to_s
 							end
+							head['Pragma'] = 'no-cache'
+							head['Cache-Control'] = 'no-cache'
+							head['X-Frame-Options'] = conf.x_frame_options if conf.x_frame_options
 							head['cookie'] = tdiary.cookies if tdiary.cookies.size > 0
 							TDiary::Response.new( body, ::TDiary::Dispatcher.extract_status_for_legacy_tdiary( head ), head )
 						end

data/lib/tdiary/dispatcher/update_main.rb

@@ -19,24 +19,14 @@ module TDiary
 				@tdiary = create_tdiary
 				begin
 					head = {}; body = ''
-					if request.mobile_agent?
-						body = conf.to_mobile( tdiary.eval_rhtml( 'i.' ) )
-						head = {
-							'Content-Type' => 'text/html',
-							'charset' => conf.mobile_encoding,
-							'Content-Length' => body.bytesize.to_s,
-							'Vary' => 'User-Agent'
-						}
-					else
-						body = tdiary.eval_rhtml
-						head = {
-							'Content-Type' => 'text/html',
-							'charset' => conf.encoding,
-							'Content-Length' => body.bytesize.to_s,
-							'Vary' => 'User-Agent',
-							'X-Frame-Options' => 'SAMEORIGIN'
-						}
-					end
+					body = tdiary.eval_rhtml
+					head = {
+						'Content-Type' => 'text/html',
+						'charset' => conf.encoding,
+						'Content-Length' => body.bytesize.to_s,
+						'Vary' => 'User-Agent',
+						'X-Frame-Options' => 'SAMEORIGIN'
+					}
 					body = ( request.head? ? '' : body )
 					TDiary::Response.new( body, 200, head )
 				rescue TDiary::ForceRedirect

data/lib/tdiary/filter/spam.rb

@@ -165,13 +165,13 @@ module TDiary
 			end
 
 			def lookup(domain, dnsbl, iplookup = false)
-				timeout(5) do
+				Timeout::timeout(5) do
 					domain = IPSocket::getaddress( domain ).split(/\./).reverse.join(".") if iplookup
 					address = Resolv.getaddress( "#{domain}.#{dnsbl}" )
 					debug("lookup:#{domain}.#{dnsbl} address:#{address}: spam host.")
 					return true
 				end
-			rescue TimeoutError, Resolv::ResolvTimeout
+			rescue Timeout::Error, Resolv::ResolvTimeout
 				debug("lookup:#{domain}.#{dnsbl}: safe host.")
 				return false
 			rescue Resolv::ResolvError, Exception

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

@@ -206,6 +206,7 @@ add_header_proc do
 	<<-HEADER
 	<meta http-equiv="Content-Type" content="text/html; charset=#{h charset}">
 	<meta name="generator" content="tDiary #{h TDIARY_VERSION}">
+	<meta name="viewport" content="width=device-width,initial-scale=1">
 	#{last_modified_header}
 	#{content_script_type}
 	#{author_name_tag}
@@ -217,14 +218,13 @@ add_header_proc do
 	#{jquery_tag.chomp}
 	#{script_tag.chomp}
 	#{css_tag.chomp}
-	#{smartphone_tag.chomp}
 	#{title_tag.chomp}
 	#{robot_control.chomp}
 	HEADER
 end
 
 def calc_links
-	if /day|edit/ =~ @mode or (@cgi.mobile_agent? and /latest|month|nyear/ =~ @mode) then
+	if /day|edit/ =~ @mode then
 		today = @date.strftime('%Y%m%d')
 		days = []
 		yms = []
@@ -261,11 +261,7 @@ def calc_links
 end
 
 def charset
-	if @cgi.mobile_agent? then
-		@conf.mobile_encoding
-	else
-		@conf.encoding
-	end
+	@conf.encoding
 end
 
 def last_modified_header
@@ -423,21 +419,6 @@ def css_tag
 	CSS
 end
 
-def smartphone_tag
-	if @cgi.smartphone? then
-	<<-CSS
-<meta name = "viewport" content = "width = device-width">
-	<style type="text/css"><!--
-	form.comment textarea {
-		width: 80%;
-	}
-	--></style>
-	CSS
-	else
-		''
-	end
-end
-
 def robot_control
 	if /^form|edit|preview|showcomment$/ =~ @mode then
 		'<meta name="robots" content="noindex,nofollow">'
@@ -468,7 +449,7 @@ add_title_proc do |date, title|
 end
 
 def nyear_link( date, title )
-	if @conf.show_nyear and @mode != 'nyear' and !@cgi.mobile_agent? then
+	if @conf.show_nyear and @mode != 'nyear' then
 		m = date.strftime( '%m' )
 		d = date.strftime( '%d' )
 		years = @years.find_all {|year, months| months.include? m}
@@ -525,20 +506,15 @@ end
 def subtitle_link( date, index, subtitle )
 	r = ''
 
-	if @cgi.mobile_agent? then
-		r << %Q[<A NAME="p#{'%02d' % index}">*</A> ]
-		r << %Q|(#{h @author})| if @multi_user and @author and subtitle
-	else
-		if date then
-			r << "<a "
-			r << %Q[name="p#{'%02d' % index}" ] if @anchor_name
-			param = "#{date.strftime( '%Y%m%d' )}#p#{'%02d' % index}"
-			titleattr = (not subtitle or subtitle.empty?) ? '' : %Q[ title="#{remove_tag( apply_plugin( subtitle )).gsub( /"/, "&quot;" )}"]
-			r << %Q[href="#{h @conf.index}#{anchor param}"#{titleattr}>#{@conf.section_anchor}</a> ]
-		end
-
-		r << %Q[(#{h @author}) ] if @multi_user and @author and subtitle
+	if date then
+		r << "<a "
+		r << %Q[name="p#{'%02d' % index}" ] if @anchor_name
+		param = "#{date.strftime( '%Y%m%d' )}#p#{'%02d' % index}"
+		titleattr = (not subtitle or subtitle.empty?) ? '' : %Q[ title="#{remove_tag( apply_plugin( subtitle )).gsub( /"/, "&quot;" )}"]
+		r << %Q[href="#{h @conf.index}#{anchor param}"#{titleattr}>#{@conf.section_anchor}</a> ]
 	end
+
+	r << %Q[(#{h @author}) ] if @multi_user and @author and subtitle
 	r << make_category_link( subtitle )
 end
 
@@ -843,7 +819,7 @@ def conf_theme_list
 	<input name="css" size="30" value="#{h @conf.css}">
 	</p>
 	<p><img id="theme_thumbnail" src="http://www.tdiary.org/theme.image/#{img}.jpg" alt="#{@theme_thumbnail_label}"></p>
-	#{@theme_location_comment unless @cgi.mobile_agent?}
+	#{@theme_location_comment}
 	HTML
 end