tdiary 5.2.2 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b8ecf86e1320b1516470a123195274912da4626497e73f8a04cd3c82ad77a4
-  data.tar.gz: 12b916d8144bbe3dc519e736f11f90fabac42c3c80f09bb65054534564f75dd4
+  metadata.gz: '06808223219cd4fe67290d6074aeda53c5d68012254dddf5a3908e270fdaa50c'
+  data.tar.gz: 1a006166326744d94cc737480d385558ad88eabc631175e6520f6564a64162de
 SHA512:
-  metadata.gz: dff9dcc1212337778500ae67abf3c7f298ce9f1a98ccb3beaa59137a35ee9974dc9df4d8ce6b70045bf185cf67b5f59fd18d41af53bee52363753ac66d60bda0
-  data.tar.gz: 7f0a916c5a014c89d60936ed82f783745275c9b2e3af309c069bad2fb3b0b8461f3aecc1b0c84c94af4e6d01cdb721cf54d73e57a2013cc046e18c7c45ae1d6e
+  metadata.gz: 1d239176d669b5b0e81a4ba683425ef2335b9034a2a263eb6065c41fe720bf2f99a142236d0d4d476bdc64ec39e2371db19945ca81a0fcb3ad7f5d3d88be5993
+  data.tar.gz: 7687e50a04a1bb5f2556d7fd074e6f1369fc9151dd6b535d8e722a8eda0834466b8ca0fbae9c138e59071a9ca35b5f41361def440ff187ba14d6bcb993e677bf

data/ChangeLog

@@ -1,6 +1,15 @@
+2022-11-29 Tada, Tadashi <t@tdtds.jp>
+	* support rack 3.x
+	* support dalli 3.x
+	* release 5.2.4
+
+2022-08-29 Tada, Tadashi <t@tdtds.jp>
+	* remove Heroku button from README
+	* release 5.2.3
+
 2022-05-29 Tada, Tadashi <t@tdtds.jp>
 	* remove support of ruby 2.6
-	* release 5.2.0
+	* release 5.2.2
 
 2022-02-28 Tada, Tadashi <t@tdtds.jp>
 	* release 5.2.1

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rack'
+gem 'rackup'
 gem 'hikidoc'
 gem 'fastimage'
 gem 'emot'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    capybara (3.37.1)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    capybara (3.36.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -20,22 +20,21 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     date (3.2.2)
-    debug (1.5.0)
+    debug (1.6.3)
       irb (>= 1.3.6)
-      reline (>= 0.2.7)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
-    digest (3.1.0)
     docile (1.4.0)
     emot (0.0.4)
       thor
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.5.2)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-net_http (3.0.0)
     fastimage (2.2.6)
     hikidoc (0.1.0)
     io-console (0.5.11)
-    irb (1.4.1)
+    irb (1.4.2)
       reline (>= 0.3.0)
     jasmine (2.99.0)
       jasmine-core (>= 2.99.0, < 3.0.0)
@@ -56,76 +55,77 @@ GEM
     mini_portile2 (2.8.0)
     net-protocol (0.1.3)
       timeout
-    net-smtp (0.3.1)
-      digest
+    net-smtp (0.3.3)
       net-protocol
-      timeout
-    nokogiri (1.13.6)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
-    octokit (4.23.0)
+    octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     phantomjs (2.1.1.0)
     pit (0.0.7)
     power_assert (2.0.1)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack (3.0.1)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
