public-suffix-list 0.1.6 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4006daada672cf9894459ab481c57db88766bc0e72a5a387d60eff7e5731b155
+  data.tar.gz: 7b30374afa59207f4c71a58454af749f07b0b59b07a01e17d828bd00689e06f4
+SHA512:
+  metadata.gz: 52ea05bd99cfee402a61c0d8f05a8080a53ada2e8842d5ad739effbc5b181093cf5f076223982a1480efe9d044dfefc51b4ee06e51cdb229c5b048dff429329a
+  data.tar.gz: 54366755a919b771e77709af783e4bf2c436d76eddccf00eb9796bc59d9069b35775362f0c5b56ee91e8f921f40af7163fe097906d72594ee25205c57cdeee16

data/README.rdoc

@@ -75,7 +75,7 @@ Or add it to your Gemfile and use bundler:
 
 == License
 
-Copyright (c) 2010-2017 Todd Sundsted
+Copyright (c) 2010-2019 Todd Sundsted
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/public_suffix_list.rb

@@ -6,7 +6,7 @@ require "public_suffix_list/parser.rb"
 
 class PublicSuffixList
 
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 
   def self.config
     @@config ||= Config.new
@@ -29,7 +29,7 @@ class PublicSuffixList
     def initialize
       @cache_dir = nil
       @cache_expiry_period = 30 * 24 * 60 * 60
-      @url = "https://publicsuffix.org/list/effective_tld_names.dat"
+      @url = "https://publicsuffix.org/list/public_suffix_list.dat"
     end
 
   end
@@ -57,19 +57,19 @@ class PublicSuffixList
 
   def split(domain)
     domain = domain.split(".")
-    result = best(match(domain, rules))
+    result = best(match(domain, rules, true))
     [gimme!(domain, result.size), gimme!(domain), domain].reverse.map { |d| d ? d.join(".") : "" }
   end
 
   def tld(domain)
     domain = domain.split(".")
-    result = best(match(domain, rules))
+    result = best(match(domain, rules, true))
     gimme!(domain, result.size).join(".")
   end
 
   def cdn(domain)
     domain = domain.split(".")
-    result = best(match(domain, rules))
+    result = best(match(domain, rules, true))
     gimme!(domain, result.size + 1).join(".")
   end
 
@@ -87,7 +87,7 @@ class PublicSuffixList
     @rules = @cache_file[:rules] unless @cache_file.expired?
   end
 
-  def match(domain, rules)
+  def match(domain, rules, wildcard = false)
     return [] if domain.empty? or rules.empty?
     domain = domain.dup
     first = domain.pop
@@ -96,8 +96,12 @@ class PublicSuffixList
       if rules[pattern]
         set << [name] if rules[pattern][:term]
         match(domain, rules[pattern]).each { |result| set << [first] + result }
+        wildcard = false
       end
     end
+    if wildcard
+      set << [domain.first]
+    end
     set
   end
 

data/lib/public_suffix_list/parser.rb

@@ -10,7 +10,7 @@ class PublicSuffixList
     # !metro.tokyo.jp
 
     # {
-    #   "com" => {:term => true}, 
+    #   "com" => {:term => true},
     #   "jp" => {
     #     "tokyo" => {"!metro" => {:term => true}, "*" => {:term => true}},
     #     "hokkaido" => {"!pref" => {:term => true}, "*" => {:term => true}},
@@ -20,10 +20,10 @@ class PublicSuffixList
 
     def self.parse(lines)
       lines.inject({}) do |acc, line|
-        line.strip!
+        line.gsub!(/\s.*/, "")
         unless line =~ %r{//} or line.empty?
           tmp = acc
-          line.split(".").reverse.each do |p|
+          line.split(".").reject(&:empty?).reverse.each do |p|
             tmp[p] = {} unless tmp[p]
             tmp = tmp[p]
           end

data/spec/{caching.spec → caching_spec.rb}

@@ -12,12 +12,12 @@ describe PublicSuffixList do
 
   it "should cache when instructed to do so" do
     File.exist?(FILE).should be false
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
     created_at = public_suffix_list.cache_file.data[:created_at]
     tag = public_suffix_list.cache_file.data[:tag]
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.data[:created_at].should == created_at
@@ -26,13 +26,13 @@ describe PublicSuffixList do
 
   it "should fetch a new data file when the cache expiry has passed" do
     File.exist?(FILE).should be false
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
     created_at = public_suffix_list.cache_file.data[:created_at]
     tag = public_suffix_list.cache_file.data[:tag]
     Timecop.travel(Time.now + 15) do
-      public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+      public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
       public_suffix_list.cache_file.cache?.should be true
       public_suffix_list.cache_file.exist?.should be true
       public_suffix_list.cache_file.data[:created_at].should_not == created_at
@@ -42,13 +42,13 @@ describe PublicSuffixList do
 
   it "should not fetch a new data file when the cache expiry has not passed" do
     File.exist?(FILE).should be false
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.cache?.should be true
     public_suffix_list.cache_file.exist?.should be true
     created_at = public_suffix_list.cache_file.data[:created_at]
     tag = public_suffix_list.cache_file.data[:tag]
     Timecop.travel(Time.now + 5) do
-      public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+      public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
       public_suffix_list.cache_file.cache?.should be true
       public_suffix_list.cache_file.exist?.should be true
       public_suffix_list.cache_file.data[:created_at].should == created_at
@@ -58,7 +58,7 @@ describe PublicSuffixList do
 
   it "should allow 0 or nil to specify an infinite cache expiry period" do
     File.exist?(FILE).should be false
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 10)
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.expired?.should be false
     public_suffix_list.cache_file.data[:created_at] = Time.now - 100
