speedtest_net 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 217f3633009196a3ae906596f022ca6c81c12bb4098338560b91b7fb523ec68a
-  data.tar.gz: 87eb7634a57f9d3176f6a6ff58f706c88f357ab5b7a4246b115151ecd68c8628
+  metadata.gz: d1a5c88b87cc3d889f9b0eca0e229ade428e5cb5235fbde09556b2fb561c5c6f
+  data.tar.gz: 4376f9b649bc1528cd07a29b20f81464cf794da3aeb8acbfb339dda87dc64b9e
 SHA512:
-  metadata.gz: 5f396b5c02e00fe4b1f276824e947c7bfbb667e2f46627775479d1711c68356d2b76a5c1d2e5c65757e8d168f63d84168175b88a587d9002f92ba575eddfcd81
-  data.tar.gz: 02eefbc9acacb3b4618588ada8874c5cc315183c092d1382bdde90ca6ed92ce5c7c06cffd529c9a5ac89ec8f6e34ccdddf5eb5ad4cc50cc9cb206d3c40447382
+  metadata.gz: f36f079a6359caf1896ab0f864df4cc7797ed1e07077ce047d641260437519ff11432898e8679842abdd3965f6e1e6457de9fe1276097452dd7dbac786a75dd3
+  data.tar.gz: 43defb7ec4ff05512f4c57f80ca2f4e30635e8bc17ba4235867c5a1362f2de691458c6c0aaddbd6735da58d4c607d599587bf9bc6cfaf9f60509bf2f9fd121e4

data/.github/workflows/ruby.yml

@@ -0,0 +1,53 @@
+name: GitHub Actions
+
+on:
+  push: 
+    paths-ignore:
+      - CODE_OF_CONDUCT.md
+      - LICENSE.txt
+      - README.md
+  pull_request:
+    paths-ignore:
+      - CODE_OF_CONDUCT.md
+      - LICENSE.txt
+      - README.md
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Setup Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Run rubocop
+      run: |
+        gem install rubocop rubocop-rspec
+        rubocop
+
+  rspec:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5.x', '2.6.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Setup Ruby 
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        architecture: 'x64'
+    - 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 rspec
+      run: bundle exec rspec
+      env:
+        CI: true
+        CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+.envrc

data/README.md

@@ -1,6 +1,7 @@
 # SpeedtestNet
 
 [![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)
 
 A Ruby library for testing internet bandwidth using speedtest.net

data/lib/speedtest_net/calculate_speed.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  class CalculateSpeed
+    class << self
+      # Fastest 10% and slowest 30% of results are then discarded
+      # See: https://support.ookla.com/hc/en-us/articles/234575828-What-is-the-test-flow-and-methodology-for-the-Speedtest-
+      def call(results)
+        sorted_results = sorted_nemric_results(results)
+        count = sorted_results.count
+
+        return 0.0 if count.zero?
+
+        faster = count - (count * 0.1).round # fastest 10%
+        slower = (count * 0.3).round # slowest 30%
+        target_results = sorted_results[slower...faster]
+
+        # The remaining result are averaged together to determine
+        # the final result
+        target_results.sum.to_f / target_results.count
+      end
+
+      private
+
+      def sorted_nemric_results(results)
+        numeric_results = results.select { |result| result.is_a? Numeric }
+        numeric_results.sort
+      end
+    end
+  end
+end

data/lib/speedtest_net/config.rb

@@ -86,9 +86,9 @@ module SpeedtestNet
       def upload_config(elements)
         {
           testlength: elements['testlength'].to_i,
-          initialtest: elements['initialtest'],
+          initialtest: elements['initialtest'].to_i,
           mintestsize: elements['mintestsize'],
-          threads: elements['threads'],
+          threads: elements['threads'].to_i,
           maxchunksize: elements['maxchunksize'],
           maxchunkcount: elements['maxchunkcount'].to_i,
           threadsperurl: elements['threadsperurl'].to_i

data/lib/speedtest_net/download.rb

@@ -2,6 +2,7 @@
 
 require 'curb'
 require 'securerandom'
+require 'speedtest_net/calculate_speed'
 
 module SpeedtestNet
   class Download
@@ -18,7 +19,7 @@ module SpeedtestNet
           urls = create_urls(server, file, concurrent_number)
           multi_downloader(urls)
         end
-        calculate_results(results)
+        SpeedtestNet::CalculateSpeed.call(results)
       end
 
       private
@@ -42,15 +43,6 @@ module SpeedtestNet
         multi.perform
         responses.map(&:download_speed).sum * 8
       end
-
-      def calculate_results(results)
-        sorted_results = results.sort
-        count = sorted_results.count
-        faster = count - (count * 0.1).round
-        slower = (count * 0.3).round
-        target_results = sorted_results[slower...faster]
-        target_results.sum / target_results.count
-      end
     end
   end
 end

data/lib/speedtest_net/server.rb

@@ -35,14 +35,16 @@ module SpeedtestNet
         servers = xml_servers.map do |server|
           create_instance(server)
         end
-        servers.sort { |a, b| a.distance <=> b.distance }
+        servers.sort_by { |s| [s.distance, s.id] }
       end
 
       def best_server
         servers = list
         closest_servers = servers.first(10)
         closest_servers.each(&:measure_latency)
-        sorted_servers = closest_servers.sort { |a, b| a.latency <=> b.latency }
+        sorted_servers = closest_servers.sort_by do |s|
+          [s.latency, s.distance, s.id]
+        end
         sorted_servers.first
       end
 

data/lib/speedtest_net/upload.rb

@@ -2,6 +2,7 @@
 
 require 'curb'
 require 'securerandom'
+require 'speedtest_net/calculate_speed'
 
 module SpeedtestNet
   class Upload
@@ -17,7 +18,7 @@ module SpeedtestNet
           urls = create_urls(server, concurrent_number)
           multi_uploader(urls, size)
         end
-        calculate_results(results)
+        SpeedtestNet::CalculateSpeed.call(results)
       end
 
       private

data/lib/speedtest_net/version.rb

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

data/speedtest_net.gemspec

@@ -34,6 +34,10 @@ Gem::Specification.new do |spec|
   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 'codacy-coverage'
 
   spec.add_dependency 'curb', '~> 0.9'
   spec.add_dependency 'typhoeus'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: vcr
+  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: webmock
+  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: codacy-coverage
+  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: curb
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -142,6 +199,7 @@ files:
 - bin/setup
 - lib/geo.rb
 - lib/speedtest_net.rb
+- lib/speedtest_net/calculate_speed.rb
 - lib/speedtest_net/config.rb
 - lib/speedtest_net/download.rb
 - lib/speedtest_net/error.rb