public_suffix 1.2.1 → 1.3.0

data/.travis.yml

@@ -3,10 +3,15 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
-  # - jruby-19mode
+  - jruby-19mode
   - rbx-18mode
+  - rbx-19mode
   - ree
 notifications:
   recipients:
-    - weppos@weppos.net
+    - weppos@weppos.net
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+## Release 1.3.0
+
+- NEW: Ability to skip Private Domains (GH-28). [Thanks @rb2k]
+
+- CHANGED: Updated definitions.
+
+
 ## Release 1.2.1
 
 - CHANGED: Updated definitions.

data/README.md

@@ -108,6 +108,23 @@ This library automatically recognizes Fully Qualified Domain Names. A FQDN is a
     domain.tld
     # => "com"
 
+## Private domains
+
+This library has support for switching off support for private (non-ICANN) domains
+
+    # Parse a domain on a private TLD
+    domain = PublicSuffix.parse("something.blogspot.com")
+    # => #<PublicSuffix::Domain>
+    domain.tld
+    # => "blogspot.com"
+
+    # Disable support for private TLDs
+    PublicSuffix::List.private_domains = false
+    # => #<PublicSuffix::List>
+    domain = PublicSuffix.parse("something.blogspot.com")
+    # => #<PublicSuffix::Domain>
+    domain.tld
+    # => "com"
 
 ## Feedback and bug reports
 

data/lib/public_suffix/definitions.txt

@@ -691,6 +691,14 @@ inf.cu
 // cv : http://en.wikipedia.org/wiki/.cv
 cv
 
+// cw : http://www.una.cw/cw_registry/
+// Confirmed by registry <registry@una.net> 2013-03-26
+cw
+com.cw
+edu.cw
+net.cw
+org.cw
+
 // cx : http://en.wikipedia.org/wiki/.cx
 // list of other 2nd level tlds ?
 cx
@@ -5308,6 +5316,9 @@ org.pn
 edu.pn
 net.pn
 
+// post : http://en.wikipedia.org/wiki/.post
+post
+
 // pr : http://www.nic.pr/index.asp?f=1
 pr
 com.pr
@@ -6950,4 +6961,38 @@ betainabox.com
 // Requested by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
 rhcloud.com
 
+// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
+// Requested by Scott Vidmar <svidmar@amazon.com> 2013-03-27
+elb.amazonaws.com
+
+// Amazon S3 : https://aws.amazon.com/s3/
+// Requested by Courtney Eckhardt <coec@amazon.com> 2013-03-22
+s3.amazonaws.com
+s3-us-west-2.amazonaws.com
+s3-us-west-1.amazonaws.com
+s3-eu-west-1.amazonaws.com
+s3-ap-southeast-1.amazonaws.com
+s3-ap-southeast-2.amazonaws.com
+s3-ap-northeast-1.amazonaws.com
+s3-sa-east-1.amazonaws.com
+s3-us-gov-west-1.amazonaws.com
+s3-fips-us-gov-west-1.amazonaws.com
+s3-website-us-east-1.amazonaws.com
+s3-website-us-west-2.amazonaws.com
+s3-website-us-west-1.amazonaws.com
+s3-website-eu-west-1.amazonaws.com
+s3-website-ap-southeast-1.amazonaws.com
+s3-website-ap-southeast-2.amazonaws.com
+s3-website-ap-northeast-1.amazonaws.com
+s3-website-sa-east-1.amazonaws.com
+s3-website-us-gov-west-1.amazonaws.com
+
+// Amazon CloudFront : https://aws.amazon.com/cloudfront/
+// Requested by Donavan Miller <donavanm@amazon.com> 2013-03-22
+cloudfront.net
+
+// NYC.mn : http://www.information.nyc.mn
+// Requested by Matthew Brown <mattbrown@nyc.mn> 2013-03-11
+nyc.mn
+
 // ===END PRIVATE DOMAINS===

data/lib/public_suffix/list.rb

@@ -67,6 +67,23 @@ module PublicSuffix
       @default = value
     end
 
+    # Shows if support for private (non-ICANN) domains is enabled or not
+    #
+    # @return [Boolean]
+    def self.private_domains?
+      @private_domains != false
+    end
+
+    # Enables/disables support for private (non-ICANN) domains
+    # Implicitly reloads the list
+    # @param [Boolean] enable/disable support
+    #
+    # @return [PublicSuffix::List]
+    def self.private_domains=(value)
+      @private_domains = !!value
+      self.clear
+    end
+
     # Sets the default rule list to +nil+.
     #
     # @return [self]
@@ -104,7 +121,7 @@ module PublicSuffix
       new do |list|
         input.each_line do |line|
           line.strip!
-
+          break if !private_domains? && line.include?('===BEGIN PRIVATE DOMAINS===')
           # strip blank lines
           if line.empty?
             next

data/lib/public_suffix/version.rb

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

data/public_suffix.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "public_suffix"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2012-12-24"
+  s.date = "2013-03-26"
   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", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "lib/public_suffix.rb", "lib/public_suffix/definitions.txt", "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://www.simonecarletti.com/code/public_suffix"
+  s.homepage = "http://www.simonecarletti.com/code/publicsuffix"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubygems_version = "1.8.24"

data/test/unit/list_test.rb

@@ -38,7 +38,6 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
     assert_equal PublicSuffix::List.new.add(rule), PublicSuffix::List.new.add(rule)
   end
 
-
   def test_add
     assert_equal @list, @list.add(PublicSuffix::Rule.factory(""))
     assert_equal @list, @list <<  PublicSuffix::Rule.factory("")
@@ -133,7 +132,6 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
     assert_equal PublicSuffix::List.new, PublicSuffix::List.default
   end
 
-
   def test_self_parse
     list = PublicSuffix::List.parse(<<EOS)
 // ***** BEGIN LICENSE BLOCK *****

data/test/unit/public_suffix_test.rb

@@ -51,6 +51,21 @@ class PublicSuffixTest < Test::Unit::TestCase
     assert_equal "example", domain.sld
     assert_equal "www",     domain.trd
   end
+  
+  def test_private_domains_are_enabled_by_default
+    domain = PublicSuffix.parse("www.example.blogspot.com")
+    assert_equal "blogspot.com",    domain.tld
+  end
+  
+  def test_disable_support_for_private_domains
+    begin
+      PublicSuffix::List.private_domains = false
+      domain = PublicSuffix.parse("www.example.blogspot.com")
+      assert_equal "com",    domain.tld
+    ensure
+      PublicSuffix::List.private_domains = true
+    end
+  end
 
   def test_self_parse_a_domain_with_custom_list
     list = PublicSuffix::List.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake