embiggen 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b038ceb25cecb37ad16def4b35e4a4b3387df36056a4d3388b473b7282371dc2
-  data.tar.gz: c9d57f7c5904f13ba6d7b4ed2eeb1edfc5e88c2c6ea17d5e758fe054c804bc2b
+  metadata.gz: 819be81e4674987a3cf53836dc3942c1c32ae8a8a3b1abf55f68f33e40110ecf
+  data.tar.gz: eca3eb40c14880fd279a7c14a9c06111d3628a215e36aebb24eab351b88d4306
 SHA512:
-  metadata.gz: 19b0f8551a389fecc9fb31bf4053eed73805dc1ceba688b9c3c5b442bba2a613d8a2999576a1550292c2fc32ab55488db79a1db55d1fa2e6b6f04d97bc8ce2d7
-  data.tar.gz: 3f85016ac86cf629b56f78c0975ba22f5a038ae861f39fca5db1b7bcbd044b1595f6e7321b91130e2ce74a3f8d28f697af97fedfe76f13c9dcd24a1e015a7d9f
+  metadata.gz: a065ac340825abbbd3e8d1198522a5cb66709e92f579f4815912baee6d09adfc15062d0adf596760f010d441c7595b71ead73789e66d02ce9b33db4ece24e720
+  data.tar.gz: a0469f86536c7353659ca8f64a7714b1d9320e31973b6e1b991cdd1dd31131562852d52ea2d79455bca4ea82ee1e9f1dadc1dcb269935ac53437440f68b88593

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2018 Altmetric LLP
+Copyright (c) 2015-2024 Altmetric LLP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,19 +2,19 @@
 
 A Ruby library to expand shortened URLs.
 
-**Current version:** 1.5.0  
-**Supported Ruby versions:** 1.8.7, 1.9.2, 1.9.3, 2.0, 2.1, 2.2
+**Current version:** 1.6.0
+**Supported Ruby versions:** >= 2.7
 
 ## Installation
 
 ```
-gem install embiggen -v '~> 1.5'
+gem install embiggen -v '~> 1.6'
 ```
 
 Or, in your `Gemfile`:
 
 ```ruby
-gem 'embiggen', '~> 1.5'
+gem 'embiggen', '~> 1.6'
 ```
 
 ## Usage
@@ -203,11 +203,12 @@ Override the following settings:
   * [Bit.do's](http://bit.do/list-of-url-shorteners.php) curated list
   * [Hongkiat's](http://www.hongkiat.com/blog/url-shortening-services-the-ultimate-list/)
   curated list
+  * [PeterDaveHello's](https://github.com/PeterDaveHello/url-shorteners) curated list
   * A list of branded [Bitly](https://bitly.com/) domains collected by Altmetric
 
 ## License
 
-Copyright © 2015-2018 Altmetric LLP
+Copyright © 2015-2024 Altmetric LLP
 
 Distributed under the MIT License.
 

data/lib/embiggen/configuration.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'set'
 require 'embiggen/shortener_list'
 
 module Embiggen
@@ -22,7 +21,7 @@ module Embiggen
     end
 
     def self.shorteners_from_file
-      file_path = File.expand_path('../../../shorteners.txt', __FILE__)
+      file_path = File.expand_path('../../shorteners.txt', __dir__)
       File.readlines(file_path).map(&:chomp)
     end
   end

data/lib/embiggen/http_client.rb

@@ -22,9 +22,14 @@ module Embiggen
       return unless response.is_a?(::Net::HTTPRedirection)
 
       response.fetch('Location')
-    rescue StandardError, ::Timeout::Error => e
+    rescue ::Timeout::Error => e
       raise NetworkError.new(
-        "could not follow #{uri}: #{e.message}", uri)
+        "Timeout::Error: could not follow #{uri}: #{e.message}", uri
+      )
+    rescue StandardError => e
+      raise NetworkError.new(
+        "StandardError: could not follow #{uri}: #{e.message}", uri
+      )
     end
 
     private

data/lib/embiggen/shortener_list.rb

@@ -1,5 +1,4 @@
 require 'forwardable'
-require 'set'
 
 module Embiggen
   class ShortenerList

data/lib/embiggen/uri.rb

@@ -19,8 +19,8 @@ module Embiggen
       redirects = extract_redirects(request_options)
       location = follow(request_options)
 
-      self.class.new(location).
-        expand(request_options.merge(:redirects => redirects - 1))
+      self.class.new(location)
+        .expand(request_options.merge(redirects: redirects - 1))
     end
 
     def shortened?
@@ -31,8 +31,11 @@ module Embiggen
 
     def extract_redirects(request_options = {})
       redirects = request_options.fetch(:redirects) { Configuration.redirects }
-      fail TooManyRedirects.new(
-        "following #{uri} reached the redirect limit", uri) if redirects.zero?
+      if redirects.zero?
+        fail TooManyRedirects.new(
+          "following #{uri} reached the redirect limit", uri
+        )
+      end
 
       redirects
     end
@@ -41,8 +44,11 @@ module Embiggen
       timeout = request_options.fetch(:timeout) { Configuration.timeout }
 
       location = http_client.follow(timeout)
-      fail BadShortenedURI.new(
-        "following #{uri} did not redirect", uri) unless followable?(location)
+      unless followable?(location)
+        fail BadShortenedURI.new(
+          "following #{uri} did not redirect", uri
+        )
+      end
 
       location
     end
@@ -53,7 +59,8 @@ module Embiggen
       Addressable::URI.parse(location).absolute?
     rescue Addressable::URI::InvalidURIError => e
       raise BadShortenedURI.new(
-        "following #{uri} returns an invalid URI: #{e}", uri)
+        "following #{uri} returns an invalid URI: #{e}", uri
+      )
     end
   end
 end

data/lib/embiggen.rb

@@ -2,7 +2,7 @@ require 'embiggen/configuration'
 require 'embiggen/uri'
 
 module Embiggen
-  def URI(uri)
+  def URI(uri) # rubocop:disable Naming/MethodName
     uri.is_a?(URI) ? uri : URI.new(uri)
   end
 
@@ -10,5 +10,6 @@ module Embiggen
     yield(Configuration)
   end
 
-  module_function :URI, :configure
+  module_function :URI
+  module_function :configure
 end