http-cookie 1.0.0.pre12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a70ec83e62018ae7621d1eb7ba75f08eea1d696
-  data.tar.gz: 9ed2b81801d89bb7adf3f6d97b087421406f4acf
+  metadata.gz: aacf47668ef161f9e46f07ed44bd6e145c805c14
+  data.tar.gz: 92c544f479f357ad08e66a8a3827e1edaca35c2e
 SHA512:
-  metadata.gz: f1ba260a8757b9076df6645368f761005cc665ef1c4ae357f102982132ed66253ae7cb49d163430bd3070225524c0cd4a988b2abbc4252e3e68e8376eea68542
-  data.tar.gz: bca8c545043e5b4975e32350dcf37f1519a183e3d207bb2692313863104884750ef656ed568106b69beab35e53b0536c36b677846255b1d477af95d022c74bfe
+  metadata.gz: 7cc1fc98627c5167e3eb410359b00a868f849d10458ca0b1881efdb6ab94bf51d300f732f9b3de52edec2e21934553f937cb38e416af18e103ca923e70285c58
+  data.tar.gz: 3fef65c59da56daba7cb4d571b034cecab3b66cb656811fe9644d99404a152b5656dc04d2a501a3a6b74cf75cb5bcdde91c87f3d5b470d8ba1ffcd515498c421

data/lib/http/cookie.rb

@@ -87,7 +87,7 @@ class HTTP::Cookie
   # The Expires attribute value as a Time object.
   #
   # The setter method accepts a Time object, a string representation
-  # of date/time, or `nil`.
+  # of date/time that Time.parse can understand, or `nil`.
   #
   # Setting this value resets #max_age to nil.  When #max_age is
   # non-nil, #expires returns `created_at + max_age`.
@@ -111,12 +111,11 @@ class HTTP::Cookie
   #     new(**attr_hash)
   #
   # Creates a cookie object.  For each key of `attr_hash`, the setter
-  # is called if defined.  Each key can be either a symbol or a
-  # string of downcased attribute names.
-  #
-  # This methods accepts any attribute name for which a setter method
-  # is defined.  Beware, however, any error (typically ArgumentError)
-  # a setter method raises will be passed through.
+  # is called if defined and any error (typically ArgumentError or
+  # TypeError) that is raised will be passed through.  Each key can be
+  # either a downcased symbol or a string that may be mixed case.
+  # Support for the latter may, however, be obsoleted in future when
+  # Ruby 2.0's keyword syntax is adopted.
   #
   # If `value` is omitted or it is nil, an expiration cookie is
   # created unless `max_age` or `expires` (`expires_at`) is given.
@@ -157,8 +156,8 @@ class HTTP::Cookie
     end
     for_domain = false
     domain = max_age = origin = nil
