public_suffix 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66dc54e27daa3b422626869f6300742016b1a26
-  data.tar.gz: ca3b89eca94f9e8a83ca74b6ce254d5ca0864e7d
+  metadata.gz: c5e75fe3c5d642adeeae60366174f25b99844b90
+  data.tar.gz: 1dc35267a417747ab37e1997434d5e219839a391
 SHA512:
-  metadata.gz: 90a240dd8521be8233d6e3d252fdb73bba58570433bbd2b13f2ab619cc1d239a98f2e4580ca412886dabcafaab4e5999d777fc2fa7775cb4696363ac49688a16
-  data.tar.gz: fcd22189e282054f6ed6ea8d56c3506fd4013a2881cab20ad48e1087fb6f485cfb8b50621180cb1d3875fcb8b592ec8ab304b9d9298f0f88c0d130bc4aad06d3
+  metadata.gz: 05477a5b192b451131723a039815127c0c12cc89b2c911f3f162e1fc20a2a596cf7639d46f521d1a17fb7f1db7a9ad29d2181809e952a581d68f530369cdff54
+  data.tar.gz: 16bf8bf394f1efca171596991c4d3039a09b658932dc7c45c00277b0fb482a917b203a53f640d83185497f2bb6e535554f69333be777d36807e1cd7699e5d98c

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+#### Release 1.5.3
+
+- FIXED: Don't duplicate rule indices when creating index (GH-77). [Thanks @ags]
+
+- CHANGED: Updated definitions.
+
+
 #### Release 1.5.2
 
 - CHANGED: Updated definitions.

data/data/definitions.txt

@@ -155,13 +155,6 @@ org.al
 // am : http://en.wikipedia.org/wiki/.am
 am
 
-// an : http://www.una.an/an_domreg/default.asp
-an
-com.an
-net.an
-org.an
-edu.an
-
 // ao : http://en.wikipedia.org/wiki/.ao
 // http://www.dns.ao/REGISTR.DOC
 ao
@@ -4437,8 +4430,21 @@ gov.ng
 mil.ng
 mobi.ng
 
-// ni : http://www.nic.ni/dominios.htm
-*.ni
+// ni : http://www.nic.ni/
+com.ni    
+gob.ni    
+edu.ni
+org.ni
+nom.ni
+net.ni
+mil.ni  
+co.ni
+biz.ni
+web.ni    
+int.ni
+ac.ni
+in.ni  
+info.ni
 
 // nl : http://en.wikipedia.org/wiki/.nl
 //      https://www.sidn.nl/
@@ -5783,7 +5789,6 @@ kms.ru
 k-uralsk.ru
 kustanai.ru
 kuzbass.ru
-magnitka.ru
 mytis.ru
 nakhodka.ru
 nkz.ru
@@ -6927,7 +6932,7 @@ web.za
 *.zw
 
 
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-10-11T22:21:58Z
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-11-12T22:43:48Z
 
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7196,6 +7201,9 @@ barefoot
 // bargains : 2013-11-14 Half Hallow, LLC
 bargains
 
+// baseball : 2015-10-29 MLB Advanced Media DH, LLC
+baseball
+
 // basketball : 2015-08-20 Fédération Internationale de Basketball (FIBA)
 basketball
 
@@ -7454,6 +7462,9 @@ casino
 // catering : 2013-12-05 New Falls. LLC
 catering
 
+// catholic : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+catholic
+
 // cba : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
 cba
 
@@ -7772,6 +7783,9 @@ discover
 // dish : 2015-07-30 Dish DBS Corporation
 dish
 
+// diy : 2015-11-05 Lifestyle Domain Holdings, Inc.
+diy
+
 // dnp : 2013-12-13 Dai Nippon Printing Co., Ltd.
 dnp
 
@@ -9038,6 +9052,9 @@ ninja
 // nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
 nissan
 
+// nissay : 2015-10-29 Nippon Life Insurance Company
+nissay
+
 // nokia : 2015-01-08 Nokia Corporation
 nokia
 
@@ -9314,6 +9331,9 @@ prudential
 // pub : 2013-12-12 United TLD Holdco Ltd.
 pub
 
+// pwc : 2015-10-29 PricewaterhouseCoopers LLP
+pwc
+
 // qpon : 2013-11-14 dotCOOL, Inc.
 qpon
 
