speedtest_net 0.6.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b18c8629b83d4f4f56437bf92439f8d118b57ff32028e415367f7b66700022ed
-  data.tar.gz: ba40b70b6a582bd80082b21885d0735f7faa68d998138f1524d1e6e1de53cfb2
+  metadata.gz: 39d774cd49d85c30b04b9bb3dfd9743b33858f177ddaaaf9e3e165aef24e31cd
+  data.tar.gz: d71d13cca347f15923c8aa1ffa14799554553f5201f41c613a6c4c451cf00bf5
 SHA512:
-  metadata.gz: a49ebdb25f3bc7722ef555af0ce1d4cfd9272af03d8e0d2232a4d7814300d1dc00070e36c595474fc104768053becc6a064ed40da5aaab57194774c6f5f64240
-  data.tar.gz: 96602a22ff88e4c798a8a1e156bf21ed6303e70192cbc226d36cd2ca74b71c73c892ab88d52200429fc9d4f05fd882b083eb01370e4dbc889a353d90e4d399d6
+  metadata.gz: 9a7fc6501f22d46c3ed6e8a999e78042dd71b6f8e1aab714efaea797276bb3fea0727a755b916c9af3fc6bb63c23db5ee7dd82dbc38d9014a68a6d845c6e8e9a
+  data.tar.gz: cfeea44e6c008e8fa52223c8add27a7807e9f41a2ded4a3dcdf08ef1651fc1947145f44b64fa7b8a495965136348e29bb78e042895a3e9066a2c194b19bf791c

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '20:00'
+  open-pull-requests-limit: 10
+  assignees:
+  - ryonkn

data/.github/workflows/ruby.yml

@@ -19,20 +19,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Setup Ruby 2.7
+    - name: Setup Ruby
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: 2.7
+        ruby-version: 3.0
+    - name: Run apt-get
+      run: |
+        sudo apt-get update
+        sudo apt-get install libcurl4-openssl-dev
+    - name: Bundle install
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
     - name: Run rubocop
       run: |
-        gem install rubocop rubocop-rspec
         rubocop
 
   rspec:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ 2.5, 2.6, 2.7, 'ruby-head' ]
+        ruby: [ 2.6, 2.7, 3.0, 'head' ]
     steps:
     - uses: actions/checkout@master
     - name: Setup Ruby 

data/.rubocop.yml

@@ -1,12 +1,8 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
-  Exclude:
-    - 'speedtest_net.gemspec'
-
-Layout/ClassStructure:
-  Enabled: true
+  TargetRubyVersion: 2.6
+  NewCops: enable
 
 Style/Documentation:
   Enabled: false

data/Gemfile

@@ -4,3 +4,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in speedtest_net.gemspec
 gemspec
+
+gem 'codacy-coverage', '>= 2.1'
+gem 'factory_bot', '>= 6.0'
+gem 'rake', '>= 13.0'
+gem 'rspec', '>= 3.0'
+gem 'rubocop', '>= 1.0.0'
+gem 'rubocop-rspec', '>= 1.44.1'
+gem 'simplecov', '>= 0.17'
+gem 'vcr', '>= 6.0'
+gem 'webmock', '>= 3.7'

data/README.md

@@ -2,8 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/speedtest_net.svg)](https://badge.fury.io/rb/speedtest_net)
 [![Actions Status](https://github.com/ryonkn/speedtest_net/workflows/GitHub%20Actions/badge.svg)](https://github.com/ryonkn/speedtest_net/actions)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/18f112dae19a48938bdf2b225d3a76bb)](https://www.codacy.com/manual/ryonkn/speedtest_net?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Grade)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/18f112dae19a48938bdf2b225d3a76bb)](https://www.codacy.com/manual/ryonkn/speedtest_net?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Coverage)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/fa55809b2789403489d9d5063249c238)](https://www.codacy.com/manual/ryonkn/speedtest_net/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/fa55809b2789403489d9d5063249c238)](https://www.codacy.com/manual/ryonkn/speedtest_net/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Coverage)
 
 A Ruby library for testing internet bandwidth using speedtest.net
 

data/lib/speedtest_net.rb

@@ -1,24 +1,25 @@
 # frozen_string_literal: true
 
 require 'speedtest_net/version'
+require 'speedtest_net/user_agent'
 require 'speedtest_net/server'
 require 'speedtest_net/download'
 require 'speedtest_net/upload'
 require 'speedtest_net/result'
+require 'speedtest_net/http_timeout'
 
 module SpeedtestNet
-  def self.run(id = nil)
-    config = SpeedtestNet::Config.fetch
-    server = SpeedtestNet::Server.select_server(id)
-    download_results = SpeedtestNet::Download.measure(server)
-    upload_results = SpeedtestNet::Upload.measure(server)
+  def self.run(id = nil, exclude_server_ids: [], timeout: HTTP_TIMEOUT)
+    config = Config.fetch
+    server = Server.select_server(id, exclude_server_ids)
+    download_results = Download.measure(server, timeout: timeout)
+    upload_results = Upload.measure(server, timeout: timeout)
 
-    SpeedtestNet::Config.clear_cache
-    SpeedtestNet::Result.new(config.client, server, download_results,
-                             upload_results)
+    Config.clear_cache
+    Result.new(config.client, server, download_results, upload_results)
   end
 
   def self.list_server
-    SpeedtestNet::Server.list
+    Server.list
   end
 end

data/lib/speedtest_net/client.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  class Client
+    attr_reader :ip, :isp, :geo
+
+    def initialize(ip, isp, geo)
+      @ip = ip
+      @isp = isp
+      @geo = geo
+    end
+  end
+end

data/lib/speedtest_net/config.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
+require 'speedtest_net/client'
 require 'speedtest_net/error'
-require 'geo'
+require 'speedtest_net/geo'
 
 module SpeedtestNet
   class Config
@@ -48,20 +49,14 @@ module SpeedtestNet
         client.follow_location = true
         client.perform
 
-        if client.response_code != 200
-          raise HTTPDownloadError, 'Config download error'
-        end
+        raise HTTPDownloadError, 'Config download error' if client.response_code != 200
 
         xml = REXML::Document.new(client.body, ignore_whitespace_nodes: :all)
         xml.elements
       end
 
       def client_config(elements)
-        {
-          ip: elements['ip'],
-          isp: elements['isp'],
-          geo: Geo.new(elements['lat'].to_f, elements['lon'].to_f)
-        }
+        Client.new(elements['ip'], elements['isp'], Geo.new(elements['lat'].to_f, elements['lon'].to_f))
       end
 
       def server_config(elements)

data/lib/speedtest_net/download.rb

@@ -3,6 +3,8 @@
 require 'curb'
 require 'securerandom'
 require 'pathname'
+require 'speedtest_net/calculate_speed'
+require 'speedtest_net/http_timeout'
 
 module SpeedtestNet
   class Download
@@ -10,16 +12,30 @@ module SpeedtestNet
                random1500x1500.jpg random2000x2000.jpg random3000x3000.jpg
                random3500x3500.jpg random4000x4000.jpg].freeze
 
+    def initialize(results)
+      @results = results
+    end
+
+    def calculate
+      CalculateSpeed.call(@results)
+    end
+
     class << self
-      def measure(server)
-        config = SpeedtestNet::Config.fetch
+      def measure(server, timeout: HTTP_TIMEOUT) # rubocop:disable Metrics/MethodLength
+        config = Config.fetch
         concurrent_number = config.download[:threadsperurl]
 
-        results = FILES.map do |file|
-          urls = create_urls(server, file, concurrent_number)
-          multi_downloader(urls)
+        results = []
+        begin
+          Timeout.timeout(timeout) do
+            FILES.each do |file|
+              urls = create_urls(server, file, concurrent_number)
+              results << multi_downloader(urls)
+            end
+          end
+        rescue Timeout::Error # rubocop:disable Lint/SuppressedException
         end
-        results
+        new(results)
       end
 
       private
@@ -37,6 +53,7 @@ module SpeedtestNet
         multi = Curl::Multi.new
         urls.each do |url|
           client = Curl::Easy.new(url)
+          client.headers['User-Agent'] = USER_AGENT
           client.on_complete { |data| responses << data }
           multi.add(client)
         end

data/lib/speedtest_net/error.rb

@@ -2,6 +2,8 @@
 
 module SpeedtestNet
   class Error < StandardError; end
+
   class HTTPDownloadError < Error; end
+
   class InvalidServerIdError < Error; end
 end

data/lib/speedtest_net/formatter/distance.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  module Formatter
+    class Distance
+      class << self
+        def call(distance)
+          format('%<distance>.3f kilometre', distance: (distance / 1_000).round(3))
+        end
+      end
+    end
+  end
+end

data/lib/speedtest_net/formatter/latency.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  module Formatter
+    class Latency
+      class << self
+        def call(latency)
+          format('%<latency>f millisecond', latency: latency * 1_000)
+        end
+      end
+    end
+  end
+end

data/lib/speedtest_net/formatter/speed.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  module Formatter
+    class Speed
+      UNITS = %w[bps Kbps Mbps Gbps Tbps].freeze
+
+      class << self
+        def call(speed)
+          i = 0
+          while speed >= 1000
+            speed /= 1000
+            i += 1
+          end
+          format('%<speed>.2f %<unit>s', speed: speed, unit: UNITS[i])
+        end
+      end
+    end
+  end
+end

data/lib/speedtest_net/geo.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  class Geo
+    RADIAN_PER_DEGREE = Math::PI / 180
+    EARTH_RADIUS = 6_371_000
+
+    def initialize(lat, long)
+      @lat = lat
+      @long = long
+    end
+
+    def distance(other) # rubocop:disable Metrics/AbcSize
+      a = Math.sin(radian_lat) * Math.sin(other.radian_lat) +
+          Math.cos(radian_lat) * Math.cos(other.radian_lat) *
+          Math.cos(radian_long - other.radian_long)
+
+      Math.acos(a) * EARTH_RADIUS
+    end
+
+    def radian_lat
+      @lat * RADIAN_PER_DEGREE
+    end
+
+    def radian_long
+      @long * RADIAN_PER_DEGREE
+    end
+  end
+end

data/lib/speedtest_net/http_timeout.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  HTTP_TIMEOUT = 180
+end

data/lib/speedtest_net/latency.rb

@@ -11,7 +11,7 @@ module SpeedtestNet
 
     class << self
       def measure(server)
-        config = SpeedtestNet::Config.fetch
+        config = Config.fetch
         test_length = test_length(config)
         timeout = config.latency[:timeout]
 
@@ -35,6 +35,7 @@ module SpeedtestNet
       end
 
       def measure_latency(url, timeout)
+        Typhoeus::Config.user_agent = SpeedtestNet::USER_AGENT
         client = Typhoeus::Request.new(url, followlocation: true,
                                             timeout: timeout)
         client.run

data/lib/speedtest_net/result.rb

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-require 'speedtest_net/calculate_speed'
+require 'speedtest_net/formatter/distance'
+require 'speedtest_net/formatter/latency'
+require 'speedtest_net/formatter/speed'
 
 module SpeedtestNet
   class Result
-    UNITS = %w[bps Kbps Mbps Gbps Tbps].freeze
+    attr_reader :client, :server
 
-    attr_reader :client, :server, :download_results, :upload_results
-
-    def initialize(client, server, download_results, upload_results)
+    def initialize(client, server, download, upload)
       @client = client
       @server = server
-      @download_results = download_results
-      @upload_results = upload_results
+      @download = download
+      @upload = upload
     end
 
     def download
-      SpeedtestNet::CalculateSpeed.call(@download_results)
+      @download.calculate
     end
 
     def pretty_download
-      pretty_format(download)
+      Formatter::Speed.call(download)
     end
 
     def upload
-      SpeedtestNet::CalculateSpeed.call(@upload_results)
+      @upload.calculate
     end
 
     def pretty_upload
-      pretty_format(upload)
+      Formatter::Speed.call(upload)
     end
 
     def latency
@@ -36,7 +36,7 @@ module SpeedtestNet
     end
 
     def pretty_latency
-      format('%<latency>f millisecond', latency: latency * 1_000)
+      Formatter::Latency.call(latency)
     end
 
     def distance
@@ -44,18 +44,7 @@ module SpeedtestNet
     end
 
     def pretty_distance
-      format('%<distance>.3f kilometre', distance: (distance / 1_000).round(3))
-    end
-
-    private
-
-    def pretty_format(speed)
-      i = 0
-      while speed > 1000
-        speed /= 1000
-        i += 1
-      end
-      format('%<speed>.2f %<unit>s', speed: speed, unit: UNITS[i])
+      Formatter::Distance.call(distance)
     end
   end
 end

data/lib/speedtest_net/server.rb

@@ -4,7 +4,7 @@ require 'rexml/document'
 require 'speedtest_net/config'
 require 'speedtest_net/latency'
 require 'speedtest_net/error'
-require 'geo'
+require 'speedtest_net/geo'
 
 module SpeedtestNet
   class Server
@@ -26,7 +26,7 @@ module SpeedtestNet
     end
 
     def measure_latency
-      @latency = SpeedtestNet::Latency.measure(self)
+      @latency = Latency.measure(self)
     end
 
     class << self
@@ -38,15 +38,16 @@ module SpeedtestNet
         servers.sort_by { |s| [s.distance, s.id] }
       end
 
-      def select_server(id = nil)
-        id.nil? ? best_server : pick_server(id)
+      def select_server(id = nil, exclude_server_ids = [])
+        id.nil? ? best_server(exclude_server_ids) : pick_server(id)
       end
 
       private
 
-      def best_server
+      def best_server(exclude_server_ids)
         servers = list
-        closest_servers = servers.first(10)
+        excluded_servers = servers.reject { |server| exclude_server_ids.include?(server.id) }
+        closest_servers = excluded_servers.first(10)
         closest_servers.each(&:measure_latency)
         sorted_servers = closest_servers.sort_by do |s|
           [s.latency, s.distance, s.id]
@@ -64,11 +65,11 @@ module SpeedtestNet
       end
 
       def create_instance(server)
-        config = SpeedtestNet::Config.fetch
+        config = Config.fetch
         url = server['url2'] || server['url']
 
         geo = Geo.new(server['lat'].to_f, server['lon'].to_f)
-        distance = geo.distance(config.client[:geo])
+        distance = geo.distance(config.client.geo)
 
         new(server['id'].to_i, url, geo, distance, server)
       end
@@ -78,9 +79,7 @@ module SpeedtestNet
         client.follow_location = true
         client.perform
 
-        if client.response_code != 200
-          raise HTTPDownloadError, 'Server lists download error'
-        end
+        raise HTTPDownloadError, 'Server lists download error' if client.response_code != 200
 
         xml = REXML::Document.new(client.body, ignore_whitespace_nodes: :all)
         xml.elements['settings/servers']

data/lib/speedtest_net/upload.rb

@@ -2,22 +2,38 @@
 
 require 'curb'
 require 'securerandom'
+require 'speedtest_net/calculate_speed'
+require 'speedtest_net/http_timeout'
 
 module SpeedtestNet
   class Upload
     SIZE = [250_000, 500_000, 1_000_000, 2_000_000, 4_000_000, 8_000_000,
             12_000_000, 17_000_000, 24_000_000, 32_000_000].freeze
 
+    def initialize(results)
+      @results = results
+    end
+
+    def calculate
+      CalculateSpeed.call(@results)
+    end
+
     class << self
-      def measure(server)
-        config = SpeedtestNet::Config.fetch
+      def measure(server, timeout: HTTP_TIMEOUT) # rubocop:disable Metrics/MethodLength
+        config = Config.fetch
         concurrent_number = config.upload[:threadsperurl]
 
-        results = SIZE.map do |size|
-          urls = create_urls(server, concurrent_number)
-          multi_uploader(urls, size)
+        results = []
+        begin
+          Timeout.timeout(timeout) do
+            SIZE.each do |size|
+              urls = create_urls(server, concurrent_number)
+              results << multi_uploader(urls, size)
+            end
+          end
+        rescue Timeout::Error # rubocop:disable Lint/SuppressedException
         end
-        results
+        new(results)
       end
 
       private
@@ -29,15 +45,18 @@ module SpeedtestNet
         end
       end
 
-      def multi_uploader(urls, size)
+      def multi_uploader(urls, size) # rubocop:disable Metrics/MethodLength
         responses = []
         content = 'A' * size
-        url_fields = urls.map do |url|
-          { url: url, post_fields: { 'content1' => content } }
-        end
-        Curl::Multi.post(url_fields) do |curl|
-          responses << curl
+        multi = Curl::Multi.new
+        urls.each do |url|
+          client = Curl::Easy.new(url)
+          client.headers['User-Agent'] = USER_AGENT
+          client.http_post(Curl::PostField.content('content1', content))
+          client.on_complete { |data| responses << data }
+          multi.add(client)
         end
+        multi.perform
         responses.map(&:upload_speed).sum * 8
       end
     end

data/lib/speedtest_net/user_agent.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  USER_AGENT = "SpeedtestNet/#{VERSION}"
+end

data/lib/speedtest_net/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpeedtestNet
-  VERSION = '0.6.1'
+  VERSION = '0.8.1'
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/speedtest_net.gemspec

@@ -28,18 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5.0'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'codacy-coverage', '~> 2.1'
-  spec.add_development_dependency 'factory_bot', '~> 5.1'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.76'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.36'
-  spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'vcr', '~> 5.0'
-  spec.add_development_dependency 'webmock', '~> 3.7'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'curb', '~> 0.9'
   spec.add_dependency 'rexml', '~> 3.2'

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Ryo Nakano
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: codacy-coverage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.76'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.76'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -211,17 +72,24 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/geo.rb
 - lib/speedtest_net.rb
 - lib/speedtest_net/calculate_speed.rb
+- lib/speedtest_net/client.rb
 - lib/speedtest_net/config.rb
 - lib/speedtest_net/download.rb
 - lib/speedtest_net/error.rb
+- lib/speedtest_net/formatter/distance.rb
+- lib/speedtest_net/formatter/latency.rb
+- lib/speedtest_net/formatter/speed.rb
+- lib/speedtest_net/geo.rb
+- lib/speedtest_net/http_timeout.rb
 - lib/speedtest_net/latency.rb
 - lib/speedtest_net/result.rb
 - lib/speedtest_net/server.rb
 - lib/speedtest_net/upload.rb
+- lib/speedtest_net/user_agent.rb
 - lib/speedtest_net/version.rb
+- renovate.json
 - speedtest_net.gemspec
 homepage: https://github.com/ryonkn/speedtest_net
 licenses:
@@ -230,7 +98,7 @@ metadata:
   homepage_uri: https://github.com/ryonkn/speedtest_net
   source_code_uri: https://github.com/ryonkn/speedtest_net
   changelog_uri: https://github.com/ryonkn/speedtest_net
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -238,15 +106,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Library for testing internet bandwidth using speedtest.net
 test_files: []

data/lib/geo.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class Geo
-  RADIAN_PER_DEGREE = Math::PI / 180
-  EARTH_RADIUS = 6_371_000
-
-  def initialize(lat, long)
-    @lat = lat
-    @long = long
-  end
-
-  def distance(other) # rubocop:disable Metrics/AbcSize
-    a = Math.sin(radian_lat) * Math.sin(other.radian_lat) +
-        Math.cos(radian_lat) * Math.cos(other.radian_lat) *
-        Math.cos(radian_long - other.radian_long)
-
-    Math.acos(a) * EARTH_RADIUS
-  end
-
-  def radian_lat
-    @lat * RADIAN_PER_DEGREE
-  end
-
-  def radian_long
-    @long * RADIAN_PER_DEGREE
-  end
-end