tdiary 5.1.7 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c2701759e3942a50f5878d3d923cba6d09234bc4fa5c89a7ca7b423e1b5928
-  data.tar.gz: 7ae4932f5824feffc414f776d693a30d1b2cbf9d35315de1d378776aced82edc
+  metadata.gz: 4984eb5f52257f2e73c11c053d11e4876d0162ce6ad3428074a88daf6c4bc66d
+  data.tar.gz: b8cf41cb9af3d8093dc7fe1215c9c2901b8c3da75f3fb27ee749c1270a9a1454
 SHA512:
-  metadata.gz: 5945fba2a021668050ffe8d9a21422d7c08495ec87d2f20d700df10c2567902ac6733910fc63eda7b20a249a299ec0d65e28b1238a7b9c1a95fdcb5456047ff1
-  data.tar.gz: ee95ba931276d38437ab4d66e2d9b8e36972b233b560c654fa6c19d9477942714691c1cc2b02cef2ba056312d969aed4a5a2df5ee869e4f17a4b200336b61cc4
+  metadata.gz: a0abba5248f764ea595b80c1d419fb8d3f588a76d5672d901f474602644e459c3339258b1967c55e7b645934b2edfc7752882c088d487b07fd4805717efe8998
+  data.tar.gz: ea588ce4056a74c9a5b0a0e8111b36258ded73ad1ab7d3bf1c79a2ba0394798dc736e8c5fad334ebee37b38e9080cb4a55b1cd4411ea6cf0b6a25eb760e761c6

data/ChangeLog

@@ -1,3 +1,10 @@
+2021-11-29 Tada, Tadashi <t@tdtds.jp>
+	* release 5.2.0
+
+2021-11-14 Tada, Tadashi <t@tdtds.jp>
+	* fix error in `String#encode` cause by keyword parameter incompatible
+	* fix debugging on vscode
+
 2021-08-29 Tada, Tadashi <t@tdtds.jp>
 	* fix heroku button: add MONGODB_URI into env section
 	* release 5.1.7

data/Gemfile.lock

@@ -3,30 +3,31 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    date (3.1.1)
+    date (3.2.2)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.12)
+    debase-ruby_core_source (0.10.13)
     diff-lcs (1.4.4)
     docile (1.4.0)
     emot (0.0.4)
       thor
-    faraday (1.7.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -53,18 +54,19 @@ GEM
       rack (>= 1.2.1)
       rake
     jasmine-core (2.99.2)
-    json (2.5.1)
+    json (2.6.1)
     launchy (2.5.0)
       addressable (~> 2.7)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mime-types (3.3.1)
+    matrix (0.4.2)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.1)
+    mime-types-data (3.2021.1115)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     multipart-post (2.1.1)
-    nokogiri (1.12.3)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     octokit (4.21.0)
@@ -74,7 +76,7 @@ GEM
     pit (0.0.7)
     power_assert (2.0.1)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -97,18 +99,19 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby-debug-ide (0.7.2)
+    rspec-support (3.10.3)
+    ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
-    sequel (5.47.0)
+    sequel (5.50.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -118,7 +121,7 @@ GEM
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.4.4)
+    test-unit (3.5.1)
       power_assert
     thor (1.1.0)
     tins (1.29.1)
@@ -159,4 +162,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.2.22
+   2.2.32

data/lib/tdiary/cli.rb

@@ -100,6 +100,7 @@ module TDiary
 		def server
 			require 'tdiary'
 			require 'tdiary/environment'
