cookiejar 0.3.2 → 0.3.4

data/lib/cookiejar/cookie_validation.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 require 'cgi'
 require 'uri'
+
 module CookieJar
   # Represents a set of cookie validation errors
   class InvalidCookieError < StandardError
@@ -8,50 +10,50 @@ module CookieJar
 
     # Create a new instance
     # @param [String, Array<String>] the validation issue(s) encountered
-    def initialize message
-     if message.is_a? Array
-       @messages = message
-       message = message.join ', '
-     else
-       @messages = [message]
-     end
-     super message
+    def initialize(message)
+      if message.is_a? Array
+        @messages = message
+        message = message.join ', '
+      else
+        @messages = [message]
+      end
+      super message
     end
   end
 
   # Contains logic to parse and validate cookie headers
   module CookieValidation
+    # REGEX cookie matching
     module PATTERN
       include URI::REGEXP::PATTERN
 
-      TOKEN = '[^(),\/<>@;:\\\"\[\]?={}\s]+'
-      VALUE1 = "([^;]*)"
-      IPADDR = "#{IPV4ADDR}|#{IPV6ADDR}"
-      BASE_HOSTNAME = "(?:#{DOMLABEL}\\.)(?:((?:(?:#{DOMLABEL}\\.)+(?:#{TOPLABEL}\\.?))|local))"
+      TOKEN = '[^(),\/<>@;:\\\"\[\]?={}\s]+'.freeze
+      VALUE1 = '([^;]*)'.freeze
+      IPADDR = "#{IPV4ADDR}|#{IPV6ADDR}".freeze
+      BASE_HOSTNAME = "(?:#{DOMLABEL}\\.)(?:((?:(?:#{DOMLABEL}\\.)+(?:#{TOPLABEL}\\.?))|local))".freeze
 
-      QUOTED_PAIR = "\\\\[\\x00-\\x7F]"
-      LWS = "\\r\\n(?:[ \\t]+)"
+      QUOTED_PAIR = '\\\\[\\x00-\\x7F]'.freeze
+      LWS = '\\r\\n(?:[ \\t]+)'.freeze
       # TEXT="[\\t\\x20-\\x7E\\x80-\\xFF]|(?:#{LWS})"
-      QDTEXT="[\\t\\x20-\\x21\\x23-\\x7E\\x80-\\xFF]|(?:#{LWS})"
-      QUOTED_TEXT = "\\\"(?:#{QDTEXT}|#{QUOTED_PAIR})*\\\""
-      VALUE2 = "#{TOKEN}|#{QUOTED_TEXT}"
-
+      QDTEXT = "[\\t\\x20-\\x21\\x23-\\x7E\\x80-\\xFF]|(?:#{LWS})".freeze
+      QUOTED_TEXT = "\\\"(?:#{QDTEXT}|#{QUOTED_PAIR})*\\\"".freeze
+      VALUE2 = "#{TOKEN}|#{QUOTED_TEXT}".freeze
     end
     BASE_HOSTNAME = /#{PATTERN::BASE_HOSTNAME}/
