public_suffix 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba2754580d47368f487d9d016a13684e9aa3440
-  data.tar.gz: 39ca3d79f2cdc62903fa79970ab207264757ba3a
+  metadata.gz: 892f161e5f319655ce28c5471b8bfd52bee52d4a
+  data.tar.gz: c5336906cb205ba862b102f26913049ddfceb84c
 SHA512:
-  metadata.gz: c84b5a8be3c0b4defbce1be5504a0ab41b2a4f9daf810cab5afbbabc0be0a1e857e73b7262027e163b107e5dfa7369c5fbcb49aa31b2fd2ac87e3165c39658e7
-  data.tar.gz: 90f2aaa790fd8481c1462b2ee12c48312d118dbcbf7b0d27c2be1b5cf6a372e52493f051aff48adae8f2b4ac1054da72dcbbdab5c91a1e91e52555184ec076ee
+  metadata.gz: 61ff3cef06b748c5d1646d3b85100774efdede3f37966385661c3f7ed72ec1fbee793f6547ef772d0edea4350cf3b8b27229da7bc796b3301d19989364ec1217
+  data.tar.gz: 1b46049d7cd042cfc68a159fe336d17fa69bfb40097a5a0978b4d979005a966febf640b6b9ac61937940fd1bfc2e864c333605fadb9d2f9e7d9501baf497e944

data/.rubocop_defaults.yml

@@ -6,6 +6,9 @@ AllCops:
     - 'tmp/**/*'
     - 'vendor/**/*'
 
+Lint/RescueWithoutErrorClass:
+  Enabled: false
+
 # [codesmell]
 Metrics/AbcSize:
   Enabled: false

data/.travis.yml

@@ -3,24 +3,22 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
-  - 2.3.3
-  - 2.4.0
+  - 2.3
+  - 2.4
+  - jruby-9.1.5.0
   - ruby-head
-  - jruby-9.0.5.0
-  - jruby-9.1.0.0
 
-before_install:
-  - gem update --system
-  - gem install bundler
+env:
+  - COVERALL=1
 
 cache:
   - bundler
 
-env:
-  - COVERALL=1
-
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.0.5.0
     - rvm: jruby-9.1.0.0
+
+before_install:
+  - rvm get latest
+  - gem install bundler

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 
+#### Release 3.0.1
+
+- CHANGED: Updated definitions.
+- CHANGED: Improve performance and avoid allocation (GH-146). [Thanks @robholland]
+
+
 #### Release 3.0.0
 
 This new version includes a major redesign of the library internals, with the goal to drastically

data/README.md

@@ -7,7 +7,7 @@
 
 ## Requirements
 
-- Ruby >= 2.0
+- Ruby >= 2.1
 
 For an older versions of Ruby use a previous release.
 

data/data/list.txt

@@ -399,24 +399,34 @@ tv.bo
 // br : http://registro.br/dominio/categoria.html
 // Submitted by registry <fneves@registro.br>
 br
+abc.br
 adm.br
 adv.br
 agr.br
+aju.br
 am.br
+aparecida.br
 arq.br
 art.br
 ato.br
 b.br
 belem.br
+bhz.br
 bio.br
 blog.br
 bmd.br
+boavista.br
+bsb.br
+campinas.br
+caxias.br
 cim.br
 cng.br
 cnt.br
 com.br
+contagem.br
 coop.br
 cri.br
+cuiaba.br
 def.br
 ecn.br
 eco.br
@@ -427,14 +437,17 @@ esp.br
 etc.br
 eti.br
 far.br
+feira.br
 flog.br
 floripa.br
 fm.br
 fnd.br
+fortal.br
 fot.br
 fst.br
 g12.br
 ggf.br
+goiania.br
 gov.br
 // gov.br 26 states + df https://en.wikipedia.org/wiki/States_of_Brazil
 ac.gov.br
@@ -464,42 +477,65 @@ sc.gov.br
 se.gov.br
 sp.gov.br
 to.gov.br
+gru.br
 imb.br
 ind.br
 inf.br
+jab.br
 jampa.br
+jdf.br
+joinville.br
 jor.br
 jus.br
 leg.br
 lel.br
+londrina.br
+macapa.br
+maceio.br
 mat.br
 med.br
 mil.br
+morena.br
 mp.br
 mus.br
+natal.br
 net.br
+niteroi.br
 *.nom.br
 not.br
 ntr.br
 odo.br
 org.br
+osasco.br
+palmas.br
 poa.br
 ppg.br
 pro.br
 psc.br
 psi.br
+pvh.br
 qsl.br
 radio.br
 rec.br
 recife.br
+ribeirao.br
+rio.br
+riobranco.br
+salvador.br
+sampa.br
+sjc.br
 slg.br
+slz.br
+sorocaba.br
 srv.br
 taxi.br
 teo.br
+the.br
 tmp.br
 trd.br
 tur.br
 tv.br
+udi.br
 vet.br
 vix.br
 vlog.br
@@ -6472,6 +6508,17 @@ lib.wy.us
 pvt.k12.ma.us
 chtr.k12.ma.us
 paroch.k12.ma.us
+// Merit Network, Inc. maintains the registry for =~ /(k12|cc|lib).mi.us/ and the following
+//    see also: http://domreg.merit.edu
+//    see also: whois -h whois.domreg.merit.edu help
+ann-arbor.mi.us
+cog.mi.us
+dst.mi.us
+eaton.mi.us
+gen.mi.us
+mus.mi.us
+tec.mi.us
+washtenaw.mi.us
 
 // uy : http://www.nic.org.uy/
 uy
@@ -7473,9 +7520,6 @@ cheap
 // chintai : 2015-06-11 CHINTAI Corporation
 chintai
 
-// chloe : 2014-10-16 Richemont DNS Inc.
-chloe
-
 // christmas : 2013-11-21 Uniregistry, Corp.
 christmas
 
@@ -8346,9 +8390,6 @@ how
 // hsbc : 2014-10-24 HSBC Holdings PLC
 hsbc
 
-// htc : 2015-04-02 HTC corporation
-htc
-
 // hughes : 2015-07-30 Hughes Satellite Systems Corporation
 hughes
 
@@ -8802,12 +8843,6 @@ mattel
 // mba : 2015-04-02 Lone Hollow, LLC
 mba
 
-// mcd : 2015-07-30 McDonald’s Corporation
-mcd
-
-// mcdonalds : 2015-07-30 McDonald’s Corporation
-mcdonalds
-
 // mckinsey : 2015-07-31 McKinsey Holdings, Inc.
 mckinsey
 
@@ -8898,9 +8933,6 @@ money
 // monster : 2015-09-11 Monster Worldwide, Inc.
 monster
 
-// montblanc : 2014-06-23 Richemont DNS Inc.
-montblanc
-
 // mopar : 2015-07-30 FCA US LLC.
 mopar
 
@@ -9132,9 +9164,6 @@ ovh
 // page : 2014-12-04 Charleston Road Registry Inc.
 page
 
-// pamperedchef : 2015-02-05 The Pampered Chef, Ltd.
-pamperedchef
-
 // panasonic : 2015-07-30 Panasonic Corporation
 panasonic
 
@@ -10582,8 +10611,23 @@ us-east-1.amazonaws.com
 
 // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
-elasticbeanstalk.cn-north-1.amazonaws.com.cn
-*.elasticbeanstalk.com
+cn-north-1.eb.amazonaws.com.cn
+elasticbeanstalk.com
+ap-northeast-1.elasticbeanstalk.com
+ap-northeast-2.elasticbeanstalk.com
+ap-south-1.elasticbeanstalk.com
+ap-southeast-1.elasticbeanstalk.com
+ap-southeast-2.elasticbeanstalk.com
+ca-central-1.elasticbeanstalk.com
+eu-central-1.elasticbeanstalk.com
+eu-west-1.elasticbeanstalk.com
+eu-west-2.elasticbeanstalk.com
+sa-east-1.elasticbeanstalk.com
+us-east-1.elasticbeanstalk.com
+us-east-2.elasticbeanstalk.com
+us-gov-west-1.elasticbeanstalk.com
+us-west-1.elasticbeanstalk.com
+us-west-2.elasticbeanstalk.com
 
 // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
@@ -10871,6 +10915,10 @@ firm.dk
 reg.dk
 store.dk
 
+// Debian : https://www.debian.org/
+// Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
+debian.net
+
 // deSEC : https://desec.io/
 // Submitted by Peter Thomassen <peter@desec.io>
 dedyn.io
@@ -11398,6 +11446,10 @@ vladikavkaz.su
 vladimir.su
 vologda.su
 
+// Fancy Bits, LLC : http://getchannels.com
+// Submitted by Aman Gupta <aman@getchannels.com>
+channelsdvr.net
+
 // Fastly Inc. : http://www.fastly.com/
 // Submitted by Fastly Security <security@fastly.com>
 fastlylb.net
@@ -11448,6 +11500,7 @@ myfusion.cloud
 
 // Futureweb OG : http://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
+*.futurecms.at
 futurehosting.at
 futuremailing.at
 *.ex.ortsinfo.at
@@ -11630,6 +11683,10 @@ se.leg.br
 sp.leg.br
 to.leg.br
 
+// intermetrics GmbH : https://pixolino.com/
+// Submitted by Wolfgang Schwarz <admin@intermetrics.de>
+pixolino.com
+
 // IPiFony Systems, Inc. : https://www.ipifony.com/
 // Submitted by Matthew Hardeman <mhardeman@ipifony.com>
 ipifony.net
@@ -11953,6 +12010,7 @@ protonet.io
 // Publication Presse Communication SARL : https://ppcom.fr
 // Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
 chirurgiens-dentistes-en-france.fr
+byen.site
 
 // QA2
 // Submitted by Daniel Dent (https://www.danieldent.com/)
