public-suffix-list 0.0.2 → 0.0.3

data/README.rdoc

@@ -16,7 +16,7 @@ easier to use.
 == Features
 
 * Transparent download of the TLD data file
-* Optional caching of parsed data
+* Optional caching of optimized, parsed TLD data
 * Tiny API
 
 == Synopsis

data/lib/public_suffix_list.rb

@@ -5,7 +5,7 @@ require "public_suffix_list/parser.rb"
 
 class PublicSuffixList
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
   def self.config
     @@config ||= Config.new
@@ -84,10 +84,10 @@ class PublicSuffixList
     domain = domain.dup
     first = domain.pop
     set = []
-    [[first, first], ["!#{first}", "!#{first}"], ["*", first]].each do |a, b|
-      if rules[a]
-        set << [b]
-        match(domain, rules[a]).each { |result| set << [first] + result }
+    [[first, first], ["!#{first}", "!#{first}"], ["*", first]].each do |pattern, name|
+      if rules[pattern]
+        set << [name] if rules[pattern][:term]
+        match(domain, rules[pattern]).each { |result| set << [first] + result }
       end
     end
     set
@@ -101,7 +101,7 @@ class PublicSuffixList
   end
 
   def gimme!(domain, n = 1)
-    domain.slice!(-n, n)
+    domain.slice!(-n, n) || []
   end
 
 end

data/lib/public_suffix_list/parser.rb

@@ -2,17 +2,34 @@ class PublicSuffixList
 
   module Parser
 
+    # com
+    # *.jp
+    # *.hokkaido.jp
+    # *.tokyo.jp
+    # !pref.hokkaido.jp
+    # !metro.tokyo.jp
+
+    # {
+    #   "com" => {:term => true}, 
+    #   "jp" => {
+    #     "tokyo" => {"!metro" => {:term => true}, "*" => {:term => true}},
+    #     "hokkaido" => {"!pref" => {:term => true}, "*" => {:term => true}},
+    #     "*" => {:term => true}
+    #   }
+    # }
+
     def self.parse(lines)
