http-cookie 1.0.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5230b0bd44e032652855e7b9e60e3d994ca56adbd57550c7520930d4dbf734a4
-  data.tar.gz: 65240197f49ac57bac8c6f3d1104cfe4f8fff77e1ac992c05c72d74efbba8300
+  metadata.gz: 72ef3493437238f93258320d1e8bdfea5d155e731ed6e88d55b284bff3c7a3a0
+  data.tar.gz: ecf432149b7b13a7437ad6c8a8433b85fbe4cf223ba07016831c2da3a8598de2
 SHA512:
-  metadata.gz: 7fc5bb2e287d60d060c54eb9fb9ccb6d55c55e84ec35525deff8c088c873d6ac26db86f7f1cf3c03a7cbf05e397b6cd0e3a1e1171c2dcff8848e0345a34b0905
-  data.tar.gz: 1c85e07a65fac1d5440126bea27dbc01160edc9a791f56e021cd3142070eada54bf1ec3cda31c9d9273f23c3a84c8786c308bcdd27e03f7266c203dde4abdd6f
+  metadata.gz: 110ace005f635800820a73c4c4955cdd0d80fdfddf781949957f2738e0bd7d78068c5d03537f9defa7eba25b7f8156e823897460cd3bf84db8fd7dff55550cd2
+  data.tar.gz: c20f7c2409b86773bcf93367d135058dea7bf52f7fe3ef240161be0b137d2dce9ced8fc4e8398353b876c469edaebcdecc2e7cba77f92795972e6472a8f13959

data/CHANGELOG.md

