domain_name 0.5.4 → 0.5.5

data/lib/domain_name.rb

@@ -125,9 +125,16 @@ class DomainName
     end
   end
 
-  # Checks if the server represented by _domain_ is qualified to send
-  # and receive cookies for _domain_.
-  def cookie_domain?(domain)
+  # Checks if the server represented by this domain is qualified to
+  # send and receive cookies with a domain attribute value of
+  # _domain_.  A true value given as the second argument represents
+  # cookies without a domain attribute value, in which case only
+  # hostname equality is checked.
+  def cookie_domain?(domain, host_only = false)
+    # RFC 6265 #5.3
+    # When the user agent "receives a cookie":
+    return self == domain if host_only
+
     domain = DomainName.new(domain) unless DomainName === domain
     if ipaddr?
       # RFC 6265 #5.1.3

data/lib/domain_name/version.rb

@@ -1,3 +1,3 @@
 class DomainName
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/test/test_domain_name.rb

@@ -160,40 +160,77 @@ class TestDomainName < Test::Unit::TestCase
   end
 
   should "check cookie domain correctly" do
-    [
-      ['b.sapporo.jp', 'jp', false],
-      ['b.sapporo.jp', 'sapporo.jp', false],
-      ['b.sapporo.jp', 'b.sapporo.jp', false],
-      ['b.sapporo.jp', 'a.b.sapporo.jp', false],
-
-      ['b.c.sapporo.jp', 'jp', false],
-      ['b.c.sapporo.jp', 'sapporo.jp', false],
-      ['b.c.sapporo.jp', 'c.sapporo.jp', false],
-      ['b.c.sapporo.jp', 'b.c.sapporo.jp', true],
-      ['b.c.sapporo.jp', 'a.b.c.sapporo.jp', false],
-
-      ['b.c.d.sapporo.jp', 'jp', false],
-      ['b.c.d.sapporo.jp', 'sapporo.jp', false],
-      ['b.c.d.sapporo.jp', 'd.sapporo.jp', false],
-      ['b.c.d.sapporo.jp', 'c.d.sapporo.jp', true],
-      ['b.c.d.sapporo.jp', 'b.c.d.sapporo.jp', true],
-      ['b.c.d.sapporo.jp', 'a.b.c.d.sapporo.jp', false],
-
-      ['city.sapporo.jp', 'jp', false],
-      ['city.sapporo.jp', 'sapporo.jp', false],
-      ['city.sapporo.jp', 'city.sapporo.jp', true],
-      ['city.sapporo.jp', 'a.city.sapporo.jp', false],
-
-      ['b.city.sapporo.jp', 'jp', false],
-      ['b.city.sapporo.jp', 'sapporo.jp', false],
-      ['b.city.sapporo.jp', 'city.sapporo.jp', true],
-      ['b.city.sapporo.jp', 'b.city.sapporo.jp', true],
-      ['b.city.sapporo.jp', 'a.b.city.sapporo.jp', false],
-    ].each { |host, domain, expected|
+    {
+      'com' => [
+        ['com', false],
+        ['example.com', false],
+        ['foo.example.com', false],
+        ['bar.foo.example.com', false],
+      ],
+
+      'example.com' => [
+        ['com', false],
+        ['example.com', true],
+        ['foo.example.com', false],
+        ['bar.foo.example.com', false],
+      ],
+
+      'foo.example.com' => [
+        ['com', false],
+        ['example.com', true],
+        ['foo.example.com', true],
+        ['foo.Example.com', true],
+        ['bar.foo.example.com', false],
+        ['bar.Foo.Example.com', false],
+      ],
+
+      'b.sapporo.jp' => [
+        ['jp', false],
+        ['sapporo.jp', false],
+        ['b.sapporo.jp', false],
+        ['a.b.sapporo.jp', false],
+      ],
+
+      'b.c.sapporo.jp' => [
+        ['jp', false],
+        ['sapporo.jp', false],
+        ['c.sapporo.jp', false],
+        ['b.c.sapporo.jp', true],
+        ['a.b.c.sapporo.jp', false],
+      ],
+
+      'b.c.d.sapporo.jp' => [
+        ['jp', false],
+        ['sapporo.jp', false],
+        ['d.sapporo.jp', false],
+        ['c.d.sapporo.jp', true],
+        ['b.c.d.sapporo.jp', true],
+        ['a.b.c.d.sapporo.jp', false],
+      ],
+
+      'city.sapporo.jp' => [
+        ['jp', false],
+        ['sapporo.jp', false],
+        ['city.sapporo.jp', true],
+        ['a.city.sapporo.jp', false],
+      ],
+
+      'b.city.sapporo.jp' => [
+        ['jp', false],
+        ['sapporo.jp', false],
+        ['city.sapporo.jp', true],
+        ['b.city.sapporo.jp', true],
+        ['a.b.city.sapporo.jp', false],
+      ],
+    }.each_pair { |host, pairs|
       dn = DomainName(host)
-      assert_equal(expected, dn.cookie_domain?(domain))
-      assert_equal(expected, dn.cookie_domain?(DomainName(domain)))
-      assert_equal(false, dn.ipaddr?)
+      assert_equal(true, dn.cookie_domain?(host.upcase, true),     dn.to_s)
+      assert_equal(true, dn.cookie_domain?(host.downcase, true),   dn.to_s)
+      assert_equal(false, dn.cookie_domain?("www." << host, true), dn.to_s)
+      pairs.each { |domain, expected|
+        assert_equal(expected, dn.cookie_domain?(domain),             "%s - %s" % [dn.to_s, domain])
+        assert_equal(expected, dn.cookie_domain?(DomainName(domain)), "%s - %s" % [dn.to_s, domain])
+      }
     }
   end
 
@@ -204,7 +241,9 @@ class TestDomainName < Test::Unit::TestCase
     assert_equal(true, dn.ipaddr?)
     assert_equal(IPAddr.new(a), dn.ipaddr)
     assert_equal(true, dn.cookie_domain?(a))
+    assert_equal(true, dn.cookie_domain?(a, true))
     assert_equal(true, dn.cookie_domain?(dn))
+    assert_equal(true, dn.cookie_domain?(dn, true))
     assert_equal(false, dn.cookie_domain?('168.10.20'))
     assert_equal(false, dn.cookie_domain?('20'))
   end
@@ -219,8 +258,11 @@ class TestDomainName < Test::Unit::TestCase
       assert_equal(true, dn.ipaddr?)
       assert_equal(IPAddr.new(a), dn.ipaddr)
       assert_equal(true, dn.cookie_domain?(host))
+      assert_equal(true, dn.cookie_domain?(host, true))
       assert_equal(true, dn.cookie_domain?(dn))
+      assert_equal(true, dn.cookie_domain?(dn, true))
       assert_equal(true, dn.cookie_domain?(a))
+      assert_equal(true, dn.cookie_domain?(a, true))
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domain_name
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293817315960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
+  version_requirements: *70293817315960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293817314640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70293817314640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293817313160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *70293817313160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293817312260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: 2.4.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
+  version_requirements: *70293817312260
 description: ! 'This is a Domain Name manipulation library for Ruby.
 
 
@@ -129,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Domain Name manipulation library for Ruby