@@ -9977,6 +9997,9 @@ ubs
 // uconnect : 2015-07-30 FCA US LLC.
 uconnect
 
+// unicom : 2015-10-15 China United Network Communications Corporation Limited
+unicom
+
 // university : 2014-03-06 Little Station, LLC
 university
 
@@ -10253,6 +10276,9 @@ xin
 // xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
 москва
 
+// xn--80aqecdr1a : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+католик
+
 // xn--80asehdb : 2013-07-14 CORE Association
 онлайн
 
@@ -10388,6 +10414,9 @@ xin
 // xn--mgbca7dzdo : 2015-07-30 Abu Dhabi Systems and Information Centre
 ابوظبي
 
+// xn--mgbi4ecexp : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+كاثوليك
+
 // xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
 همراه
 
@@ -10442,6 +10471,9 @@ xin
 // xn--tckwe : 2015-01-15 VeriSign Sarl
 コム
 
+// xn--tiq49xqyj : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+天主教
+
 // xn--unup4y : 2013-07-14 Spring Fields, LLC
 游戏
 
@@ -11158,6 +11190,10 @@ bmoattachments.org
 // Submitted by Trung Tran <Trung.Tran@neustar.biz> 2015-04-23
 4u.com
 
+// ngrok : https://ngrok.com/
+// Submitted by Alan Shreve <alan@ngrok.com> 2015-11-10
+ngrok.io
+
 // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
 // Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02
 nfshost.com

data/lib/public_suffix/list.rb

@@ -156,7 +156,6 @@ module PublicSuffix
     #
     def initialize(&block)
       @rules   = []
-      @indexes = {}
       yield(self) if block_given?
       create_index!
     end
@@ -169,6 +168,7 @@ module PublicSuffix
     # where Rule#labels.first is 'us' @indexes['us'] #=> [5,4], that way in 
     # select we can avoid mapping every single rule against the candidate domain.
     def create_index!
+      @indexes = {}
       @rules.map { |l| l.labels.first }.each_with_index do |elm, inx|
         if !@indexes.has_key?(elm)
           @indexes[elm] = [inx]

data/lib/public_suffix/version.rb

@@ -11,7 +11,7 @@ module PublicSuffix
   module Version
     MAJOR = 1
     MINOR = 5
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/public_suffix.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
-# stub: public_suffix 1.5.1 ruby lib
+# stub: public_suffix 1.5.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "public_suffix"
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Simone Carletti"]
-  s.date = "2015-04-10"
+  s.date = "2015-10-27"
   s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains."
   s.email = "weppos@weppos.net"
   s.files = [".gemtest", ".gitignore", ".ruby-gemset", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "data/definitions.txt", "lib/public_suffix.rb", "lib/public_suffix/domain.rb", "lib/public_suffix/errors.rb", "lib/public_suffix/list.rb", "lib/public_suffix/rule.rb", "lib/public_suffix/version.rb", "public_suffix.gemspec", "test/acceptance_test.rb", "test/test_helper.rb", "test/unit/domain_test.rb", "test/unit/errors_test.rb", "test/unit/list_test.rb", "test/unit/public_suffix_test.rb", "test/unit/rule_test.rb"]
   s.homepage = "http://simonecarletti.com/code/publicsuffix"
   s.licenses = ["MIT"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0")
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.7"
   s.summary = "Domain name parser based on the Public Suffix List."
   s.test_files = ["test/acceptance_test.rb", "test/test_helper.rb", "test/unit/domain_test.rb", "test/unit/errors_test.rb", "test/unit/list_test.rb", "test/unit/public_suffix_test.rb", "test/unit/rule_test.rb"]
 

data/test/unit/list_test.rb

@@ -54,6 +54,13 @@ class PublicSuffix::ListTest < Minitest::Unit::TestCase
     assert_equal PublicSuffix::Rule.factory("net"), @list.find("google.net")
   end
 
+  def test_add_should_not_duplicate_indices
+    @list = PublicSuffix::List.parse("com")
+    @list.add(PublicSuffix::Rule.factory("net"))
+
+    assert_equal @list.indexes["com"], [0]
+  end
+
   def test_empty?
     assert  @list.empty?
     @list.add(PublicSuffix::Rule.factory(""))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake