http-cookie 1.0.8 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 143890479b8951250d5f45d4528c390e03741d943269abe0901e091b544f95ca
-  data.tar.gz: 7bfef9e1bd7cd6cb01f0de248717fade7a1871fb120cd35227657a96c371d384
+  metadata.gz: 72ef3493437238f93258320d1e8bdfea5d155e731ed6e88d55b284bff3c7a3a0
+  data.tar.gz: ecf432149b7b13a7437ad6c8a8433b85fbe4cf223ba07016831c2da3a8598de2
 SHA512:
-  metadata.gz: ba03e3c618d888517bc4bb9e95c08cf4c89bbe5a9ec075d31dcaba353d8864b338fe79bf7ad36f45d6e87a114eefabe41ed62a7b62876c3ba55f459e022fb24f
-  data.tar.gz: 846fa3243f97982df9b196fbc0645d13cd233105bbaa98e2e42b36f5a95b58c07d7571c213c6b35034b4ea41f1ce415857aabbbfe20042305611608fa3d327df
+  metadata.gz: 110ace005f635800820a73c4c4955cdd0d80fdfddf781949957f2738e0bd7d78068c5d03537f9defa7eba25b7f8156e823897460cd3bf84db8fd7dff55550cd2
+  data.tar.gz: c20f7c2409b86773bcf93367d135058dea7bf52f7fe3ef240161be0b137d2dce9ced8fc4e8398353b876c469edaebcdecc2e7cba77f92795972e6472a8f13959

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## 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

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.0.8"
+    VERSION = "1.1.6"
   end
 end

data/lib/http/cookie.rb

@@ -6,7 +6,7 @@ require 'time'
 require 'uri'
 require 'domain_name'
 require 'http/cookie/ruby_compat'
-require 'cgi'
+require 'cgi/escape'
 
 module HTTP
   autoload :CookieJar, 'http/cookie_jar'
@@ -655,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:

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
 
@@ -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.8
+  version: 1.1.6
 platform: ruby
 authors:
 - Akinori MUSHA
 - Aaron Patterson
 - Eric Hodel
 - Mike Dalessio
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-05 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,18 +123,12 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.txt
+- README.md
 files:
-- ".github/CODEOWNERS"
-- ".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
@@ -149,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
@@ -173,13 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-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/CODEOWNERS

@@ -1 +0,0 @@
-* @knu

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", "3.2", "3.3", "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@v4
-
-      - 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

data/Rakefile

@@ -1,20 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |test|
-  test.ruby_opts << '-r./test/simplecov_start.rb' if RUBY_VERSION >= '1.9'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = HTTP::Cookie::VERSION
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "http-cookie #{version}"
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include(Bundler::GemHelper.gemspec.extra_rdoc_files)
-end

data/http-cookie.gemspec

@@ -1,35 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'http/cookie/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "http-cookie"
-  gem.version       = HTTP::Cookie::VERSION
-  gem.authors, gem.email = {
-    'Akinori MUSHA'   => 'knu@idaemons.org',
-    'Aaron Patterson' => 'aaronp@rubyforge.org',
-    'Eric Hodel'      => 'drbrain@segment7.net',
-    'Mike Dalessio'   => 'mike.dalessio@gmail.com',
-  }.instance_eval { [keys, values] }
-
-  gem.description   = %q{HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265.  It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers.  It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.}
-  gem.summary       = %q{A Ruby library to handle HTTP Cookies based on RFC 6265}
-  gem.homepage      = "https://github.com/sparklemotion/http-cookie"
-  gem.license       = "MIT"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-
-  gem.add_runtime_dependency("domain_name", ["~> 0.5"])
-  gem.add_development_dependency("sqlite3", ["~> 1.3"]) unless defined?(JRUBY_VERSION)
-  gem.add_development_dependency("bundler", [">= 1.2.0"])
-  gem.add_development_dependency("test-unit", [">= 2.4.3", *("< 3" if RUBY_VERSION < "1.9")])
-  gem.add_development_dependency("rake", [">= 0.9.2.2", *("< 11" if RUBY_VERSION < "1.9")])
-  gem.add_development_dependency("rdoc", RUBY_VERSION > "1.9" ? "> 2.4.2" : "~> 2.4.2")
-  gem.add_development_dependency("simplecov", [">= 0"])
-  gem.add_development_dependency("json", ["< 2"]) if RUBY_VERSION < "2.0"
-end

data/test/helper.rb

@@ -1,55 +0,0 @@
-require 'rubygems'
-require 'test-unit'
-require 'uri'
-require 'http/cookie'
-
-module Test
-  module Unit
-    module Assertions
-      def assert_warn(pattern, message = nil, &block)
-        class << (output = +"")
-          alias write <<
-        end
-        stderr, $stderr = $stderr, output
-        yield
-        assert_match(pattern, output, message)
-      ensure
-        $stderr = stderr
-      end
-
-      def assert_warning(pattern, message = nil, &block)
-        verbose, $VERBOSE = $VERBOSE, true
-        assert_warn(pattern, message, &block)
-      ensure
-        $VERBOSE = verbose
-      end
-    end
-  end
-end
-
-module Enumerable
-  def combine
-    masks = inject([[], 1]){|(ar, m), e| [ar << m, m << 1 ] }[0]
-    all = masks.inject(0){ |al, m| al|m }
-
-    result = []
-    for i in 1..all do
-      tmp = []
-      each_with_index do |e, idx|
-        tmp << e unless (masks[idx] & i) == 0
-      end
-      result << tmp
-    end
-    result
-  end
-end
-
-def test_file(filename)
-  File.expand_path(filename, File.dirname(__FILE__))
-end
-
-def sleep_until(time)
-  if (s = time - Time.now) > 0
-    sleep s + 0.01
-  end
-end