speedtest_net 0.4.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8557381dfe5f9b85498b317c29d985ce7bf3d7ed6e79546775e8e5128c14a3da
-  data.tar.gz: 6961f5827bdd67097558d9d72ce07efd6534451b59b725ffbcbfe4f565c734c8
+  metadata.gz: 0aec09a328146d86a192b080290157be98842cf7c8c7b765faa4646e284ebfb0
+  data.tar.gz: 9302feaeee0e0833ea3197d2edcf71eee47e8d0227c80bd6215c21342fff6f71
 SHA512:
-  metadata.gz: 8dc78c384eff85bc4dde708e6dbb988d44e4bd7e4ba99c5c6e62c1a43360230086099d8d629bc8b5590daf6133a59d36e9eeebf96a998a9697dc71da135e4dae
-  data.tar.gz: 6f90f4ac77852c2018a3f31691e916addd6dd5765ea62f1de855c20d99899e73b80f0c98a6c9f8165bfd127609366b077a755c8c3726e915554c3b4c299da460
+  metadata.gz: e7d1212ef3209071e2feb1fab097dbe62c679654717b99537a4ad34c86c54a1ce67613200fa4536dd85e6b125418fdd50c3b6af24318c9de73b0b3e4bcc8e73e
+  data.tar.gz: 6396e99b7a4400ae634b78398f8e40bb07213a1bb34561690082deb486da1cf19c0883fdd1431674287d76a2fb50d92fa81134abae0a04b7ad8cc2d522457f75

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,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Setup Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Setup Ruby 2.7
+      uses: ruby/setup-ruby@master
       with:
-        ruby-version: 2.6.x
+        ruby-version: 2.7
     - name: Run rubocop
       run: |
         gem install rubocop rubocop-rspec
@@ -32,14 +32,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5.x', '2.6.x' ]
+        ruby: [ 2.5, 2.6, 2.7, 'ruby-head' ]
     steps:
     - uses: actions/checkout@master
     - name: Setup Ruby 
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@master
       with:
         ruby-version: ${{ matrix.ruby }}
-        architecture: 'x64'
     - name: Run apt-get
       run: |
         sudo apt-get update

data/.rubocop.yml

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

data/bin/console

@@ -8,8 +8,8 @@ require 'speedtest_net'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
-Pry.start
+# require 'pry'
+# Pry.start
 
-# require "irb"
-# IRB.start(__FILE__)
+require 'irb'
+IRB.start(__FILE__)

data/lib/geo.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 class Geo
-  RADIUS_PER_DEGREE = Math::PI / 180
-  RADIUS_METER = 6_371_000
-
-  attr_reader :lat, :long
+  RADIAN_PER_DEGREE = Math::PI / 180
+  EARTH_RADIUS = 6_371_000
 
   def initialize(lat, long)
     @lat = lat
@@ -12,17 +10,18 @@ class Geo
   end
 
   def distance(other) # rubocop:disable Metrics/AbcSize
-    delta_lat = (@lat - other.lat) * RADIUS_PER_DEGREE
-    delta_long = (@long - other.long) * RADIUS_PER_DEGREE
+    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)
 
-    lat_radius = @lat * RADIUS_PER_DEGREE
-    other_lat_radius = other.lat * RADIUS_PER_DEGREE
+    Math.acos(a) * EARTH_RADIUS
+  end
 
-    a = Math.sin(delta_lat / 2)**2 +
-        Math.cos(lat_radius) *
-        Math.cos(other_lat_radius) *
-        Math.sin(delta_long / 2)**2
+  def radian_lat
+    @lat * RADIAN_PER_DEGREE
+  end
 
-    Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)) * 2 * RADIUS_METER
+  def radian_long
+    @long * RADIAN_PER_DEGREE
   end
 end

data/lib/speedtest_net.rb

@@ -1,15 +1,16 @@
 # 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'
 
 module SpeedtestNet
-  def self.run
+  def self.run(id = nil)
     config = SpeedtestNet::Config.fetch
-    server = SpeedtestNet::Server.best_server
+    server = SpeedtestNet::Server.select_server(id)
     download_results = SpeedtestNet::Download.measure(server)
     upload_results = SpeedtestNet::Upload.measure(server)
 

data/lib/speedtest_net/config.rb

@@ -48,9 +48,7 @@ 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

data/lib/speedtest_net/download.rb

@@ -37,6 +37,7 @@ module SpeedtestNet
         multi = Curl::Multi.new
         urls.each do |url|
           client = Curl::Easy.new(url)
+          client.headers['User-Agent'] = SpeedtestNet::USER_AGENT
           client.on_complete { |data| responses << data }
           multi.add(client)
         end

data/lib/speedtest_net/error.rb

@@ -3,4 +3,5 @@
 module SpeedtestNet
   class Error < StandardError; end
   class HTTPDownloadError < Error; end
+  class InvalidServerIdError < Error; end
 end

data/lib/speedtest_net/latency.rb

@@ -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/server.rb

@@ -38,6 +38,12 @@ module SpeedtestNet
         servers.sort_by { |s| [s.distance, s.id] }
       end
 
+      def select_server(id = nil)
+        id.nil? ? best_server : pick_server(id)
+      end
+
+      private
+
       def best_server
         servers = list
         closest_servers = servers.first(10)
@@ -48,7 +54,14 @@ module SpeedtestNet
         sorted_servers.first
       end
 
-      private
+      def pick_server(id)
+        servers = list
+        server = servers.find { |s| s.id == id }
+        raise InvalidServerIdError if server.nil?
+
+        server.measure_latency
+        server
+      end
 
       def create_instance(server)
         config = SpeedtestNet::Config.fetch
@@ -65,9 +78,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

@@ -29,15 +29,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'] = SpeedtestNet::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/#{SpeedtestNet::VERSION}"
+end

data/lib/speedtest_net/version.rb

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

data/renovate.json

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

data/speedtest_net.gemspec

@@ -28,18 +28,20 @@ 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'
-  spec.add_development_dependency 'factory_bot'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'codacy-coverage', '~> 2.1'
+  spec.add_development_dependency 'factory_bot', '~> 6.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
+  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', '~> 6.0'
+  spec.add_development_dependency 'webmock', '~> 3.7'
 
   spec.add_dependency 'curb', '~> 0.9'
-  spec.add_dependency 'typhoeus'
+  spec.add_dependency 'rexml', '~> 3.2'
+  spec.add_dependency 'typhoeus', '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ryo Nakano
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,58 +28,44 @@ dependencies:
   name: codacy-coverage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,72 +84,72 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.76'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.76'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Library for testing internet bandwidth using speedtest.net
 email:
 - ryo@ryonkn.com
@@ -199,6 +199,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -221,7 +222,9 @@ files:
 - 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 +233,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 +241,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Library for testing internet bandwidth using speedtest.net
 test_files: []