ruby-http-session 1.0.1 → 2.1.0

data/lib/http/session.rb

@@ -1,51 +1,61 @@
+require "forwardable"
 require "http"
 require "monitor"
+require "set"
 
+require_relative "session/exceptions"
+require_relative "session/options/optionable"
+require_relative "session/options/cache_option"
+require_relative "session/options/cookies_option"
+require_relative "session/options/persistent_option"
+require_relative "session/options"
 require_relative "session/cache/cache_control"
 require_relative "session/cache/entry"
 require_relative "session/cache/status"
 require_relative "session/cache"
+require_relative "session/cookies"
+require_relative "session/connection_pool"
+require_relative "session/pool_manager"
+require_relative "session/request"
+require_relative "session/response/string_body"
+require_relative "session/response"
+require_relative "session/features/auto_inflate"
+require_relative "session/features"
+require_relative "session/context/follow_context"
+require_relative "session/context"
 require_relative "session/client/perform"
 require_relative "session/client"
+require_relative "session/redirector"
 require_relative "session/configurable"
-require_relative "session/features/auto_inflate"
-require_relative "session/options/cache_option"
-require_relative "session/options/cookies_option"
-require_relative "session/options"
-require_relative "session/request"
 require_relative "session/requestable"
-require_relative "session/response/string_body"
-require_relative "session/response"
 require_relative "session/version"
 
 # Use session to manage cookies and cache across requests.
 class HTTP::Session
-  include MonitorMixin
   include HTTP::Session::Configurable
   include HTTP::Session::Requestable
 
-  # @!attribute [r] default_options
-  #   @return [Options]
+  # @!visibility private
   attr_reader :default_options
 
-  # @!attribute [r] cache
-  #   @return [Cache]
-  attr_reader :cache
+  # @!visibility private
+  attr_reader :cookies_mgr
 
-  # @!attribute [r] jar
-  #   @return [HTTP::CookieJar]
-  attr_reader :jar
+  # @!visibility private
+  attr_reader :cache_mgr
 
   # @param [Hash] default_options
   # @option default_options [Boolean, Hash] :cookies session cookies option
   # @option default_options [Boolean, Hash] :cache session cache option
+  # @option default_options [Boolean, Hash] :persistent session persistent option
   # @option default_options [Hash] :http http client options
   def initialize(default_options = {})
     super()
 
     @default_options = HTTP::Session::Options.new(default_options)
-    @cache = HTTP::Session::Cache.new(@default_options.cache)
-    @jar = HTTP::CookieJar.new
+    @cookies_mgr = HTTP::Session::Cookies.new(@default_options.cookies)
+    @cache_mgr = HTTP::Session::Cache.new(@default_options.cache)
+    @pool_mgr = HTTP::Session::PoolManager.new(@default_options.persistent, self)
   end
 
   # @param verb
@@ -53,45 +63,32 @@ class HTTP::Session
   # @param [Hash] opts
   # @return [Response]
   def request(verb, uri, opts = {})
-    c = HTTP::Session::Client.new(@default_options.http, self)
-    c.request(verb, uri, opts).tap do |res|
-      handle_http_response(res)
+    http_opts = @default_options.http.merge(opts)
+    opts[:follow] = false
+
+    res = perform(verb, uri, opts)
+    return res unless http_opts.follow
+
+    redirector = HTTP::Session::Redirector.new(http_opts.follow)
+    redirector.perform(res) do |new_verb, new_uri, follow_ctx|
+      new_opts = follow_ctx.same_origin? ? opts : {}
+      ctx = HTTP::Session::Context.new(follow: follow_ctx)
+      perform(new_verb, new_uri, new_opts, ctx)
     end
   end
 
   # @!visibility private
-  def make_http_request_data
-    synchronize do
-      {
-        cookies: extract_cookie_from_jar
-      }
+  def freeze
+    super.tap do
+      default_options.freeze
     end
   end
 
   private
 
-  def handle_http_response(res)
-    synchronize do
-      extract_cookie_to_jar(res)
-    end
-  end
-
-  def extract_cookie_from_jar
-    return unless @default_options.cookies.enabled?
-
-    return if @jar.empty?
-    @jar.cookies.each_with_object({}) { |c, h| h[c.name] = c.value }
-  end
-
-  def extract_cookie_to_jar(res)
-    return unless @default_options.cookies.enabled?
-
-    all = ([] << res.history << res).flatten
-    all.each do |r|
-      req = r.request
-      r.headers.get(HTTP::Headers::SET_COOKIE).each do |header|
-        @jar.parse(header, req.uri)
-      end
+  def perform(verb, uri, opts, ctx = nil)
+    @pool_mgr.with(uri) do |c|
+      c.request(verb, uri, opts, ctx)
     end
   end
 end

data/lib/http-session.rb

@@ -5,6 +5,7 @@ module HTTP
     # @param [Hash] default_options
     # @option default_options [Boolean, Hash] :cookies session cookies option
     # @option default_options [Boolean, Hash] :cache session cache option
+    # @option default_options [Boolean, Hash] :persistent session persistent option
     # @option default_options [Hash] :http http client options
     # @return [Session] a new instance of Session.
     def session(default_options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-http-session
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - John Doe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.1.1
 description: HTTP::Session - a session abstraction for http.rb in order to support
-  cookies and caching.
+  Cookies and Caching.
 email:
 - johndoe@example.com
 executables: []
@@ -61,10 +61,20 @@ files:
 - lib/http/session/client.rb
 - lib/http/session/client/perform.rb
 - lib/http/session/configurable.rb
+- lib/http/session/connection_pool.rb
+- lib/http/session/context.rb
+- lib/http/session/context/follow_context.rb
+- lib/http/session/cookies.rb
+- lib/http/session/exceptions.rb
+- lib/http/session/features.rb
 - lib/http/session/features/auto_inflate.rb
 - lib/http/session/options.rb
 - lib/http/session/options/cache_option.rb
 - lib/http/session/options/cookies_option.rb
+- lib/http/session/options/optionable.rb
+- lib/http/session/options/persistent_option.rb
+- lib/http/session/pool_manager.rb
+- lib/http/session/redirector.rb
 - lib/http/session/request.rb
 - lib/http/session/requestable.rb
 - lib/http/session/response.rb
@@ -95,6 +105,6 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: HTTP::Session - a session abstraction for http.rb in order to support cookies
-  and caching.
+summary: HTTP::Session - a session abstraction for http.rb in order to support Cookies
+  and Caching.
 test_files: []