http-cookie 1.0.0.pre11 → 1.0.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a442b5c8222376568f11b2ed2f3ff948cb297a
-  data.tar.gz: 27b3d634fdd2e75bff0302f89463b5ed777e936f
+  metadata.gz: 2a70ec83e62018ae7621d1eb7ba75f08eea1d696
+  data.tar.gz: 9ed2b81801d89bb7adf3f6d97b087421406f4acf
 SHA512:
-  metadata.gz: 48ee26913f44add403e4d620e75b6f64156efaf23b37ab30e7c10543bd765a12adaeb25ff7f6c666410b82d291457f049d718ae4d802906be53db5a28638b89c
-  data.tar.gz: 7703dd086e0802411ab9e7ee9c12278a3321a41a0fcecdb203a6de3e2848c5c73e6e5a4141ccb01f65e165e1f80a3c8b3ea1a60be3505bb5ea1bcfa2bf55fc59
+  metadata.gz: f1ba260a8757b9076df6645368f761005cc665ef1c4ae357f102982132ed66253ae7cb49d163430bd3070225524c0cd4a988b2abbc4252e3e68e8376eea68542
+  data.tar.gz: bca8c545043e5b4975e32350dcf37f1519a183e3d207bb2692313863104884750ef656ed568106b69beab35e53b0536c36b677846255b1d477af95d022c74bfe

data/lib/http/cookie.rb

@@ -344,8 +344,8 @@ class HTTP::Cookie
 
   # See #name.
   def name=(name)
-    name = String.try_convert(name) or
-      raise TypeError, "#{name.class} is not a String"
+    name = (String.try_convert(name) or
+      raise TypeError, "#{name.class} is not a String")
     if name.empty?
       raise ArgumentError, "cookie name cannot be empty"
     elsif name.match(/[\x00-\x20\x7F,;\\"=]/)
@@ -365,8 +365,8 @@ class HTTP::Cookie
       self.expires = UNIX_EPOCH
       return @value = ''
     end
-    value = String.try_convert(value) or
-      raise TypeError, "#{value.class} is not a String"
+    value = (String.try_convert(value) or
+      raise TypeError, "#{value.class} is not a String")
     if value.match(/[\x00-\x1F\x7F]/)
       raise ArgumentError, "invalid cookie value"
     end
@@ -393,8 +393,8 @@ class HTTP::Cookie
     when DomainName
       @domain_name = domain
     else
-      domain = String.try_convert(domain) or
-        raise TypeError, "#{domain.class} is not a String"
+      domain = (String.try_convert(domain) or
+        raise TypeError, "#{domain.class} is not a String")
       if domain.start_with?('.')
         for_domain = true
         domain = domain[1..-1]
@@ -438,8 +438,8 @@ class HTTP::Cookie
 
   # See #path.
   def path=(path)
-    path = String.try_convert(path) or
-      raise TypeError, "#{path.class} is not a String"
+    path = (String.try_convert(path) or
+      raise TypeError, "#{path.class} is not a String")
     @path = path.start_with?('/') ? path : '/'
   end
 
@@ -564,9 +564,9 @@ class HTTP::Cookie
   def acceptable?
     case
     when @domain.nil?
-      raise ArgumentError, "domain is missing"
+      raise "domain is missing"
     when @path.nil?
-      raise ArgumentError, "path is missing"
+      raise "path is missing"
     when @origin.nil?
       true
     else
@@ -574,8 +574,8 @@ class HTTP::Cookie
     end
   end
 
-  # Tests if it is OK to send this cookie to a given `uri`.  A runtime
-  # error is raised if the cookie's domain is unknown.
+  # Tests if it is OK to send this cookie to a given `uri`.  A
+  # RuntimeError is raised if the cookie's domain is unknown.
   def valid_for_uri?(uri)
     if @domain.nil?
       raise "cannot tell if this cookie is valid because the domain is unknown"

data/lib/http/cookie/version.rb

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

data/lib/http/cookie_jar.rb

@@ -9,6 +9,27 @@ 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
+      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 => e
+        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
 
   # Generates a new cookie jar.
@@ -69,7 +90,12 @@ class HTTP::CookieJar
   #       jar.origin = origin
   #       jar.add(cookie)     # acceptance check is performed
   def add(cookie)
-    @store.add(cookie) if cookie.acceptable?
+    @store.add(cookie) if
+      begin
+        cookie.acceptable?
+      rescue RuntimeError => e
+          raise ArgumentError, e.message
+      end
     self
   end
   alias << add

data/lib/http/cookie_jar/abstract_saver.rb

@@ -26,7 +26,7 @@ class HTTP::CookieJar::AbstractSaver
   end
 
   def default_options
-    {}
+    # {}
   end
   private :default_options
 
@@ -42,10 +42,10 @@ class HTTP::CookieJar::AbstractSaver
   end
 
   def save(io, jar)
-    raise
+    # self
   end
 
   def load(io, jar)
-    raise
+    # self
   end
 end

data/lib/http/cookie_jar/abstract_store.rb

@@ -30,7 +30,7 @@ class HTTP::CookieJar::AbstractStore
   end
 
   def default_options
-    {}
+    # {}
   end
   private :default_options
 
@@ -46,18 +46,15 @@ class HTTP::CookieJar::AbstractStore
   end
 
   def initialize_copy(other)
-    raise
-    self
+    # self
   end
 
   def add(cookie)
-    raise
-    self
+    # self
   end
 
   def delete(cookie)
-    raise
-    self
+    # self
   end
 
   # Iterates over all cookies that are not expired.
@@ -70,35 +67,34 @@ 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)
-    if uri
-      raise
-    else
-      synchronize {
-        raise
-      }
-    end
-    self
+    # if uri
+    #   ...
+    # else
+    #   synchronize {
+    #     ...
+    #   }
+    # end
+    # self
   end
   include Enumerable
 
   def empty?
-    raise
+    # true or false
   end
 
   def clear
-    raise
-    self
+    # self
   end
 
   def cleanup(session = false)
-    if session
-      select { |cookie| cookie.session? || cookie.expired? }
-    else
-      select(&:expired?)
-    end.each { |cookie|
-      delete(cookie)
-    }
-    # subclasses can optionally remove over-the-limit cookies.
-    self
+    # if session
+    #   select { |cookie| cookie.session? || cookie.expired? }
+    # else
+    #   select(&:expired?)
+    # end.each { |cookie|
+    #   delete(cookie)
+    # }
+    # # subclasses can optionally remove over-the-limit cookies.
+    # self
   end
 end

data/lib/http/cookie_jar/mozilla_store.rb

@@ -9,6 +9,7 @@ class HTTP::CookieJar
   # Session cookies are stored separately on memory and will not be
   # stored persistently in the SQLite3 database.
   class MozillaStore < AbstractStore
+    # :stopdoc:
     SCHEMA_VERSION = 5
 
     def default_options
@@ -32,6 +33,41 @@ class HTTP::CookieJar
       appId inBrowserElement
     ]
 
+    SQL = {}
+
+    Callable = proc { |obj, meth, *args|
+      proc {
+        obj.__send__(meth, *args)
+      }
+    }
+
+    class Database < SQLite3::Database
+      def initialize(file, options = {})
+        @stmts = []
+        options = {
+          :results_as_hash => true,
+        }.update(options)
+        super
+      end
+
+      def prepare(sql)
+        case st = super
+        when SQLite3::Statement
+          @stmts << st
+        end
+        st
+      end
+
+      def close
+        return self if closed?
+        @stmts.reject! { |st|
+          st.closed? || st.close
+        }
+        super
+      end
+    end
+    # :startdoc:
+
     # 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
@@ -58,22 +94,32 @@ class HTTP::CookieJar
 
       @filename = options[:filename] or raise ArgumentError, ':filename option is missing'
 
-      @sjar = HashStore.new
-      @db = SQLite3::Database.new(@filename)
-      @db.results_as_hash = true
+      @sjar = HTTP::CookieJar::HashStore.new
+
+      @db = Database.new(@filename)
+
+      @stmt = Hash.new { |st, key|
+        st[key] = @db.prepare(SQL[key])
+      }
+
+      ObjectSpace.define_finalizer(self, Callable[@db, :close])
 
       upgrade_database
 
       @gc_index = 0
     end
 
+    def initialize_copy(other)
+      raise TypeError, 'can\'t clone %s' % self.class
+    end
+
     # The file name of the SQLite3 database given in initialization.
     attr_reader :filename
 
     # Closes the SQLite3 database.  After closing, any operation may
     # raise an error.
     def close
-      @db.close
+      @db.closed? || @db.close
       self
     end
 
@@ -126,6 +172,13 @@ class HTTP::CookieJar
       SQL
     end
 
+    def db_prepare(sql)
+      st = @db.prepare(sql)
+      yield st
+    ensure
+      st.close if st
+    end
+
     def upgrade_database
       loop {
         case schema_version
@@ -138,28 +191,28 @@ class HTTP::CookieJar
         when 2
           @db.execute("ALTER TABLE moz_cookies ADD baseDomain TEXT")
 
-          st_update = @db.prepare("UPDATE moz_cookies SET baseDomain = :baseDomain WHERE id = :id")
-
-          @db.execute("SELECT id, host FROM moz_cookies") { |row|
-            domain_name = DomainName.new(row[:host])
-            domain = domain_name.domain || domain_name.hostname
-            st_update.execute(:baseDomain => domain, :id => row[:id])
+          db_prepare("UPDATE moz_cookies SET baseDomain = :baseDomain WHERE id = :id") { |st_update|
+            @db.execute("SELECT id, host FROM moz_cookies") { |row|
+              domain_name = DomainName.new(row['host'][/\A\.?(.*)/, 1])
+              domain = domain_name.domain || domain_name.hostname
+              st_update.execute(:baseDomain => domain, :id => row['id'])
+            }
           }
 
           @db.execute("CREATE INDEX moz_basedomain ON moz_cookies (baseDomain)")
           self.schema_version += 1
         when 3
-          st_delete = @db.prepare("DELETE FROM moz_cookies WHERE id = :id")
-
-          prev_row  = nil
-          @db.execute(<<-'SQL') { |row|
-                       SELECT id, name, host, path FROM moz_cookies
-                         ORDER BY name ASC, host ASC, path ASC, expiry ASC
-          SQL
-            if %w[name host path].all? { |col| row[col] == prev_row[col] }
-              st_delete.execute(prev_row['id'])
-            end
-            prev_row = row
+          db_prepare("DELETE FROM moz_cookies WHERE id = :id") { |st_delete|
+            prev_row = nil
+            @db.execute(<<-'SQL') { |row|
+                         SELECT id, name, host, path FROM moz_cookies
+                           ORDER BY name ASC, host ASC, path ASC, expiry ASC
+            SQL
+              if %w[name host path].all? { |col| prev_row and row[col] == prev_row[col] }
+                st_delete.execute(prev_row['id'])
+              end
+              prev_row = row
+            }
           }
 
           @db.execute("ALTER TABLE moz_cookies ADD creationTime INTEGER")
@@ -192,14 +245,15 @@ class HTTP::CookieJar
       end
     end
 
-    def db_add(cookie)
-      @st_add ||=
-        @db.prepare('INSERT OR REPLACE INTO moz_cookies (%s) VALUES (%s)' % [
-          ALL_COLUMNS.join(', '),
-          ALL_COLUMNS.map { |col| ":#{col}" }.join(', ')
-        ])
+    SQL[:add] = <<-'SQL' % [
+      INSERT OR REPLACE INTO moz_cookies (%s) VALUES (%s)
+    SQL
+      ALL_COLUMNS.join(', '),
+      ALL_COLUMNS.map { |col| ":#{col}" }.join(', ')
+    ]
 
-      @st_add.execute({
+    def db_add(cookie)
+      @stmt[:add].execute({
           :baseDomain => cookie.domain_name.domain || cookie.domain,
           :appId => @app_id,
           :inBrowserElement => @in_browser_element ? 1 : 0,
@@ -217,18 +271,17 @@ class HTTP::CookieJar
       self
     end
 
+    SQL[:delete] = <<-'SQL'
+      DELETE FROM moz_cookies
+        WHERE appId = :appId AND
+              inBrowserElement = :inBrowserElement AND
+              name = :name AND
+              host = :host AND
+              path = :path
+    SQL
+
     def db_delete(cookie)
-      @st_delete ||=
-        @db.prepare(<<-'SQL')
-                     DELETE FROM moz_cookies
-                       WHERE appId = :appId AND
-                             inBrowserElement = :inBrowserElement AND
-                             name = :name AND
-                             host = :host AND
-                             path = :path
-                    SQL
-
-      @st_delete.execute({
+      @stmt[:delete].execute({
           :appId => @app_id,
           :inBrowserElement => @in_browser_element ? 1 : 0,
           :name => cookie.name,
@@ -255,25 +308,34 @@ class HTTP::CookieJar
       db_delete(cookie)
     end
 
+    SQL[:cookies_for_domain] = <<-'SQL'
+      SELECT * FROM moz_cookies
+        WHERE baseDomain = :baseDomain AND
+              appId = :appId AND
+              inBrowserElement = :inBrowserElement AND
+              expiry >= :expiry
+    SQL
+
+    SQL[:update_lastaccessed] = <<-'SQL'
+      UPDATE moz_cookies
+        SET lastAccessed = :lastAccessed
+        WHERE id = :id
+    SQL
+
+    SQL[:all_cookies] = <<-'SQL'
+      SELECT * FROM moz_cookies
+        WHERE appId = :appId AND
+              inBrowserElement = :inBrowserElement AND
+              expiry >= :expiry
+    SQL
+
     def each(uri = nil, &block)
       now = Time.now
       if uri
-        @st_cookies_for_domain ||=
-          @db.prepare(<<-'SQL')
-                       SELECT * FROM moz_cookies
-                         WHERE baseDomain = :baseDomain AND
-                               appId = :appId AND
-                               inBrowserElement = :inBrowserElement AND
-                               expiry >= :expiry
-                      SQL
-
-        @st_update_lastaccessed ||=
-            @db.prepare("UPDATE moz_cookies SET lastAccessed = :lastAccessed where id = :id")
-
         thost = DomainName.new(uri.host)
         tpath = uri.path
 
-        @st_cookies_for_domain.execute({
+        @stmt[:cookies_for_domain].execute({
             :baseDomain => thost.domain || thost.hostname,
             :appId => @app_id,
             :inBrowserElement => @in_browser_element ? 1 : 0,
@@ -289,15 +351,15 @@ class HTTP::CookieJar
               attrs[:domain]      = row['host']
               attrs[:path]        = row['path']
               attrs[:expires_at]  = Time.at(row['expiry'])
-              attrs[:accessed_at] = Time.at(row['lastAccessed'])
-              attrs[:created_at]  = Time.at(row['creationTime'])
+              attrs[:accessed_at] = Time.at(row['lastAccessed'] || 0)
+              attrs[:created_at]  = Time.at(row['creationTime'] || 0)
               attrs[:secure]      = secure
               attrs[:httponly]    = row['isHttpOnly'] != 0
             })
 
           if cookie.valid_for_uri?(uri)
             cookie.accessed_at = now
-            @st_update_lastaccessed.execute({
+            @stmt[:update_lastaccessed].execute({
                 'lastAccessed' => now.to_i,
                 'id' => row['id'],
               })
@@ -306,15 +368,7 @@ class HTTP::CookieJar
         }
         @sjar.each(uri, &block)
       else
-        @st_all_cookies ||=
-          @db.prepare(<<-'SQL')
-                       SELECT * FROM moz_cookies
-                         WHERE appId = :appId AND
-                               inBrowserElement = :inBrowserElement AND
-                               expiry >= :expiry
-                      SQL
-
-        @st_all_cookies.execute({
+        @stmt[:all_cookies].execute({
             :appId => @app_id,
             :inBrowserElement => @in_browser_element ? 1 : 0,
             :expiry => now.to_i,
@@ -325,8 +379,8 @@ class HTTP::CookieJar
               attrs[:domain]      = row['host']
               attrs[:path]        = row['path']
               attrs[:expires_at]  = Time.at(row['expiry'])
-              attrs[:accessed_at] = Time.at(row['lastAccessed'])
-              attrs[:created_at]  = Time.at(row['creationTime'])
+              attrs[:accessed_at] = Time.at(row['lastAccessed'] || 0)
+              attrs[:created_at]  = Time.at(row['creationTime'] || 0)
               attrs[:secure]      = row['isSecure'] != 0
               attrs[:httponly]    = row['isHttpOnly'] != 0
             })
@@ -344,11 +398,12 @@ class HTTP::CookieJar
       self
     end
 
-    def count
-      @st_count ||=
-        @db.prepare("SELECT COUNT(id) FROM moz_cookies")
+    SQL[:count] = <<-'SQL'
+      SELECT COUNT(id) FROM moz_cookies
+    SQL
 
-      @st_count.execute.first[0]
+    def count
+      @stmt[:count].execute.first[0]
     end
     protected :count
 
@@ -356,44 +411,43 @@ class HTTP::CookieJar
       @sjar.empty? && count == 0
     end
 
-    def cleanup(session = false)
-      @st_delete_expired ||=
-        @db.prepare("DELETE FROM moz_cookies WHERE expiry < :expiry")
-
-      @st_overusing_domains ||=
-        @db.prepare(<<-'SQL')
-                     SELECT LTRIM(host, '.') domain, COUNT(*) count
-                       FROM moz_cookies
-                       GROUP BY domain
-                       HAVING count > :count
-                    SQL
-
-      @st_delete_per_domain_overuse ||=
-        @db.prepare(<<-'SQL')
-                     DELETE FROM moz_cookies WHERE id IN (
-                       SELECT id FROM moz_cookies
-                         WHERE LTRIM(host, '.') = :domain
-                         ORDER BY creationtime
-                         LIMIT :limit)
-        SQL
-      @st_delete_total_overuse ||=
-        @db.prepare(<<-'SQL')
-                     DELETE FROM moz_cookies WHERE id IN (
-                       SELECT id FROM moz_cookies ORDER BY creationTime ASC LIMIT :limit
-                     )
-        SQL
+    SQL[:delete_expired] = <<-'SQL'
+      DELETE FROM moz_cookies WHERE expiry < :expiry
+    SQL
+
+    SQL[:overusing_domains] = <<-'SQL'
+      SELECT LTRIM(host, '.') domain, COUNT(*) count
+        FROM moz_cookies
+        GROUP BY domain
+        HAVING count > :count
+    SQL
+
+    SQL[:delete_per_domain_overuse] = <<-'SQL'
+      DELETE FROM moz_cookies WHERE id IN (
+        SELECT id FROM moz_cookies
+          WHERE LTRIM(host, '.') = :domain
+          ORDER BY creationtime
+          LIMIT :limit)
+    SQL
+
+    SQL[:delete_total_overuse] = <<-'SQL'
+      DELETE FROM moz_cookies WHERE id IN (
+        SELECT id FROM moz_cookies ORDER BY creationTime ASC LIMIT :limit
+      )
+    SQL
 
+    def cleanup(session = false)
       synchronize {
         break if @gc_index == 0
 
-        @st_delete_expired.execute({ 'expiry' => Time.now.to_i })
+        @stmt[:delete_expired].execute({ 'expiry' => Time.now.to_i })
 
-        @st_overusing_domains.execute({
+        @stmt[:overusing_domains].execute({
             'count' => HTTP::Cookie::MAX_COOKIES_PER_DOMAIN
           }).each { |row|
           domain, count = row['domain'], row['count']
 
-          @st_delete_per_domain_overuse.execute({
+          @stmt[:delete_per_domain_overuse].execute({
               'domain' => domain,
               'limit' => count - HTTP::Cookie::MAX_COOKIES_PER_DOMAIN,
             })
@@ -402,7 +456,7 @@ class HTTP::CookieJar
         overrun = count - HTTP::Cookie::MAX_COOKIES_TOTAL
 
         if overrun > 0
-          @st_delete_total_overuse.execute({ 'limit' => overrun })
+          @stmt[:delete_total_overuse].execute({ 'limit' => overrun })
         end
 
         @gc_index = 0

data/lib/http/cookie_jar/yaml_saver.rb

@@ -38,6 +38,10 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
       data.each { |domain, paths|
         paths.each { |path, names|
           names.each { |cookie_name, cookie_hash|
+            if cookie_hash.respond_to?(:ivars)
+              # YAML::Object of Syck
+              cookie_hash = cookie_hash.ivars
+            end
             cookie = HTTP::Cookie.new(cookie_hash)
             jar.add(cookie)
           }

data/test/helper.rb

@@ -19,3 +19,7 @@ module Enumerable
     result
   end
 end
+
+def test_file(filename)
+  File.expand_path(filename, File.dirname(__FILE__))
+end

data/test/mechanize.yml

@@ -0,0 +1,101 @@
+---
+google.com:
+  /:
+    PREF: !ruby/object:Mechanize::Cookie
+      version: 0
+      port: 
+      discard: 
+      comment_url: 
+      expires: Tue, 24 Mar 2065 08:20:15 GMT
+      max_age: 
+      comment: 
+      secure: false
+      path: /
+      domain: google.com
+      accessed_at: 2013-03-24 17:20:15.822619000 +09:00
+      created_at: 2013-03-24 17:20:15.822619000 +09:00
+      name: PREF
+      value: ID=7571a59c059e09db:FF=0:TM=1364199615:LM=1364199615:S=BxUqnqPrchd2cVmC
+      for_domain: true
+      domain_name: !ruby/object:DomainName
+        ipaddr: 
+        hostname: google.com
+        uri_host: google.com
+        tld: com
+        canonical_tld_p: true
+        domain: google.com
+      session: false
+    NID: !ruby/object:Mechanize::Cookie
+      version: 0
+      port: 
+      discard: 
+      comment_url: 
+      expires: Sun, 23 Sep 2063 08:20:15 GMT
+      max_age: 
+      comment: 
+      secure: false
+      path: /
+      domain: google.com
+      accessed_at: 2013-03-24 17:20:15.828434000 +09:00
+      created_at: 2013-03-24 17:20:15.828434000 +09:00
+      name: NID
+      value: 67=Kn2osS6wOzILpl7sCM1QIDmGg2VESBiwCyt6zx4vOVSWKOYDlwGIpgIGrpD8FpkbS9eqizo3QWFa5YkOygnCF6vRIQpbvlTxWB2Hq1Oo-qXWy0317yCqQ-B25eJLfUcC
+      for_domain: true
+      domain_name: !ruby/object:DomainName
+        ipaddr: 
+        hostname: google.com
+        uri_host: google.com
+        tld: com
+        canonical_tld_p: true
+        domain: google.com
+      session: false
+google.co.jp:
+  /:
+    PREF: !ruby/object:Mechanize::Cookie
+      version: 0
+      port: 
+      discard: 
+      comment_url: 
+      expires: Tue, 24 Mar 2065 08:20:16 GMT
+      max_age: 
+      comment: 
+      secure: false
+      path: /
+      domain: google.co.jp
+      accessed_at: 2013-03-24 17:20:17.136581000 +09:00
+      created_at: 2013-03-24 17:20:17.136581000 +09:00
+      name: PREF
+      value: ID=cb25dd1567d8b5c8:FF=0:TM=1364199616:LM=1364199616:S=c3PbhRq79Wo5T_vV
+      for_domain: true
+      domain_name: !ruby/object:DomainName
+        ipaddr: 
+        hostname: google.co.jp
+        uri_host: google.co.jp
+        tld: jp
+        canonical_tld_p: true
+        domain: google.co.jp
+      session: false
+    NID: !ruby/object:Mechanize::Cookie
+      version: 0
+      port: 
+      discard: 
+      comment_url: 
+      expires: Sun, 23 Sep 2063 08:20:16 GMT
+      max_age: 
+      comment: 
+      secure: false
+      path: /
+      domain: google.co.jp
+      accessed_at: 2013-03-24 17:20:17.139782000 +09:00
+      created_at: 2013-03-24 17:20:17.139782000 +09:00
+      name: NID
+      value: 67=GS7P-68zgm_KRA0e0dpN_XbYpmw9uBDe56qUeoCGiSRTahsM7dtOBCKfCoIFRKlzSuOiwJQdIZNpwv3DSXQNHXDKltucgfv2qkHlGeoj8-5VlowPXLLesz2VIpLOLw-a
+      for_domain: true
+      domain_name: !ruby/object:DomainName
+        ipaddr: 
+        hostname: google.co.jp
+        uri_host: google.co.jp
+        tld: jp
+        canonical_tld_p: true
+        domain: google.co.jp
+      session: false

data/test/test_http_cookie.rb

@@ -3,11 +3,10 @@ require File.expand_path('helper', File.dirname(__FILE__))
 
 class TestHTTPCookie < Test::Unit::TestCase
   def silently
-    warn_level = $VERBOSE
-    $VERBOSE = false
-    res = yield
+    warn_level, $VERBOSE = $VERBOSE, false
+    yield
+  ensure
     $VERBOSE = warn_level
-    res
   end
 
   def setup
@@ -523,7 +522,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal 'key', cookie.name
     assert_equal 'value', cookie.value
     assert_equal nil, cookie.expires
-    assert_raises(ArgumentError) {
+    assert_raises(RuntimeError) {
       cookie.acceptable?
     }
 
@@ -534,7 +533,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal 'key', cookie.name
     assert_equal 'value', cookie.value
     assert_equal expires, cookie.expires
-    assert_raises(ArgumentError) {
+    assert_raises(RuntimeError) {
       cookie.acceptable?
     }
 
@@ -543,7 +542,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal 'value', cookie.value
     assert_equal expires, cookie.expires
     assert_equal false, cookie.for_domain?
-    assert_raises(ArgumentError) {
+    assert_raises(RuntimeError) {
       # domain and path are missing
       cookie.acceptable?
     }
@@ -553,7 +552,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal 'value', cookie.value
     assert_equal expires, cookie.expires
     assert_equal true, cookie.for_domain?
-    assert_raises(ArgumentError) {
+    assert_raises(RuntimeError) {
       # path is missing
       cookie.acceptable?
     }
@@ -563,7 +562,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal 'value', cookie.value
     assert_equal expires, cookie.expires
     assert_equal false, cookie.for_domain?
-    assert_raises(ArgumentError) {
+    assert_raises(RuntimeError) {
       # path is missing
       cookie.acceptable?
     }
@@ -574,7 +573,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal expires, cookie.expires
     assert_equal 'example.org', cookie.domain
     assert_equal true, cookie.for_domain?
-    assert_raises(ArgumentError) {
+    assert_raises(RuntimeError) {
       # path is missing
       cookie.acceptable?
     }
@@ -849,7 +848,7 @@ class TestHTTPCookie < Test::Unit::TestCase
       cookie.domain = d
       assert_equal nil, cookie.domain, "domain=#{d.inspect}"
       assert_equal nil, cookie.domain_name, "domain=#{d.inspect}"
-      assert_raises(ArgumentError) {
+      assert_raises(RuntimeError) {
         cookie.acceptable?
       }
 

data/test/test_http_cookie_jar.rb

@@ -2,25 +2,7 @@ require File.expand_path('helper', File.dirname(__FILE__))
 require 'tmpdir'
 
 module TestHTTPCookieJar
-  class TestBasic < Test::Unit::TestCase
-    def test_store
-      jar = HTTP::CookieJar.new(:store => :hash)
-      assert_instance_of HTTP::CookieJar::HashStore, jar.store
-
-      assert_raises(IndexError) {
-        jar = HTTP::CookieJar.new(:store => :nonexistent)
-      }
-
-      jar = HTTP::CookieJar.new(:store => HTTP::CookieJar::HashStore.new)
-      assert_instance_of HTTP::CookieJar::HashStore, jar.store
-
-      assert_raises(TypeError) {
-        jar = HTTP::CookieJar.new(:store => HTTP::CookieJar::HashStore)
-      }
-    end
-  end
-
-  module Tests
+  module CommonTests
     def setup(options = nil, options2 = nil)
       default_options = {
         :store => :hash,
@@ -34,9 +16,9 @@ module TestHTTPCookieJar
       @jar2 = HTTP::CookieJar.new(new_options2)
     end
 
-    def hash_store?
-      @store_type == :hash
-    end
+    #def hash_store?
+    #  @store_type == :hash
+    #end
 
     def mozilla_store?
       @store_type == :mozilla
@@ -505,6 +487,32 @@ module TestHTTPCookieJar
       assert_equal(5, @jar.cookies(url).length)
     end
 
+    def test_load_yaml_mechanize
+      @jar.load(test_file('mechanize.yml'), :yaml)
+
+      assert_equal 4, @jar.to_a.size
+
+      com_nid, com_pref = @jar.cookies('http://www.google.com/')
+
+      assert_equal 'NID', com_nid.name
+      assert_equal 'Sun, 23 Sep 2063 08:20:15 GMT', com_nid.expires.httpdate
+      assert_equal 'google.com', com_nid.domain_name.hostname
+
+      assert_equal 'PREF', com_pref.name
+      assert_equal 'Tue, 24 Mar 2065 08:20:15 GMT', com_pref.expires.httpdate
+      assert_equal 'google.com', com_pref.domain_name.hostname
+
+      cojp_nid, cojp_pref = @jar.cookies('http://www.google.co.jp/')
+
+      assert_equal 'NID', cojp_nid.name
+      assert_equal 'Sun, 23 Sep 2063 08:20:16 GMT', cojp_nid.expires.httpdate
+      assert_equal 'google.co.jp', cojp_nid.domain_name.hostname
+
+      assert_equal 'PREF', cojp_pref.name
+      assert_equal 'Tue, 24 Mar 2065 08:20:16 GMT', cojp_pref.expires.httpdate
+      assert_equal 'google.co.jp', cojp_pref.domain_name.hostname
+    end
+
     def test_expire_cookies
       url = URI 'http://rubyforge.org/'
 
@@ -744,17 +752,116 @@ module TestHTTPCookieJar
   end
 
   class WithHashStore < Test::Unit::TestCase
-    include Tests
+    include CommonTests
+
+    def test_new
+      jar = HTTP::CookieJar.new(:store => :hash)
+      assert_instance_of HTTP::CookieJar::HashStore, jar.store
+
+      assert_raises(IndexError) {
+        jar = HTTP::CookieJar.new(:store => :nonexistent)
+      }
+
+      jar = HTTP::CookieJar.new(:store => HTTP::CookieJar::HashStore.new)
+      assert_instance_of HTTP::CookieJar::HashStore, jar.store
+
+      assert_raises(TypeError) {
+        jar = HTTP::CookieJar.new(:store => HTTP::CookieJar::HashStore)
+      }
+    end
+
   end
 
   class WithMozillaStore < Test::Unit::TestCase
-    include Tests
+    include CommonTests
 
     def setup
       super(
         { :store => :mozilla, :filename => ":memory:" },
         { :store => :mozilla, :filename => ":memory:" })
     end
+
+    def add_and_delete(jar)
+      jar.parse("name=Akinori; Domain=rubyforge.org; Expires=Sun, 08 Aug 2076 19:00:00 GMT; Path=/",
+                'http://rubyforge.org/')
+      jar.parse("country=Japan; Domain=rubyforge.org; Expires=Sun, 08 Aug 2076 19:00:00 GMT; Path=/",
+                'http://rubyforge.org/')
+      jar.delete(HTTP::Cookie.new("name", :domain => 'rubyforge.org'))
+    end
+
+    def test_close
+      add_and_delete(@jar)
+
+      assert_not_send [@jar.store, :closed?]
+      @jar.store.close
+      assert_send [@jar.store, :closed?]
+      @jar.store.close	# should do nothing
+      assert_send [@jar.store, :closed?]
+    end
+
+    def test_finalizer
+      db = nil
+      loop {
+        jar = HTTP::CookieJar.new(:store => :mozilla, :filename => ':memory:')
+        add_and_delete(jar)
+        db = jar.store.instance_variable_get(:@db)
+        class << db
+          alias close_orig close
+          def close
+            STDERR.print "[finalizer is called]"
+            STDERR.flush
+            close_orig
+          end
+        end
+        break
+      }
+    end
+
+    def test_upgrade_mozillastore
+      Dir.mktmpdir { |dir|
+        filename = File.join(dir, 'cookies.sqlite')
+
+        sqlite = SQLite3::Database.new(filename)
+        sqlite.execute(<<-'SQL')
+          CREATE TABLE moz_cookies (
+            id INTEGER PRIMARY KEY,
+            name TEXT,
+            value TEXT,
+            host TEXT,
+            path TEXT,
+            expiry INTEGER,
+            isSecure INTEGER,
+            isHttpOnly INTEGER)
+        SQL
+        sqlite.execute(<<-'SQL')
+          PRAGMA user_version = 1
+        SQL
+
+        begin
+          st_insert = sqlite.prepare(<<-'SQL')
+            INSERT INTO moz_cookies (
+              id, name, value, host, path, expiry, isSecure, isHttpOnly
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+          SQL
+
+          st_insert.execute(1, 'name1', 'value1', '.example.co.jp', '/', 2312085765, 0, 0)
+          st_insert.execute(2, 'name1', 'value2', '.example.co.jp', '/', 2312085765, 0, 0)
+          st_insert.execute(3, 'name1', 'value3', 'www.example.co.jp', '/', 2312085765, 0, 0)
+        ensure
+          st_insert.close if st_insert
+        end
+
+        sqlite.close
+        jar = HTTP::CookieJar.new(:store => :mozilla, :filename => filename)
+
+        assert_equal 2, jar.to_a.size
+        assert_equal 2, jar.cookies('http://www.example.co.jp/').size
+
+        cookie, *rest = jar.cookies('http://host.example.co.jp/')
+        assert_send [rest, :empty?]
+        assert_equal 'value2', cookie.value
+      }
+    end
   end if begin
     require 'sqlite3'
     true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre11
+  version: 1.0.0.pre12
 platform: ruby
 authors:
 - Akinori MUSHA
@@ -143,6 +143,7 @@ files:
 - 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
@@ -171,6 +172,7 @@ specification_version: 4
 summary: A Ruby library to handle HTTP Cookies
 test_files:
 - test/helper.rb
+- test/mechanize.yml
 - test/simplecov_start.rb
 - test/test_http_cookie.rb
 - test/test_http_cookie_jar.rb