-    attr_hash.each_pair { |key, val|
-      case key.to_sym
+    attr_hash.each_pair { |okey, val|
+      case key ||= okey
       when :name
         self.name = val
       when :value
@@ -180,23 +179,21 @@ class HTTP::Cookie
         @httponly = val
       when :secure, :secure?
         @secure = val
-      when /[A-Z]/
-        warn "keyword should be downcased: #{key}" if $VERBOSE
-        key = key.downcase
-        redo
       when Symbol
         setter = :"#{key}="
         if respond_to?(setter)
           __send__(setter, val)
         else
-          warn "unknown keyword: #{key}" if $VERBOSE
+          warn "unknown attribute name: #{okey.inspect}" if $VERBOSE
+          next
         end
       when String
-        key = key.to_sym
+        warn "use downcased symbol for keyword: #{okey.inspect}" if $VERBOSE
+        key = key.downcase.to_sym
         redo
       else
-        key = key.to_s
-        redo
+        warn "invalid keyword ignored: #{okey.inspect}" if $VERBOSE
+        next
       end
     }
     if @name.nil?
@@ -343,7 +340,7 @@ class HTTP::Cookie
   attr_reader :name
 
   # See #name.
-  def name=(name)
+  def name= name
     name = (String.try_convert(name) or
       raise TypeError, "#{name.class} is not a String")
     if name.empty?
@@ -360,7 +357,7 @@ class HTTP::Cookie
   attr_reader :value
 
   # See #value.
-  def value=(value)
+  def value= value
     if value.nil?
       self.expires = UNIX_EPOCH
       return @value = ''
@@ -379,7 +376,7 @@ class HTTP::Cookie
   attr_reader :domain
 
   # See #domain.
-  def domain=(domain)
+  def domain= domain
     case domain
     when nil
       @for_domain = false
@@ -437,7 +434,7 @@ class HTTP::Cookie
   attr_reader :path
 
   # See #path.
-  def path=(path)
+  def path= path
     path = (String.try_convert(path) or
       raise TypeError, "#{path.class} is not a String")
     @path = path.start_with?('/') ? path : '/'
@@ -446,7 +443,7 @@ class HTTP::Cookie
   attr_reader :origin
 
   # See #origin.
-  def origin=(origin)
+  def origin= origin
     return origin if origin == @origin
     @origin.nil? or
       raise ArgumentError, "origin cannot be changed once it is set"
@@ -482,7 +479,7 @@ class HTTP::Cookie
   end
 
   # See #expires.
-  def expires=(t)
+  def expires= t
     case t
     when nil, Time
     else
@@ -499,7 +496,7 @@ class HTTP::Cookie
   attr_reader :max_age
 
   # See #max_age.
-  def max_age=(sec)
+  def max_age= sec
     @expires = nil
     case sec
     when Integer, nil
@@ -635,7 +632,7 @@ class HTTP::Cookie
 
   # Compares the cookie with another.  When there are many cookies with
   # the same name for a URL, the value of the smallest must be used.
-  def <=>(other)
+  def <=> other
     # RFC 6265 5.4
     # Precedence: 1. longer path  2. older creation
     (@name <=> other.name).nonzero? ||

data/lib/http/cookie/ruby_compat.rb

@@ -1,5 +1,5 @@
 class Array
-  def select!
+  def select! # :yield: x
     i = 0
     each_with_index { |x, j|
       yield x or next
@@ -10,6 +10,10 @@ class Array
     self[i..-1] = []
     self
   end unless method_defined?(:select!)
+
+  def sort_by!(&block) # :yield: x
+    replace(sort_by(&block))
+  end unless method_defined?(:sort_by!)
 end
 
 class Hash

data/lib/http/cookie/scanner.rb

@@ -152,13 +152,6 @@ class HTTP::Cookie::Scanner < StringScanner
   end
 
   def scan_set_cookie
-    unless block_given?
-      scan_set_cookie { |*values|
-        return values
-      }
-      return
-    end
-
     # RFC 6265 4.1.1 & 5.2
     until eos?
       start = pos
@@ -221,13 +214,6 @@ class HTTP::Cookie::Scanner < StringScanner
   end
 
   def scan_cookie
-    unless block_given?
-      scan_cookie { |*values|
-        return values
-      }
-      return
-    end
-
     # RFC 6265 4.1.1 & 5.4
     until eos?
       skip_wsp

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "1.0.0.pre12"
+    VERSION = "1.0.0"
   end
 end

data/lib/http/cookie_jar.rb

@@ -6,9 +6,6 @@ require 'http/cookie'
 # any particular website.
 
 class HTTP::CookieJar
-  require 'http/cookie_jar/abstract_store'
-  require 'http/cookie_jar/abstract_saver'
-
   class << self
     def const_missing(name)
       case name.to_s
@@ -62,6 +59,7 @@ class HTTP::CookieJar
     end
   end
 
+  # The copy constructor.  Not all backend store classes support cloning.
   def initialize_copy(other)
     @store = other.instance_eval { @store.dup }
   end
@@ -94,7 +92,7 @@ class HTTP::CookieJar
       begin
         cookie.acceptable?
       rescue RuntimeError => e
-          raise ArgumentError, e.message
+        raise ArgumentError, e.message
       end
     self
   end
@@ -139,7 +137,7 @@ class HTTP::CookieJar
   #
   # If (and only if) the `uri` option is given, last access time of
   # each cookie is updated to the current time.
-  def each(uri = nil, &block)
+  def each(uri = nil, &block) # :yield: cookie
     block_given? or return enum_for(__method__, uri)
 
     if uri
@@ -210,7 +208,7 @@ class HTTP::CookieJar
   #     </dl>
   #
   # All options given are passed through to the underlying cookie
-  # saver module.
+  # saver module's constructor.
   def save(writable, *options)
     opthash = {
       :format => :yaml,
@@ -269,7 +267,7 @@ class HTTP::CookieJar
   #     </dl>
   #
   # All options given are passed through to the underlying cookie
-  # saver module.
+  # saver module's constructor.
   def load(readable, *options)
     opthash = {
       :format => :yaml,
@@ -314,7 +312,8 @@ class HTTP::CookieJar
     self
   end
 
-  # Removes expired cookies and returns self.
+  # Removes expired cookies and returns self.  If `session` is true,
+  # all session cookies are removed as well.
   def cleanup(session = false)
     @store.cleanup session
     self

data/lib/http/cookie_jar/abstract_saver.rb

@@ -1,3 +1,6 @@
+# :markup: markdown
+
+# An abstract superclass for all saver classes.
 class HTTP::CookieJar::AbstractSaver
   class << self
     @@class_map = {}
@@ -16,20 +19,25 @@ class HTTP::CookieJar::AbstractSaver
       end
     end
 
-    def inherited(subclass)
+    def inherited(subclass) # :nodoc:
       @@class_map[class_to_symbol(subclass)] = subclass
     end
 
-    def class_to_symbol(klass)
+    def class_to_symbol(klass) # :nodoc:
       klass.name[/[^:]+?(?=Saver$|$)/].downcase.to_sym
     end
   end
 
+  # Defines options and their default values.
   def default_options
     # {}
   end
   private :default_options
 
+  # :call-seq:
+  #   new(**options)
+  #
+  # Called by the constructor of each subclass using super().
   def initialize(options = nil)
     options ||= {}
     @logger  = options[:logger]
@@ -41,10 +49,16 @@ class HTTP::CookieJar::AbstractSaver
     }
   end
 
+  # Implements HTTP::CookieJar#save().
+  #
+  # This is an abstract method that each subclass must override.
   def save(io, jar)
     # self
   end
 
+  # Implements HTTP::CookieJar#load().
+  #
+  # This is an abstract method that each subclass must override.
   def load(io, jar)
     # self
   end

data/lib/http/cookie_jar/abstract_store.rb

@@ -1,5 +1,7 @@
+# :markup: markdown
 require 'monitor'
 
+# An abstract superclass for all store classes.
 class HTTP::CookieJar::AbstractStore
   include MonitorMixin
 
@@ -20,20 +22,25 @@ class HTTP::CookieJar::AbstractStore
       end
     end
 
-    def inherited(subclass)
+    def inherited(subclass) # :nodoc:
       @@class_map[class_to_symbol(subclass)] = subclass
     end
 
-    def class_to_symbol(klass)
+    def class_to_symbol(klass) # :nodoc:
       klass.name[/[^:]+?(?=Store$|$)/].downcase.to_sym
     end
   end
 
+  # Defines options and their default values.
   def default_options
     # {}
   end
   private :default_options
 
+  # :call-seq:
+  #   new(**options)
+  #
+  # Called by the constructor of each subclass using super().
   def initialize(options = nil)
     super() # MonitorMixin
     options ||= {}
@@ -45,14 +52,21 @@ class HTTP::CookieJar::AbstractStore
     }
   end
 
+  # This is an abstract method that each subclass must override.
   def initialize_copy(other)
     # self
   end
 
+  # Implements HTTP::CookieJar#add().
+  #
+  # This is an abstract method that each subclass must override.
   def add(cookie)
     # self
   end
 
+  # Implements HTTP::CookieJar#delete().
+  #
+  # This is an abstract method that each subclass must override.
   def delete(cookie)
     # self
   end
@@ -66,7 +80,9 @@ class HTTP::CookieJar::AbstractStore
   #
   # If (and only if) the +uri+ option is given, last access time of
   # each cookie is updated to the current time.
-  def each(uri = nil, &block)
+  #
+  # This is an abstract method that each subclass must override.
+  def each(uri = nil, &block) # :yield: cookie
     # if uri
     #   ...
     # else
@@ -78,14 +94,22 @@ class HTTP::CookieJar::AbstractStore
   end
   include Enumerable
 
+  # Implements HTTP::CookieJar#empty?().
   def empty?
-    # true or false
+    each { return false }
+    true
   end
 
+  # Implements HTTP::CookieJar#clear().
+  #
+  # This is an abstract method that each subclass must override.
   def clear
     # self
   end
 
+  # Implements HTTP::CookieJar#cleanup().
+  #
+  # This is an abstract method that each subclass must override.
   def cleanup(session = false)
     # if session
     #   select { |cookie| cookie.session? || cookie.expired? }

data/lib/http/cookie_jar/cookiestxt_saver.rb

@@ -1,9 +1,25 @@
+# :markup: markdown
 require 'http/cookie_jar'
 
 # CookiestxtSaver saves and loads cookies in the cookies.txt format.
 class HTTP::CookieJar::CookiestxtSaver < HTTP::CookieJar::AbstractSaver
-  True  = "TRUE"
-  False = "FALSE"
+  # :singleton-method: new
+  # :call-seq:
+  #   new(**options)
+  #
+  # Available option keywords are below:
+  #
+  # * `:header`
+  #
+  #     Specifies the header line not including a line feed, which is
+  #     only used by #save().  None is output if nil is
+  #     given. (default: `"# HTTP Cookie File"`)
+  #
+  # * `:linefeed`
+  #
+  #     Specifies the line separator (default: `"\n"`).
+
+  ##
 
   def save(io, jar)
     io.puts @header if @header
@@ -28,8 +44,13 @@ class HTTP::CookieJar::CookiestxtSaver < HTTP::CookieJar::AbstractSaver
     }
   end
 
+  # :stopdoc:
+  True  = "TRUE"
+  False = "FALSE"
+
   HTTPONLY_PREFIX = '#HttpOnly_'
   RE_HTTPONLY_PREFIX = /\A#{HTTPONLY_PREFIX}/
+  # :startdoc:
 
   # Serializes the cookie into a cookies.txt line.
   def cookie_to_record(cookie)

data/lib/http/cookie_jar/hash_store.rb

@@ -1,13 +1,6 @@
+# :markup: markdown
 require 'http/cookie_jar'
 
-# :stopdoc:
-class Array
-  def sort_by!(&block)
-    replace(sort_by(&block))
-  end unless method_defined?(:sort_by!)
-end
-# :startdoc:
-
 class HTTP::CookieJar
   # A store class that uses a hash-based cookie store.
   #
@@ -26,6 +19,9 @@ class HTTP::CookieJar
       }
     end
 
