http-cookie 0.1.1 → 0.1.2

data/Rakefile

@@ -1,14 +1,8 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
 
-if RUBY_VERSION >= '1.9.0'
-  require 'rake/testtask'
-  Rake::TestTask
-else
-  require 'rcov/rcovtask'
-  Rcov::RcovTask
-end.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.ruby_opts << '-r./test/simplecov_start.rb' if !defined?(Rcov)
+Rake::TestTask.new(:test) do |test|
+  test.ruby_opts << '-r./test/simplecov_start.rb' if defined?(SimbleCov)
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end

data/lib/http/cookie.rb

@@ -7,6 +7,17 @@ module HTTP
   autoload :CookieJar, 'http/cookie_jar'
 end
 
+# In Ruby < 1.9.3 URI() does not accept an URI object.
+if RUBY_VERSION < "1.9.3"
+  begin
+    URI(URI(''))
+  rescue
+    def URI(url)
+      url.is_a?(URI) ? url : URI.parse(url)
+    end
+  end
+end
+
 # This class is used to represent an HTTP Cookie.
 class HTTP::Cookie
   # Maximum number of bytes per cookie (RFC 6265 6.1 requires 4096 at least)
@@ -25,16 +36,6 @@ class HTTP::Cookie
     expires     created_at  accessed_at
   ]
 
-  # In Ruby < 1.9.3 URI() does not accept an URI object.
-  if RUBY_VERSION < "1.9.3"
-    module URIFix
-      def URI(url)
-        url.is_a?(URI) ? url : Kernel::URI(url)
-      end
-      private :URI
-    end
-  end
-
   if String.respond_to?(:try_convert)
     def check_string_type(object)
       String.try_convert(object)
@@ -52,8 +53,6 @@ class HTTP::Cookie
     private :check_string_type
   end
 
-  include URIFix if defined?(URIFix)
-
   attr_reader :name, :domain, :path, :origin
   attr_accessor :secure, :httponly, :value, :version
   attr_reader :domain_name, :expires

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/http/cookie_jar.rb

@@ -5,8 +5,8 @@ require 'http/cookie'
 # any particular website.
 
 class HTTP::CookieJar
-  autoload :AbstractSaver, 'http/cookie_jar/abstract_saver'
-  autoload :AbstractStore, 'http/cookie_jar/abstract_store'
+  require 'http/cookie_jar/abstract_store'
+  require 'http/cookie_jar/abstract_saver'
 
   attr_reader :store
 
@@ -136,7 +136,7 @@ class HTTP::CookieJar
 
     begin
       saver = AbstractSaver.implementation(opthash[:format]).new(opthash)
-    rescue KeyError => e
+    rescue IndexError => e
       raise ArgumentError, e.message
     end
 
@@ -197,7 +197,7 @@ class HTTP::CookieJar
 
     begin
       saver = AbstractSaver.implementation(opthash[:format]).new(opthash)
-    rescue KeyError => e
+    rescue IndexError => e
       raise ArgumentError, e.message
     end
 

data/lib/http/cookie_jar/abstract_saver.rb

@@ -6,15 +6,15 @@ class HTTP::CookieJar::AbstractSaver
 
     # Gets an implementation class by the name, optionally trying to
     # load "http/cookie_jar/*_saver" if not found.  If loading fails,
-    # KeyError is raised.
+    # IndexError is raised.
     def implementation(symbol)
       @@class_map.fetch(symbol)
-    rescue KeyError
+    rescue IndexError
       begin
         require 'http/cookie_jar/%s_saver' % symbol
         @@class_map.fetch(symbol)
-      rescue LoadError, KeyError => e
-        raise KeyError, 'cookie saver unavailable: %s' % symbol.inspect
+      rescue LoadError, IndexError => e
+        raise IndexError, 'cookie saver unavailable: %s' % symbol.inspect
       end
     end
 

data/lib/http/cookie_jar/abstract_store.rb

@@ -6,15 +6,15 @@ class HTTP::CookieJar::AbstractStore
 
     # Gets an implementation class by the name, optionally trying to
     # load "http/cookie_jar/*_store" if not found.  If loading fails,
-    # KeyError is raised.
+    # IndexError is raised.
     def implementation(symbol)
       @@class_map.fetch(symbol)
-    rescue KeyError
+    rescue IndexError
       begin
         require 'http/cookie_jar/%s_store' % symbol
         @@class_map.fetch(symbol)
-      rescue LoadError, KeyError => e
-        raise KeyError, 'cookie store unavailable: %s' % symbol.inspect
+      rescue LoadError, IndexError => e
+        raise IndexError, 'cookie store unavailable: %s' % symbol.inspect
       end
     end
 

data/test/test_http_cookie_jar.rb

@@ -5,14 +5,6 @@ class TestHTTPCookieJar < Test::Unit::TestCase
     @jar = HTTP::CookieJar.new
   end
 
-  def in_tmpdir
-    Dir.mktmpdir do |dir|
-      Dir.chdir dir do
-        yield
-      end
-    end
-  end
-
   def cookie_values(options = {})
     {
       :name     => 'Foo',
@@ -310,12 +302,12 @@ class TestHTTPCookieJar < Test::Unit::TestCase
 
     assert_equal(3, @jar.cookies(url).length)
 
-    in_tmpdir do
-      value = @jar.save("cookies.yml")
+    Dir.mktmpdir do |dir|
+      value = @jar.save(File.join(dir, "cookies.yml"))
       assert_same @jar, value
 
       jar = HTTP::CookieJar.new
-      jar.load("cookies.yml")
+      jar.load(File.join(dir, "cookies.yml"))
       cookies = jar.cookies(url).sort_by { |cookie| cookie.name }
       assert_equal(2, cookies.length)
       assert_equal('Baz', cookies[0].name)
@@ -342,11 +334,11 @@ class TestHTTPCookieJar < Test::Unit::TestCase
 
     assert_equal(3, @jar.cookies(url).length)
 
-    in_tmpdir do
-      @jar.save("cookies.yml", :format => :yaml, :session => true)
+    Dir.mktmpdir do |dir|
+      @jar.save(File.join(dir, "cookies.yml"), :format => :yaml, :session => true)
 
       jar = HTTP::CookieJar.new
-      jar.load("cookies.yml")
+      jar.load(File.join(dir, "cookies.yml"))
       assert_equal(3, jar.cookies(url).length)
     end
 
@@ -374,11 +366,11 @@ class TestHTTPCookieJar < Test::Unit::TestCase
 
     assert_equal(3, @jar.cookies(url).length)
 
-    in_tmpdir do
-      @jar.save("cookies.txt", :cookiestxt)
+    Dir.tmpdir do |dir|
+      @jar.save(File.join(dir, "cookies.txt"), :cookiestxt)
 
       jar = HTTP::CookieJar.new
-      jar.load("cookies.txt", :cookiestxt) # HACK test the format
+      jar.load(File.join(dir, "cookies.txt"), :cookiestxt) # HACK test the format
       cookies = jar.cookies(url)
       assert_equal(2, cookies.length)
       cookies.each { |cookie|
@@ -533,7 +525,7 @@ class TestHTTPCookieJar < Test::Unit::TestCase
           :domain => uri.host,
           :for_domain => true,
           :path => '/dir%d/' % (i / 2),
-          :origin => uri,
+          :origin => uri
           )).tap { |cookie|
         cookie.created_at = i == 42 ? date - i : date
       }
@@ -543,8 +535,8 @@ class TestHTTPCookieJar < Test::Unit::TestCase
     count = jar.to_a.size
     assert_equal limit_per_domain, count
     assert_equal [*1..41] + [*43..(limit_per_domain + 1)], jar.map { |cookie|
-      cookie.name[/(?<=^Foo)(\d+)$/].to_i
-    }
+      cookie.name[/(\d+)$/].to_i
+    }.sort
 
     hlimit = HTTP::Cookie::MAX_COOKIES_TOTAL
     slimit = hlimit + HTTP::CookieJar::HashStore::GC_THRESHOLD
@@ -560,7 +552,7 @@ class TestHTTPCookieJar < Test::Unit::TestCase
             :domain => uri.host,
             :for_domain => true,
             :path => '/dir%d/' % (i / 2),
-            :origin => uri,
+            :origin => uri
             )).tap { |cookie|
           cookie.created_at = i == j ? date - i : date
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: