speedtest_net 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80f9bd935e73dcf094c225c6ec4eb80ff086cd7797286b3d7f6c86caa16cb9e1
-  data.tar.gz: 29bb84492a55c888f88692be51ee9944ee5b7313584f7699dc222b826782b3a6
+  metadata.gz: 787db5a853e47d1ff30c1d19a559d5fa97ac509a04b02cfd5bf40af2480f1c48
+  data.tar.gz: 5f3d1de9803286980bde19667c43953484e2acaf87ce89efd64fe1d0e396e9a3
 SHA512:
-  metadata.gz: 682bb8762df5c47e239d727a1444cdcb255c7be49cc66e7390341187dd4ab45ddb238190bf1885884a29eb707093b7b2898b8f8947189a9ab7dac3b08fb26067
-  data.tar.gz: 3ae25bca44c7da78721f63cd4d8d98b146057d253f6c78cd16a3704fadd92dda171cd1a75015a050eff0c58d7466ec42673b92877b7cb60de6c80187146511d6
+  metadata.gz: 361732b261cf02801d3507938ae4bc59f533bf2c26d8d3ee66c7267948ede13c1fa9f5e78145455b0b4171bffad15ef9233912ed7a0af690c2a4f74d10577a44
+  data.tar.gz: 53f5835b6b32905b7f1332595a4ddc02f2d3b5e26258867b6d3d15f5b972b437c5d9ff6d909ffca9e601e6d59d9f8804dd8c536770f9f9088c4ce637af8a6179

data/README.md

@@ -1,5 +1,8 @@
 # SpeedtestNet
 
+[![Gem Version](https://badge.fury.io/rb/speedtest_net.svg)](https://badge.fury.io/rb/speedtest_net)
+[![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
 
 ## Installation

data/lib/speedtest_net/config.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'geo_point'
 require 'rexml/document'
 require 'speedtest_net/error'
+require 'speedtest_net/geo'
 
 module SpeedtestNet
   class Config
@@ -60,7 +60,7 @@ module SpeedtestNet
         {
           ip: elements['ip'],
           isp: elements['isp'],
-          geo_point: GeoPoint.new(elements['lat'].to_f, elements['lon'].to_f)
+          geo: SpeedtestNet::Geo.new(elements['lat'].to_f, elements['lon'].to_f)
         }
       end
 

data/lib/speedtest_net/download.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'curb'
+require 'securerandom'
 
 module SpeedtestNet
   class Download

data/lib/speedtest_net/geo.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  class Geo
+    RADIUS_PER_DEGREE = Math::PI / 180
+    RADIUS_METER = 6_371_000
+
+    attr_reader :lat, :long
+
+    def initialize(lat, long)
+      @lat = lat
+      @long = long
+    end
+
+    def distance(other) # rubocop:disable Metrics/AbcSize
+      delta_lat = (@lat - other.lat) * RADIUS_PER_DEGREE
+      delta_long = (@long - other.long) * RADIUS_PER_DEGREE
+
+      lat_radius = @lat * RADIUS_PER_DEGREE
+      other_lat_radius = other.lat * RADIUS_PER_DEGREE
+
+      a = Math.sin(delta_lat / 2)**2 +
+          Math.cos(lat_radius) *
+          Math.cos(other_lat_radius) *
+          Math.sin(delta_long / 2)**2
+
+      Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)) * 2 * RADIUS_METER
+    end
+  end
+end

data/lib/speedtest_net/latency.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'typhoeus'
+require 'securerandom'
 
 module SpeedtestNet
   class Latency

data/lib/speedtest_net/server.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require 'geo_point'
 require 'rexml/document'
 require 'speedtest_net/config'
 require 'speedtest_net/latency'
 require 'speedtest_net/error'
+require 'speedtest_net/geo'
 
 module SpeedtestNet
   class Server
-    attr_reader :id, :url, :geo_point, :distance, :name, :country, :cc,
+    attr_reader :id, :url, :geo, :distance, :name, :country, :cc,
                 :sponsor, :host
     attr_accessor :latency
 
-    def initialize(id, url, geo_point, distance, server)
+    def initialize(id, url, geo, distance, server)
       @id = id
       @url = url
-      @geo_point = geo_point
+      @geo = geo
       @distance = distance
       @name = server['name']
       @country = server['country']
@@ -52,10 +52,10 @@ module SpeedtestNet
         config = SpeedtestNet::Config.fetch
         url = server['url2'] || server['url']
 
-        geo_point = GeoPoint.new(server['lat'].to_f, server['lon'].to_f)
-        distance = geo_point.distance_to(config.client[:geo_point])
+        geo = SpeedtestNet::Geo.new(server['lat'].to_f, server['lon'].to_f)
+        distance = geo.distance(config.client[:geo])
 
-        new(server['id'].to_i, url, geo_point, distance, server)
+        new(server['id'].to_i, url, geo, distance, server)
       end
 
       def fetch_servers

data/lib/speedtest_net/upload.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'curb'
+require 'securerandom'
 
 module SpeedtestNet
   class Upload

data/lib/speedtest_net/version.rb

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

data/speedtest_net.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Ryo Nakano']
   spec.email         = ['ryo@ryonkn.com']
 
-  spec.summary       = 'Ruby Library for testing internet bandwidth using speedtest.net'
-  spec.description   = 'Ruby Library for testing internet bandwidth using speedtest.net'
+  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'
 
@@ -36,6 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec'
 
   spec.add_dependency 'curb', '~> 0.9'
-  spec.add_dependency 'geo_point', '~> 0.2'
   spec.add_dependency 'typhoeus'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: geo_point
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby Library for testing internet bandwidth using speedtest.net
+description: Library for testing internet bandwidth using speedtest.net
 email:
 - ryo@ryonkn.com
 executables: []
@@ -158,6 +144,7 @@ files:
 - lib/speedtest_net/config.rb
 - lib/speedtest_net/download.rb
 - lib/speedtest_net/error.rb
+- lib/speedtest_net/geo.rb
 - lib/speedtest_net/latency.rb
 - lib/speedtest_net/result.rb
 - lib/speedtest_net/run.rb
@@ -190,5 +177,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby Library for testing internet bandwidth using speedtest.net
+summary: Library for testing internet bandwidth using speedtest.net
 test_files: []