+    # :call-seq:
+    #   new(**options)
+    #
     # Generates a hash based cookie store.
     #
     # Available option keywords are as below:
@@ -50,6 +46,7 @@ class HTTP::CookieJar
       @gc_index = 0
     end
 
+    # The copy constructor.  This store class supports cloning.
     def initialize_copy(other)
       @jar = Marshal.load(Marshal.dump(other.instance_variable_get(:@jar)))
     end
@@ -67,7 +64,7 @@ class HTTP::CookieJar
       self
     end
 
-    def each(uri = nil)
+    def each(uri = nil) # :yield: cookie
       now = Time.now
       if uri
         thost = DomainName.new(uri.host)
@@ -113,10 +110,6 @@ class HTTP::CookieJar
       self
     end
 
-    def empty?
-      @jar.empty?
-    end
-
     def cleanup(session = false)
       now = Time.now
       all_cookies = []

data/lib/http/cookie_jar/mozilla_store.rb

@@ -68,6 +68,9 @@ class HTTP::CookieJar
     end
     # :startdoc:
 
+    # :call-seq:
+    #   new(**options)
+    #
     # Generates a Mozilla cookie store.  If the file does not exist,
     # it is created.  If it does and its schema is old, it is
     # automatically upgraded with a new schema keeping the existing