@@ -12180,10 +12238,15 @@ lib.de.us
 // Submitted by Simon Kissel <hostmaster@viprinet.com>
 router.management
 
+// Virtual-Info : https://www.virtual-info.info/
+// Submitted by Adnan RIHAN <hostmaster@v-info.info>
+v-info.info
+
 // WeDeploy by Liferay, Inc. : https://www.wedeploy.com
 // Submitted by Henrique Vicente <security@wedeploy.com>
 wedeploy.io
 wedeploy.me
+wedeploy.sh
 
 // Western Digital Technologies, Inc : https://www.wdc.com
 // Submitted by Jung Jin <jungseok.jin@wdc.com>

data/lib/public_suffix/list.rb

@@ -51,9 +51,7 @@ module PublicSuffix
 
     # Sets the default rule list to +value+.
     #
-    # @param [PublicSuffix::List] value
-    #   The new rule list.
-    #
+    # @param  value [PublicSuffix::List] the new list
     # @return [PublicSuffix::List]
     def self.default=(value)
       @default = value
@@ -63,9 +61,9 @@ module PublicSuffix
     #
     # See http://publicsuffix.org/format/ for more details about input format.
     #
-    # @param  string [#each_line] The list to parse.
-    # @param  private_domains [Boolean] whether to ignore the private domains section.
-    # @return [Array<PublicSuffix::Rule::*>]
+    # @param  string [#each_line] the list to parse
+    # @param  private_domains [Boolean] whether to ignore the private domains section
+    # @return [PublicSuffix::List]
     def self.parse(input, private_domains: true)
       comment_token = "//".freeze
       private_token = "===BEGIN PRIVATE DOMAINS===".freeze

data/lib/public_suffix/rule.rb

@@ -165,7 +165,7 @@ module PublicSuffix
         # we need to properly walk the input and skip parts according
         # to wildcard component.
         diff = name.chomp(value)
-        diff.empty? || diff[-1] == DOT
+        diff.empty? || diff.end_with?(DOT)
       end
 
       # @abstract

data/lib/public_suffix/version.rb

@@ -6,5 +6,5 @@
 
 module PublicSuffix
   # The current library version.
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.1".freeze
 end

data/test/unit/list_test.rb

@@ -28,10 +28,10 @@ class PublicSuffix::ListTest < Minitest::Test
   end
 
   def test_each_without_block
-    list = PublicSuffix::List.parse(<<EOS)
+    list = PublicSuffix::List.parse(<<LIST)
 alpha
 beta
-EOS
+LIST
 
     assert_kind_of Enumerator, list.each
     assert_equal 2, list.each.count
@@ -39,10 +39,10 @@ EOS
   end
 
   def test_each_with_block
-    list = PublicSuffix::List.parse(<<EOS)
+    list = PublicSuffix::List.parse(<<LIST)
 alpha
 beta
-EOS
+LIST
 
     entries = []
     list.each { |r| entries << r }
@@ -90,7 +90,7 @@ EOS
 
 
   def test_find
-    list = PublicSuffix::List.parse(<<EOS)
+    list = PublicSuffix::List.parse(<<LIST)
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
@@ -116,7 +116,7 @@ io
 blogspot.com
 
 // ===END PRIVATE DOMAINS===
-EOS
+LIST
 
     # match IANA
     assert_equal PublicSuffix::Rule.factory("com"), list.find("example.com")
@@ -186,7 +186,7 @@ EOS
   end
 
   def test_self_parse
-    list = PublicSuffix::List.parse(<<EOS)
+    list = PublicSuffix::List.parse(<<LIST)
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
@@ -207,7 +207,7 @@ com
 blogspot.com
 
 // ===END PRIVATE DOMAINS===
-EOS
+LIST
 
     assert_instance_of PublicSuffix::List, list
     assert_equal 4, list.size
@@ -224,7 +224,7 @@ EOS
   private
 
   def list
-    @_list ||= PublicSuffix::List.parse(<<EOS)
+    @_list ||= PublicSuffix::List.parse(<<LIST)
 // com : http://en.wikipedia.org/wiki/.com
 com
 
@@ -233,7 +233,7 @@ com
 *.sch.uk
 !bl.uk
 !british-library.uk
-EOS
+LIST
   end
 
 end

data/test/unit/public_suffix_test.rb

@@ -156,7 +156,7 @@ class PublicSuffixTest < Minitest::Test
         nil,
         "",
         " ",
-    ].each do |input, _|
+    ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
       assert_equal "Name is blank", error.message
@@ -166,7 +166,7 @@ class PublicSuffixTest < Minitest::Test
   def test_normalize_scheme
     [
         "https://google.com",
-    ].each do |input, _|
+    ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
       assert_match(/scheme/, error.message)
@@ -176,7 +176,7 @@ class PublicSuffixTest < Minitest::Test
   def test_normalize_leading_dot
     [
         ".google.com",
-    ].each do |input, _|
+    ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
       assert_match "Name starts with a dot", error.message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake