weather-emoji 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4539ae699d488648935128d94455dbf2a4a69eb8
-  data.tar.gz: 6a792c8b9e7d25a40c2bbef62f3f32d1efaef57d
+  metadata.gz: 21cfddc805287e4a88f936350a8720c86a908e5b
+  data.tar.gz: a63f9861a3a0ae7975ba80ca06bd713ce41a24df
 SHA512:
-  metadata.gz: e6855717c4fcfaef41e8d0e49cac291c7ecfdf3db6018eb3cdf62103d2c79601709068f0e7b48f1d339090f40d9c790410936b1146c2e55c0ef3171da44d6bf2
-  data.tar.gz: f834d00f5b75a4806d21a4862c8df54bdd35ffe2078221df0fcda4bf3b350b28d9344be4dcc19b40e42c9c99a94172b1ca38bd976ab0e1724f76d7a8f674af40
+  metadata.gz: 811e86c10184927c43879e4e4bfe73386a8130b4b61fa5f70dd8d3abfe1a7b9ac3dbcd65dfce71a126899cea7d3673889a85b440cd5230073c066b2e84fbfaf2
+  data.tar.gz: 9284146f30c5553ce1d1f6e35723c2dd35fcb6431e85044605c6121d92a4893c55ff7c18c15a2e4a50c0cb08bc67a64218eac8f4dcc4ea9e4d6aa956d9453318

data/bin/weather

@@ -1,4 +1,32 @@
 #!/usr/bin/env ruby
 
 require 'weather-emoji'
-puts WeatherEmoji::weather ARGV[0]
+require 'optparse'
+
+options = {:host => nil}
+
+# Rules to parse the command line arguments.
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: weather [options]"
+
+  opts.on('-c', '--celsius', 'to use Metric (Celsius)') do
+    options[:unit] = "metric";
+  end
+
+  opts.on('-f', '--fahrenheit', 'to use Imperial (Fahrenheit)') do
+    options[:unit] = "imperial";
+  end
+
+  opts.on('-h', '--help', 'Display this help message') do
+    puts opts
+    exit
+  end
+end
+
+# Parse arguments according to above rules; leftovers are kept in ARGV
+parser.parse!
+
+# print the target hostname
+options[:host] = ARGV[0]
+
+puts WeatherEmoji::weather options

data/lib/weather-emoji.rb

@@ -5,10 +5,12 @@ require_relative 'weather-emoji/api'
 require_relative 'weather-emoji/emoji'
 
 module WeatherEmoji
-  def self.weather host=nil
-    coord = get_coordinates host
-    result = get_weather_for_coordinates coord, 'c'
+  # the "wrapper" for everything.
+  def self.weather options
+    coord = get_coordinates options[:host]
+    result = get_weather_for_coordinates coord, options
     data = consume_weather_data result
-    WeatherEmoji::stringify data
+    puts WeatherEmoji::stringify data
+    exit
   end
-end
+end

data/lib/weather-emoji/api.rb

@@ -2,60 +2,83 @@ module WeatherEmoji
   GEOIP_URI = "http://freegeoip.net/json/"
   API_KEY = "17928230b610439be8e3f005b7245c8a"
 
-  # get coordinates for given IP address
-  def self.get_coordinates ip_addr=nil
-    raise ArgumentError.new('ip_addr not String') unless !ip_addr or ip_addr.is_a? String
-
+  # get coordinates and corresponding country code for given IP address
+  # * +ip_addr+ - the IP address, or the hostname to get coordinates and country code of.
+  def self.get_coordinates ip_addr
     uri = GEOIP_URI
     uri += ip_addr if ip_addr
 
     begin
       response = JSON.parse(Net::HTTP.get(URI(uri)))
+
+      # latitude, longitude
       lat = response["latitude"]
       lon = response["longitude"]
-      [lat, lon]
-    rescue => e
-      p e.backtrace
-      raise "no internet connection?"
+
+      # fetch country_code to determine which unit to default to
+      country_code = response["country_code"]
+      return [lat, lon, country_code]
+    rescue
+      puts "no internet connection or invalid hostname!"
+      exit
     end
   end
 
   # get weather for given coordinates
-  def self.get_weather_for_coordinates coordinates, unit="metric"
+  def self.get_weather_for_coordinates coordinates, options
     raise ArgumentError.new('latitude or longtitude not Numeric.') unless coordinates[0].is_a? Numeric or coordinates[1].is_a? Numeric
 
     raw_weather_data = {}
 
-    current_weather_response = JSON.parse(Net::HTTP.get(URI(endpoint_for_current_weather(coordinates))))
+    # set up unit depending on the coordinate's country, if not given
+    raw_weather_data[:unit] = options[:unit]
+    if options[:unit].nil?
+      if coordinates[2] == "US"
+        raw_weather_data[:unit] = "imperial"
+      else
+        raw_weather_data[:unit] = "metric"
+      end
+    end
+
+    current_weather_response = JSON.parse(Net::HTTP.get(URI(endpoint_for_current_weather(coordinates, raw_weather_data[:unit]))))
     if current_weather_response["cod"] == 200
       raw_weather_data[:current] = current_weather_response
     else
-      p "Error getting current weather information (#{current_weather_response["cod"]})"
+      puts "Error getting current weather information (#{current_weather_response["cod"]})"
       exit
     end
 
-    forecast_weather_response = JSON.parse(Net::HTTP.get(URI(endpoint_for_weather_forecast(coordinates))))
+    forecast_weather_response = JSON.parse(Net::HTTP.get(URI(endpoint_for_weather_forecast(coordinates, raw_weather_data[:unit]))))
     if forecast_weather_response["cod"] == "200"
       raw_weather_data[:today]    = forecast_weather_response["list"][0]
       raw_weather_data[:tomorrow] = forecast_weather_response["list"][1]
     else
-      p "error getting forecast information (#{forecast_weather_response["cod"]})"
+      puts "error getting forecast information (#{forecast_weather_response["cod"]})"
       exit
     end
 
     raw_weather_data
   end
 
-  def self.endpoint_for_current_weather coordinates, unit="metric"
+  # Returns the API endpoint for current weather.
+  # * +coordinates+ - the coordinates to check weather of.
+  # * +unit+ - the unit to use. nil defaults to Kelvin; need to provide either "metric" or "imperial" for common uses.
+  def self.endpoint_for_current_weather coordinates, unit
     "http://api.openweathermap.org/data/2.5/weather?units=#{unit}&lat=#{coordinates[0]}&lon=#{coordinates[1]}&APPID=#{API_KEY}"
   end
 
-  def self.endpoint_for_weather_forecast coordinates, unit="metric"
+  # Returns the API endpoint for weather forecast.
+  # * +coordinates+ - the coordinates to check weather of.
+  # * +unit+ - the unit to use. nil defaults to Kelvin; need to provide either "metric" or "imperial" for common uses.
+  def self.endpoint_for_weather_forecast coordinates, unit
     "http://api.openweathermap.org/data/2.5/forecast/daily?units=#{unit}&lat=#{coordinates[0]}&lon=#{coordinates[1]}&APPID=#{API_KEY}"
   end
 
+  # Consumes given raw weather data from the API call.
+  # * +raw_weather_data+ - the raw data from the API call.
   def self.consume_weather_data raw_weather_data
     weather_data = {}
+    weather_data[:unit] = raw_weather_data[:unit]
 
     weather_data[:current] = {
       :code =>     raw_weather_data[:current]["weather"][0]["id"],
@@ -90,10 +113,19 @@ module WeatherEmoji
     weather_data
   end
 
+  def self.unit_code_for weather_data
+    if weather_data[:unit] == "metric"
+      "C"
+    elsif weather_data[:unit] == "imperial"
+      "F"
+    end
+  end
+
   def self.stringify weather_data
-    "Now:      #{weather_data[:current][:code].to_emoji} (#{weather_data[:current][:temp].to_i}ºC/#{weather_data[:current][:humidity]}%)
-Today:    #{weather_data[:today][:code].to_emoji} (#{weather_data[:today][:min].to_i}-#{weather_data[:today][:max].to_i}ºC)
-Tomorrow: #{weather_data[:tomorrow][:code].to_emoji} (#{weather_data[:tomorrow][:min].to_i}-#{weather_data[:tomorrow][:max].to_i}ºC)"
+    unit = unit_code_for weather_data
+    "Now:      #{weather_data[:current][:code].to_emoji} (#{weather_data[:current][:temp].to_i}º#{unit}/#{weather_data[:current][:humidity]}%)
+Today:    #{weather_data[:today][:code].to_emoji} (#{weather_data[:today][:min].to_i}-#{weather_data[:today][:max].to_i}º#{unit})
+Tomorrow: #{weather_data[:tomorrow][:code].to_emoji} (#{weather_data[:tomorrow][:min].to_i}-#{weather_data[:tomorrow][:max].to_i}º#{unit})"
   end
 
 end

data/lib/weather-emoji/emoji.rb

@@ -22,25 +22,37 @@ class Integer
   end
 
   # corresponding emoji for one single weather code.
-  # TODO verify each weather code to emoji conversion is accurate
   def to_emoji
     case self
-    when (200...300)
-      "\u{26A1}" # thunderstorm
-    when (300...400)
+    when (200..299), 960, 961
+      "\u{26A1}"  # thunderstorm
+    when (300..399)
       "\u{1F326}" # light rain (drizzle)
-    when (500...600)
-      "\u{2614}" # rain
+    when (500..599)
+      "\u{2614}"  # rain
+    when (600..699)
     when 800
       "\u{1F31E}" # clear sky
     when 801
-      "\u{26C5}" # few clouds
+      "\u{26C5}"  # few clouds
     when 802
       "\u{1F324}" # scattered clouds
     when 803
       "\u{1F325}" # broken clouds
     when 804
-      "\u{2601}" # overcast clouds
+      "\u{2601}"  # overcast clouds
+    when 900, 962
+      "\u{1F32A}" # tornado
+    when 903
+      "\u{2744}"  # cold
+    when 904
+      "\u{1F525}" # hot
+    when 905, 957
+      "\u{1F32C}" # windy
+    when 906, 958, 959
+      "\u{1F30A}" # hail
+    else
+      "\u{1F30A}" # error
     end
   end
 end

data/lib/weather-emoji/version.rb

@@ -1,3 +1,3 @@
 module WeatherEmoji
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weather-emoji
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hun Jae Lee