racknga 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd550e89e845e0e90ccac2ef34bf3823e03639b0d61e71fe75ee02bb9ad63e2a
-  data.tar.gz: 4365f32450b7b0a9fc95b77cfbe3403119b8f2623824f3b4be199ec594255011
+  metadata.gz: a79351d478e9f65c4a538c46887772e03d50a40ec6184cd293a66c4fd3b17693
+  data.tar.gz: 6063c757219857417651798caa288da2467e891faadaf0ff1699b1ac0f171d0a
 SHA512:
-  metadata.gz: a1d84e5281d56bd2f520d0483f1a9ba6cdd1dafbc363268e466b4fea860dd832892d7b5d84ec9ba6d38ebc74d5d356603e7857543ea21029a512fa0b1cd438ae
-  data.tar.gz: f983eab4c092d7d2215d2d52310ff51dc3568be0fb197444f4a5f0a8a7c36ef806cb45a2451b38636994d9fac6d53cda6ca07008d91f0d18557cf5f2d8ff0fc9
+  metadata.gz: 7b5143554b8e2ded028e10e37f74b6b01064c12a8bfc8fee957bbb0167748cbb043c9ebb0ccbc7e9949239bd095bb971f449dc85e4a4fb7688647b4536fce905
+  data.tar.gz: 902a9509717410a4f9221f7d12b7398485ab7a0ecb2996e80874ffd97f050d52446aca77e20d2a6c2f9365110742d97d55b3704481f6a3debf0070387f82ff50

data/README.md

