nasa-neo 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39c3b2f4dcea89280298b2742156c13eb30d249558d7e86ab46475ec458149c4
-  data.tar.gz: 3e4211e5ecea32b7c40962d7858529287917f923f80b819c19136f704c0d4dce
+  metadata.gz: 860304df445032348b913060a02e0e5d7b258e1ddda03745c5e11b11e23aecf9
+  data.tar.gz: 4e7b071bdb52b5b245ad4d5db322d64ad101944dee911701bf993c07f162c071
 SHA512:
-  metadata.gz: 9b886908d2c30577bfd60365a89bf0881da783ca45c10d2974ccfeaddab6ceb10b7e797a9e40d84bf43a092a129a5b57b9fbb665514cade185e202fb6f00748e
-  data.tar.gz: 6dec97d322e25a330539b1a57006a4a4d549cd1ec8602b8bd29d679763df019b21104b9361e509ab48d8ceca0ec8fed1154275eeb88328d5303cb804b39005eb
+  metadata.gz: 88411f27624c29e01cec4fc18c2d4f84bcbff9a1cfc1da55b675ac103b3bcfd8c9acf091563803cd1a5f5c1af87936cceda90d0955d1db05189c86550aba1958
+  data.tar.gz: 5ea233ce45eca55d9d419a8d1a41286669fbdab4ab9124c209543154da7f7413bccd9773c36640d974c7c587f1525b8d9302ac0270cb270e4e359d3f335a547c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nasa-neo (1.3.2)
+    nasa-neo (1.3.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/nasa-neo/client.rb

@@ -29,17 +29,7 @@ module NasaNeo
       end
 
       def estimated_diameter(measurement = nil, min_max = nil)
-        if ESTIMATED_DIAMETER_OPTIONS.include? measurement
-          if ["min", "max"].include? min_max
-            call_and_rescue { retrieve_neo(ESTIMATED_DIAMETER_KEYS + ["#{measurement}", "estimated_diameter_#{min_max}"]) }
-          else
-            min_max == nil ? call_and_rescue { retrieve_neo(ESTIMATED_DIAMETER_KEYS + ["#{measurement}"]) }
-                           : error_feedback(['min_max', 'check arguments'])
-          end
-        else
-          measurement == nil ? call_and_rescue { retrieve_neo(ESTIMATED_DIAMETER_KEYS) }
-                             : error_feedback(['measurement', 'check arguments'])
-        end
+        retrieve_specific(ESTIMATED_DIAMETER_OPTIONS, ESTIMATED_DIAMETER_KEYS, measurement, min_max)
       end
 
       def hazardous?
@@ -47,12 +37,7 @@ module NasaNeo
       end
 
       def miss_distance(measurement = nil)
-        if MISS_DISTANCE_OPTIONS.include? measurement
-          call_and_rescue { retrieve_neo(MISS_DISTANCE_KEYS + ["#{measurement}"]).to_f }
-        else
-          measurement == nil ? call_and_rescue { retrieve_neo(MISS_DISTANCE_KEYS) }
-                             : error_feedback(['measurement', 'check arguments'])
-        end
+        retrieve_specific(MISS_DISTANCE_OPTIONS, MISS_DISTANCE_KEYS, measurement)
       end
 
       def neo_name
@@ -80,12 +65,7 @@ module NasaNeo
       end
 
       def velocity(measurement = nil)
-        if VELOCITY_OPTIONS.include? measurement
-          call_and_rescue { retrieve_neo(VELOCITY_KEYS + ["#{measurement}"]).to_f }
-        else
-          measurement == nil ? call_and_rescue { retrieve_neo(VELOCITY_KEYS) }
-                             : error_feedback(['measurement', 'check arguments'])
-        end
+        retrieve_specific(VELOCITY_OPTIONS, VELOCITY_KEYS, measurement)
       end
 
       private
@@ -118,6 +98,23 @@ module NasaNeo
         @result.dig(*root_keys + keys)
       end
 
+      def retrieve_specific(options, keys, measurement, min_max = nil)
+
+        if options.include? measurement
+          chained_keys = retrieve_neo(keys + ["#{measurement}"])
+          if ["min", "max"].include? min_max
+            call_and_rescue { chained_keys["estimated_diameter_#{min_max}"] }
+          else
+            min_max == nil ? call_and_rescue { chained_keys.respond_to?(:to_f) ? chained_keys.to_f
+                                                                               : chained_keys }
+                           : error_feedback(['min_max', 'check arguments'])
+          end
+        else
+          measurement == nil ? call_and_rescue { retrieve_neo(keys) }
+                             : error_feedback(['measurement', 'check arguments'])
+        end
+      end
+
       def error_feedback(error_info)
         { 'error': error_info }
       end

data/lib/nasa-neo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NasaNeo
-  VERSION = "1.3.2".freeze
+  VERSION = "1.3.3".freeze
 end

data/nasa-neo.gemspec

@@ -4,7 +4,7 @@ require "nasa-neo/version"
 
 Gem::Specification.new do |s|
   s.name        = 'nasa-neo'
-  s.version     = '1.3.2'
+  s.version     = '1.3.3'
   s.date        = '2019-04-09'
   s.summary     = "This gem provides a simple wrapper for https://api.nasa.gov/api.html#NeoWS API"
   s.description = "Retrieve information about the closest near earth objects on any given day using the NASA NEO API. "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nasa-neo
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - James Sutherland