@@ -1,3 +1,59 @@
+## 1.1.6 (2026-04-20)
+
+- Use `autoload` to avoid "circular require" warnings between `http/cookie` and `http/cookie_jar`. (#65)
+
+
+## 1.1.5 (2026-04-19)
+
+- Fix `NameError: uninitialized constant HTTP::Cookie::MAX_COOKIES_TOTAL` when `http/cookie_jar` is required without `http/cookie`, as done by the `http` gem. (#62)
+
+
+## 1.1.4 (2026-04-07)
+
+- Fix `require "http/cookie_jar"` raising `NameError: uninitialized constant HTTP`. (#61)
+
+
+## 1.1.3 (2026-04-06)
+
+- Restore compatibility with Ruby 2.6.
+
+
+## 1.1.2 (2026-04-06)
+
+- Stop requiring sqlite3 at load time by changing `MozillaStore::Database` from inheritance to composition.
+
+
+## 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.
+- Relax sqlite3 development dependency to `>= 1.3`.
+
+
+## 1.1.0 (2025-09-26)
+
+- Implement `Cookie#to_h`. (#55) @luke-hill @flavorjones
+- Reduce gem size by excluding test files (#54) @yuri-zubov
+
+
+## 1.0.8 (2024-12-05)
+
+- `Cookie#expires=` accepts `DateTime` objects. (#52) @luke-hill @flavorjones
+
+
+## 1.0.7 (2024-06-06)
+
+- Explicitly require "cgi" to avoid `NameError` in some applications. (#50 by @flavorjones)
+
+
+## 1.0.6 (2024-06-01)
+
+- Fix error formatting bug in HTTP::CookieJar::AbstractStore (#42 by @andrelaszlo)
+- Allow non-RFC 3986-compliant URLs (#45 by @c960657)
+- Add coverage for Ruby 3.2 and 3.3 (#46 by @flavorjones)
+- Quash ruby 3.4 warnings (#47 by @flavorjones)
+
 ## 1.0.5 (2022-05-25)
 
 - Silence SQLite3 warnings

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/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/http-cookie.svg)](https://badge.fury.io/rb/http-cookie)
+
 # HTTP::Cookie
 
 HTTP::Cookie is a ruby library to handle HTTP cookies in a way both
@@ -20,7 +22,8 @@ The following is an incomplete list of its features:
 * It takes eTLD (effective TLD, also known as "Public Suffix") into
   account just as major browsers do, to reject cookies with an eTLD
   domain like "org", "co.jp", or "appspot.com".  This feature is
-  brought to you by the domain_name gem.
+  brought to you by the
+  [domain_name](https://github.com/knu/ruby-domain_name) gem.
 
 * The number of cookies and the size are properly capped so that a
   cookie store does not get flooded.
@@ -207,7 +210,7 @@ equivalent using HTTP::Cookie:
     guarantee that it will remain available in the future.
 
 
-HTTP::Cookie/CookieJar raise runtime errors to help migration, so
+HTTP::Cookie/CookieJar raises runtime errors to help migration, so
 after replacing the class names, try running your test code once to
 find out how to fix your code base.
 

data/lib/http/cookie/scanner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'http/cookie'
 require 'strscan'
 require 'time'
@@ -23,7 +24,7 @@ class HTTP::Cookie::Scanner < StringScanner
   class << self
     def quote(s)
       return s unless s.match(RE_BAD_CHAR)
-      '"' << s.gsub(/([\\"])/, "\\\\\\1") << '"'
+      (+'"') << s.gsub(/([\\"])/, "\\\\\\1") << '"'
     end
   end
 
@@ -32,7 +33,7 @@ class HTTP::Cookie::Scanner < StringScanner
   end
 
   def scan_dquoted
-    ''.tap { |s|
+    (+'').tap { |s|
       case
       when skip(/"/)
         break
@@ -51,7 +52,7 @@ class HTTP::Cookie::Scanner < StringScanner
   end
 
   def scan_value(comma_as_separator = false)
-    ''.tap { |s|
+    (+'').tap { |s|
       case
       when scan(/[^,;"]+/)
         s << matched

data/lib/http/cookie/uri_parser.rb

@@ -0,0 +1,36 @@
+module HTTP::Cookie::URIParser
+  module_function
+
+  # Regular Expression taken from RFC 3986 Appendix B
+  URIREGEX = %r{
+    \A
+    (?: (?<scheme> [^:/?\#]+ ) : )?
+    (?: // (?<authority> [^/?\#]* ) )?
+    (?<path> [^?\#]* )
+    (?: \? (?<query> [^\#]* ) )?
+    (?: \# (?<fragment> .* ) )?
+    \z
+  }x
+
+  # Escape RFC 3986 "reserved" characters minus valid characters for path
+  # More specifically, gen-delims minus "/" / "?" / "#"
+  def escape_path(path)
+    path.sub(/\A[^?#]+/) { |p| p.gsub(/[:\[\]@]+/) { |r| CGI.escape(r) } }
+  end
+
+  # Parse a URI string or object, relaxing the constraints on the path component
+  def parse(uri)
+    URI(uri)
+  rescue URI::InvalidURIError
+    str = String.try_convert(uri) or
+      raise ArgumentError, "bad argument (expected URI object or URI string)"
+
+    m = URIREGEX.match(str) or raise
+
+    path = m[:path]
+    str[m.begin(:path)...m.end(:path)] = escape_path(path)
+    uri = URI.parse(str)
+    uri.__send__(:set_path, path)
+    uri
+  end
+end

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "1.0.5"
+    VERSION = "1.1.6"
   end
 end

data/lib/http/cookie.rb

@@ -1,9 +1,12 @@
 # :markup: markdown
+# frozen_string_literal: true
 require 'http/cookie/version'
+require 'http/cookie/uri_parser'
 require 'time'
 require 'uri'
 require 'domain_name'
 require 'http/cookie/ruby_compat'
+require 'cgi/escape'
 
 module HTTP
   autoload :CookieJar, 'http/cookie_jar'
@@ -86,7 +89,7 @@ class HTTP::Cookie
 
   # The Expires attribute value as a Time object.
   #
-  # The setter method accepts a Time object, a string representation
+  # The setter method accepts a Time / DateTime object, a string representation
   # of date/time that Time.parse can understand, or `nil`.
   #
   # Setting this value resets #max_age to nil.  When #max_age is
@@ -275,7 +278,7 @@ class HTTP::Cookie
         logger = options[:logger]
         created_at = options[:created_at]
       end
-      origin = URI(origin)
+      origin = HTTP::Cookie::URIParser.parse(origin)
 
       [].tap { |cookies|
         Scanner.new(set_cookie, logger).scan_set_cookie { |name, value, attrs|
@@ -424,7 +427,7 @@ class HTTP::Cookie
   # Returns the domain, with a dot prefixed only if the domain flag is
   # on.
   def dot_domain
-    @for_domain ? '.' << @domain : @domain
+    @for_domain ? (+'.') << @domain : @domain
   end
 
   # Returns the domain attribute value as a DomainName object.
@@ -455,7 +458,7 @@ class HTTP::Cookie
     @origin.nil? or
       raise ArgumentError, "origin cannot be changed once it is set"
     # Delay setting @origin because #domain= or #path= may fail
-    origin = URI(origin)
+    origin = HTTP::Cookie::URIParser.parse(origin)
     if URI::HTTP === origin
       self.domain ||= origin.host
       self.path   ||= (origin + './').path
@@ -490,6 +493,8 @@ class HTTP::Cookie
   def expires= t
     case t
     when nil, Time
+    when DateTime
+      t = t.to_time
     else
       t = Time.parse(t)
     end
@@ -548,7 +553,7 @@ class HTTP::Cookie
   # Tests if it is OK to accept this cookie if it is sent from a given
   # URI/URL, `uri`.
   def acceptable_from_uri?(uri)
-    uri = URI(uri)
+    uri = HTTP::Cookie::URIParser.parse(uri)
     return false unless URI::HTTP === uri && uri.host
     host = DomainName.new(uri.host)
 
@@ -585,7 +590,7 @@ class HTTP::Cookie
     if @domain.nil?
       raise "cannot tell if this cookie is valid because the domain is unknown"
     end
-    uri = URI(uri)
+    uri = HTTP::Cookie::URIParser.parse(uri)
     # RFC 6265 5.4
     return false if secure? && !(URI::HTTPS === uri)
     acceptable_from_uri?(uri) && HTTP::Cookie.path_match?(@path, uri.path)
@@ -594,7 +599,7 @@ class HTTP::Cookie
   # Returns a string for use in the Cookie header, i.e. `name=value`
   # or `name="value"`.
   def cookie_value
-    "#{@name}=#{Scanner.quote(@value)}"
+    +"#{@name}=#{Scanner.quote(@value)}"
   end
   alias to_s cookie_value
 
@@ -650,6 +655,11 @@ class HTTP::Cookie
   end
   include Comparable
 
+  # Hash serialization helper for use back into other libraries (Like Selenium)
+  def to_h
+    PERSISTENT_PROPERTIES.each_with_object({}) { |property, hash| hash[property.to_sym] = instance_variable_get("@#{property}") }
+  end
+
   # YAML serialization helper for Syck.
   def to_yaml_properties
     PERSISTENT_PROPERTIES.map { |name| "@#{name}" }

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
@@ -38,20 +37,15 @@ class HTTP::CookieJar
       }
     }
 
-    class Database < SQLite3::Database
-      def initialize(file, options = {})
+    class Database
+      def initialize(file)
+        @db = SQLite3::Database.new(file, results_as_hash: true)
         @stmts = []
-        options = {
-          :results_as_hash => true,
-        }.update(options)
-        super
       end
 
       def prepare(sql)
-        case st = super
-        when SQLite3::Statement
-          @stmts << st
-        end
+        st = @db.prepare(sql)
+        @stmts << st if st.is_a?(SQLite3::Statement)
         st
       end
 
@@ -60,7 +54,19 @@ class HTTP::CookieJar
         @stmts.reject! { |st|
           st.closed? || st.close
         }
-        super
+        @db.close
+      end
+
+      def closed?
+        @db.closed?
+      end
+
+      def execute(*args, &block)
+        @db.execute(*args, &block)
+      end
+
+      def create_function(*args, &block)
+        @db.create_function(*args, &block)
       end
     end
     # :startdoc:
@@ -400,8 +406,6 @@ class HTTP::CookieJar
         }
       end
     else
-      require 'cgi'
-
       def encode_www_form(enum)
         enum.map { |k, v| "#{CGI.escape(k)}=#{CGI.escape(v)}" }.join('&')
       end

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,14 @@
 # :markup: markdown
-require 'http/cookie'
+
+module HTTP
+  autoload :Cookie, "http/cookie"
+end
 
 ##
 # 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
 
@@ -156,7 +139,7 @@ class HTTP::CookieJar
     block_given? or return enum_for(__method__, uri)
 
     if uri
-      uri = URI(uri)
+      uri = HTTP::Cookie::URIParser.parse(uri)
       return self unless URI::HTTP === uri && uri.host
     end
 
@@ -342,3 +325,6 @@ class HTTP::CookieJar
     self
   end
 end
+
+require 'http/cookie_jar/abstract_store'
+require 'http/cookie_jar/abstract_saver'

data/lib/http-cookie.rb

@@ -1 +1,4 @@
-require 'http/cookie'
+module HTTP
+  autoload :Cookie, 'http/cookie'
+  autoload :CookieJar, 'http/cookie_jar'
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Akinori MUSHA
 - Aaron Patterson
 - Eric Hodel
 - Mike Dalessio
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domain_name
@@ -31,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
@@ -124,21 +123,17 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.txt
+- README.md
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- http-cookie.gemspec
 - lib/http-cookie.rb
 - lib/http/cookie.rb
 - lib/http/cookie/ruby_compat.rb
 - lib/http/cookie/scanner.rb
+- lib/http/cookie/uri_parser.rb
 - lib/http/cookie/version.rb
 - lib/http/cookie_jar.rb
 - lib/http/cookie_jar/abstract_saver.rb
@@ -147,16 +142,10 @@ files:
 - lib/http/cookie_jar/hash_store.rb
 - lib/http/cookie_jar/mozilla_store.rb
 - lib/http/cookie_jar/yaml_saver.rb
-- test/helper.rb
-- test/mechanize.yml
-- test/simplecov_start.rb
-- test/test_http_cookie.rb
-- test/test_http_cookie_jar.rb
 homepage: https://github.com/sparklemotion/http-cookie
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,13 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A Ruby library to handle HTTP Cookies based on RFC 6265
-test_files:
-- test/helper.rb
-- test/mechanize.yml
-- test/simplecov_start.rb
-- test/test_http_cookie.rb
-- test/test_http_cookie_jar.rb
+test_files: []

data/.github/workflows/ci.yml

@@ -1,37 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - "*"
-
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu]
-        # We still kind of support Ruby 1.8.7
-        ruby: [2.7, "3.0", 3.1, head, jruby]
-
-    name: >-
-      ${{matrix.os}}:ruby-${{matrix.ruby}}
-    runs-on: ${{matrix.os}}-latest
-    continue-on-error: ${{matrix.ruby == 'head' || matrix.ruby == 'jruby'}}
-
-    steps:
-      - name: Check out
-        uses: actions/checkout@v2
-
-      - name: Set up ruby and bundle
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-          bundler-cache: true
-
-      - name: Run rake
-        run: |
-          bundle exec rake

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in http-cookie.gemspec
-gemspec