speedtest_net 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 787db5a853e47d1ff30c1d19a559d5fa97ac509a04b02cfd5bf40af2480f1c48
-  data.tar.gz: 5f3d1de9803286980bde19667c43953484e2acaf87ce89efd64fe1d0e396e9a3
+  metadata.gz: bcdc8354efb8ccb8f3816bb7c3951211da2e8e2371eaa4790ed7d05061f1eaf3
+  data.tar.gz: a02b89411ed31e8e3893266063c2309e03a1fb1abac2a626d2d9fc961b5e25ea
 SHA512:
-  metadata.gz: 361732b261cf02801d3507938ae4bc59f533bf2c26d8d3ee66c7267948ede13c1fa9f5e78145455b0b4171bffad15ef9233912ed7a0af690c2a4f74d10577a44
-  data.tar.gz: 53f5835b6b32905b7f1332595a4ddc02f2d3b5e26258867b6d3d15f5b972b437c5d9ff6d909ffca9e601e6d59d9f8804dd8c536770f9f9088c4ce637af8a6179
+  metadata.gz: eb96f0835e8253dbe5c149d9cf921f2bf4840b4cffdde07826b02ded3de13f348e1d896d5f8d636ee5db66182e1a5b8c5ddde49abebfbe2eb1ab8f2fdd804cbd
+  data.tar.gz: 8b2478d2d3b4e56ab77a99247f399b4e243f1299f248005be1adc6962259d34ed540344d89be2132674b7b0cc06af1f43653947d2cfd9887614373f818fe6332

data/lib/geo.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+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

data/lib/speedtest_net/config.rb

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

data/lib/speedtest_net/download.rb

@@ -44,10 +44,11 @@ module SpeedtestNet
       end
 
       def calculate_results(results)
-        count = results.count
+        sorted_results = results.sort
+        count = sorted_results.count
         faster = count - (count * 0.1).round
         slower = (count * 0.3).round
-        target_results = results[slower...faster]
+        target_results = sorted_results[slower...faster]
         target_results.sum / target_results.count
       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 'speedtest_net/geo'
+require 'geo'
 
 module SpeedtestNet
   class Server
@@ -52,7 +52,7 @@ module SpeedtestNet
         config = SpeedtestNet::Config.fetch
         url = server['url2'] || server['url']
 
-        geo = SpeedtestNet::Geo.new(server['lat'].to_f, server['lon'].to_f)
+        geo = Geo.new(server['lat'].to_f, server['lon'].to_f)
         distance = geo.distance(config.client[:geo])
 
         new(server['id'].to_i, url, geo, distance, server)

data/lib/speedtest_net/upload.rb

@@ -42,10 +42,11 @@ module SpeedtestNet
       end
 
       def calculate_results(results)
-        count = results.count
+        sorted_results = results.sort
+        count = sorted_results.count
         faster = count - (count * 0.1).round
         slower = (count * 0.3).round
-        target_results = results[slower...faster]
+        target_results = sorted_results[slower...faster]
         target_results.sum / target_results.count
       end
     end

data/lib/speedtest_net/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-03 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,11 +140,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/geo.rb
 - lib/speedtest_net.rb
 - 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

data/lib/speedtest_net/geo.rb

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