http-cookie 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8164cb03f90d107b135379101cbc38ca71bfb1b850410007d739c38c3097036
-  data.tar.gz: 1171fba029df999fd8c27a1ddb42626840510cf1b9521f5d48282f0578f8c94f
+  metadata.gz: 969f67e57846abc8cdb185d5a94581d1e3a71e136955d2528ef302b1bff35b7b
+  data.tar.gz: e79b8cb800e9726fcfed81bbdbe66a0cdced64809b0deec305015d5564e40c5e
 SHA512:
-  metadata.gz: b41e686acc80a67ceb08ef01ce608de1cf67790364f1dba9255ff595b30dcd361316d50d5dcca03c1f3d0d2c506c507fa707fdd1cfe4963076b7bdef0551a2f7
-  data.tar.gz: d88dc3ccf9dad9bf2ee56b27ad137e87c9ff19e29d2ef28814c6eb06038e3db8cb93fa6be17a7cc8cbfc00ad70f086409ab41d7a1ff52fdacffbedee39302013
+  metadata.gz: b1ddeeba22838c75e9638ac9b04f5cf98d985917ff9066ae79f77e91a6a08725ae27ad45de84f6c6bdd49117798572a7703ee871097124901ae008b5a899f6b5
+  data.tar.gz: 37b3457fcd0722b7db58deff7a4ca937ddac0be7ced0f5c4efc46cd6e706be66473995b13288d881c688d3d050da9140cb9952be6fc92c09b281f611d563f5f0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.1 (2026-04-06)
+
+- Fix thread-unsafe runtime requires. (#43 by @brasic, #57)
+- Replace `require 'cgi'` with `require 'cgi/escape'` to suppress Ruby 4.0 warning. (#56 by @dominion525)
+- Do not define `MozillaStore` on JRuby; leave the constant undefined instead.
+
+
 ## 1.1.0 (2025-09-26)
 
 - Implement `Cookie#to_h`. (#55) @luke-hill @flavorjones

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Akinori MUSHA
+Copyright (c) 2013-2026 Akinori MUSHA
 Copyright (c) 2011-2012 Akinori MUSHA, Eric Hodel
 Copyright (c) 2006-2011 Aaron Patterson, Mike Dalessio
 

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/http/cookie.rb

@@ -6,11 +6,8 @@ require 'time'
 require 'uri'
 require 'domain_name'
 require 'http/cookie/ruby_compat'
-require 'cgi'
-
-module HTTP
-  autoload :CookieJar, 'http/cookie_jar'
-end
+require 'cgi/escape'
+require 'http/cookie_jar'
 
 # This class is used to represent an HTTP Cookie.
 class HTTP::Cookie

data/lib/http/cookie_jar/abstract_saver.rb

@@ -2,29 +2,15 @@
 
 # An abstract superclass for all saver classes.
 class HTTP::CookieJar::AbstractSaver
-  class << self
-    @@class_map = {}
 
-    # Gets an implementation class by the name, optionally trying to
-    # load "http/cookie_jar/*_saver" if not found.  If loading fails,
-    # IndexError is raised.
-    def implementation(symbol)
-      @@class_map.fetch(symbol)
-    rescue IndexError
-      begin
-        require 'http/cookie_jar/%s_saver' % symbol
-        @@class_map.fetch(symbol)
-      rescue LoadError, IndexError
-        raise IndexError, 'cookie saver unavailable: %s' % symbol.inspect
-      end
-    end
-
-    def inherited(subclass) # :nodoc:
-      @@class_map[class_to_symbol(subclass)] = subclass
-    end
-
-    def class_to_symbol(klass) # :nodoc:
-      klass.name[/[^:]+?(?=Saver$|$)/].downcase.to_sym
+  def self.implementation(symbol)
+    case symbol
+    when :yaml
+      HTTP::CookieJar::YAMLSaver
+    when :cookiestxt
+      HTTP::CookieJar::CookiestxtSaver
+    else
+      raise IndexError, 'cookie saver unavailable: %s' % symbol.inspect
     end
   end
 
@@ -63,3 +49,6 @@ class HTTP::CookieJar::AbstractSaver
     # self
   end
 end
+
+require "http/cookie_jar/yaml_saver"
+require "http/cookie_jar/cookiestxt_saver"

data/lib/http/cookie_jar/abstract_store.rb

@@ -6,29 +6,18 @@ class HTTP::CookieJar::AbstractStore
   include MonitorMixin
 
   class << self
-    @@class_map = {}
 
-    # Gets an implementation class by the name, optionally trying to
-    # load "http/cookie_jar/*_store" if not found.  If loading fails,
-    # IndexError is raised.
+    # Gets an implementation class by the name.
     def implementation(symbol)
-      @@class_map.fetch(symbol)
-    rescue IndexError
-      begin
-        require 'http/cookie_jar/%s_store' % symbol
-        @@class_map.fetch(symbol)
-      rescue LoadError, IndexError => e
-        raise IndexError, 'cookie store unavailable: %s, error: %s' % [symbol.inspect, e.message]
+      case symbol
+      when :hash
+        HTTP::CookieJar::HashStore
+      when :mozilla
+        HTTP::CookieJar::MozillaStore
+      else
+        raise IndexError, 'cookie store unavailable: %s' % symbol.inspect
       end
     end
-
-    def inherited(subclass) # :nodoc:
-      @@class_map[class_to_symbol(subclass)] = subclass
-    end
-
-    def class_to_symbol(klass) # :nodoc:
-      klass.name[/[^:]+?(?=Store$|$)/].downcase.to_sym
-    end
   end
 
   # Defines options and their default values.
@@ -122,3 +111,9 @@ class HTTP::CookieJar::AbstractStore
     # self
   end
 end
+
+require 'http/cookie_jar/hash_store'
+
+unless defined?(JRUBY_VERSION)
+  require 'http/cookie_jar/mozilla_store'
+end

data/lib/http/cookie_jar/cookiestxt_saver.rb

@@ -1,5 +1,4 @@
 # :markup: markdown
-require 'http/cookie_jar'
 
 # CookiestxtSaver saves and loads cookies in the cookies.txt format.
 class HTTP::CookieJar::CookiestxtSaver < HTTP::CookieJar::AbstractSaver

data/lib/http/cookie_jar/hash_store.rb

@@ -1,5 +1,4 @@
 # :markup: markdown
-require 'http/cookie_jar'
 
 class HTTP::CookieJar
   # A store class that uses a hash-based cookie store.

data/lib/http/cookie_jar/mozilla_store.rb

@@ -1,6 +1,5 @@
 # :markup: markdown
-require 'http/cookie_jar'
-require 'sqlite3'
+autoload :SQLite3, 'sqlite3'
 
 class HTTP::CookieJar
   # A store class that uses Mozilla compatible SQLite3 database as

data/lib/http/cookie_jar/yaml_saver.rb

@@ -1,7 +1,5 @@
 # :markup: markdown
-require 'http/cookie_jar'
-require 'psych' if !defined?(YAML) && RUBY_VERSION == "1.9.2"
-require 'yaml'
+autoload :YAML, 'yaml'
 
 # YAMLSaver saves and loads cookies in the YAML format.  It can load a
 # YAML file saved by Mechanize, but the saving format is not
@@ -74,13 +72,9 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
     {}
   end
 
-  if YAML.name == 'Psych' && Psych::VERSION >= '3.1'
-    def load_yaml(yaml)
-      YAML.safe_load(yaml, :permitted_classes => %w[Time HTTP::Cookie Mechanize::Cookie DomainName], :aliases => true)
-    end
-  else
-    def load_yaml(yaml)
-      YAML.load(yaml)
-    end
+  def load_yaml(yaml)
+    YAML.safe_load(yaml, :permitted_classes => %w[Time HTTP::Cookie Mechanize::Cookie DomainName], :aliases => true)
+  rescue NoMethodError # ruby < 2.0, no safe_load
+    YAML.load(yaml)
   end
 end

data/lib/http/cookie_jar.rb

@@ -1,31 +1,10 @@
 # :markup: markdown
-require 'http/cookie'
 
 ##
 # This class is used to manage the Cookies that have been returned from
 # any particular website.
 
 class HTTP::CookieJar
-  class << self
-    def const_missing(name)
-      case name.to_s
-      when /\A([A-Za-z]+)Store\z/
-        file = 'http/cookie_jar/%s_store' % $1.downcase
-      when /\A([A-Za-z]+)Saver\z/
-        file = 'http/cookie_jar/%s_saver' % $1.downcase
-      end
-      begin
-        require file
-      rescue LoadError
-        raise NameError, 'can\'t resolve constant %s; failed to load %s' % [name, file]
-      end
-      if const_defined?(name)
-        const_get(name)
-      else
-        raise NameError, 'can\'t resolve constant %s after loading %s' % [name, file]
-      end
-    end
-  end
 
   attr_reader :store
 
@@ -342,3 +321,6 @@ class HTTP::CookieJar
     self
   end
 end
+
+require 'http/cookie_jar/abstract_store'
+require 'http/cookie_jar/abstract_saver'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Akinori MUSHA
@@ -30,14 +30,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.9
 specification_version: 4
 summary: A Ruby library to handle HTTP Cookies based on RFC 6265
 test_files: []