@@ -109,6 +112,7 @@ class HTTP::CookieJar
       @gc_index = 0
     end
 
+    # Raises TypeError.  Cloning is inhibited in this store class.
     def initialize_copy(other)
       raise TypeError, 'can\'t clone %s' % self.class
     end
@@ -138,7 +142,7 @@ class HTTP::CookieJar
 
     protected
 
-    def schema_version=(version)
+    def schema_version= version
       @db.execute("PRAGMA user_version = %d" % version)
       @schema_version = version
     end
@@ -329,7 +333,7 @@ class HTTP::CookieJar
               expiry >= :expiry
     SQL
 
-    def each(uri = nil, &block)
+    def each(uri = nil, &block) # :yield: cookie
       now = Time.now
       if uri
         thost = DomainName.new(uri.host)
@@ -398,19 +402,6 @@ class HTTP::CookieJar
       self
     end
 
-    SQL[:count] = <<-'SQL'
-      SELECT COUNT(id) FROM moz_cookies
-    SQL
-
-    def count
-      @stmt[:count].execute.first[0]
-    end
-    protected :count
-
-    def empty?
-      @sjar.empty? && count == 0
-    end
-
     SQL[:delete_expired] = <<-'SQL'
       DELETE FROM moz_cookies WHERE expiry < :expiry
     SQL

