secobarbital-cookiejar 0.2.9.2 → 0.2.9.3

data/lib/cookiejar.rb

@@ -1,2 +1,5 @@
+require 'rubygems'
+gem 'addressable'
+
 require 'cookiejar/cookie'
 require 'cookiejar/jar'

data/lib/cookiejar/cookie.rb

@@ -156,10 +156,10 @@ module CookieJar
       # being sent over http, and it must not be a http_only cookie sent to
       # a script
       path_match   = uri.path.start_with? @path
-      secure_match = !(@secure && uri.scheme == 'http') 
+      secure_match = !(@secure && uri.scheme.downcase == 'http') 
       script_match = !(script && @http_only)
       expiry_match = !expired?
-      ports_match = ports.nil? || (ports.include? uri.port)
+      ports_match = ports.nil? || (ports.include? uri.port || uri.inferred_port)
       path_match && secure_match && script_match && expiry_match && ports_match
     end
     

data/lib/cookiejar/cookie_validation.rb

@@ -1,5 +1,7 @@
 require 'cgi'
+require 'addressable/uri'
 require 'uri'
+
 module CookieJar
   # Represents a set of cookie validation errors
   class InvalidCookieError < StandardError
@@ -51,7 +53,7 @@ module CookieJar
     # @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)
+      Addressable::URI.parse request_uri
     end
     
     # Converts an input cookie or uri to a string representing the path.
@@ -60,7 +62,7 @@ module CookieJar
     # @param [String, URI, Cookie] object containing the path
     # @return [String] path information
     def self.to_path uri_or_path
-      if (uri_or_path.is_a? URI) || (uri_or_path.is_a? Cookie)
+      if (uri_or_path.is_a? URI) || (uri_or_path.is_a? Addressable::URI) || (uri_or_path.is_a? Cookie)
         uri_or_path.path
       else
         uri_or_path
@@ -73,7 +75,7 @@ module CookieJar
     # @param [String, URI, Cookie] object containing the domain
     # @return [String] domain information.
     def self.to_domain uri_or_domain
-      if uri_or_domain.is_a? URI
+      if (uri_or_domain.is_a? URI) || (uri_or_domain.is_a? Addressable::URI)
         uri_or_domain.host
       elsif uri_or_domain.is_a? Cookie
         uri_or_domain.domain
@@ -231,7 +233,7 @@ module CookieJar
       uri = to_uri request_uri
       request_host = effective_host uri.host
       request_path = uri.path
-      request_secure = (uri.scheme == 'https')
+      request_secure = (uri.scheme.downcase == 'https')
       cookie_host = cookie.domain
       cookie_path = cookie.path
       
@@ -270,7 +272,7 @@ module CookieJar
       # 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.find_index uri.port
+        unless cookie.ports.find_index uri.port || uri.inferred_port
           errors << "Ports list does not contain request URI port"
         end
       end

data/lib/cookiejar/jar.rb

@@ -1,4 +1,5 @@
 require 'cookiejar/cookie'
+require 'addressable/uri'
  
 module CookieJar
   # A cookie store for client side usage. 
@@ -289,7 +290,7 @@ module CookieJar
     end
   
     def to_uri request_uri
-      (request_uri.is_a? URI)? request_uri : (URI.parse request_uri)
+      Addressable::URI.parse request_uri
     end
     
     def find_domain host

data/test/cookie_validation_test.rb

@@ -96,6 +96,9 @@ describe CookieValidation do
     it "should handle URI objects" do
       CookieValidation.cookie_base_path(URI.parse('http://www.foo.com/bar/')).should == '/bar/'
     end
+    it "should handle Addressable URI objects" do
+      CookieValidation.cookie_base_path(Addressable::URI.parse('http://www.foo.com/bar/')).should == '/bar/'
+    end
     it "should preserve case" do
       CookieValidation.cookie_base_path("/BaR/").should == '/BaR/'
     end
@@ -108,6 +111,9 @@ describe CookieValidation do
     it "should handle URI objects" do
       CookieValidation.determine_cookie_path(URI.parse('http://foo.com/bar/'), '').should == '/bar/'
     end
+    it "should handle Addressable URI objects" do
+      CookieValidation.determine_cookie_path(Addressable::URI.parse('http://foo.com/bar/'), '').should == '/bar/'
+    end
     it "should handle Cookie objects" do
       cookie = Cookie.from_set_cookie('http://foo.com/', "name=value;path=/")
       CookieValidation.determine_cookie_path('http://foo.com/', cookie).should == '/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: secobarbital-cookiejar
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 125
   prerelease: false
   segments: 
   - 0
   - 2
   - 9
-  - 2
-  version: 0.2.9.2
+  - 3
+  version: 0.2.9.3
 platform: ruby
 authors: 
 - David Waite
@@ -19,8 +19,23 @@ cert_chain: []
 
 date: 2010-06-04 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
+  type: :runtime
+  version_requirements: *id001
 description: Allows for parsing and returning cookies in Ruby HTTP client code
 email: 
 - david@alkaline-solutions.com