+    rackup (0.2.3)
+      rack (>= 3.0.0.beta1)
+      webrick
     rake (13.0.6)
     redcarpet (3.5.1)
     regexp_parser (2.5.0)
     reline (0.3.1)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sawyer (0.9.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    selenium-webdriver (4.2.0)
+    selenium-webdriver (4.1.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    sequel (5.56.0)
+      rubyzip (>= 1.2.2)
+    sequel (5.62.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sqlite3 (1.4.2)
+    sqlite3 (1.5.4)
+      mini_portile2 (~> 2.8.0)
+    sqlite3 (1.5.4-x86_64-linux)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.5.3)
+    test-unit (3.5.5)
       power_assert
     thor (1.2.1)
     timeout (0.3.0)
     tins (1.31.1)
       sync
     webrick (1.7.0)
-    websocket (1.2.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -150,6 +150,7 @@ DEPENDENCIES
   pit
   rack
   racksh
+  rackup
   rake
   redcarpet
   rexml

data/README.md

@@ -1,7 +1,5 @@
 # tDiary
 
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://www.heroku.com/deploy?template=https://github.com/tdiary/tdiary-core)
-
 [![Gem Version](https://badge.fury.io/rb/tdiary.png)](https://rubygems.org/gems/tdiary) [![Build Status](https://github.com/tdiary/tdiary-core/actions/workflows/ci.yml/badge.svg)](https://github.com/tdiary/tdiary-core/actions/workflows/ci.yml) [![Coverage Status](https://coveralls.io/repos/tdiary/tdiary-core/badge.png?branch=master)](https://coveralls.io/r/tdiary/tdiary-core) [![Code Climate](https://codeclimate.com/github/tdiary/tdiary-core.png)](https://codeclimate.com/github/tdiary/tdiary-core)
 
 ## tDiary, The TSUKKOMI-able Weblog.

data/lib/tdiary/cli.rb

@@ -126,7 +126,7 @@ module TDiary
 				if options[:log]
 					opts[:AccessLog] = [[File.open(options[:log], 'a'), WEBrick::AccessLog::CLF]]
 				end
-				::Rack::Server.start( opts )
+				::Rackup::Server.start( opts )
 			end
 		end
 

data/lib/tdiary/rack/session.rb

@@ -20,7 +20,6 @@ module TDiary
 				if ::Rack::Session.const_defined? :Dalli
 					::Rack::Session::Dalli.new(
 						app,
-						cache: Dalli::Client.new,
 						expire_after: 2592000
 					)
 				else

data/lib/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '5.2.2'
+	VERSION = '5.2.4'
 end

data/misc/paas/heroku/Gemfile.local

@@ -1,4 +1,4 @@
-ruby '~> 3.1.1'
+ruby '~> 3.1.2'
 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,7 @@ gem 'tdiary-style-gfm'
 gem 'tdiary-style-rd'
 gem 'omniauth'
 gem 'omniauth-twitter'
-gem 'dalli', '< 3'
+gem 'dalli'
+gem 'connection_pool'
 gem 'memcachier'
 gem 'octokit'

data/misc/paas/heroku/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/tdiary/tdiary-contrib.git
-  revision: bea21c05349d243e7bc64fc8d1707af0bc5d5eb9
+  revision: 783d72144db8392edc8306c1dc8b259c6b557847
   specs:
-    tdiary-contrib (5.2.0)
+    tdiary-contrib (5.2.2)
       coderay
       holiday_japan
       pushbullet_ruby
@@ -21,15 +21,15 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     bson (4.15.0)
     capybara (3.37.1)
       addressable
@@ -42,7 +42,7 @@ GEM
       xpath (~> 3.2)
     childprocess (4.1.0)
     coderay (1.1.3)
-    commonmarker (0.23.4)
+    commonmarker (0.23.5)
     concurrent-ruby (1.1.10)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -52,9 +52,9 @@ GEM
       tins (~> 1.6)
     dalli (2.7.11)
     date (3.2.2)
-    debug (1.5.0)
+    debug (1.6.2)
       irb (>= 1.3.6)
-      reline (>= 0.2.7)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     digest (3.1.0)
     docile (1.4.0)
@@ -66,7 +66,7 @@ GEM
     hashie (5.0.0)
     hikidoc (0.1.0)
     holiday_japan (1.4.4)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     idn-ruby (0.1.4)
     io-console (0.5.11)
@@ -90,14 +90,14 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    mongo (2.17.1)
-      bson (>= 4.8.2, < 5.0.0)
-    mongoid (7.4.0)
+    minitest (5.16.3)
+    mongo (2.18.1)
+      bson (>= 4.14.1, < 5.0.0)
+    mongoid (7.5.1)
       activemodel (>= 5.1, < 7.1, != 7.0.0)
       mongo (>= 2.10.5, < 3.0.0)
       ruby2_keywords (~> 0.0.5)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
@@ -105,12 +105,13 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    oauth (0.5.10)
+    oauth (1.0.0)
+      version_gem (~> 1.1)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -127,18 +128,18 @@ GEM
     phantomjs (2.1.1.0)
     pit (0.0.7)
     power_assert (2.0.1)
-    public_suffix (4.0.7)
-    puma (5.6.4)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
     pushbullet_ruby (1.1.4)
       faraday (>= 0.13.0, < 1.0)
       mime-types
     racc (1.6.0)
-    rack (2.2.3.1)
-    rack-protection (2.2.0)
+    rack (2.2.4)
+    rack-protection (2.2.2)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
@@ -167,20 +168,20 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    selenium-webdriver (4.2.0)
+    selenium-webdriver (4.4.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sequel (5.56.0)
+    sequel (5.59.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     sync (0.5.0)
-    tdiary (5.2.1)
+    tdiary (5.2.2)
       bundler (>= 1.3, < 3.0)
       emot
       fastimage
@@ -208,11 +209,12 @@ GEM
     twitter-text (3.1.0)
       idn-ruby
       unf (~> 0.1.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
+    version_gem (1.1.0)
     webrick (1.7.0)
     websocket (1.2.9)
     xpath (3.2.0)
@@ -260,7 +262,7 @@ DEPENDENCIES
   webrick
 
 RUBY VERSION
-   ruby 3.1.1p18
+   ruby 3.1.2p20
 
 BUNDLED WITH
-   2.3.8
+   2.3.7

data/vendor/bundle/ruby/3.1.0/bin/bundle

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ENV['BUNDLER_VERSION'] = str
+
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundle', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundle", version)
+end

data/vendor/bundle/ruby/3.1.0/bin/bundler

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ENV['BUNDLER_VERSION'] = str
+
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundler', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundler", version)
+end

data/vendor/bundle/ruby/3.1.0/bin/irb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'irb' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('irb', 'irb', version)
+else
+gem "irb", version
+load Gem.bin_path("irb", "irb", version)
+end

data/vendor/bundle/ruby/3.1.0/bin/rackup

@@ -2,7 +2,7 @@
 #
 # This file was generated by RubyGems.
 #
-# The application 'rack' is installed as part of a gem, and
+# The application 'rackup' is installed as part of a gem, and
 # this file is here to facilitate running it.
 #
 
@@ -22,8 +22,8 @@ if str
 end
 
 if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('rack', 'rackup', version)
+load Gem.activate_bin_path('rackup', 'rackup', version)
 else
-gem "rack", version
-load Gem.bin_path("rack", "rackup", version)
+gem "rackup", version
+load Gem.bin_path("rackup", "rackup", version)
 end

data/vendor/bundle/ruby/3.1.0/extensions/x86_64-linux/3.1.0/debug-1.6.3/gem_make.out

@@ -0,0 +1,16 @@
+current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/debug-1.6.3/ext/debug
+/usr/local/bin/ruby -I /usr/local/lib/ruby/3.1.0 extconf.rb
+creating Makefile
+
+current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/debug-1.6.3/ext/debug
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-8bfmtp sitelibdir\=./.gem.20221129-3781-8bfmtp clean
+
+current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/debug-1.6.3/ext/debug
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-8bfmtp sitelibdir\=./.gem.20221129-3781-8bfmtp
+compiling debug.c
+compiling iseq_collector.c
+linking shared-object debug/debug.so
+
+current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/debug-1.6.3/ext/debug
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-8bfmtp sitelibdir\=./.gem.20221129-3781-8bfmtp install
+/usr/bin/install -c -m 0755 debug.so ./.gem.20221129-3781-8bfmtp/debug

data/vendor/bundle/ruby/3.1.0/extensions/x86_64-linux/3.1.0/json-2.6.2/gem_make.out

@@ -1,13 +1,13 @@
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/json-2.6.2/ext/json
-/usr/local/bin/ruby -I /usr/local/lib/ruby/3.1.0 -r ./siteconf20220529-9431-5txynh.rb extconf.rb
+/usr/local/bin/ruby -I /usr/local/lib/ruby/3.1.0 extconf.rb
 creating Makefile
 
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/json-2.6.2/ext/json
-make DESTDIR\= clean
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-7vnr53 sitelibdir\=./.gem.20221129-3781-7vnr53 clean
 
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/json-2.6.2/ext/json
-make DESTDIR\=
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-7vnr53 sitelibdir\=./.gem.20221129-3781-7vnr53
 make: Nothing to be done for 'all'.
 
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/json-2.6.2/ext/json
-make DESTDIR\= install
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-7vnr53 sitelibdir\=./.gem.20221129-3781-7vnr53 install

data/vendor/bundle/ruby/3.1.0/extensions/x86_64-linux/3.1.0/redcarpet-3.5.1/gem_make.out

@@ -1,12 +1,12 @@
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/redcarpet-3.5.1/ext/redcarpet
-/usr/local/bin/ruby -I /usr/local/lib/ruby/3.1.0 -r ./siteconf20220529-9431-5a7shm.rb extconf.rb
+/usr/local/bin/ruby -I /usr/local/lib/ruby/3.1.0 extconf.rb
 creating Makefile
 
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/redcarpet-3.5.1/ext/redcarpet
-make DESTDIR\= clean
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-xe63va sitelibdir\=./.gem.20221129-3781-xe63va clean
 
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/redcarpet-3.5.1/ext/redcarpet
-make DESTDIR\=
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-xe63va sitelibdir\=./.gem.20221129-3781-xe63va
 compiling autolink.c
 compiling buffer.c
 buffer.c: In function ‘bufcstr’:
@@ -91,5 +91,5 @@ compiling stack.c
 linking shared-object redcarpet.so
 
 current directory: /home/t/src/tdiary/core/vendor/bundle/ruby/3.1.0/gems/redcarpet-3.5.1/ext/redcarpet
-make DESTDIR\= install
-/usr/bin/install -c -m 0755 redcarpet.so ./.gem.20220529-9431-637rfk
+make DESTDIR\= sitearchdir\=./.gem.20221129-3781-xe63va sitelibdir\=./.gem.20221129-3781-xe63va install
+/usr/bin/install -c -m 0755 redcarpet.so ./.gem.20221129-3781-xe63va