data/lib/http/cookie_jar/yaml_saver.rb

@@ -1,9 +1,20 @@
+# :markup: markdown
 require 'http/cookie_jar'
 require 'psych' if !defined?(YAML) && RUBY_VERSION == "1.9.2"
 require 'yaml'
 
-# YAMLSaver saves and loads cookies in the YAML format.
+# YAMLSaver saves and loads cookies in the YAML format.  It can load a
+# YAML file saved by Mechanize, but the saving format is not
+# compatible with older versions of Mechanize (< 2.7).
 class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
+  # :singleton-method: new
+  # :call-seq:
+  #   new(**options)
+  #
+  # There is no option keyword supported at the moment.
+
+  ##
+
   def save(io, jar)
     YAML.dump(@session ? jar.to_a : jar.reject(&:session?), io)
   end
@@ -42,7 +53,11 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
               # YAML::Object of Syck
               cookie_hash = cookie_hash.ivars
             end
-            cookie = HTTP::Cookie.new(cookie_hash)
+            cookie = HTTP::Cookie.new({}.tap { |hash|
+                cookie_hash.each_pair { |key, value|
+                  hash[key.to_sym] = value
+                }
+              })
             jar.add(cookie)
           }
         }

data/test/helper.rb

@@ -3,6 +3,30 @@ 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]
@@ -23,3 +47,9 @@ 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
+  end
+end

data/test/test_http_cookie.rb

@@ -2,13 +2,6 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
 class TestHTTPCookie < Test::Unit::TestCase
-  def silently
-    warn_level, $VERBOSE = $VERBOSE, false
-    yield
-  ensure
-    $VERBOSE = warn_level
-  end
-
   def setup
     httpdate = 'Sun, 27-Sep-2037 00:00:00 GMT'
 
@@ -46,12 +39,10 @@ class TestHTTPCookie < Test::Unit::TestCase
 
     dates.each do |date|
       cookie = "PREF=1; expires=#{date}"
-      silently do
-        assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
-          assert c.expires, "Tried parsing: #{date}"
-          assert_send [c.expires, :<, yesterday]
-        }.size
-      end
+      assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
+        assert c.expires, "Tried parsing: #{date}"
+        assert_send [c.expires, :<, yesterday]
+      }.size
     end
 
     [
@@ -177,14 +168,12 @@ class TestHTTPCookie < Test::Unit::TestCase
       "20/06/95 21:07",
     ]
 
-    silently do
-      dates.each do |date|
-        cookie = "PREF=1; expires=#{date}"
-        assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
-          assert_equal(true, c.expires.nil?)
-        }.size
-      end
-    end
+    dates.each { |date|
+      cookie = "PREF=1; expires=#{date}"
+      assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
+        assert_equal(true, c.expires.nil?)
+      }.size
+    }
   end
 
   def test_parse_domain_dot
@@ -537,6 +526,30 @@ class TestHTTPCookie < Test::Unit::TestCase
       cookie.acceptable?
     }
 
+    # various keywords
+    [
+      ["Expires", /use downcased symbol/],
+    ].each { |key, pattern|
+      assert_warning(pattern, "warn of key: #{key.inspect}") {
+        cookie = HTTP::Cookie.new(:value => 'value', :name => 'key', key => expires.dup)
+        assert_equal 'key', cookie.name
+        assert_equal 'value', cookie.value
+        assert_equal expires, cookie.expires, "key: #{key.inspect}"
+      }
+    }
+    [
+      [:Expires,   /unknown attribute name/],
+      [:expires?,  /unknown attribute name/],
+      [[:expires], /invalid keyword/],
+    ].each { |key, pattern|
+      assert_warning(pattern, "warn of key: #{key.inspect}") {
+        cookie = HTTP::Cookie.new(:value => 'value', :name => 'key', key => expires.dup)
+        assert_equal 'key', cookie.name
+        assert_equal 'value', cookie.value
+        assert_equal nil, cookie.expires, "key: #{key.inspect}"
+      }
+    }
+
     cookie = HTTP::Cookie.new(:value => 'value', :name => 'key', :expires => expires.dup)
     assert_equal 'key', cookie.name
     assert_equal 'value', cookie.value

data/test/test_http_cookie_jar.rb

@@ -2,11 +2,63 @@ require File.expand_path('helper', File.dirname(__FILE__))
 require 'tmpdir'
 
 module TestHTTPCookieJar
+  class TestAutoloading < Test::Unit::TestCase
+    def test_nonexistent_store
+      assert_raises(NameError) {
+        HTTP::CookieJar::NonexistentStore
+      }
+    end
+
+    def test_erroneous_store
+      Dir.mktmpdir { |dir|
+        Dir.mkdir(File.join(dir, 'http'))
+        Dir.mkdir(File.join(dir, 'http', 'cookie_jar'))
+        rb = File.join(dir, 'http', 'cookie_jar', 'erroneous_store.rb')
+        File.open(rb, 'w').close
+        $LOAD_PATH.unshift(dir)
+
+        assert_raises(NameError) {
+          HTTP::CookieJar::ErroneousStore
+        }
+        if RUBY_VERSION >= "1.9"
+          assert_includes $LOADED_FEATURES, rb
+        else
+          assert_includes $LOADED_FEATURES, rb[(dir.size + 1)..-1]
+        end
+      }
+    end
+
+    def test_nonexistent_saver
+      assert_raises(NameError) {
+        HTTP::CookieJar::NonexistentSaver
+      }
+    end
+
+    def test_erroneous_saver
+      Dir.mktmpdir { |dir|
+        Dir.mkdir(File.join(dir, 'http'))
+        Dir.mkdir(File.join(dir, 'http', 'cookie_jar'))
+        rb = File.join(dir, 'http', 'cookie_jar', 'erroneous_saver.rb')
+        File.open(rb, 'w').close
+        $LOAD_PATH.unshift(dir)
+
+        assert_raises(NameError) {
+          HTTP::CookieJar::ErroneousSaver
+        }
+        if RUBY_VERSION >= "1.9"
+          assert_includes $LOADED_FEATURES, rb
+        else
+          assert_includes $LOADED_FEATURES, rb[(dir.size + 1)..-1]
+        end
+      }
+    end
+  end
+
   module CommonTests
     def setup(options = nil, options2 = nil)
       default_options = {
         :store => :hash,
-        :gc_threshold => 150,
+        :gc_threshold => 1500, # increased by 10 for shorter test time
       }
       new_options  = default_options.merge(options || {})
       new_options2 = new_options.merge(options2 || {})
