weatherfetch 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf062366579620ac82e2d599cd7f162be4b134d7fa011185d52fc0a548b0002
-  data.tar.gz: dacd56d05c3c1e17f07dde431dad3c1f95bf83361e795c8113e998f91cad7aa3
+  metadata.gz: d07efd25e4be1cd983bcda4169cf7fe0180f78c287d5cf251925e437f89ad8fa
+  data.tar.gz: 5fdd836833b35e52e93599bca127e663cbaf2944392a137027e67ccf5e2eb1e5
 SHA512:
-  metadata.gz: 48e0fbf3dc2ef9e3b6c41e25981c915ad6758a0e4e9c99b70ca17e9a409adbe33ce8514fdef7739121733b63965b718ef2d03517f86bbaeb0d37da833f54b49d
-  data.tar.gz: 73101963a77f63414fd5934030a5a6d5af47b38f8f86083a7c48f5b174db3f8c53150fa0181f761f3981f4ba9a1082a948a30c17bff84ccf2ac9fc8e4bc18acd
+  metadata.gz: c7577a516a7e3f934eb9524812814a8f6b5c417c2e5631c2bc8e94557086224da895d60f7cad7ac26387e30480c57bd0b6da07e2bf53f48f5ec033876d5ec9e4
+  data.tar.gz: c76bec63c2522b511db4c4004056f61545889edce7ff5dc53de781524e999ee6821074e4c006ce643dd23c300c77e6f8a3488789fd4fb513175dcb592f77d40a

data/lib/weatherfetch/cli.rb

@@ -27,7 +27,7 @@ module WeatherFetch
       table = Terminal::Table.new(
         headings: create_headings(['Hour', 'Actual', 'Feels Like', 'Conditions', 'Humidity']),
         rows: rows,
-        title: "🌧  #{Rainbow(location.capitalize).cornflower} 🌞"
+        title: "#{Rainbow(get_title).cornflower}"
       )
 
       puts table
@@ -54,7 +54,7 @@ module WeatherFetch
       table = Terminal::Table.new do |t|
         t.headings = create_headings(['Date', 'Min', 'Max', 'Morning', 'Afternoon', 'Evening', 'Night', 'Conditions', 'Humidity'])
         t.rows = rows
-        t.title = "🌧  #{Rainbow(location.capitalize).cornflower} 🌞"
+        t.title = "#{Rainbow(get_title).cornflower}"
         t.style = { all_separators: :true }
       end
 
@@ -66,23 +66,43 @@ module WeatherFetch
       headings.map { |h| Rainbow(h).red }
     end
 
-    def fetch_location_data(location, type)
-      latitude, longitude = Geocoder.search(location).first.coordinates
+    def get_title
+      city = @location_data.data.dig('address', 'city')
+      country = @location_data.data.dig('address', 'country_code').upcase
+      state = @location_data.data.dig('address', 'state')
+
+      cleaned_city = city && city.split('-').first
+      flag = country.tr('A-Z', "\u{1F1E6}-\u{1F1FF}")
 
-      exclusions = ['hourly', 'minutely', 'current', 'daily'].reject do |ex|
-        ex == type
+      title = [cleaned_city, state, country].each_with_object('') do |loc, str|
+        str << "#{loc}, " if loc
       end
 
-      options = {
-        query: {
-          lat: latitude,
-          lon: longitude,
-          exclude: exclusions.join(','),
-          units: 'imperial',
-          appid: 'c8d7f5fd25b8914cc543ed45e6a40bba'
+      "#{flag}  #{title.delete_suffix(', ')} #{flag}"
+    end
+
+    def fetch_location_data(location, type)
+      if @location_data = Geocoder.search(location).first
+        latitude, longitude = @location_data.coordinates
+
+        exclusions = ['hourly', 'minutely', 'current', 'daily'].reject do |ex|
+          ex == type
+        end
+
+        options = {
+          query: {
+            lat: latitude,
+            lon: longitude,
+            exclude: exclusions.join(','),
+            units: 'imperial',
+            appid: 'c8d7f5fd25b8914cc543ed45e6a40bba'
+          }
         }
-      }
-      response = HTTParty.get('http://api.openweathermap.org/data/2.5/onecall', options)
+        response = HTTParty.get('http://api.openweathermap.org/data/2.5/onecall', options)
+      else
+        puts Rainbow('Please enter a valid location').red
+        exit
+      end
     end
   end
 end

data/lib/weatherfetch/version.rb

@@ -1,3 +1,3 @@
 module WeatherFetch
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weatherfetch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dylan Andrews