twingly-url 6.0.4 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7308c5eb70d91f77fb0f81761948a6652a79dd610c481bb4237cfa435f3495b5
-  data.tar.gz: d54e531c0a7e350f01cf495d73adc69b16d9dd25af7859388c2d543d2bdfa299
+  metadata.gz: 4d077940af63f0646300c3438d45f3ca66370825c5ca81df32c6d1597e156071
+  data.tar.gz: 308a66eb3c281139a9f747a3538c3e53291f491eafa3bbdd3dbe30d1decb42d3
 SHA512:
-  metadata.gz: 7a871c957a15ba4695de8dbed2122619a5bf89922f5901ed7c3cecbde4ee33a9cf3017350344972d2a28ab9e6cb3e17380b1e42ce1532679332a1c25cea5d6d8
-  data.tar.gz: ab7c227ca8300c094637de6ae2cbbab4f65fab2585863f81feacdee85e1f5cf73711c5b3ec15dc8a05ac343a84b106047f6bb12f81ed769eb8b3c893004c8987
+  metadata.gz: 0b50ee3c1e3dd3beb12b85c813e36952945fca3de296257d7e0428a1de78d866932d334f13c405f784659324a69de0b2de293c07520f94f0e9d3c9a0665a3955
+  data.tar.gz: 278af99f73d82edb9f05eed9f795fe0e0395bf45626f9fde2e09b605ce467afc90c13780020fc94b6e54f2c64daf995f061a20eddbc1fcc84d6ac1cf0a1fcd48

data/README.md

@@ -8,7 +8,6 @@ Twingly URL tools.
     * `Twingly::URL.parse` - Returns one or more `Twingly::URL` instance
 * `twingly/url/hasher` - Generate URL hashes suitable for primary keys
     * `Twingly::URL::Hasher.taskdb_hash(url)` - MD5 hexdigest
-    * `Twingly::URL::Hasher.blogstream_hash(url)` - MD5 hexdigest
     * `Twingly::URL::Hasher.documentdb_hash(url)` - SHA256 unsigned long, native endian digest
     * `Twingly::URL::Hasher.autopingdb_hash(url)` - SHA256 64-bit signed, native endian digest
 * `twingly/url/utilities` - Utilities to work with URLs

data/lib/twingly/url/hasher.rb

@@ -19,10 +19,6 @@ module Twingly
         MD5_DIGEST.hexdigest(url)[0..29].upcase
       end
 
-      def blogstream_hash(url)
-        MD5_DIGEST.hexdigest(url)[0..29].upcase
-      end
-
       def documentdb_hash(url)
         SHA256_DIGEST.digest(url).unpack("L!")[0]
       end

data/lib/twingly/url.rb

@@ -22,6 +22,8 @@ module Twingly
       Addressable::URI::InvalidURIError,
       PublicSuffix::DomainInvalid,
     ].freeze
+    DOT = "."
+    HYPHEN = "-"
     CARRIAGE_RETURN = "\u000D"
     LINE_FEED = "\u000A"
     NBSP = "\u00A0"
@@ -34,16 +36,20 @@ module Twingly
     ].join.freeze
     LEADING_AND_TRAILING_WHITESPACE =
       /\A[#{WHITESPACE_CHARS}]+|[#{WHITESPACE_CHARS}]+\z/.freeze
+    LETTERS_DIGITS_HYPHEN = /\A[a-zA-Z0-9-]+\z/.freeze
 
     private_constant :ACCEPTED_SCHEMES
     private_constant :CUSTOM_PSL
     private_constant :STARTS_WITH_WWW
     private_constant :ENDS_WITH_SLASH
     private_constant :ERRORS_TO_EXTEND
+    private_constant :DOT
+    private_constant :HYPHEN
     private_constant :NBSP
     private_constant :SPACE
     private_constant :WHITESPACE_CHARS
     private_constant :LEADING_AND_TRAILING_WHITESPACE
+    private_constant :LETTERS_DIGITS_HYPHEN
 
     class << self
       def parse(potential_url)
@@ -91,10 +97,9 @@ module Twingly
         input.gsub(LEADING_AND_TRAILING_WHITESPACE, "")
       end
 
-      # Workaround for the following bug in addressable:
-      # https://github.com/sporkmonger/addressable/issues/224
       def try_addressable_normalize(addressable_uri)
-        addressable_uri.normalize
+        ascii_host = addressable_uri.normalize.host
+        raise Twingly::URL::Error::ParseError unless valid_hostname?(ascii_host)
       rescue ArgumentError => error
         if error.message.include?("invalid byte sequence in UTF-8")
           raise Twingly::URL::Error::ParseError
@@ -103,11 +108,29 @@ module Twingly
         raise
       end
 
+      def valid_hostname?(hostname)
+        return false if hostname.nil?
+
+        # No need to check the TLD, the public suffix list does that
+        labels = hostname.split(DOT)[0...-1].map(&:to_s)
+
+        labels.all? { |label| valid_label?(label) }
+      end
+
+      def valid_label?(label)
+        return false if label.start_with?(HYPHEN)
+        return false if label.end_with?(HYPHEN)
+
+        label.match?(LETTERS_DIGITS_HYPHEN)
+      end
+
       private :new
       private :internal_parse
       private :clean_input
       private :strip_whitespace
       private :try_addressable_normalize
+      private :valid_hostname?
+      private :valid_label?
     end
 
     def initialize(addressable_uri, public_suffix_domain)

data/lib/twingly/version.rb

@@ -2,6 +2,6 @@
 
 module Twingly
   class URL
-    VERSION = "6.0.4"
+    VERSION = "7.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-url
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 7.0.1
 platform: ruby
 authors:
 - Twingly AB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -33,7 +33,7 @@ dependencies:
         version: 3.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby library for URL handling