-      lines.inject({}) do |a, line|
+      lines.inject({}) do |acc, line|
         line.strip!
         unless line =~ %r{//} or line.empty?
-          t = a
+          tmp = acc
           line.split(".").reverse.each do |p|
-            t[p] = {} unless t[p]
-            t = t[p]
+            tmp[p] = {} unless tmp[p]
+            tmp = tmp[p]
           end
+          tmp[:term] = true
         end
-        a
+        acc
       end
     end
 

data/spec/caching.spec

@@ -0,0 +1,21 @@
+require 'tmpdir'
+require 'lib/public_suffix_list'
+
+options = {
+  :cache_dir => Dir.tmpdir,
+  :cache_expiry_period => 10,
+  :effective_tld_names_url => "spec/test.dat"
+}
+
+describe PublicSuffixList do
+
+  before do
+    File.delete(File.join(Dir.tmpdir, "test.dat.cache")) if File.exist?(File.join(Dir.tmpdir, "test.dat.cache"))
+  end
+
+  it "should cache when instructed to" do
+    public_suffix_list = PublicSuffixList.new(options)
+    File.exist?(File.join(Dir.tmpdir, "test.dat.cache")).should be true
+  end
+
+end

data/spec/cookie_calculation.spec

@@ -0,0 +1,23 @@
+require 'lib/public_suffix_list'
+
+def cookie_calculation(public_suffix_list, domain)
+  s, d, t = public_suffix_list.split(domain)
+  s.empty? && !d.empty? ? "Cookies may be set for #{domain}." : "Cookies may not be set for #{domain}."
+end
+
+describe PublicSuffixList do
+
+  it "should calculate cookies as described at http://publicsuffix.org/format/" do
+    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
+    cookie_calculation(public_suffix_list, "foo.com").should == "Cookies may be set for foo.com."
+    cookie_calculation(public_suffix_list, "foo.bar.jp").should == "Cookies may be set for foo.bar.jp."
+    cookie_calculation(public_suffix_list, "bar.jp").should == "Cookies may not be set for bar.jp."
+    cookie_calculation(public_suffix_list, "foo.bar.hokkaido.jp").should == "Cookies may be set for foo.bar.hokkaido.jp."
+    cookie_calculation(public_suffix_list, "bar.hokkaido.jp").should == "Cookies may not be set for bar.hokkaido.jp."
+    cookie_calculation(public_suffix_list, "foo.bar.tokyo.jp").should == "Cookies may be set for foo.bar.tokyo.jp."
+    cookie_calculation(public_suffix_list, "bar.tokyo.jp").should == "Cookies may not be set for bar.tokyo.jp."
+    cookie_calculation(public_suffix_list, "pref.hokkaido.jp").should == "Cookies may be set for pref.hokkaido.jp."
+    cookie_calculation(public_suffix_list, "metro.tokyo.jp").should == "Cookies may be set for metro.tokyo.jp."
+  end
+
+end

data/spec/public_suffix_list.spec

@@ -1,29 +1,30 @@
 require 'lib/public_suffix_list'
 
-def cookie_calculation(public_suffix_list, domain)
-  s, d, t = public_suffix_list.split(domain)
-  (s.empty? and !d.empty?) ? "Cookies may be set for #{domain}." : "Cookies may not be set for #{domain}."
-end
-
 describe PublicSuffixList do
 
-  it "should act as described at http://publicsuffix.org/format/" do
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
-    cookie_calculation(public_suffix_list, "foo.com").should == "Cookies may be set for foo.com."
-    cookie_calculation(public_suffix_list, "foo.bar.jp").should == "Cookies may be set for foo.bar.jp."
-    cookie_calculation(public_suffix_list, "bar.jp").should == "Cookies may not be set for bar.jp."
-    cookie_calculation(public_suffix_list, "foo.bar.hokkaido.jp").should == "Cookies may be set for foo.bar.hokkaido.jp."
-    cookie_calculation(public_suffix_list, "bar.hokkaido.jp").should == "Cookies may not be set for bar.hokkaido.jp."
-    cookie_calculation(public_suffix_list, "foo.bar.tokyo.jp").should == "Cookies may be set for foo.bar.tokyo.jp."
-    cookie_calculation(public_suffix_list, "bar.tokyo.jp").should == "Cookies may not be set for bar.tokyo.jp."
-    cookie_calculation(public_suffix_list, "pref.hokkaido.jp").should == "Cookies may be set for pref.hokkaido.jp."
-    cookie_calculation(public_suffix_list, "metro.tokyo.jp").should == "Cookies may be set for metro.tokyo.jp."
+  before do
+    @public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
   end
 
   it "should calculate tld and cdn correctly" do
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
-    public_suffix_list.cdn("foo.bar.com").should == "bar.com"
-    public_suffix_list.tld("foo.bar.com").should == "com"
+    @public_suffix_list.cdn("foo.bar.com").should == "bar.com"
+    @public_suffix_list.tld("foo.bar.com").should == "com"
+    @public_suffix_list.cdn("foobar.com").should == "foobar.com"
+    @public_suffix_list.tld("foobar.com").should == "com"
+  end
+
+  it "should not assume the root name is a top level domain" do
+    @public_suffix_list.tld("com").should == "com"
+    @public_suffix_list.tld("bar.foo").should == "bar.foo"
+    @public_suffix_list.tld("baz.foo").should == "baz.foo"
+    @public_suffix_list.tld("qux.foo").should == ""
+    @public_suffix_list.tld("foo").should == ""
+  end
+
+  it "should handle edge cases correctly" do
+    @public_suffix_list.split("").should == ["", "", ""]
+    @public_suffix_list.cdn("").should == ""
+    @public_suffix_list.tld("").should == ""
   end
 
 end

data/spec/test.dat

@@ -1,6 +1,13 @@
+// data for cookie calculation, http://publicsuffix.org/format/
 com
 *.jp
 *.hokkaido.jp
 *.tokyo.jp
 !pref.hokkaido.jp
 !metro.tokyo.jp 
+
+// "foo" and "qux.foo" are not tlds
+bar.foo
+baz.foo
+one.qux.foo
+two.qux.foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: public-suffix-list
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Todd Sundsted
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 -05:00
+date: 2010-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,8 @@ files:
 - README.rdoc
 - lib/public_suffix_list.rb
 - lib/public_suffix_list/parser.rb
+- spec/caching.spec
+- spec/cookie_calculation.spec
 - spec/public_suffix_list.spec
 - spec/test.dat
 has_rdoc: true