speedtest_net 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f79907495fb46041e545a27bf81429cbeb7d4ac8281cc5b3e0dc58cd329b66
-  data.tar.gz: 0750ba31b2672dc5c9b3b3707dbf80d7a4bdcc3095971f54aa9ea45477f7e39e
+  metadata.gz: 39d774cd49d85c30b04b9bb3dfd9743b33858f177ddaaaf9e3e165aef24e31cd
+  data.tar.gz: d71d13cca347f15923c8aa1ffa14799554553f5201f41c613a6c4c451cf00bf5
 SHA512:
-  metadata.gz: f8801cfc3a1dd4ce6ad90c8d76ed3ffe0196d9d74996f05e624f6c948f71a65c496d73140ca230c2cd84e64ecb191ab6d4d2818fd68f8520ef7133bb1d5d55ea
-  data.tar.gz: 6e15ea46406b725c5b290312a81230a8caed487118c87fe46a0ff03cd86eb7ad6fca04500d5ac9029af3bd66455c141cdb23feb6ab47bb8fbbc20b770fd93dd9
+  metadata.gz: 9a7fc6501f22d46c3ed6e8a999e78042dd71b6f8e1aab714efaea797276bb3fea0727a755b916c9af3fc6bb63c23db5ee7dd82dbc38d9014a68a6d845c6e8e9a
+  data.tar.gz: cfeea44e6c008e8fa52223c8add27a7807e9f41a2ded4a3dcdf08ef1651fc1947145f44b64fa7b8a495965136348e29bb78e042895a3e9066a2c194b19bf791c

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

@@ -9,8 +9,8 @@ gem 'codacy-coverage', '>= 2.1'
 gem 'factory_bot', '>= 6.0'
 gem 'rake', '>= 13.0'
 gem 'rspec', '>= 3.0'
-gem 'rubocop', '>= 0.76'
-gem 'rubocop-rspec', '>= 1.36'
+gem 'rubocop', '>= 1.0.0'
+gem 'rubocop-rspec', '>= 1.44.1'
 gem 'simplecov', '>= 0.17'
 gem 'vcr', '>= 6.0'
 gem 'webmock', '>= 3.7'

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
@@ -55,11 +56,7 @@ module SpeedtestNet
       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/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/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/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
@@ -69,7 +69,7 @@ module SpeedtestNet
         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

data/lib/speedtest_net/version.rb

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

data/speedtest_net.gemspec

@@ -28,7 +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.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'curb', '~> 0.9'
   spec.add_dependency 'rexml', '~> 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -72,15 +72,16 @@ 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
@@ -105,14 +106,14 @@ 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
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Library for testing internet bandwidth using speedtest.net

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