@@ -692,7 +744,7 @@ module TestHTTPCookieJar
       @jar.cleanup
       count = @jar.to_a.size
       assert_equal limit_per_domain, count
-      assert_equal [*1..41] + [*43..(limit_per_domain + 1)], @jar.map { |cookie|
+      assert_equal [*1..(limit_per_domain + 1)] - [42], @jar.map { |cookie|
         cookie.name[/(\d+)$/].to_i
       }.sort
 
@@ -749,6 +801,46 @@ module TestHTTPCookieJar
       assert_equal %w[Akinori Japan], cookies.map { |c| c.value }
       assert_equal %w[Japan Akinori], @jar.to_a.sort_by { |c| c.name }.map { |c| c.value }
     end
+
+    def test_expire_by_each_and_cleanup
+      uri = URI('http://www.example.org/')
+
+      ts = Time.now.to_f
+      if ts % 1 > 0.5
+        sleep 0.5
+        ts += 0.5
+      end
+      expires = Time.at(ts.floor)
+      time = expires
+
+      if mozilla_store?
+        # MozillaStore only has the time precision of seconds.
+        time = expires
+        expires -= 1
+      end
+
+      0.upto(2) { |i|
+        c = HTTP::Cookie.new('Foo%d' % (3 - i), 'Bar', :expires => expires + i, :origin => uri)
+        @jar  << c
+        @jar2 << c
+      }
+
+      assert_equal %w[Foo1 Foo2], @jar.cookies.map(&:name)
+      assert_equal %w[Foo1 Foo2], @jar2.cookies(uri).map(&:name)
+
+      sleep_until time + 1
+
+      assert_equal %w[Foo1], @jar.cookies.map(&:name)
+      assert_equal %w[Foo1], @jar2.cookies(uri).map(&:name)
+
+      sleep_until time + 2
+
+      @jar.cleanup
+      @jar2.cleanup
+
+      assert_send [@jar,  :empty?]
+      assert_send [@jar2, :empty?]
+    end
   end
 
   class WithHashStore < Test::Unit::TestCase
@@ -770,6 +862,20 @@ module TestHTTPCookieJar
       }
     end
 
+    def test_clone
+      jar = @jar.clone
+      assert_not_send [
+        @jar.store,
+        :equal?,
+        jar.store
+      ]
+      assert_not_send [
+        @jar.store.instance_variable_get(:@jar),
+        :equal?,
+        jar.store.instance_variable_get(:@jar)
+      ]
+      assert_equal @jar.cookies, jar.cookies
+    end
   end
 
   class WithMozillaStore < Test::Unit::TestCase
@@ -789,6 +895,12 @@ module TestHTTPCookieJar
       jar.delete(HTTP::Cookie.new("name", :domain => 'rubyforge.org'))
     end
 
+    def test_clone
+      assert_raises(TypeError) {
+        @jar.clone
+      }
+    end
+
     def test_close
       add_and_delete(@jar)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre12
+  version: 1.0.0
 platform: ruby
 authors:
 - Akinori MUSHA
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domain_name
@@ -161,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3