@@ -0,0 +1,44 @@
+# README
+
+## Name
+
+Racknga
+
+## Description
+
+Rack middlewares that use Rroonga features and
+middlewares/utilities that don't use Rroonga features.
+
+  * [Rroonga](https://ranguba.org/)
+  * [Rack](https://rack.github.io/)
+
+## Authors
+
+  * Sutou Kouhei `<kou@clear-code.com>`
+
+## License
+
+LGPL 2.1 or later. See license/lgpl-2.1.txt for details.
+
+(Sutou Kouhei has a right to change the license
+including contributed patches.)
+
+## Dependencies
+
+  * Ruby >= 1.9.1
+  * Rroonga
+  * Rack
+
+## Suggested libraries
+
+  * jpmobile
+
+## Install
+
+```console
+$ sudo gem install racknga
+```
+
+## Documents
+
+https://ranguba.org/racknga/en/

data/Rakefile

@@ -50,7 +50,7 @@ end
 
 desc "Run test"
 task :test do
-  ruby("-rubygems", "test/run-test.rb")
+  ruby("test/run-test.rb")
 end
 
 task :default => :test

data/doc/text/{news.textile → news.md}

@@ -1,16 +1,25 @@
-h1. NEWS
+# NEWS
 
-h2. 0.9.4: 2023-09-03
+## 0.9.5: 2024-04-08
 
-h3. Improvments
+### Improvments
+
+  * Added `base64` dependency.
+  * Added `net-smtp` dependency.
+  * Removed `nkf` dependency.
+  * Stopped using deprecated APIs of Rack.
+
+## 0.9.4: 2023-09-03
+
+### Improvments
 
   * [cache] Made Rroonga dependency optional. Users must add Rroonga
     dependency explicitly.
   * And more improvements...
 
-h2. 0.9.3: 2011-11-12
+## 0.9.3: 2011-11-12
 
-h3. Improvments
+### Improvments
 
   * [access-log-parser] Supported Apache log.
   * [cache] Fixed unknown name errors.
@@ -20,9 +29,9 @@ h3. Improvments
   * [exception-mail-notifier] Used #message instead of #to_s.
   * [logger] Logged also X-Runtime.
 
-h2. 0.9.2: 2011-08-07
+## 0.9.2: 2011-08-07
 
-h3. Improvments
+### Improvments
 
   * [munin] Supported Passenger 3 support.
   * [munin] Removed Passenger 2 support.
@@ -36,7 +45,7 @@ h3. Improvments
   * Added NginixAccessLogParser.
   * Documented middlewares.
 
-h2. 0.9.1: 2010-11-11
+## 0.9.1: 2010-11-11
 
   * Improved cache validation.
   * Supported caches per User-Agent.
@@ -47,6 +56,6 @@ h2. 0.9.1: 2010-11-11
   * Changed license to LGPLv2.1 or later from LGPLv2.1.
   * Supported will_paginate.
 
-h2. 0.9.0: 2010-07-04
+## 0.9.0: 2010-07-04
 
   * Initial release!

data/lib/racknga/api-keys.rb

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,7 +31,7 @@ module Racknga
     # @return [Boolean] true if an API key is included, or false if not.
     def include?(environment)
       request = Rack::Request.new(environment)
-      key = request[@query_parameter]
+      key = request.params[@query_parameter]
 
       @api_keys.include?(key)
     end

data/lib/racknga/exception_mail_notifier.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2010-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,13 +14,13 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require 'time'
-require 'net/smtp'
-require 'etc'
-require 'socket'
-require 'nkf'
+require "base64"
+require "etc"
+require "net/smtp"
+require "socket"
+require "time"
 
-require 'racknga/utils'
+require "racknga/utils"
 
 module Racknga
   # Ruby 1.9 only. 1.8 isn't supported.
@@ -198,10 +196,13 @@ EOB
     def encode_subject(subject)
       case charset
       when /\Aiso-2022-jp\z/i
-        NKF.nkf('-Wj -M', subject)
-      else
-        NKF.nkf('-Ww -M', subject)
+        subject = subject.encode("ISO-2022-JP")
+      end
+      base64_subject = Base64.encode64(subject)
+      lines = base64_subject.lines.collect do |line|
+        "=?#{charset}?B?#{line.chomp}?="
       end
+      lines.join("\r\n")
     end
   end
 end

data/lib/racknga/middleware/cache.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -138,7 +136,7 @@ module Racknga
       def skip_caching_response?(status, headers, body)
         return true if status != 200
 
-        headers = Rack::Utils::HeaderHash.new(headers)
+        headers = Rack::Headers[headers]
         content_type = headers["Content-Type"]
         if /\A(\w+)\/([\w.+\-]+)\b/ =~ content_type
           media_type = $1
@@ -167,7 +165,7 @@ module Racknga
         end
 
         now = Time.now
-        headers = Rack::Utils::HeaderHash.new(headers)
+        headers = Rack::Headers[headers]
         headers["Last-Modified"] ||= now.httpdate
         encoded_body = ''.force_encoding("ASCII-8BIT")
         deflater = ::Zlib::Deflate.new

data/lib/racknga/middleware/jsonp.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2010-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -84,11 +82,11 @@ module Racknga
       # For Rack.
       def call(environment)
         request = Rack::Request.new(environment)
-        callback = request["callback"]
+        callback = request.params["callback"]
         update_cache_key(request) if callback
         status, headers, body = @application.call(environment)
         return [status, headers, body] unless callback
-        header_hash = Rack::Utils::HeaderHash.new(headers)
+        header_hash = Rack::Headers[headers]
         return [status, headers, body] unless json_response?(header_hash)
         body = Writer.new(callback, body)
         update_header_hash(header_hash, body)

data/lib/racknga/middleware/range.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -38,7 +36,7 @@ module Racknga
         status, headers, body = @application.call(environment)
         return [status, headers, body] if status != 200
 
-        headers = Rack::Utils::HeaderHash.new(headers)
+        headers = Rack::Headers[headers]
         headers["Accept-Ranges"] = "bytes"
         request = Rack::Request.new(environment)
         range = request.env["HTTP_RANGE"]
@@ -60,7 +58,7 @@ module Racknga
 
         if first_byte.empty? and last_byte.empty?
           headers["Content-Length"] = "0"
-          return [Rack::Utils.status_code(:requested_range_not_satisfiable),
+          return [Rack::Utils.status_code(:range_not_satisfiable),
                   headers,
                   []]
         end

data/lib/racknga/version.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2010-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
-  VERSION = '0.9.4'
+  VERSION = "0.9.5"
 end

data/test/racknga-test-utils.rb

@@ -22,11 +22,6 @@ require 'racknga/middleware/auth/api-key'
 require 'racknga/middleware/cache'
 require 'racknga/middleware/instance_name'
 
-Capybara.configure do |config|
-  config.default_driver = nil
-  config.current_driver = nil
-end
-
 module RackngaTestUtils
   include Capybara::DSL
 

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2010-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,6 @@ require "rubygems"
 require "bundler/setup"
 
 require 'test/unit'
-require 'test/unit/notify'
 
 Test::Unit::Priority.enable
 

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: racknga
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,13 +24,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rroonga
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rroonga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +136,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-capybara
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +150,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: test-unit-capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,13 +169,13 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.textile
+- README.md
 files:
 - AUTHORS
 - Gemfile
-- README.textile
+- README.md
 - Rakefile
-- doc/text//news.textile
+- doc/text//news.md
 - lib/racknga.rb
 - lib/racknga/access_log_parser.rb
 - lib/racknga/api-keys.rb
@@ -185,7 +212,6 @@ homepage: http://ranguba.org/
 licenses:
 - LGPLv2.1 or later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: A Rack middleware collection for Rroonga features.
 test_files:

data/README.textile

@@ -1,53 +0,0 @@
-h1. README
-
-h2. Name
-
-Racknga
-
-h2. Description
-
-Rack middlewares that use Rroonga features and
-middlewares/utilities that don't use Rroonga features.
-
-  * "Rroonga":http://ranguba.org/
-  * "Rack":http://rack.github.io/
-
-h2. Authors
-
-  * Kouhei Sutou <kou@clear-code.com>
-
-h2. License
-
-LGPL 2.1 or later. See license/lgpl-2.1.txt for details.
-
-(Kouhei Sutou has a right to change the license
-including contributed patches.)
-
-h2. Dependencies
-
-  * Ruby >= 1.9.1
-  * Rroonga
-  * Rack
-
-h2. Suggested libraries
-
-  * jpmobile
-
-h2. Install
-
-<pre>
-% sudo gem install racknga
-</pre>
-
-h2. Documents
-
-http://ranguba.org/racknga/en/
-
-h2. Mailing list
-
-  * English: "groonga-talk":http://lists.sourceforge.net/mailman/listinfo/groonga-talk
-  * Japanese: "groonga-dev":http://lists.sourceforge.jp/mailman/listinfo/groonga-dev
-
-h2. Thanks
-
-  * ...