+			require 'webrick'
 
 			if options[:cgi]
 				opts = {
@@ -113,7 +114,6 @@ module TDiary
 			elsif
 				# --rack option
 				# Rack::Server reads ARGV as :config, so delete it
-				require 'webrick'
 				ARGV.shift
 				opts = {
 					environment: ENV['RACK_ENV'] || "development",

data/lib/tdiary/lang/en.rb

@@ -23,13 +23,6 @@ def encoding_old
 	'UTF-8'
 end
 
-#
-# 'mobile_encoding' method returns charactor encoding in mobile mode.
-#
-def mobile_encoding
-	'UTF-8'
-end
-
 #
 # 'migrate_to_utf8' method converts string to UTF-8, but dummy in en.
 #
@@ -37,20 +30,6 @@ def migrate_to_utf8( str )
 	str.dup
 end
 
-#
-# 'to_mobile' method converts string automatically to mobile mode encoding.
-#
-def to_mobile( str )
-	str.dup
-end
-
-#
-# 'to_mail' method converts string automatically to E-mail encoding.
-#
-def to_mail( str )
-	str.dup
-end
-
 #
 # 'shorten' method cuts string length.
 #

data/lib/tdiary/lang/ja.rb

@@ -17,18 +17,6 @@ def encoding_old
 	'EUC-JP'
 end
 
-def mobile_encoding
-	'Shift_JIS'
-end
-
-def to_mobile( str )
-	str.encode(mobile_encoding, {invalid: :replace, undef: :replace})
-end
-
-def to_mail( str )
-	str.encode('iso-2022-jp', {invalid: :replace, undef: :replace})
-end
-
 def migrate_to_utf8( str )
 	to_native( str, encoding_old )
 end

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

@@ -630,33 +630,6 @@ def comment_form
 	comment_form_text
 end
 
-def comment_form_mobile_mail_field
-	%Q|#{comment_mail_label_short}: <INPUT NAME="mail"><BR>|
-end
-
-def comment_form_mobile
-	return '' if @conf.hide_comment_form
-	return '' if bot?
-	return '' if hide_comment_day_limit
-
-	if @diaries[@date.strftime('%Y%m%d')].count_comments( true ) >= @conf.comment_limit_per_day then
-		return "<HR><P>#{comment_limit_label}</P>"
-	end
-
-	return <<-FORM
-		<HR>
-		<FORM METHOD="POST" ACTION="#{h @conf.index}">
-			<INPUT TYPE="HIDDEN" NAME="date" VALUE="#{@date.strftime( '%Y%m%d' )}">
-			<P>#{comment_description_short}<BR>
-			#{comment_name_label_short}: <INPUT NAME="name"><BR>
-			#{comment_form_mobile_mail_field}
-			#{comment_body_label_short}:<BR>
-			<TEXTAREA NAME="body" COLS="100%" ROWS="5"></TEXTAREA><BR>
-			<INPUT TYPE="SUBMIT" NAME="comment" value="#{comment_submit_label_short}"></P>
-		</FORM>
-	FORM
-end
-
 def hide_comment_day_limit
 	if @conf.options.include?('spamfilter.date_limit') &&
 			@conf.options['spamfilter.date_limit'] &&
@@ -675,6 +648,13 @@ 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/, '')}?=|
+	end
+end
+
 def comment_mail_send
 	return unless @comment
 	return unless @conf['comment_mail.enable']
@@ -692,9 +672,7 @@ def comment_mail_send
 	receivers = [@conf.author_mail] if receivers.compact.empty?
 	return if receivers.empty?
 