@@ -66,7 +66,7 @@ describe PublicSuffixList do
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.delete
     public_suffix_list.cache_file.exist?.should be false
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 0)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => 0)
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.expired?.should be false
     public_suffix_list.cache_file.data[:created_at] = Time.now - 10000000
@@ -74,7 +74,7 @@ describe PublicSuffixList do
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.delete
     public_suffix_list.cache_file.exist?.should be false
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => nil)
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat", :cache_dir => Dir.tmpdir, :cache_expiry_period => nil)
     public_suffix_list.cache_file.exist?.should be true
     public_suffix_list.cache_file.expired?.should be false
     public_suffix_list.cache_file.data[:created_at] = Time.now - 10000000

data/spec/{cookie_calculation.spec → cookie_calculation_spec.rb}

@@ -8,7 +8,7 @@ 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")
+    public_suffix_list = PublicSuffixList.new(: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."

data/spec/{public_suffix_list.spec → public_suffix_list_spec.rb}

@@ -2,17 +2,16 @@ require 'public_suffix_list'
 
 describe PublicSuffixList do
 
-  it "should accept both effective_tld_names_url and url" do
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
-    public_suffix_list.config.effective_tld_names_url.should == "spec/test.dat"
-    public_suffix_list.config.url.should == "spec/test.dat"
+  it "should match * if no rules match" do
     public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat")
-    public_suffix_list.config.effective_tld_names_url.should == "spec/test.dat"
-    public_suffix_list.config.url.should == "spec/test.dat"
+    public_suffix_list.cache_file.should be nil
+    public_suffix_list.split("www.home.foobar").should == ["www", "home", "foobar"]
+    public_suffix_list.cdn("www.home.foobar").should == "home.foobar"
+    public_suffix_list.tld("www.home.foobar").should == "foobar"
   end
 
   it "should calculate tld and cdn correctly" do
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat")
     public_suffix_list.cache_file.should be nil
     public_suffix_list.cdn("foo.bar.com").should == "bar.com"
     public_suffix_list.tld("foo.bar.com").should == "com"
@@ -21,7 +20,7 @@ describe PublicSuffixList do
   end
 
   it "should not assume the root name is a top level domain" do
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat")
     public_suffix_list.cache_file.should be nil
     public_suffix_list.tld("com").should == "com"
     public_suffix_list.tld("bar.foo").should == "bar.foo"
@@ -31,7 +30,7 @@ describe PublicSuffixList do
   end
 
   it "should handle edge cases correctly" do
-    public_suffix_list = PublicSuffixList.new(:effective_tld_names_url => "spec/test.dat")
+    public_suffix_list = PublicSuffixList.new(:url => "spec/test.dat")
     public_suffix_list.cache_file.should be nil
     public_suffix_list.split("").should == ["", "", ""]
     public_suffix_list.cdn("").should == ""

data/spec/test.dat

@@ -4,7 +4,7 @@ com
 *.hokkaido.jp
 *.tokyo.jp
 !pref.hokkaido.jp
-!metro.tokyo.jp 
+!metro.tokyo.jp
 
 // "foo" and "qux.foo" are not tlds
 bar.foo

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: public-suffix-list
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Todd Sundsted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies: []
 description: The Public Suffix List (http://publicsuffix.org/) is "a cross-vendor
   initiative to provide an accurate list of domain name suffixes". Such a list is
@@ -28,35 +27,34 @@ files:
 - lib/public_suffix_list.rb
 - lib/public_suffix_list/cache_file.rb
 - lib/public_suffix_list/parser.rb
-- spec/caching.spec
-- spec/cookie_calculation.spec
-- spec/public_suffix_list.spec
-- spec/rdoc_synopsis.spec
-- spec/upcase_downcase.spec
+- spec/caching_spec.rb
+- spec/cookie_calculation_spec.rb
+- spec/public_suffix_list_spec.rb
+- spec/rdoc_synopsis_spec.rb
 - spec/test.dat
+- spec/upcase_downcase_spec.rb
 homepage: http://github.com/toddsundsted/Public-Suffix-List
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Public Suffix List is a small Ruby library designed to make the Public Suffix
   List (http://publicsuffix.org/) easier to use.
 test_files: []