public-suffix-list 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07ccdd8cb5bc94567fa0a93437e7c8cabd66a671d31d0a06030ec49aff9481f
-  data.tar.gz: 3a2ec9b5966283c4d11c4c1121109af701acb71331807b67aa45130c196da711
+  metadata.gz: 41d03f21b529c0401313c948ee0117b05ae770e5774998697dcb53f623da1294
+  data.tar.gz: bc7f1cd08207f7a4c0bc17fc979ef46b02db4d663791c5b3601a8bb748785a4c
 SHA512:
-  metadata.gz: a154df3dc9285612da36dfc1ec38b98fd6ed1697f473d50692275bbbe5e2285101bc0973097ce9c0d96b124eb8eb525fef3f6141399626b3e206647926ed0f15
-  data.tar.gz: 7d2bdcb047214593da9ad91479f678247bd2467ff46bbd5d6df72e2da8af63a440010210e400f15af0725ba1843d04f37885c87a85368638497a4e317c35f860
+  metadata.gz: e2bbf922fbae28c93ff74423f90b1da07f7578425c0e81ca2019e6757f79f31aafd7183b5b0764d93588293193ebb2dbddf7e8466f3264d13eb74e7017ec79a3
+  data.tar.gz: a9a106d7b6674dbbf83e39569669ce4d9897f4b4a7d9a4adf2b8bf39904c4fd5cc4427a8a9291d91307b2e49cbd9e2a7f52c2cf5335d9bc3f803cf3a7fb8af8f

data/Gemfile

@@ -1,6 +1,12 @@
 source 'https://rubygems.org'
 
+group :development do
+  gem 'sorbet'
+  gem 'sorbet-runtime'
+end
+
 group :test do
+  gem 'rdoc'
   gem 'rspec'
   gem 'timecop'
 end

data/README.rdoc

@@ -1,6 +1,7 @@
 = Public Suffix List
 
-* http://github.com/toddsundsted/Public-Suffix-List
+{<img src="https://travis-ci.org/toddsundsted/Public-Suffix-List.svg?branch=master">}[https://travis-ci.org/toddsundsted/Public-Suffix-List]
+{<img src="https://img.shields.io/badge/docs-available-brightgreen.svg">}[https://toddsundsted.github.io/Public-Suffix-List/]
 
 == Description
 

data/lib/public_suffix_list.rb

@@ -1,3 +1,4 @@
+# typed: true
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__))
 
 require 'open-uri'
@@ -6,7 +7,7 @@ require "public_suffix_list/parser.rb"
 
 class PublicSuffixList
 
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
   def self.config
     @@config ||= Config.new
@@ -59,7 +60,7 @@ class PublicSuffixList
     domain = domain.split(".")
     result = best(match(domain, rules, true))
     return ["", "", ""] if result.empty?
-    [gimme!(domain, result.size), gimme!(domain), domain].reverse.map { |d| d ? d.join(".") : "" }
+    [gimme!(domain, result.size), gimme!(domain), domain].reverse.map { |d| d.join(".") }
   end
 
   def tld(domain)
@@ -79,7 +80,10 @@ class PublicSuffixList
   private
 
   def fetch
-    @rules = Parser.parse(open(@config.url))
+    @rules =
+      if (file = open(@config.url))
+        Parser.parse(file)
+      end
   end
 
   def cache
@@ -95,7 +99,7 @@ class PublicSuffixList
     domain = domain.dup
     first = domain.pop
     set = []
-    [[first.downcase, first], ["!#{first.downcase}", "!#{first}"], ["*", first]].each do |pattern, name|
+    [[first&.downcase, first], ["!#{first&.downcase}", "!#{first}"], ["*", first]].each do |pattern, name|
       if rules[pattern]
         set << [name] if rules[pattern][:term]
         match(domain, rules[pattern]).each { |result| set << [first] + result }
@@ -109,10 +113,9 @@ class PublicSuffixList
   end
 
   def best(results)
-    return [] if results.empty?
-    result = results.find { |r| r.last[0] == ?! } || results.sort { |a, b| a.size <=> b.size }.last
-    result = result[0..result.size - 2] if result.last[0] == ?!
-    result
+    result = results.find { |r| r.last&.[](0) == ?! } || results.sort { |a, b| a.size <=> b.size }.last
+    result = result[0..result.size - 2] if result && result.last&.[](0) == ?!
+    result || []
   end
 
   def gimme!(domain, n = 1)

data/lib/public_suffix_list/cache_file.rb

@@ -1,21 +1,24 @@
+# typed: true
 class PublicSuffixList
 
   class CacheFile
 
     def initialize(config)
       @config = config
+      @data = {}
     end
 
     def cache?
-      @config.cache_dir && File.directory?(@config.cache_dir) && true
+      @config.cache_dir && File.directory?(@config.cache_dir) && true || false
     end
 
     def file
-      File.join(@config.cache_dir, URI.parse(@config.url).path.split("/").last + ".cache") if cache?
+      path = URI.parse(@config.url)&.path&.split("/")&.last || ""
+      File.join(@config.cache_dir, path + ".cache")
     end
 
     def exist?
-      File.exist?(file) if cache?
+      cache? && File.exist?(file) && true || false
     end
 
     def delete
@@ -31,7 +34,8 @@ class PublicSuffixList
     end
 
     def data
-      @data or (load_data and @data) or @data = {}
+      @data.empty? and load_data
+      @data
     end
 
     def [](key)
@@ -39,7 +43,7 @@ class PublicSuffixList
     end
 
     def []=(key, value)
-      data.merge!({key => value, created_at: Time.now, tag: rand(36**8).to_s(36)}) and dump_data
+      data.merge!({key => value, created_at: Time.now, tag: rand(2821109907456).to_s(36)}) and dump_data
     end
 
     def expired?

data/lib/public_suffix_list/parser.rb

@@ -1,3 +1,4 @@
+# typed: strict
 class PublicSuffixList
 
   module Parser

data/spec/caching_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'tmpdir'
 require 'public_suffix_list'
 require 'timecop'

data/spec/cookie_calculation_spec.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'public_suffix_list'
 
 def cookie_calculation(public_suffix_list, domain)

data/spec/public_suffix_list_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'public_suffix_list'
 
 describe PublicSuffixList do

data/spec/rdoc_synopsis_spec.rb

@@ -1,3 +1,4 @@
+# typed: strict
 require 'tmpdir'
 require 'public_suffix_list'
 

data/spec/upcase_downcase_spec.rb

@@ -1,3 +1,4 @@
+# typed: strict
 require 'public_suffix_list'
 
 describe PublicSuffixList do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: public-suffix-list
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Todd Sundsted
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-10-19 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