-	require 'socket'
-
-	name = comment_mail_mime( @conf.to_mail( @comment.name ) )[0]
+	name = comment_mail_mime(@comment.name)[0]
 	body = @comment.body.sub( /[\r\n]+\Z/, '' )
 	mail = @comment.mail
 	mail = @conf.author_mail unless mail =~ %r<[0-9a-zA-Z_.-]+@[\(\)%!0-9a-zA-Z_$@.&+-,'"*-]+>
@@ -706,22 +684,25 @@ def comment_mail_send
 	tz = (g.to_i - l.to_i) / 36
 	date = now.strftime( "%a, %d %b %Y %X " ) + sprintf( "%+05d", tz )
 
+	require 'socket'
 	serial = @diaries[@date.strftime( '%Y%m%d' )].count_comments( true )
 	message_id = %Q!<tdiary.#{[@conf['comment_mail.header'] || ''].pack('m').gsub(/\n/,'')}.#{now.strftime('%Y%m%d%H%M%S')}.#{serial}@#{Socket::gethostname}>!
 
-	mail_header = (@conf['comment_mail.header'] || '').dup
-	mail_header << ":#{@conf.date_format}" unless /%[a-zA-Z%]/ =~ mail_header
-	mail_header = @date.strftime( mail_header )
-	mail_header = comment_mail_mime( @conf.to_mail( mail_header ) ).join( "\n " ) #if /[\x80-\xff]/ =~ mail_header
-
-	rmail = ''
-	begin
-		rmail = File::open( "#{TDiary::PATH}/../views/mail.rtxt.#{@conf.lang}" ){|f| f.read }
-	rescue
-		rmail = File::open( "#{TDiary::PATH}/../views/mail.rtxt" ){|f| f.read }
-	end
-	text = @conf.to_mail( ERB::new( rmail ).result( binding ) )
-	comment_mail( text, receivers )
+	subject_header = (@conf['comment_mail.header'] || '').dup
+	subject_header << ":#{@conf.date_format}" unless /%[a-zA-Z%]/ =~ subject_header
+	subject_header = @date.strftime(subject_header)
+	subject_header = comment_mail_mime(subject_header).join("\n ")
+	rmail = File::open("#{TDiary::PATH}/../views/mail.rtxt").read
+	header = ERB::new(rmail).result(binding)
+
+	text = NKF.nkf('-w -MB', [
+		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"))
+	comment_mail([header, text].join("\r\n"), receivers)
 end
 
 def comment_mail( text )

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

@@ -259,11 +259,6 @@ add_conf_proc( 'comment', 'TSUKKOMI', 'tsukkomi' ) do
 	HTML
 end
 
-# comment mail
-def comment_mail_mime( str )
-	[str.dup]
-end
-
 def comment_mail_conf_label; 'TSUKKOMI Mail'; end
 
 def comment_mail_basic_html

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

@@ -36,13 +36,6 @@ end
 #
 # TSUKKOMI mail
 #
-def comment_mail_mime( str )
-	require 'nkf'
-	NKF::nkf( "-j -m0 -f50", str ).lines.collect do |s|
-		%Q|=?ISO-2022-JP?B?#{[s.chomp].pack( 'm' ).gsub( /\n/, '' )}?=|
-	end
-end
-
 def comment_mail_conf_label; 'ツッコミメール'; end
 
 def comment_mail_basic_html

data/lib/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '5.1.7'
+	VERSION = '5.2.0'
 end

data/misc/paas/heroku/Gemfile.local

@@ -1,4 +1,4 @@
-ruby '~> 3.0.1'
+ruby '~> 3.0.3'
 gem 'puma', require: false
 gem 'tdiary-io-mongodb', git: 'https://github.com/tdiary/tdiary-io-mongodb.git'
 gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'
@@ -6,6 +6,6 @@ gem 'tdiary-style-gfm'
 gem 'tdiary-style-rd'
 gem 'omniauth'
 gem 'omniauth-twitter'
-gem 'dalli'
+gem 'dalli', '< 3'
 gem 'memcachier'
 gem 'octokit'

data/misc/paas/heroku/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/tdiary/tdiary-contrib.git
-  revision: 462b794cc7a4d4b7c7f179a01823bb5f5453c1c1
+  revision: bd10dba950d2ba8d4ddab941ac8749a413160fad
   specs:
-    tdiary-contrib (5.1.6)
+    tdiary-contrib (5.1.7)
       coderay
       holiday_japan
       pushbullet_ruby
@@ -32,17 +32,18 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     bson (4.12.1)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     coderay (1.1.3)
-    commonmarker (0.22.0)
+    commonmarker (0.23.2)
     concurrent-ruby (1.1.9)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -51,10 +52,10 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     dalli (2.7.11)
-    date (3.1.1)
+    date (3.2.2)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.12)
+    debase-ruby_core_source (0.10.13)
     diff-lcs (1.4.4)
     docile (1.4.0)
     emot (0.0.4)
@@ -62,40 +63,41 @@ GEM
     faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     fastimage (2.2.5)
-    hashie (4.1.0)
+    hashie (5.0.0)
     hikidoc (0.1.0)
     holiday_japan (1.4.4)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    idn-ruby (0.1.2)
+    idn-ruby (0.1.4)
     jasmine (2.99.0)
       jasmine-core (>= 2.99.0, < 3.0.0)
       phantomjs
       rack (>= 1.2.1)
       rake
     jasmine-core (2.99.2)
-    json (2.5.1)
+    json (2.6.1)
     launchy (2.5.0)
       addressable (~> 2.7)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    matrix (0.4.2)
     memcachier (0.0.2)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.1)
+    mime-types-data (3.2021.1115)
+    mini_mime (1.1.2)
     minitest (5.14.4)
-    mongo (2.15.0)
+    mongo (2.17.0)
       bson (>= 4.8.2, < 5.0.0)
-    mongoid (7.3.2)
+    mongoid (7.3.3)
       activemodel (>= 5.1, < 6.2)
       mongo (>= 2.10.5, < 3.0.0)
       ruby2_keywords (~> 0.0.5)
     multipart-post (2.1.1)
     nio4r (2.5.8)
-    nokogiri (1.12.3-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
-    oauth (0.5.6)
+    oauth (0.5.8)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -113,12 +115,12 @@ GEM
     pit (0.0.7)
     power_assert (2.0.1)
     public_suffix (4.0.6)
-    puma (5.4.0)
+    puma (5.5.2)
       nio4r (~> 2.0)
     pushbullet_ruby (1.1.4)
       faraday (>= 0.13.0, < 1.0)
       mime-types
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
@@ -144,18 +146,19 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby-debug-ide (0.7.2)
+    rspec-support (3.10.3)
+    ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
-    sequel (5.47.0)
+    sequel (5.50.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -163,7 +166,7 @@ GEM
     simplecov-html (0.10.2)
     sqlite3 (1.4.2)
     sync (0.5.0)
-    tdiary (5.1.6)
+    tdiary (5.1.7)
       bundler (>= 1.3, < 3.0)
       emot
       fastimage
@@ -182,7 +185,7 @@ GEM
       rdtool
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.4.4)
+    test-unit (3.5.1)
       power_assert
     thor (1.1.0)
     tins (1.29.1)
@@ -194,11 +197,11 @@ GEM
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     webrick (1.7.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-linux
@@ -206,7 +209,7 @@ PLATFORMS
 DEPENDENCIES
   capybara
   coveralls (~> 0.8)
-  dalli
+  dalli (< 3)
   date (>= 3.1.1)
   debase
   emot
@@ -241,7 +244,7 @@ DEPENDENCIES
   webrick
 
 RUBY VERSION
-   ruby 3.0.2p107
+   ruby 3.0.3p157
 
 BUNDLED WITH
-   2.2.22
+   2.2.32

data/misc/plugin/amazon.rb

@@ -185,7 +185,12 @@ def amazon_get(asin, with_image = true, label = nil, pos = 'amazon')
 		if @mode == 'preview' then
 			message << %Q|<span class="message">(#{h e.message})</span>|
 		end
-		message
+		# Handle 429 "Too Many Requests"
+		if /^429/ =~ e.message then
+			%Q|<a href="https://www.amazon.co.jp/dp/#{h asin}">https://www.amazon.co.jp/dp/#{h asin}</a>|
+		else
+			message
+		end
 	rescue NoMethodError
 		@logger.error "amazon.rb: #{json["Errors"][0]["Message"]}"
 		message = label || asin

data/misc/plugin/comment_mail-smtp.rb

@@ -30,28 +30,32 @@
 #          SMTP認証が必要な場合のユーザ名とパスワード
 #     @options['comment_mail.authentication']
 #          SMTP認証の方式。:plainや:loginなど(Mail gemに指定できるもの)
-#     @options['comment_mail.starttls']
-#          TLSに自動接続する(true/false) (Mail gem)
 #
 # Copyright (c) 2015 TADA Tadashi <t@tdtds.jp>
 # You can distribute this file under the GPL2 or any later version.
 #
-def comment_mail( text, to )
+def comment_mail(text, to)
 	begin
 		require 'mail'
-
-		mail = Mail.new( text )
-		delivery_opts = {
+		mail = Mail.new(text)
+		mail.delivery_method(:smtp,
 			address: @conf['comment_mail.smtp_host'] || 'localhost',
 			port: @conf['comment_mail.smtp_port'] || 25,
 			authentication: @conf['comment_mail.authentication'],
 			user_name: @conf['comment_mail.user_name'],
-			password: @conf['comment_mail.password'],
-			enable_starttls_auto: @conf['comment_mail.starttls']
-		}.delete_if{|k,v| v == nil}
-		mail.delivery_method( :smtp, delivery_opts )
+			password: @conf['comment_mail.password']
+		)
+	rescue
+		$stderr.puts $!
+	end
+	begin
 		mail.deliver
 	rescue
+		# retry without verify when SSL error
+		unless mail.delivery_method.settings[:openssl_verify_mode] == 'none'
+			mail.delivery_method(:smtp, openssl_verify_mode: 'none')
+			retry
+		end
 		$stderr.puts $!
 	end
 end

data/misc/plugin/hide-mail-field.rb

@@ -31,10 +31,6 @@ add_footer_proc do
 	end
 end
 
-def comment_form_mobile_mail_field
-	%Q|<INPUT NAME="mail" TYPE="hidden">|
-end
-
 add_conf_proc( 'hide-mail-field', @hide_mail_field_label_conf, 'security' ) do
 	if @mode == 'saveconf'
 		@conf['comment_description'] = @cgi.params['comment_description'][0]