-    BASE_PATH = /\A((?:[^\/?#]*\/)*)/
+    BASE_PATH = %r{\A((?:[^/?#]*/)*)}
     IPADDR = /\A#{PATTERN::IPV4ADDR}\Z|\A#{PATTERN::IPV6ADDR}\Z/
     HDN = /\A#{PATTERN::HOSTNAME}\Z/
     TOKEN = /\A#{PATTERN::TOKEN}\Z/
     PARAM1 = /\A(#{PATTERN::TOKEN})(?:=#{PATTERN::VALUE1})?\Z/
-    PARAM2 = Regexp.new "(#{PATTERN::TOKEN})(?:=(#{PATTERN::VALUE2}))?(?:\\Z|;)", '', 'n'
+    PARAM2 = Regexp.new("(#{PATTERN::TOKEN})(?:=(#{PATTERN::VALUE2}))?(?:\\Z|;)", Regexp::NOENCODING)
     # TWO_DOT_DOMAINS = /\A\.(com|edu|net|mil|gov|int|org)\Z/
 
     # Converts the input object to a URI (if not already a URI)
     #
     # @param [String, URI] request_uri URI we are normalizing
     # @param [URI] URI representation of input string, or original URI
-    def self.to_uri request_uri
-      (request_uri.is_a? URI)? request_uri : (URI.parse request_uri)
+    def self.to_uri(request_uri)
+      (request_uri.is_a? URI) ? request_uri : (URI.parse request_uri)
     end
 
     # Converts an input cookie or uri to a string representing the path.
@@ -59,7 +61,7 @@ module CookieJar
     #
     # @param [String, URI, Cookie] object containing the path
     # @return [String] path information
-    def self.to_path uri_or_path
+    def self.to_path(uri_or_path)
       if (uri_or_path.is_a? URI) || (uri_or_path.is_a? Cookie)
         uri_or_path.path
       else
@@ -72,7 +74,7 @@ module CookieJar
     #
     # @param [String, URI, Cookie] object containing the domain
     # @return [String] domain information.
-    def self.to_domain uri_or_domain
+    def self.to_domain(uri_or_domain)
       if uri_or_domain.is_a? URI
         uri_or_domain.host
       elsif uri_or_domain.is_a? Cookie
@@ -88,10 +90,10 @@ module CookieJar
     # @param [String] tested_domain domain to be tested against
     # @param [String] base_domain new domain being tested
     # @return [String,nil] matching domain on success, nil on failure
-    def self.domains_match tested_domain, base_domain
+    def self.domains_match(tested_domain, base_domain)
       base = effective_host base_domain
       search_domains = compute_search_domains_for_host base
-      result = search_domains.find do |domain|
+      search_domains.find do |domain|
         domain == tested_domain
       end
     end
@@ -101,21 +103,19 @@ module CookieJar
     #
     # @param [String,URI,Cookie] hostname hostname, or object holding hostname
     # @return [String,nil] next highest hostname, or nil if none
-    def self.hostname_reach hostname
+    def self.hostname_reach(hostname)
       host = to_domain hostname
       host = host.downcase
       match = BASE_HOSTNAME.match host
-      if match
-        match[1]
-      end
+      match[1] if match
     end
 
     # Compute the base of a path, for default cookie path assignment
     #
     # @param [String, URI, Cookie] path, or object holding path
     # @return base path (all characters up to final '/')
-    def self.cookie_base_path path
-      BASE_PATH.match(to_path path)[1]
+    def self.cookie_base_path(path)
+      BASE_PATH.match(to_path(path))[1]
     end
 
     # Processes cookie path data using the following rules:
@@ -123,16 +123,16 @@ module CookieJar
     # to the last '/' character. If no path is specified in the cookie, a path
     # value will be taken from the request URI which was used for the site.
     #
-    # Note that this will not attempt to detect a mismatch of the request uri domain
-    # and explicitly specified cookie path
+    # Note that this will not attempt to detect a mismatch of the request uri
+    # domain and explicitly specified cookie path
     #
     # @param [String,URI] request URI yielding this cookie
     # @param [String] path on cookie
-    def self.determine_cookie_path request_uri, cookie_path
+    def self.determine_cookie_path(request_uri, cookie_path)
       uri = to_uri request_uri
       cookie_path = to_path cookie_path
 
-      if cookie_path == nil || cookie_path.empty?
+      if cookie_path.nil? || cookie_path.empty?
         cookie_path = cookie_base_path uri.path
       end
       cookie_path
@@ -145,8 +145,9 @@ module CookieJar
     # @param [String, URI] request_uri requested uri
     # @return [Array<String>] all cookie domain values which would match the
     #   requested uri
-    def self.compute_search_domains request_uri
+    def self.compute_search_domains(request_uri)
       uri = to_uri request_uri
+      return nil unless uri.is_a? URI::HTTP
       host = uri.host
       compute_search_domains_for_host host
     end
@@ -157,59 +158,55 @@ module CookieJar
     # @param [String] host host being requested
     # @return [Array<String>] all cookie domain values which would match the
     #   requested uri
-    def self.compute_search_domains_for_host host
+    def self.compute_search_domains_for_host(host)
       host = effective_host host
       result = [host]
       unless host =~ IPADDR
         result << ".#{host}"
         base = hostname_reach host
-        if base
-          result << ".#{base}"
-        end
+        result << ".#{base}" if base
       end
       result
     end
 
     # Processes cookie domain data using the following rules:
     # Domains strings of the form .foo.com match 'foo.com' and all immediate
-    # subdomains of 'foo.com'. Domain strings specified of the form 'foo.com' are
-    # modified to '.foo.com', and as such will still apply to subdomains.
+    # subdomains of 'foo.com'. Domain strings specified of the form 'foo.com'
+    # are modified to '.foo.com', and as such will still apply to subdomains.
     #
-    # Cookies without an explicit domain will have their domain value taken directly
-    # from the URL, and will _NOT_ have any leading dot applied. For example, a request
-    # to http://foo.com/ will cause an entry for 'foo.com' to be created - which applies
-    # to foo.com but no subdomain.
+    # Cookies without an explicit domain will have their domain value taken
+    # directly from the URL, and will _NOT_ have any leading dot applied. For
+    # example, a request to http://foo.com/ will cause an entry for 'foo.com'
+    # to be created - which applies to foo.com but no subdomain.
     #
-    # Note that this will not attempt to detect a mismatch of the request uri domain
-    # and explicitly specified cookie domain
+    # Note that this will not attempt to detect a mismatch of the request uri
+    # domain and explicitly specified cookie domain
     #
     # @param [String, URI] request_uri originally requested URI
     # @param [String] cookie domain value
     # @return [String] effective host
-    def self.determine_cookie_domain request_uri, cookie_domain
+    def self.determine_cookie_domain(request_uri, cookie_domain)
       uri = to_uri request_uri
       domain = to_domain cookie_domain
 
-      if domain == nil || domain.empty?
-        domain = effective_host uri.host
+      return effective_host(uri.host) if domain.nil? || domain.empty?
+      domain = domain.downcase
+      if domain =~ IPADDR || domain.start_with?('.')
+        domain
       else
-        domain = domain.downcase
-        if domain =~ IPADDR || domain.start_with?('.')
-          domain
-        else
-          ".#{domain}"
-        end
+        ".#{domain}"
       end
     end
 
     # Compute the effective host (RFC 2965, section 1)
     #
-    # Has the added additional logic of searching for interior dots specifically, and
-    # matches colons to prevent .local being suffixed on IPv6 addresses
+    # Has the added additional logic of searching for interior dots
+    # specifically, and matches colons to prevent .local being suffixed on
+    # IPv6 addresses
     #
     # @param [String, URI] host_or_uridomain name, or absolute URI
     # @return [String] effective host per RFC rules
-    def self.effective_host host_or_uri
+    def self.effective_host(host_or_uri)
       hostname = to_domain host_or_uri
       hostname = hostname.downcase
 
@@ -227,11 +224,9 @@ module CookieJar
     # @param [Cookie] cookie object
     # @param [true] will always return true on success
     # @raise [InvalidCookieError] on failures, containing all validation errors
-    def self.validate_cookie request_uri, cookie
+    def self.validate_cookie(request_uri, cookie)
       uri = to_uri request_uri
-      request_host = effective_host uri.host
       request_path = uri.path
-      request_secure = (uri.scheme == 'https')
       cookie_host = cookie.domain
       cookie_path = cookie.path
 
@@ -242,19 +237,22 @@ module CookieJar
       # A user agent rejects (SHALL NOT store its information) if the
       # Version attribute is missing. Note that the legacy Set-Cookie
       # directive will result in an implicit version 0.
-      unless cookie.version
-        errors << "Version missing"
-      end
+      errors << 'Version missing' unless cookie.version
 
       # The value for the Path attribute is not a prefix of the request-URI
+
+      # If the initial request path is empty then this will always fail
+      # so check if it is empty and if so then set it to /
+      request_path = '/' if request_path == ''
+
       unless request_path.start_with? cookie_path
-        errors << "Path is not a prefix of the request uri path"
+        errors << 'Path is not a prefix of the request uri path'
       end
 
-      unless cookie_host =~ IPADDR || #is an IPv4 or IPv6 address
-        cookie_host =~ /.\../ || #contains an embedded dot
-        cookie_host == '.local' #is the domain cookie for local addresses
-        errors << "Domain format is illegal"
+      unless cookie_host =~ IPADDR || # is an IPv4 or IPv6 address
+             cookie_host =~ /.\../ || # contains an embedded dot
+             cookie_host == '.local' # is the domain cookie for local addresses
+        errors << 'Domain format is illegal'
       end
 
       # The effective host name that derives from the request-host does
@@ -264,18 +262,18 @@ module CookieJar
       # where D is the value of the Domain attribute, and H is a string
       # that contains one or more dots.
       unless domains_match cookie_host, uri
-        errors << "Domain is inappropriate based on request URI hostname"
+        errors << 'Domain is inappropriate based on request URI hostname'
       end
 
       # The Port attribute has a "port-list", and the request-port was
       # not in the list.
-      unless cookie.ports.nil? || cookie.ports.length != 0
+      unless cookie.ports.nil? || !cookie.ports.empty?
         unless cookie.ports.find_index uri.port
-          errors << "Ports list does not contain request URI port"
+          errors << 'Ports list does not contain request URI port'
         end
       end
 
-      raise InvalidCookieError.new(errors) unless errors.empty?
+      fail InvalidCookieError, errors unless errors.empty?
 
       # Note: 'secure' is not explicitly defined as an SSL channel, and no
       # test is defined around validity and the 'secure' attribute
@@ -289,15 +287,16 @@ module CookieJar
     # @param [String] set_cookie_value a Set-Cookie header formatted cookie
     #   definition
     # @return [Hash] Contains the parsed values of the cookie
-    def self.parse_set_cookie set_cookie_value
-      args = { }
-      params=set_cookie_value.split(/;\s*/)
+    def self.parse_set_cookie(set_cookie_value)
+      args = {}
+      params = set_cookie_value.split(/;\s*/)
 
-      first=true
+      first = true
       params.each do |param|
         result = PARAM1.match param
-        if !result
-          raise InvalidCookieError.new "Invalid cookie parameter in cookie '#{set_cookie_value}'"
+        unless result
+          fail InvalidCookieError,
+               "Invalid cookie parameter in cookie '#{set_cookie_value}'"
         end
         key = result[1].downcase.to_sym
         keyvalue = result[2]
@@ -311,17 +310,21 @@ module CookieJar
             begin
               args[:expires_at] = Time.parse keyvalue
             rescue ArgumentError
-              raise unless $!.message == "time out of range"
+              raise unless $ERROR_INFO.message == 'time out of range'
               args[:expires_at] = Time.at(0x7FFFFFFF)
             end
-          when *[:domain, :path]
+          when :"max-age"
+            args[:max_age] = keyvalue.to_i
+          when :domain, :path
             args[key] = keyvalue
           when :secure
             args[:secure] = true
           when :httponly
             args[:http_only] = true
+          when :samesite
+            args[:samesite] = keyvalue.downcase
           else
-            raise InvalidCookieError.new "Unknown cookie parameter '#{key}'"
+            fail InvalidCookieError, "Unknown cookie parameter '#{key}'"
           end
         end
       end
@@ -330,18 +333,18 @@ module CookieJar
     end
 
     # Parse a RFC 2965 value and convert to a literal string
-    def self.value_to_string value
-      if /\A"(.*)"\Z/.match value
-        value = $1
-        value = value.gsub(/\\(.)/, '\1')
+    def self.value_to_string(value)
+      if /\A"(.*)"\Z/ =~ value
+        value = Regexp.last_match(1)
+        value.gsub(/\\(.)/, '\1')
       else
         value
       end
     end
 
     # Attempt to decipher a partially decoded version of text cookie values
-    def self.decode_value value
-      if /\A"(.*)"\Z/.match value
+    def self.decode_value(value)
+      if /\A"(.*)"\Z/ =~ value
         value_to_string value
       else
         CGI.unescape value
@@ -355,16 +358,17 @@ module CookieJar
     # @param [String] set_cookie_value a Set-Cookie2 header formatted cookie
     #   definition
     # @return [Hash] Contains the parsed values of the cookie
-    def self.parse_set_cookie2 set_cookie_value
-      args = { }
+    def self.parse_set_cookie2(set_cookie_value)
+      args = {}
       first = true
       index = 0
       begin
         md = PARAM2.match set_cookie_value[index..-1]
         if md.nil? || md.offset(0).first != 0
-          raise InvalidCookieError.new "Invalid Set-Cookie2 header '#{set_cookie_value}'"
+          fail InvalidCookieError,
+               "Invalid Set-Cookie2 header '#{set_cookie_value}'"
         end
-        index+=md.offset(0)[1]
+        index += md.offset(0)[1]
 
         key = md[1].downcase.to_sym
         keyvalue = md[2] || md[3]
@@ -375,9 +379,9 @@ module CookieJar
         else
           keyvalue = value_to_string keyvalue
           case key
-          when *[:comment,:commenturl,:domain,:path]
+          when :comment, :commenturl, :domain, :path
             args[key] = keyvalue
-          when *[:discard,:secure]
+          when :discard, :secure
             args[key] = true
           when :httponly
             args[:http_only] = true
@@ -388,15 +392,16 @@ module CookieJar
           when :port
             # must be in format '"port,port"'
             ports = keyvalue.split(/,\s*/)
-            args[:ports] = ports.map do |portstr| portstr.to_i end
+            args[:ports] = ports.map(&:to_i)
           else
-            raise InvalidCookieError.new "Unknown cookie parameter '#{key}'"
+            fail InvalidCookieError, "Unknown cookie parameter '#{key}'"
           end
         end
       end until md.post_match.empty?
       # if our last match in the scan failed
       if args[:version] != 1
-        raise InvalidCookieError.new "Set-Cookie2 declares a non RFC2965 version cookie"
+        fail InvalidCookieError,
+             'Set-Cookie2 declares a non RFC2965 version cookie'
       end
 
       args

data/lib/cookiejar/jar.rb

@@ -39,7 +39,7 @@ module CookieJar
   #
   # Paths are given a straight prefix string comparison to match.
   # Further filters <secure, http only, ports> are not represented in this
-  # heirarchy.
+  # hierarchy.
   #
   # Cookies returned are ordered solely by specificity (length) of the
   # path.
@@ -56,7 +56,7 @@ module CookieJar
     # @param [String] cookie_header_value the contents of the Set-Cookie
     # @return [Cookie] which was created and stored
     # @raise [InvalidCookieError] if the cookie header did not validate
-    def set_cookie request_uri, cookie_header_values
+    def set_cookie(request_uri, cookie_header_values)
       cookie_header_values.split(/, (?=[\w]+=)/).each do |cookie_header_value|
         cookie = Cookie.from_set_cookie request_uri, cookie_header_value
         add_cookie cookie
@@ -70,7 +70,7 @@ module CookieJar
     # @param [String] cookie_header_value the contents of the Set-Cookie2
     # @return [Cookie] which was created and stored
     # @raise [InvalidCookieError] if the cookie header did not validate
-    def set_cookie2 request_uri, cookie_header_value
+    def set_cookie2(request_uri, cookie_header_value)
       cookie = Cookie.from_set_cookie2 request_uri, cookie_header_value
       add_cookie cookie
     end
@@ -87,7 +87,7 @@ module CookieJar
     # @return [Array<Cookie>,nil] the cookies created, or nil if none found.
     # @raise [InvalidCookieError] if one of the cookie headers contained
     #   invalid formatting or data
-    def set_cookies_from_headers request_uri, http_headers
+    def set_cookies_from_headers(request_uri, http_headers)
       set_cookie_key = http_headers.keys.detect { |k| /\ASet-Cookie\Z/i.match k }
       cookies = gather_header_values http_headers[set_cookie_key] do |value|
         begin
@@ -123,7 +123,7 @@ module CookieJar
     #
     # @param [Cookie] cookie a pre-existing cookie object
     # @return [Cookie] the cookie added to the store
-    def add_cookie cookie
+    def add_cookie(cookie)
       domain_paths = find_or_add_domain_for_cookie cookie
       add_cookie_to_path domain_paths, cookie
       cookie
@@ -149,7 +149,7 @@ module CookieJar
     # @param [Array] a options controlling output JSON text
     #   (usually a State and a depth)
     # @return [String] JSON representation of object data
-    def to_json *a
+    def to_json(*a)
       {
         'json_class' => self.class.name,
         'cookies' => to_a.to_json(*a)
@@ -160,17 +160,13 @@ module CookieJar
     #
     # @param o [Hash] the expanded JSON object
     # @return [CookieJar] a new CookieJar instance
-    def self.json_create o
-      if o.is_a? String
-        o = JSON.parse(o)
-      end
-      if o.is_a? Hash
-        o = o['cookies']
-      end
+    def self.json_create(o)
+      o = JSON.parse(o) if o.is_a? String
+      o = o['cookies'] if o.is_a? Hash
       cookies = o.inject([]) do |result, cookie_json|
         result << (Cookie.json_create cookie_json)
       end
-      self.from_a cookies
+      from_a cookies
     end
 
     # Create a new Jar from an array of Cookie objects. Expired cookies
@@ -179,7 +175,7 @@ module CookieJar
     #
     # @param [Array<Cookie>] cookies array of cookie objects
     # @return [CookieJar] a new CookieJar instance
-    def self.from_a cookies
+    def self.from_a(cookies)
       jar = new
       cookies.each do |cookie|
         jar.add_cookie cookie
@@ -192,10 +188,10 @@ module CookieJar
     #
     # @param session [Boolean] whether session cookies should be expired,
     #   or just cookies past their expiration date.
-    def expire_cookies session = false
-      @domains.delete_if do |domain, paths|
-        paths.delete_if do |path, cookies|
-          cookies.delete_if do |cookie_name, cookie|
+    def expire_cookies(session = false)
+      @domains.delete_if do |_domain, paths|
+        paths.delete_if do |_path, cookies|
+          cookies.delete_if do |_cookie_name, cookie|
             cookie.expired? || (session && cookie.session?)
           end
           cookies.empty?
@@ -209,27 +205,36 @@ module CookieJar
     # otherwise unordered.
     #
     # @param [String, URI] request_uri the address the HTTP request will be
-    #   sent to
+    #   sent to. This must be a full URI, i.e. must include the protocol,
+    #   if you pass digi.ninja it will fail to find the domain, you must pass
+    #   http://digi.ninja
     # @param [Hash] opts options controlling returned cookies
-    # @option opts [Boolean] :script (false) Cookies marked HTTP-only will be ignored
-    #   if true
+    # @option opts [Boolean] :script (false) Cookies marked HTTP-only will be
+    #   ignored if true
     # @return [Array<Cookie>] cookies which should be sent in the HTTP request
-    def get_cookies request_uri, opts = { }
+    def get_cookies(request_uri, opts = {})
       uri = to_uri request_uri
       hosts = Cookie.compute_search_domains uri
 
+      return [] if hosts.nil?
+
+      path = if uri.path == ''
+               '/'
+             else
+               uri.path
+             end
+
       results = []
       hosts.each do |host|
         domain = find_domain host
-        domain.each do |path, cookies|
-          if uri.path.start_with? path
-            results += cookies.values.select do |cookie|
-              cookie.should_send? uri, opts[:script]
-            end
+        domain.each do |apath, cookies|
+          next unless path.start_with? apath
+          results += cookies.values.select do |cookie|
+            cookie.should_send? uri, opts[:script]
           end
         end
       end
-      #Sort by path length, longest first
+      # Sort by path length, longest first
       results.sort do |lhs, rhs|
         rhs.path.length <=> lhs.path.length
       end
@@ -242,22 +247,19 @@ module CookieJar
     # @param [String, URI] request_uri the address the HTTP request will be
     #   sent to
     # @param [Hash] opts options controlling returned cookies
-    # @option opts [Boolean] :script (false) Cookies marked HTTP-only will be ignored
-    #   if true
+    # @option opts [Boolean] :script (false) Cookies marked HTTP-only will be
+    #   ignored if true
     # @return String value of the Cookie header which should be sent on the
     #   HTTP request
-    def get_cookie_header request_uri, opts = { }
+    def get_cookie_header(request_uri, opts = {})
       cookies = get_cookies request_uri, opts
-      version = 0
-      ver = [[],[]]
+      ver = [[], []]
       cookies.each do |cookie|
         ver[cookie.version] << cookie
       end
-      if (ver[1].empty?)
+      if ver[1].empty?
         # can do a netscape-style cookie header, relish the opportunity
-        cookies.map do |cookie|
-          cookie.to_s
-        end.join ";"
+        cookies.map(&:to_s).join ';'
       else
         # build a RFC 2965-style cookie header. Split the cookies into
         # version 0 and 1 groups so that we can reuse the '$Version' header
@@ -265,46 +267,46 @@ module CookieJar
         unless ver[0].empty?
           result << '$Version=0;'
           result << ver[0].map do |cookie|
-            (cookie.to_s 1,false)
+            (cookie.to_s 1, false)
           end.join(';')
           # separate version 0 and 1 with a comma
           result << ','
         end
         result << '$Version=1;'
         ver[1].map do |cookie|
-          result << (cookie.to_s 1,false)
+          result << (cookie.to_s 1, false)
         end
         result
       end
     end
 
-  protected
+    protected
 
-    def gather_header_values http_header_value, &block
+    def gather_header_values(http_header_value, &_block)
       result = []
       if http_header_value.is_a? Array
         http_header_value.each do |value|
-          result << block.call(value)
+          result << yield(value)
         end
       elsif http_header_value.is_a? String
-        result << block.call(http_header_value)
+        result << yield(http_header_value)
       end
       result.compact
     end
 
-    def to_uri request_uri
-      (request_uri.is_a? URI)? request_uri : (URI.parse request_uri)
+    def to_uri(request_uri)
+      (request_uri.is_a? URI) ? request_uri : (URI.parse request_uri)
     end
 
-    def find_domain host
+    def find_domain(host)
       @domains[host] || {}
     end
 
-    def find_or_add_domain_for_cookie cookie
+    def find_or_add_domain_for_cookie(cookie)
       @domains[cookie.domain] ||= {}
     end
 
-    def add_cookie_to_path paths, cookie
+    def add_cookie_to_path(paths, cookie)
       path_entry = (paths[cookie.path] ||= {})
       path_entry[cookie.name] = cookie
     end

data/lib/cookiejar/version.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+module CookieJar
+  VERSION = '0.3.4'.freeze
+end