speedtest_net 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b33950e2013b5e7608eae2b1d3ded42bea175d66e7c5298e952926fb96cc40f
-  data.tar.gz: bc40d98a9adff5e426d4feca1ccc18bfb19d8977a2e2cb40b7f2dd52e283f6b1
+  metadata.gz: ae7607d307332c3a3c76f0e8670abd4d11f1d1c1873f22477dec654af45fc015
+  data.tar.gz: e7b783804a6b084296d18895f171634069089c2e1e0c321ef2d2f753c2470c7b
 SHA512:
-  metadata.gz: c63cc0218a5a999e2dc4139a590d7be2f40f191240a0540e73c092d8ec35845b69627187a8b01202e65228743697f3cd2429fb68e3748f42b6aff716cea96288
-  data.tar.gz: 221fc7a4f6dca42c7aac968744f92b5acd434bee8dc09649539f05f01ba363e026af8181dc8248a904ae9ce64e5ca50830141a999a643edf81945a1605825563
+  metadata.gz: 8f015a05bb41bd9c8564af2440fc67206cc5fda3bf1c82fbb97014268c2a6184532496bec7ea0b39de47c6db94d90c7e31f1446301c00732b71f58bd4a99cebf
+  data.tar.gz: 889349ae54eca6504548703454624a3ef57d499dfcaaf206b19e8a8869dd0ce6c873d4423ed4bf0ef60b10aa525ccb59e9ae991a75e72010241a7c3c933d3a28

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 Style/Documentation:

data/lib/speedtest_net/download.rb

@@ -4,8 +4,8 @@ require 'curb'
 require 'securerandom'
 require 'timeout'
 require 'pathname'
-require 'speedtest_net/calculate_speed'
 require 'speedtest_net/http_timeout'
+require 'speedtest_net/measure_result'
 
 module SpeedtestNet
   class Download
@@ -13,14 +13,6 @@ 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, timeout: HTTP_TIMEOUT) # rubocop:disable Metrics/MethodLength
         config = Config.fetch
@@ -36,7 +28,7 @@ module SpeedtestNet
           end
         rescue Timeout::Error # rubocop:disable Lint/SuppressedException
         end
-        new(results)
+        MeasureResult.new(results)
       end
 
       private

data/lib/speedtest_net/measure_result.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  class MeasureResult
+    def initialize(results = [])
+      @results = results.select { |result| result.instance_of?(Integer) || result.instance_of?(Float) }
+    end
+
+    def calculate
+      return 0.0 if @results.empty?
+
+      # 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-
+      sorted_results = @results.sort
+      count = sorted_results.size
+
+      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
+  end
+end

data/lib/speedtest_net/result.rb

@@ -8,15 +8,15 @@ module SpeedtestNet
   class Result
     attr_reader :client, :server
 
-    def initialize(client, server, download, upload)
+    def initialize(client, server, download_result, upload_result)
       @client = client
       @server = server
-      @download = download
-      @upload = upload
+      @download_result = download_result
+      @upload_result = upload_result
     end
 
     def download
-      @download.calculate
+      @download_result.calculate
     end
 
     def pretty_download
@@ -24,7 +24,7 @@ module SpeedtestNet
     end
 
     def upload
-      @upload.calculate
+      @upload_result.calculate
     end
 
     def pretty_upload

data/lib/speedtest_net/upload.rb

@@ -3,22 +3,14 @@
 require 'curb'
 require 'securerandom'
 require 'timeout'
-require 'speedtest_net/calculate_speed'
 require 'speedtest_net/http_timeout'
+require 'speedtest_net/measure_result'
 
 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, timeout: HTTP_TIMEOUT) # rubocop:disable Metrics/MethodLength
         config = Config.fetch
@@ -34,7 +26,7 @@ module SpeedtestNet
           end
         rescue Timeout::Error # rubocop:disable Lint/SuppressedException
         end
-        new(results)
+        MeasureResult.new(results)
       end
 
       private
@@ -48,12 +40,12 @@ module SpeedtestNet
 
       def multi_uploader(urls, size) # rubocop:disable Metrics/MethodLength
         responses = []
-        content = 'A' * size
+        post_field = "content1=#{'A' * size}"
         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.http_post(post_field)
           client.on_complete { |data| responses << data }
           multi.add(client)
         end

data/lib/speedtest_net/user_agent.rb

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

data/lib/speedtest_net/version.rb

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

data/speedtest_net.gemspec

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'speedtest_net/version'
+require_relative 'lib/speedtest_net/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'speedtest_net'
-  spec.version       = SpeedtestNet::VERSION
-  spec.authors       = ['Ryo Nakano']
-  spec.email         = ['ryo.z.nakano@gmail.com']
+  spec.name = 'speedtest_net'
+  spec.version = SpeedtestNet::VERSION
+  spec.authors = ['Ryo Nakano']
+  spec.email = ['ryo.z.nakano@gmail.com']
 
-  spec.summary       = 'Library for testing internet bandwidth using speedtest.net'
-  spec.description   = 'Library for testing internet bandwidth using speedtest.net'
-  spec.homepage      = 'https://github.com/ryonkn/speedtest_net'
-  spec.license       = 'MIT'
+  spec.summary = 'Library for testing internet bandwidth using speedtest.net'
+  spec.description = 'Library for testing internet bandwidth using speedtest.net'
+  spec.homepage = 'https://github.com/ryonkn/speedtest_net'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -24,15 +23,15 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6.0'
-
-  spec.add_dependency 'curb', '~> 0.9'
+  spec.add_dependency 'curb', '>= 0.9', '< 2.0'
   spec.add_dependency 'rexml', '~> 3.2'
   spec.add_dependency 'typhoeus', '~> 1.3'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -59,12 +65,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/dependabot.yml"
-- ".github/workflows/ruby.yml"
-- ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -73,7 +75,6 @@ files:
 - bin/console
 - bin/setup
 - 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
@@ -84,6 +85,7 @@ files:
 - lib/speedtest_net/geo.rb
 - lib/speedtest_net/http_timeout.rb
 - lib/speedtest_net/latency.rb
+- lib/speedtest_net/measure_result.rb
 - lib/speedtest_net/result.rb
 - lib/speedtest_net/server.rb
 - lib/speedtest_net/upload.rb
@@ -107,14 +109,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Library for testing internet bandwidth using speedtest.net

data/.github/dependabot.yml

@@ -1,10 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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
-  schedule:
-    - cron: '0 3 * * *'
-
-jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@master
-      with:
-        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: |
-        rubocop
-
-  rspec:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ 2.6, 2.7, 3.0, 'head' ]
-    steps:
-    - uses: actions/checkout@master
-    - name: Setup Ruby 
-      uses: ruby/setup-ruby@master
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - 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

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/Gemfile.lock
-
-# rspec failure tracking
-.rspec_status
-.envrc

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.4
-before_install: gem install bundler -v 2.0.2

data/lib/speedtest_net/calculate_speed.rb

@@ -1,31 +0,0 @@
-# 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