myweatherforecast 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724647c8f6324b8f09781b112a58c1c2844fea17
-  data.tar.gz: 446d0270e1c999c8688dc8c8e461ca8e84f9ec34
+  metadata.gz: 4828694b4f19f73d4b4d6de75c86ace00a9814cd
+  data.tar.gz: a189b59984efe9f649fafb7dc72ecc7348082cd2
 SHA512:
-  metadata.gz: 17ddb50b0858836debd1e61b60e868fc078d000663b86e5481c7120a839b8b1bc594d094ef333c142c9de6880c9aa85fdb91b6884cc77e2deea640f6fbf99242
-  data.tar.gz: 7671182c6e45fb87fd4f1adb17e0b4d093c09f1071ff14e1839cb90292ec814a98af44d492df6fc1132f6f35a54100dc782bbcfefb542769737072b5505b7983
+  metadata.gz: 0a83b05bd02a2bca202e0a53945218f7de5a3d217a1b5f0ee33a0b9a1e3f59dc2e6e67a2567e3048f95924c168d13e3ac87153bf569e059f87ec088269194aa7
+  data.tar.gz: 81400d8cd99433f65ecbae41a29956f05b05e3a6076251942977dac96e858f0698e76641b03220ccb243719a8966463f42ad466cbf921048845be19b2c8ecbeb

data/lib/myweatherforecast.rb

@@ -14,6 +14,8 @@ require 'open-uri'
 # SI explained: https://en.wikipedia.org/wiki/SI_derived_unit
 
 class MyWeatherForecast
+  
+  attr_reader :coordinates
 
   def initialize(*location, api_key: nil, units: :auto, timeout: 3)
     
@@ -36,7 +38,7 @@ class MyWeatherForecast
                                                                    results.any?
       results[0].coordinates
                               
-    end
+    end        
 
     ForecastIO.api_key = api_key
 
@@ -46,16 +48,23 @@ class MyWeatherForecast
     autounits = @forecast['flags']['units']
     
     @tlabel = autounits == 'us' ? '°F' : '°C'      
+    @coordinates = [lat, lon]
     
   end
 
-  class Day
+  class Hourly
+    
+    attr_reader :today
 
-    def initialize(forecast, tlabel, i=nil)
+    def initialize(forecast, tlabel, i=0)
       
-      @forecast = forecast
-      @x = i ? forecast['hourly']['data'][i] : forecast.currently
-      @tlabel = tlabel
+      @forecast, @tlabel, @i = forecast, tlabel, i
+      
+      @x, @hourly_data = if i > 0 then
+        [forecast['hourly']['data'][i], forecast['hourly']['data'][i..-1]]
+      else
+        [forecast.currently, forecast['hourly']['data']]
+      end
 
     end    
     
@@ -63,11 +72,25 @@ class MyWeatherForecast
       
       hour = Time.parse(raw_hour).hour
       i = 0
-      i += 1 until Time.at(@forecast['hourly']['data'][i]['time']).hour \
-                                                                  ==  hour.to_i
-      Day.new(@forecast, @tlabel, i)
+
+      return if Time.at(@hourly_data[i]['time']).hour > hour
+      
+      i += 1 until Time.at(@hourly_data[i]['time']).hour ==  hour
+
+      Hourly.new(@forecast, @tlabel, i+@i)
+
     end
     
+    def afternoon()   period(12, 17)                end    
+    def early_hours() period(0, 5)                  end
+    def evening()     period(17, night_time.hour+1) end
+    def morning()     period(6, 12)                 end    
+    def night()       period(night_time.hour, 23)   end
+    
+    def night_time()
+      Time.at(@day.sunsetTime)
+    end        
+    
     def humidity()
       @x.humidity
     end
@@ -75,19 +98,38 @@ class MyWeatherForecast
     def icon()
       @x.icon
     end
+    
+    def noon()
+      at_hour 12
+    end
+    
+    alias midday noon
 
     def to_s
-      "%d%s, %s" % [@x.temperature.round, @tlabel, @x.summary]
+      "%s: %d%s, %s" % [self.time.strftime("%-I%P"), @x.temperature.round, \
+                                                          @tlabel, @x.summary]
     end
 
     def summary()
       @x.summary
     end
     
+    def sunrise()
+      @day.sunrise
+    end
+        
+    def sunset()
+      @day.sunset
+    end    
+    
+    alias night_time sunset    
+    
     def temperature
       "%s°" % @x.temperature.round
     end
     
+    alias temp temperature
+    
     def time
       Time.at @x.time
     end
@@ -100,48 +142,72 @@ class MyWeatherForecast
       @x.windSpeed.round
     end
     
-  end
-  
-  class DaysAhead < Day
+    private
     
-    def initialize(forecast, tlabel, index: 0)
+    def at_hour(n)
+
+      i = 0
+
+      return if Time.at(@hourly_data[i]['time']).hour > n 
+      len = @hourly_data.length
+      i += 1 until Time.at(@hourly_data[i]['time']).hour ==  n or i >= len - 1
+
+      Hourly.new(@forecast, @tlabel, i+@i)
+    end
+    
+    def period(hr1, hr2)
       
-      @forecast = forecast
-      @x = forecast['hourly']['data'][index]      
-      @tlabel = tlabel
-      @i = index
+      current_hour = Time.at(@hourly_data[0]['time']).hour      
+      
+      return if current_hour >= hr2
+      
+      hr1 = current_hour if current_hour > hr1
+      hr2 = @hourly_data.length - 2 if hr2 + 1 > @hourly_data.length - 1
+      (hr1..hr2).map {|n| at_hour n}
       
     end
     
-    def at(raw_hour)
-      
-      hour = Time.parse(raw_hour).hour
-
-      i = @i - 12
-      i += 1 until Time.at(@forecast['hourly']['data'][i]['time']).hour \
-                                                                  ==  hour.to_i
-      DaysAhead.new(@forecast, @tlabel, index: i)
-    end    
-
   end
+  
                                  
-  class OutlookDay < Day
+  class Daily < Hourly
                                  
-    def initialize(day, tlabel)
-      @x = day
+    def initialize(forecast, tlabel, d=0)
+      
+      @forecast = forecast
+
+      @x = forecast['daily']['data'][d]
       @tlabel = tlabel
+
+      found = forecast['hourly']['data'].detect do |hour|
+        Time.at(@x.time).to_date == Time.at(hour.time).to_date
+      end
+      
+      @i = forecast['hourly']['data'].index found      
+      
+      return if @i.nil?
+
+      @hourly_data = forecast['hourly']['data'][@i..-1]
+      @day = self
+                                      
     end
     
-    def at(*a)
-      "%s outlook: %s - %s, %s" % [Date::DAYNAMES[self.time.wday], \
-                                                  tempmin, tempmax, @x.summary]
-    end
-
     def to_s
-      "%s: %s - %s, %s" % [Date::ABBR_DAYNAMES[self.time.wday], \
-                                                  tempmin, tempmax, @x.summary]
+      
+      label = self.time.to_date == Time.now.to_date ? 'Today' : \
+                                            Date::ABBR_DAYNAMES[self.time.wday]
+      
+      "%s: ▽%s ▲%s, %s" % [label, tempmin, tempmax, @x.summary]
+    end
+    
+    def sunrise()
+      Time.at @x.sunriseTime
     end
     
+    def sunset()
+      Time.at @x.sunsetTime
+    end    
+    
     def temperature()
     end
 
@@ -155,7 +221,7 @@ class MyWeatherForecast
     
 
   end
-
+  
   
   # e.g.
   # require 'myweatherforecast'
@@ -168,25 +234,31 @@ class MyWeatherForecast
   # Sun: 5° - 12°, Mostly cloudy throughout the day.
 
   def days()
-    @forecast['daily']['data'].map {|day| OutlookDay.new(day, @tlabel) }
+    (@forecast['daily']['data'].length).times.map {|n| Daily.new(@forecast, @tlabel, n) }
+  end
+
+  def hours()
+    
+    len = @forecast['hourly']['data'].length
+    len.times.map {|i| Hourly.new @forecast, @tlabel, i}
+
   end
   
   def today()
-    Day.new(@forecast, @tlabel)
+    Daily.new(@forecast, @tlabel)
   end
   
-  alias now today
-
-  def tomorrow()
-    
-    # select tomorrow at midday
-    i = 0
-    
-    i += 7 if Time.at(@forecast['hourly']['data'][i]['time']).hour >= 6
-    
-    i += 1 until Time.at(@forecast['hourly']['data'][i]['time']).hour ==  12
-    DaysAhead.new(@forecast, @tlabel, index: i)
+  def tonight()
+    Daily.new(@forecast, @tlabel).night
   end
+        
+  alias currently today
+  alias now today
+  alias this today
+  
+  def tomorrow()    
+    Daily.new(@forecast, @tlabel, 1)
+  end 
   
   def monday()    day :monday    end
   def tuesday()   day :tuesday   end
@@ -209,16 +281,11 @@ class MyWeatherForecast
   def day(name)
     
     name = (name.to_s + '?').to_sym
-    len = @forecast['hourly']['data'].length
-    i = 0
-    i += 1 until Time.at(@forecast['hourly']['data'][i]['time']).\
-                                              method(name).call or i >= len - 1
-    return DaysAhead.new(@forecast, @tlabel, index: i) unless i == len - 1
                                  
     d = 0 
     d += 1 until Time.at(@forecast['daily']['data'][d].time).method(name).call
     Time.at(@forecast['daily']['data'][d].time)
-    OutlookDay.new(@forecast['daily']['data'][d], @tlabel)    
+    Daily.new(@forecast, @tlabel, d)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myweatherforecast
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson