cookiejar 0.3.2 → 0.3.4

data/spec/jar_spec.rb

@@ -1,235 +1,232 @@
-require 'cookiejar'
-require 'yaml'
-require 'rubygems'
+require 'spec_helper'
 
 include CookieJar
 
 describe Jar do
   describe '.setCookie' do
-    it "should allow me to set a cookie" do
-      jar = Jar.new 
+    it 'should allow me to set a cookie' do
+      jar = Jar.new
       jar.set_cookie 'http://foo.com/', 'foo=bar'
     end
-    it "should allow me to set multiple cookies" do
-      jar = Jar.new 
+    it 'should allow me to set multiple cookies' do
+      jar = Jar.new
       jar.set_cookie 'http://foo.com/', 'foo=bar'
       jar.set_cookie 'http://foo.com/', 'bar=baz'
       jar.set_cookie 'http://auth.foo.com/', 'foo=bar'
-      jar.set_cookie 'http://auth.foo.com/', 'auth=135121...;domain=foo.com'    
+      jar.set_cookie 'http://auth.foo.com/', 'auth=135121...;domain=foo.com'
     end
-    it "should allow me to set multiple cookies in 1 header" do
+    it 'should allow me to set multiple cookies in 1 header' do
       jar = Jar.new
       jar.set_cookie 'http://foo.com/', 'my_cookie=123456; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT; Path=/, other_cookie=helloworld; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT, last_cookie=098765'
     end
   end
   describe '.get_cookies' do
-    it "should let me read back cookies which are set" do
-      jar = Jar.new 
+    it 'should let me read back cookies which are set' do
+      jar = Jar.new
       jar.set_cookie 'http://foo.com/', 'foo=bar'
       jar.set_cookie 'http://foo.com/', 'bar=baz'
       jar.set_cookie 'http://auth.foo.com/', 'foo=bar'
       jar.set_cookie 'http://auth.foo.com/', 'auth=135121...;domain=foo.com'
-      jar.get_cookies('http://foo.com/').should have(3).items
+      expect(jar.get_cookies('http://foo.com/')).to have(3).items
     end
-    it "should let me read back a multiple cookies from 1 header" do
+    it 'should let me read back a multiple cookies from 1 header' do
       jar = Jar.new
       jar.set_cookie 'http://foo.com/', 'my_cookie=123456; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT; Path=/, other_cookie=helloworld; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT, last_cookie=098765'
-      jar.get_cookie_header('http://foo.com/').should == 'last_cookie=098765;my_cookie=123456;other_cookie=helloworld'
+      expect(jar.get_cookie_header('http://foo.com/')).to eq 'last_cookie=098765;my_cookie=123456;other_cookie=helloworld'
     end
-    it "should return cookies longest path first" do
+    it 'should return cookies longest path first' do
       jar = Jar.new
-      uri = 'http://foo.com/a/b/c/d' 
+      uri = 'http://foo.com/a/b/c/d'
       jar.set_cookie uri, 'a=bar'
       jar.set_cookie uri, 'b=baz;path=/a/b/c/d'
       jar.set_cookie uri, 'c=bar;path=/a/b'
       jar.set_cookie uri, 'd=bar;path=/a/'
       cookies = jar.get_cookies(uri)
-      cookies.should have(4).items
-      cookies[0].name.should == 'b'
-      cookies[1].name.should == 'a'
-      cookies[2].name.should == 'c'
-      cookies[3].name.should == 'd'
+      expect(cookies).to have(4).items
+      expect(cookies[0].name).to eq 'b'
+      expect(cookies[1].name).to eq 'a'
+      expect(cookies[2].name).to eq 'c'
+      expect(cookies[3].name).to eq 'd'
     end
-    it "should not return expired cookies" do
+    it 'should not return expired cookies' do
       jar = Jar.new
       uri = 'http://localhost/'
       jar.set_cookie uri, 'foo=bar;expires=Wednesday, 09-Nov-99 23:12:40 GMT'
       cookies = jar.get_cookies(uri)
-      cookies.should have(0).items
+      expect(cookies).to have(0).items
     end
   end
   describe '.get_cookie_headers' do
-    it "should return cookie headers" do
+    it 'should return cookie headers' do
       jar = Jar.new
-      uri = 'http://foo.com/a/b/c/d' 
+      uri = 'http://foo.com/a/b/c/d'
       jar.set_cookie uri, 'a=bar'
       jar.set_cookie uri, 'b=baz;path=/a/b/c/d'
       cookie_headers = jar.get_cookie_header uri
-      cookie_headers.should == "b=baz;a=bar"
+      expect(cookie_headers).to eq 'b=baz;a=bar'
     end
-    it "should handle a version 1 cookie" do
+    it 'should handle a version 1 cookie' do
       jar = Jar.new
-      uri = 'http://foo.com/a/b/c/d' 
+      uri = 'http://foo.com/a/b/c/d'
       jar.set_cookie uri, 'a=bar'
       jar.set_cookie uri, 'b=baz;path=/a/b/c/d'
       jar.set_cookie2 uri, 'c=baz;Version=1;path="/"'
       cookie_headers = jar.get_cookie_header uri
-      cookie_headers.should == '$Version=0;b=baz;$Path="/a/b/c/d";a=bar;$Path="/a/b/c/",$Version=1;c=baz;$Path="/"'
+      expect(cookie_headers).to eq '$Version=0;b=baz;$Path="/a/b/c/d";a=bar;$Path="/a/b/c/",$Version=1;c=baz;$Path="/"'
     end
   end
   describe '.add_cookie' do
-    it "should let me add a pre-existing cookie" do
+    it 'should let me add a pre-existing cookie' do
       jar = Jar.new
       cookie = Cookie.from_set_cookie 'http://localhost/', 'foo=bar'
       jar.add_cookie cookie
     end
   end
   describe '.to_a' do
-    it "should return me an array of all cookie objects" do
-      uri = 'http://foo.com/a/b/c/d' 
+    it 'should return me an array of all cookie objects' do
+      uri = 'http://foo.com/a/b/c/d'
       jar = Jar.new
       jar.set_cookie uri, 'a=bar;expires=Wednesday, 09-Nov-99 23:12:40 GMT'
       jar.set_cookie uri, 'b=baz;path=/a/b/c/d'
       jar.set_cookie uri, 'c=bar;path=/a/b'
       jar.set_cookie uri, 'd=bar;path=/a/'
       jar.set_cookie 'http://localhost/', 'foo=bar'
-      jar.to_a.should have(5).items
+      expect(jar.to_a).to have(5).items
     end
   end
   describe '.expire_cookies' do
-    it "should expire cookies which are no longer valid" do
-      uri = 'http://foo.com/a/b/c/d' 
+    it 'should expire cookies which are no longer valid' do
+      uri = 'http://foo.com/a/b/c/d'
       jar = Jar.new
       jar.set_cookie uri, 'a=bar;expires=Wednesday, 09-Nov-99 23:12:40 GMT'
       jar.set_cookie uri, 'b=baz;path=/a/b/c/d;expires=Wednesday, 01-Nov-2028 12:00:00 GMT'
       jar.set_cookie uri, 'c=bar;path=/a/b'
       jar.set_cookie uri, 'd=bar;path=/a/'
       jar.set_cookie 'http://localhost/', 'foo=bar'
-      jar.to_a.should have(5).items
+      expect(jar.to_a).to have(5).items
       jar.expire_cookies
-      jar.to_a.should have(4).items
+      expect(jar.to_a).to have(4).items
     end
-    it "should let me expire all session cookies" do
-      uri = 'http://foo.com/a/b/c/d' 
+    it 'should let me expire all session cookies' do
+      uri = 'http://foo.com/a/b/c/d'
       jar = Jar.new
       jar.set_cookie uri, 'a=bar;expires=Wednesday, 09-Nov-99 23:12:40 GMT'
       jar.set_cookie uri, 'b=baz;path=/a/b/c/d;expires=Wednesday, 01-Nov-2028 12:00:00 GMT'
       jar.set_cookie uri, 'c=bar;path=/a/b'
       jar.set_cookie uri, 'd=bar;path=/a/'
       jar.set_cookie 'http://localhost/', 'foo=bar'
-      jar.to_a.should have(5).items
+      expect(jar.to_a).to have(5).items
       jar.expire_cookies true
-      jar.to_a.should have(1).items
+      expect(jar.to_a).to have(1).items
     end
   end
   describe '#set_cookies_from_headers' do
-    it "should handle a Set-Cookie header" do
+    it 'should handle a Set-Cookie header' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie' => 'foo=bar' } 
-      cookies.should have(1).items
-      jar.to_a.should have(1).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie' => 'foo=bar'
+      expect(cookies).to have(1).items
+      expect(jar.to_a).to have(1).items
     end
-    it "should handle a set-cookie header" do
+    it 'should handle a set-cookie header' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'set-cookie' => 'foo=bar' } 
-      cookies.should have(1).items
-      jar.to_a.should have(1).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'set-cookie' => 'foo=bar'
+      expect(cookies).to have(1).items
+      expect(jar.to_a).to have(1).items
     end
-    it "should handle multiple Set-Cookie headers" do
+    it 'should handle multiple Set-Cookie headers' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie' => ['foo=bar','bar=baz'] } 
-      cookies.should have(2).items
-      jar.to_a.should have(2).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie' => ['foo=bar', 'bar=baz']
+      expect(cookies).to have(2).items
+      expect(jar.to_a).to have(2).items
     end
-    it "should handle a Set-Cookie2 header" do
+    it 'should handle a Set-Cookie2 header' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie2' => 'foo=bar;Version=1' } 
-      cookies.should have(1).items
-      jar.to_a.should have(1).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie2' => 'foo=bar;Version=1'
+      expect(cookies).to have(1).items
+      expect(jar.to_a).to have(1).items
     end
-    it "should handle a set-cookie2 header" do
+    it 'should handle a set-cookie2 header' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'set-cookie2' => 'foo=bar;Version=1' } 
-      cookies.should have(1).items
-      jar.to_a.should have(1).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'set-cookie2' => 'foo=bar;Version=1'
+      expect(cookies).to have(1).items
+      expect(jar.to_a).to have(1).items
     end
-    it "should handle multiple Set-Cookie2 headers" do
+    it 'should handle multiple Set-Cookie2 headers' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie2' => ['foo=bar;Version=1','bar=baz;Version=1'] } 
-      cookies.should have(2).items
-      jar.to_a.should have(2).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie2' => ['foo=bar;Version=1', 'bar=baz;Version=1']
+      expect(cookies).to have(2).items
+      expect(jar.to_a).to have(2).items
     end
-    it "should handle mixed distinct Set-Cookie and Set-Cookie2 headers" do
+    it 'should handle mixed distinct Set-Cookie and Set-Cookie2 headers' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie' => 'foo=bar',
-        'Set-Cookie2' => 'bar=baz;Version=1' } 
-      cookies.should have(2).items
-      jar.to_a.should have(2).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie' => 'foo=bar',
+                                             'Set-Cookie2' => 'bar=baz;Version=1'
+      expect(cookies).to have(2).items
+      expect(jar.to_a).to have(2).items
     end
-    it "should handle overlapping Set-Cookie and Set-Cookie2 headers" do
+    it 'should handle overlapping Set-Cookie and Set-Cookie2 headers' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie' => ['foo=bar','bar=baz'],
-        'Set-Cookie2' => 'foo=bar;Version=1' } 
-      cookies.should have(2).items
-      jar.to_a.should have(2).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie' => ['foo=bar', 'bar=baz'],
+                                             'Set-Cookie2' => 'foo=bar;Version=1'
+      expect(cookies).to have(2).items
+      expect(jar.to_a).to have(2).items
       # and has the version 1 cookie
-      cookies.find do |cookie|
+      expect(cookies.find do |cookie|
         cookie.name == 'foo'
-      end.version.should == 1
+      end.version).to eq 1
     end
-    it "should silently drop invalid cookies" do
+    it 'should silently drop invalid cookies' do
       jar = Jar.new
-      cookies = jar.set_cookies_from_headers 'http://localhost/', 
-      { 'Set-Cookie' => ['foo=bar','bar=baz;domain=.foo.com'] } 
-      cookies.should have(1).items
-      jar.to_a.should have(1).items
+      cookies = jar.set_cookies_from_headers 'http://localhost/',
+                                             'Set-Cookie' => ['foo=bar', 'bar=baz;domain=.foo.com']
+      expect(cookies).to have(1).items
+      expect(jar.to_a).to have(1).items
     end
   end
   begin
     require 'json'
-    describe ".to_json" do
-      it "should serialize cookies to JSON" do
-      
+    describe '.to_json' do
+      it 'should serialize cookies to JSON' do
         c = Cookie.from_set_cookie 'https://localhost/', 'foo=bar;secure;expires=Wed, 01-Nov-2028 12:00:00 GMT'
         jar = Jar.new
         jar.add_cookie c
         json = jar.to_json
-        json.should be_a String
+        expect(json).to be_a String
       end
     end
-    describe ".json_create" do
-      it "should deserialize a JSON array to a jar" do
-        json = "[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]" 
+    describe '.json_create' do
+      it 'should deserialize a JSON array to a jar' do
+        json = '[{"name":"foo","value":"bar","domain":"localhost.local","path":"\\/","created_at":"2009-09-11 12:51:03 -0600","expiry":"2028-11-01 12:00:00 GMT","secure":true}]'
         array = JSON.parse json
-       
+
         jar = Jar.json_create array
-        jar.get_cookies('https://localhost/').should have(1).items
+        expect(jar.get_cookies('https://localhost/')).to have(1).items
       end
-      it "should deserialize a JSON hash to a jar" do
-        json = "{\"cookies\":[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]}" 
+      it 'should deserialize a JSON hash to a jar' do
+        json = '{"cookies":[{"name":"foo","value":"bar","domain":"localhost.local","path":"\\/","created_at":"2009-09-11 12:51:03 -0600","expiry":"2028-11-01 12:00:00 GMT","secure":true}]}'
         hash = JSON.parse json
-        
+
         jar = Jar.json_create hash
-        jar.get_cookies('https://localhost/').should have(1).items
+        expect(jar.get_cookies('https://localhost/')).to have(1).items
       end
-      
-      it "should automatically deserialize to a jar" do
-        json = "{\"json_class\":\"CookieJar::Jar\",\"cookies\":[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]}" 
-        jar = JSON.parse json, :create_additions => true
-        jar.get_cookies('https://localhost/').should have(1).items  
+
+      it 'should automatically deserialize to a jar' do
+        json = '{"json_class":"CookieJar::Jar","cookies":[{"name":"foo","value":"bar","domain":"localhost.local","path":"\\/","created_at":"2009-09-11 12:51:03 -0600","expiry":"2028-11-01 12:00:00 GMT","secure":true}]}'
+        jar = JSON.parse json, create_additions: true
+        expect(jar.get_cookies('https://localhost/')).to have(1).items
       end
     end
   rescue LoadError
-    it "does not appear the JSON library is installed" do
-       raise 'please install the JSON lirbary'
+    it 'does not appear the JSON library is installed' do
+      raise 'please install the JSON library'
     end
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'cookiejar'
+require 'rubygems'
+require 'rspec'
+require 'rspec/collection_matchers'
+require 'yaml'

metadata

@@ -1,85 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: cookiejar
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - David Waite
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.3
 description: Allows for parsing and returning cookies in Ruby HTTP client code
-email: david@alkaline-solutions.com
+email:
+- david@alkaline-solutions.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
+- _config.yml
 - contributors.json
+- cookiejar.gemspec
 - lib/cookiejar.rb
 - lib/cookiejar/cookie.rb
 - lib/cookiejar/cookie_validation.rb
 - lib/cookiejar/jar.rb
+- lib/cookiejar/version.rb
 - spec/cookie_spec.rb
 - spec/cookie_validation_spec.rb
 - spec/jar_spec.rb
-homepage: https://alkaline-solutions.com
+- spec/spec_helper.rb
+homepage: http://alkaline-solutions.com
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - CookieJar -- Client-side HTTP Cookies
@@ -96,10 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.5.3
+signing_key:
+specification_version: 4
 summary: Client-side HTTP Cookie library
-test_files: []
-has_rdoc: 
+test_files:
+- spec/cookie_spec.rb
+- spec/cookie_validation_spec.rb
+- spec/jar_spec.rb
+- spec/spec_helper.rb