tdiary 5.5.0 → 5.6.0

data/lib/tdiary/view.rb

@@ -7,12 +7,12 @@ module TDiary
 		def initialize( cgi, rhtml, conf )
 			super
 
-			unless referer_filter( @cgi.referer )
-				def @cgi.referer; nil; end
+			unless referer_filter( @request.referer )
+				@request.hide_referer!
 			end
 
 			# save referer to latest
-			if (!@conf.referer_day_only or (@cgi.params['date'][0] and @cgi.params['date'][0].length == 8)) and @cgi.referer then
+			if (!@conf.referer_day_only or (@request.param('date') and @request.param('date').length == 8)) and @request.referer then
 				ym = latest_month
 				@date = ym ? Time::local( ym[0], ym[1] ) : Time::now
 				@io.transaction( @date ) do |diaries|
@@ -23,7 +23,7 @@ module TDiary
 						break if @diary.visible?
 					end
 					if @diary then
-						@diary.add_referer( @cgi.referer )
+						@diary.add_referer( @request.referer )
 						dirty = DIRTY_REFERER
 					end
 					dirty
@@ -121,7 +121,7 @@ module TDiary
 
 			begin
 				# time is noon for easy to calc leap second.
-				@date = Time::local( *@cgi.params['date'][0].scan( /^(\d{4})(\d\d)(\d\d)$/ )[0] ) + 12*60*60
+				@date = Time::local( *@request.param('date').scan( /^(\d{4})(\d\d)(\d\d)$/ )[0] ) + 12*60*60
 				load( @date )
 			rescue ArgumentError, NameError
 				raise TDiaryError, 'bad date'
@@ -149,8 +149,8 @@ module TDiary
 					@diaries = diaries
 					dirty = DIRTY_NONE
 					@diary = self[date]
-					if @diary and @cgi.referer then
-						@diary.add_referer( @cgi.referer )
+					if @diary and @request.referer then
+						@diary.add_referer( @request.referer )
 						dirty = DIRTY_REFERER
 					end
 					dirty
@@ -161,11 +161,11 @@ module TDiary
 		end
 
 		def cookie_name
-			@cgi.cookies['tdiary'][0] or ''
+			@request.cgi_cookies['tdiary'][0] or ''
 		end
 
 		def cookie_mail
-			@cgi.cookies['tdiary'][1] or ''
+			@request.cgi_cookies['tdiary'][1] or ''
 		end
 	end
 
@@ -189,9 +189,9 @@ module TDiary
 
 		def load( date )
 			@date = date
-			@name = @cgi.params['name'][0]
-			@mail = @cgi.params['mail'][0]
-			@body = @cgi.params['body'][0]
+			@name = @request.param('name')
+			@mail = @request.param('mail')
+			@body = @request.param('body')
 			@name = @conf.to_native( @name )
 			@body = @conf.to_native( @body )
 			@comment = Comment::new( @name, @mail, @body )
@@ -203,13 +203,18 @@ module TDiary
 				if @diary and comment_filter( @diary, @comment ) then
 					@diary.add_comment( @comment )
 					dirty = DIRTY_COMMENT
-					cookie_path = File::dirname( @cgi.script_name )
+					script_name = @request.script_name
+					cookie_path = script_name.empty? ? '/' : File::dirname( script_name )
 					cookie_path += '/' if cookie_path !~ /\/$/
-					@cookies << CGI::Cookie::new( {
-						'name' => 'tdiary',
-						'value' => [@name,@mail],
-						'path' => cookie_path,
-						'expires' => Time::now.gmtime + 90*24*60*60 # 90days
+					# the escaped 'name&mail' multi-value format must be kept;
+					# CGI::Cookie.parse on the reading side splits on '&'
+					@cookies << ::Rack::Utils.set_cookie_header( 'tdiary', {
+						value: [@name, @mail],
+						path: cookie_path,
+						expires: Time::now.gmtime + 90*24*60*60, # 90days
+						secure: @request.ssl?,
+						http_only: true,
+						same_site: :lax
 					} )
 					@io.clear_cache( /(latest|#{@date.strftime( '%Y%m' )})/ )
 				else
@@ -254,7 +259,7 @@ module TDiary
 			super
 
 			begin
-				date = Time::local( *@cgi.params['date'][0].scan( /^(\d{4})(\d\d)$/ )[0] )
+				date = Time::local( *@request.param('date').scan( /^(\d{4})(\d\d)$/ )[0] )
 				d1 = @date.dup.gmtime if @date
 				d2 = date.dup.gmtime
 				if not @date or d1.year != d2.year or d1.month != d2.month then
@@ -280,7 +285,7 @@ module TDiary
 			super
 
 			@diaries = {}
-			month, day = @cgi.params['date'][0].scan(/^(\d\d)(\d\d)$/)[0]
+			month, day = @request.param('date').scan(/^(\d\d)(\d\d)$/)[0]
 			nyear(month).each do |y, m|
 				@date = Time::local(y, m)
 				@io.transaction(@date) do |diaries|
@@ -318,8 +323,8 @@ module TDiary
 		def initialize( cgi, rhtml, conf )
 			super
 
-			if @cgi.params['date'][0] then
-				ym = [@cgi.params['date'][0][0,4].to_i, @cgi.params['date'][0][4,2].to_i]
+			if @request.param('date') then
+				ym = [@request.param('date')[0,4].to_i, @request.param('date')[4,2].to_i]
 				@date = nil
 			else
 				ym = latest_month
@@ -329,8 +334,8 @@ module TDiary
 				@date = ym ? Time::local( ym[0], ym[1] ) : Time::now
 				@io.transaction( @date ) do |diaries|
 					@diaries = diaries
-					if @cgi.params['date'][0] then
-						@diary = @diaries[@cgi.params['date'][0][0,8]]
+					if @request.param('date') then
+						@diary = @diaries[@request.param('date')[0,8]]
 						@date = @diary.date if @diary
 					end
 					unless @diary then
@@ -442,16 +447,16 @@ module TDiary
 		end
 
 		def start_date
-			if @cgi.params['date'][0] then
-				@cgi.params['date'][0][0,8]
+			if @request.param('date') then
+				@request.param('date')[0,8]
 			else
 				'99999999' # max of date string
 			end
 		end
 
 		def limit_size( default_limit )
-			if @cgi.params['date'][0] then
-				date = @cgi.params['date'][0]
+			if @request.param('date') then
+				date = @request.param('date')
 				limit = date[9,date.length-9].to_i
 				limit = 30 if limit > 30
 				limit

data/lib/tdiary/view_helper.rb

@@ -1,15 +1,23 @@
 module TDiary
   module ViewHelper
 		def bot?
-			@conf.bot =~ @cgi.user_agent
+			@conf.bot =~ view_helper_request.user_agent
 		end
 
     def base_url
       if @conf.options['base_url'] && @conf.options['base_url'].length > 0
         @conf.options['base_url']
       else
-        @cgi.base_url
+        view_helper_request.tdiary_base_url
       end
     end
+
+  private
+
+    # plugins include this helper into objects that hold only the @cgi
+    # facade (misc/plugin/makerss.rb); fall back to its wrapped request
+    def view_helper_request
+      @request || @cgi.request
+    end
   end
 end

data/lib/tdiary.rb

@@ -16,6 +16,12 @@ $:.unshift File.join(File::dirname(__FILE__), '../misc/lib')
 	Dir[File.join(File.dirname(__FILE__), path)].each {|dir| $:.unshift dir }
 end
 
+# Set up the bundle before requiring anything that ships as a default gem.
+# A CGI process starts without RUBYOPT or BUNDLE_GEMFILE (WEBrick's CGI runner
+# wipes the environment), so requiring 'cgi' first activates the version bundled
+# with Ruby and Bundler then fails on the version the Gemfile asks for.
+require 'tdiary/environment'
+
 gem 'cgi' if RUBY_VERSION >= '4.0'
 require 'cgi'
 require 'uri'
@@ -23,7 +29,6 @@ require 'fileutils'
 require 'pstore'
 require 'json'
 require 'erb'
-require 'tdiary/environment'
 require 'tdiary/core_ext'
 
 #

data/misc/plugin/image.rb

@@ -101,7 +101,7 @@ end
 #
 # initialize
 #
-@image_dir = (@options && @options['image.dir']) || File.join(TDiary.server_root, @cgi.is_a?(RackCGI) ? 'public/images' : 'images')
+@image_dir = (@options && @options['image.dir']) || File.join(TDiary.server_root, @cgi.static_assets? ? 'images' : 'public/images')
 @image_dir.chop! if /\/$/ =~ @image_dir
 FileUtils.mkdir_p @image_dir unless File.exist?(@image_dir)
 

data/misc/plugin/makerss.rb

@@ -177,10 +177,10 @@ class MakeRssFull
 	end
 
 	def document_root
-		if @cgi.is_a?(RackCGI)
-			File.join(TDiary.server_root, 'public')
-		else
+		if @cgi.static_assets?
 			TDiary.server_root
+		else
+			File.join(TDiary.server_root, 'public')
 		end
 	end
 end

data/tdiary.conf.sample

@@ -75,6 +75,14 @@
 #   必要です。blog-category プラグイン利用時は自動的に無効になります。
 #@options['plugin.cache'] = true
 
+# 静的アセットの配信元URL【オプション】
+#   テーマやJavaScriptなどの静的ファイルを、CDNや別ホストなど任意のURLから
+#   配信する場合に指定します。指定すると、Rack・CGI・FCGIのどの実行形態でも
+#   このURLを元にテーマやJavaScriptのURLを生成します。配信元には、Rackアプ
+#   リのassets配下と同じ構成(jsディレクトリとthemeディレクトリの内容をひと
+#   つのディレクトリにまとめた構成)でファイルを配置してください。
+#@options['assets_url'] = 'https://assets.example.org/tdiary'
+
 # プラグインに渡すオプション【オプション】
 #   プラグインによっては、tdiary.conf経由でオプションを渡すことで挙動を
 #   変更できるものがあります。@optionsはそのオプションを指定する時に使う

data/tdiary.conf.sample-en

@@ -62,6 +62,14 @@
 #   any directory for cache files by this variable.
 #@cache_path = 'path of cache files'
 
+# base URL of static assets. (optional)
+#   Set this to serve theme and JavaScript files from another URL, such
+#   as a CDN. When set, every hosting mode (Rack, CGI and FCGI) builds
+#   theme and JavaScript URLs from it. The serving location must use the
+#   same merged layout as the assets/ mount of the Rack application (the
+#   contents of the js and theme directories under one root).
+#@options['assets_url'] = 'https://assets.example.org/tdiary'
+
 # options for plugins. (optional)
 #   Some plugins can receive options from tdiary.conf.
 #     ex: a option "foo" of plugin "sample".

data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/cgi-0.5.2/gem_make.out

@@ -3,16 +3,16 @@ current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/
 creating Makefile
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/cgi-0.5.2/ext/cgi/escape
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-p7gzfo sitelibdir\=./.gem.20260724-2392-p7gzfo clean
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-m2rodt sitelibdir\=./.gem.20260904-2409-m2rodt clean
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/cgi-0.5.2/ext/cgi/escape
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-p7gzfo sitelibdir\=./.gem.20260724-2392-p7gzfo
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-m2rodt sitelibdir\=./.gem.20260904-2409-m2rodt
 compiling escape.c
 linking shared-object cgi/escape.so
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/cgi-0.5.2/ext/cgi/escape
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-p7gzfo sitelibdir\=./.gem.20260724-2392-p7gzfo install
-/usr/bin/install -c -m 0755 escape.so ./.gem.20260724-2392-p7gzfo/cgi
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-m2rodt sitelibdir\=./.gem.20260904-2409-m2rodt install
+/usr/bin/install -c -m 0755 escape.so ./.gem.20260904-2409-m2rodt/cgi
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/cgi-0.5.2/ext/cgi/escape
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-p7gzfo sitelibdir\=./.gem.20260724-2392-p7gzfo clean
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-m2rodt sitelibdir\=./.gem.20260904-2409-m2rodt clean

data/vendor/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/date-3.5.1/gem_make.out

@@ -6,10 +6,10 @@ checking for altzone in time.h with -Werror... no
 creating Makefile
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/date-3.5.1/ext/date
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-lclah2 sitelibdir\=./.gem.20260724-2392-lclah2 clean
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-mbib62 sitelibdir\=./.gem.20260904-2409-mbib62 clean
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/date-3.5.1/ext/date
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-lclah2 sitelibdir\=./.gem.20260724-2392-lclah2
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-mbib62 sitelibdir\=./.gem.20260904-2409-mbib62
 compiling date_core.c
 compiling date_parse.c
 compiling date_strftime.c
@@ -17,8 +17,8 @@ compiling date_strptime.c
 linking shared-object date_core.so
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/date-3.5.1/ext/date
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-lclah2 sitelibdir\=./.gem.20260724-2392-lclah2 install
-/usr/bin/install -c -m 0755 date_core.so ./.gem.20260724-2392-lclah2
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-mbib62 sitelibdir\=./.gem.20260904-2409-mbib62 install
+/usr/bin/install -c -m 0755 date_core.so ./.gem.20260904-2409-mbib62
 
 current directory: /home/runner/work/tdiary-core/tdiary-core/vendor/bundle/ruby/3.4.0/gems/date-3.5.1/ext/date
-make DESTDIR\= sitearchdir\=./.gem.20260724-2392-lclah2 sitelibdir\=./.gem.20260724-2392-lclah2 clean
+make DESTDIR\= sitearchdir\=./.gem.20260904-2409-mbib62 sitelibdir\=./.gem.20260904-2409-mbib62 clean

data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.5.15 → net-imap-0.6.6}/Gemfile

@@ -7,10 +7,11 @@ gemspec
 # gem "digest"  # not included as a workaround for #576
 gem "strscan"
 gem "base64"
+gem "psych", ">= 5.3.0" # 5.2.5 for Data serialization, 5.3.0 for TruffleRuby
 
 gem "irb"
 gem "rake"
-gem "rdoc"
+gem "rdoc", ">= 7.2.0"
 gem "test-unit"
 gem "test-unit-ruby-core", git: "https://github.com/ruby/test-unit-ruby-core"
 
@@ -19,7 +20,5 @@ gem "benchmark-driver", require: false
 gem "vernier", require: false, platform: :mri
 
 group :test do
-  gem "simplecov",        require: false, platforms: %i[mri windows]
-  gem "simplecov-html",   require: false, platforms: %i[mri windows]
-  gem "simplecov-json",   require: false, platforms: %i[mri windows]
+  gem "simplecov", ">= 1.0.0", require: false, platforms: %i[mri windows]
 end

data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.5.15 → net-imap-0.6.6}/README.md

@@ -61,9 +61,9 @@ imap.search(["BEFORE", "30-Apr-2003", "SINCE", "1-Apr-2003"]).each do |message_i
   else
     imap.copy(message_id, "Mail/sent-apr03")
     imap.store(message_id, "+FLAGS", [:Deleted])
+    imap.expunge
   end
 end
-imap.expunge
 ```
 
 ## Development

data/vendor/bundle/ruby/3.4.0/gems/net-imap-0.6.6/Rakefile

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "rake/clean"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test/lib"
+  t.ruby_opts << "-rhelper"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task :default => :test
+
+desc "Output coverage data report, and error when threshholds aren't met"
+task "coverage:report" do
+  require "simplecov"
+  SimpleCov.collate "coverage/.resultset.json" do
+    coverage(:line) do
+      minimum           90
+      minimum_per_file  40
+    end
+  end
+end

data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.5.15 → net-imap-0.6.6}/lib/net/imap/command_data.rb

@@ -3,7 +3,6 @@
 require "date"
 
 require_relative "errors"
-require_relative "data_lite"
 
 # :enddoc:
 
@@ -16,6 +15,9 @@ module Net
       case data
       when nil
       when String
+        if data.include?("\0")
+          raise DataFormatError, "String argument contains NULL byte"
+        end
       when Integer
         # Covers modseq-valzer, which is the largest valid IMAP integer
         if data.negative?
@@ -56,33 +58,42 @@ module Net
       end
     end
 
+    UNQUOTABLE_CHARS = /[\0\r\n]/
+    ASTRING_SPECIALS = /[(){ \x00-\x1f\x7f%*"\\]/
+    private_constant :UNQUOTABLE_CHARS, :ASTRING_SPECIALS
+
+    # Sends generic strings formatted as +astring+:
+    # * as an atom (note: this is based on +ASTRING-CHAR+, not +ATOM-CHAR+)
+    # * as a quoted string
+    # * as a literal (may send non-synchronizing)
+    #
+    # NOTE: This does not validate that +str+ contains no +NULL+ bytes.
     def send_string_data(str, tag = nil)
       if str.empty?
+        # same as send_quoted_string(str), but incompatible encoding is allowed
         put_string('""')
-      elsif str.match?(/[\r\n]/n)
-        # literal, because multiline
-        send_literal(str, tag)
-      elsif !str.ascii_only?
-        if @utf8_strings
-          # quoted string
-          send_quoted_string(str)
-        else
-          # literal, because of non-ASCII bytes
-          send_literal(str, tag)
-        end
-      elsif str.match?(/[(){ \x00-\x1f\x7f%*"\\]/n)
-        # quoted string
+      elsif str.ascii_only? && !str.match?(ASTRING_SPECIALS)
+        # valid +astring+ atom: non-empty, ASCII only, no ASTRING_SPECIALS
+        put_string(str)
+      elsif text_encodable?(str) && !str.match?(UNQUOTABLE_CHARS)
         send_quoted_string(str)
       else
-        put_string(str)
+        send_literal(str, tag)
       end
     end
 
-    def send_quoted_string(str)
-      put_string('"' + str.gsub(/["\\]/, "\\\\\\&") + '"')
+    # Encodable as +text+ (which is a superset of +quoted+):
+    # * ASCII only (for any ASCII compatible encoding)
+    # * or valid UTF-8 (when the connection supports it)
+    def text_encodable?(str)
+      str.ascii_only? || (utf8_enabled? &&
+                          str.encoding == Encoding::UTF_8 &&
+                          str.valid_encoding?)
     end
 
-    def send_binary_literal(*a, **kw); send_literal(*a, **kw, binary: true) end
+    def send_quoted_string(str) = QuotedString.new(data: str).send_data(self)
+
+    def send_binary_literal(*, **) = send_literal(*, **, binary: true)
 
     # `non_sync` is an optional tri-state flag:
     # * `true`  -> Force non-synchronizing `LITERAL+`/`LITERAL-` behavior.
@@ -90,7 +101,6 @@ module Net
     #   non-synchronizing literal, or literal is too large for LITERAL-.
     # * `false` -> Force normal synchronizing literal behavior.
     # * `nil`   -> (default) Currently behaves like `false` (will be dynamic).
-    #   TODO: Dynamic, based on capabilities and bytesize.
     def send_literal(str, tag = nil, binary: false, non_sync: nil)
       bytesize = str.bytesize
       synchronize do
@@ -100,6 +110,7 @@ module Net
           raise DataFormatError, "Connection closed: " \
             "Cannot send non-synchronizing literal without known server support"
         end
+        non_sync = non_sync_literal?(bytesize) if non_sync.nil?
         prefix = "~" if binary
         plus = "+" if non_sync
         put_string("#{prefix}{#{bytesize}#{plus}}\r\n")
@@ -111,8 +122,7 @@ module Net
         @continuation_request_exception = nil
         begin
           @continuation_request_arrival.wait
-          e = @continuation_request_exception || @exception
-          raise e if e
+          reraise @continuation_request_exception || @exception
           put_string(str)
         ensure
           @continued_command_tag = nil
@@ -121,6 +131,11 @@ module Net
       end
     end
 
+    def non_sync_literal?(bytesize)
+      bytesize <= config.max_non_synchronizing_literal \
+        && non_sync_literal_allowed?(bytesize)
+    end
+
     def non_sync_literal_allowed?(bytesize)
       return unless capabilities_cached?
       return "+" if capable?("LITERAL+")
@@ -152,6 +167,9 @@ module Net
     def send_date_data(date) put_string Net::IMAP.encode_date(date) end
     def send_time_data(time) put_string Net::IMAP.encode_time(time) end
 
+    # NOTE: Currently for internal use only.  The API is expected to change.
+    Command = Data.define(:tag, :name) # :nodoc:
+
     CommandData = Data.define(:data) do # :nodoc:
       def self.validate(...)
         data = new(...)
@@ -249,10 +267,10 @@ module Net
         parts = []
         while data.match(/(~)?\{(0|[1-9]\d*)(\+)?\}\r\n/n)
           text, binary, bytesize, non_sync, data = $`, !!$1, $2, !!$3, $'
-          bytesize = Integer bytesize, 10
+          bytesize = NumValidator.coerce_number64 bytesize
           parts << RawText[text] unless text.empty?
           parts << extract_literal(data, binary:, bytesize:, non_sync:)
-          data[0, bytesize] = ""
+          data.bytesplice(0, bytesize, "")
         end
         parts << RawText[data] unless data.empty?
         parts
@@ -269,6 +287,17 @@ module Net
       private_class_method :extract_literal
     end
 
+    # Please note that +ATOM-CHAR+ and +atom+ are not the same as +ASTRING-char+
+    # and the atom form of +astring+.  +astring+ allows <tt>]</tt>, but +atom+
+    # does not.
+    #
+    # Generic string arguments in Net::IMAP use +astring+, so they will send as
+    # atoms even if they contain <tt>]</tt>.
+    #
+    # This class is used by:
+    # * to validate generic symbol arguments, as the superclass of Flag
+    # * to validate #enable +capabilities+
+    # * to validate #store (and #uid_store) +attr+
     class Atom < CommandData # :nodoc:
       def initialize(**)
         super
@@ -318,7 +347,7 @@ module Net
         validate
       end
 
-      def bytesize; data.bytesize end
+      def bytesize = data.bytesize
 
       def validate
         if data.include?("\0")
@@ -333,7 +362,7 @@ module Net
     end
 
     class Literal8 < Literal # :nodoc:
-      def validate; nil end # all bytes are okay
+      def validate = nil # all bytes are okay
 
       def send_data(imap, tag)
         imap.__send__(:send_binary_literal, data, tag, non_sync:)
@@ -372,73 +401,6 @@ module Net
       end
     end
 
-    # *DEPRECATED*.  Replaced by SequenceSet.
-    class MessageSet < CommandData # :nodoc:
-      def send_data(imap, tag)
-        imap.__send__(:put_string, format_internal(data))
-      end
-
-      def validate
-        validate_internal(data)
-      end
-
-      private
-
-      def initialize(data:)
-        super
-        warn("DEPRECATED: #{MessageSet} should be replaced with #{SequenceSet}.",
-             uplevel: 1, category: :deprecated)
-        begin
-          # to ensure the input works with SequenceSet, too
-          SequenceSet.new(data)
-        rescue
-          warn "MessageSet input is incompatible with SequenceSet: [%s] %s" % [
-            $!.class, $!.message
-          ]
-        end
-      end
-
-      def format_internal(data)
-        case data
-        when "*"
-          return data
-        when Integer
-          if data == -1
-            return "*"
-          else
-            return data.to_s
-          end
-        when Range
-          return format_internal(data.first) +
-            ":" + format_internal(data.last)
-        when Array
-          return data.collect {|i| format_internal(i)}.join(",")
-        when ThreadMember
-          return data.seqno.to_s +
-            ":" + data.children.collect {|i| format_internal(i).join(",")}
-        end
-      end
-
-      def validate_internal(data)
-        case data
-        when "*"
-        when Integer
-          NumValidator.ensure_nz_number(data)
-        when Range
-        when Array
-          data.each do |i|
-            validate_internal(i)
-          end
-        when ThreadMember
-          data.children.each do |i|
-            validate_internal(i)
-          end
-        else
-          raise DataFormatError, data.inspect
-        end
-      end
-    end
-
     class ClientID < CommandData # :nodoc:
 
       def send_data(imap, tag)
@@ -476,6 +438,14 @@ module Net
 
       module_function
 
+      def literal_or_literal8(input, name: "argument")
+        return input if input in Literal | Literal8
+        data = String.try_convert(input) \
+          or raise TypeError, "expected #{name} to be String, got #{input.class}"
+        type = data.include?("\0") ? Literal8 : Literal
+        type.new(data:)
+      end
+
       # Allows symbols in addition to strings
       def valid_string?(str)
         str.is_a?(Symbol) || str.respond_to?(:to_str)

data/vendor/bundle/ruby/3.4.0/gems/{net-imap-0.5.15 → net-imap-0.6.6}/lib/net/imap/config/attr_accessors.rb

@@ -27,24 +27,23 @@ module Net
 
         def self.attr_accessor(name) # :nodoc: internal API
           name = name.to_sym
+          raise ArgumentError, "already defined #{name}" if attributes.include?(name)
+          attributes << name
           def_delegators :data, name, :"#{name}="
         end
 
-        def self.attributes
-          instance_methods.grep(/=\z/).map { _1.to_s.delete_suffix("=").to_sym }
-        end
-        private_class_method :attributes
+        # An array of Config attribute names
+        singleton_class.attr_reader :attributes
+        @attributes = []
 
         def self.struct # :nodoc: internal API
-          unless defined?(self::Struct)
-            const_set :Struct, Struct.new(*attributes)
-          end
-          self::Struct
+          attributes.freeze
+          Struct.new(*attributes)
         end
 
         def initialize # :notnew:
           super()
-          @data = AttrAccessors.struct.new
+          @data = Config::Struct.new
         end
 
         # Freezes the internal attributes struct, in addition to +self+.