rate_center 0.1.2 → 0.1.3

data/lib/rate_center/city.rb

@@ -1,7 +1,6 @@
 
 require "ostruct"
 require_relative "collection"
-require_relative "vector"
 require_relative "distance"
 
 module RateCenter
@@ -19,10 +18,10 @@ module RateCenter
         data.map do |data|
           city = new(**data)
           city.nearby_rate_centers = Array(data["nearby_rate_centers"]).map do |rate_center|
-            distance = rate_center.fetch("distance")
-            Vector.new(
+            distance_km = rate_center.fetch("distance_km")
+            Distance.new(
               name: rate_center.fetch("name"),
-              distance: Distance.new(value: distance.fetch("value"), units: distance.fetch("units"))
+              distance_km:
             )
           end
           city

data/lib/rate_center/data_prep.rb

@@ -32,10 +32,7 @@ module RateCenter
 
           rate_center["closest_city"] = {
             "name" => closest_city.name,
-            "distance" => {
-              "value" => closest_city.distance.round(2),
-              "units" => "km"
-            }
+            "distance_km" => closest_city.distance.round(2)
           }
         end
       end
@@ -66,10 +63,7 @@ module RateCenter
           city["nearby_rate_centers"] = nearby_rate_centers.map do |rate_center|
             {
               "name" => rate_center.name,
-              "distance" => {
-                "value" => rate_center.distance.round(2),
-                "units" => "km"
-              }
+              "distance_km" => rate_center.distance.round(2)
             }
           end
         end
@@ -92,7 +86,7 @@ module RateCenter
         )
       end
 
-      distances_to.sort_by(&:distance)
+      distances_to.sort_by { |e| [ e.distance, e.name ] }
     end
 
     def write_data(type, country, data)

data/lib/rate_center/distance.rb

@@ -1,3 +1,3 @@
 module RateCenter
-  Distance = Struct.new(:value, :units, keyword_init: true)
+  Distance = Struct.new(:name, :distance_km, keyword_init: true)
 end

data/lib/rate_center/rate_center.rb

@@ -1,6 +1,5 @@
 require "ostruct"
 require_relative "collection"
-require_relative "vector"
 require_relative "distance"
 
 module RateCenter
@@ -20,10 +19,10 @@ module RateCenter
           closest_city = data["closest_city"]
           next rate_center if closest_city.nil?
 
-          distance = closest_city.fetch("distance")
-          rate_center.closest_city = Vector.new(
+          distance_km = closest_city.fetch("distance_km")
+          rate_center.closest_city = Distance.new(
             name: closest_city.fetch("name"),
-            distance: Distance.new(value: distance.fetch("value"), units: distance.fetch("units"))
+            distance_km:
           )
 
           rate_center

data/lib/rate_center/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RateCenter
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rate_center
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -368,7 +368,6 @@ files:
 - lib/rate_center/distance.rb
 - lib/rate_center/errors.rb
 - lib/rate_center/rate_center.rb
-- lib/rate_center/vector.rb
 - lib/rate_center/version.rb
 - release-please-config.json
 homepage: https://github.com/somleng/rate_center

data/lib/rate_center/vector.rb

@@ -1,3 +0,0 @@
-module RateCenter
-  Vector = Struct.new(:name, :distance, keyword_init: true)
-end