myweatherforecast 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af86dccf7ea42e5895c5507c83438800e40e7a52
-  data.tar.gz: d7a8f68980b40d89cfdd3ee6fef3cc22ffffa368
+  metadata.gz: 76f62520a708432f5a5b3c2c9304b5efedc2972e
+  data.tar.gz: e760fc1785af1ad2649f94759413070d7ef5b8df
 SHA512:
-  metadata.gz: 2e9e424e01d72a035fe73e5eeec4d56ab7f3dea40a33a634482c9d9c609002a8d92196564daba2d91bec5a35067ec66aa3eebe61c8f7ace0b03ea29853828640
-  data.tar.gz: e446c90dfc272c3ffb487dddb9a886155ede21040d19ceaf15c0f1c442fc2bde40e238f06b2a0238127db78c2bd4ca616d1a7c7ec13857a20464cf5f9afdf60f
+  metadata.gz: e48099ceacb8f5c1ea1dfd19183be6773813042cb2608d6b49a3d1ba166c09aa70cecda2406194d4e043bb8ab542ba34f3c90d473144b3222e5fe0b83c6053d0
+  data.tar.gz: 86ce36fa0b4d34195eb00ea918d708b75d7a2210ecfdbd2e243e998839e885f1fef8b18f8736839c50f52df0c411667e68fd3129b5f6280a4c65a432bb7e864b

data/lib/myweatherforecast.rb

@@ -2,9 +2,11 @@
 
 # file: myweatherforecast.rb
 
+require 'json'
 require 'time'
 require 'geocoder'
 require 'forecast_io'
+require 'open-uri'
 
 
 
@@ -13,18 +15,27 @@ require 'forecast_io'
 
 class MyWeatherForecast
 
-  def initialize(*location, api_key: nil, units: :auto)
+  def initialize(*location, api_key: nil, units: :auto, timeout: 3)
     
     lat, lon = if location.length > 1 then
     
       location
       
-    else
+    elsif location.any?
       
       results = Geocoder.search(location.first)
       return puts 'location not found' unless results.any?
       results[0].coordinates
       
+    else
+      
+      h = JSON.parse open('http://jsonip.com/').read
+      Geocoder.configure(timeout: timeout)
+      results = Geocoder.search(h['ip'])
+      return puts 'could not determine location from IP address' unless \
+                                                                   results.any?
+      results[0].coordinates
+                              
     end
 
     ForecastIO.api_key = api_key
@@ -112,11 +123,42 @@ class MyWeatherForecast
       DaysAhead.new(@forecast, @tlabel, index: i)
     end    
 
+  end
+                                 
+  class OutlookDay < Day
+                                 
+    def initialize(day, tlabel)
+      @x = day
+      @tlabel = tlabel
+    end
+    
+    def at()
+    end
+
+    def to_s
+      "min: %d%s max: %d%s, %s" % [@x.tempmin, @tlabel, \
+                                             @x.tempmax, @tlabel, @x.summary]
+    end
+    
+    def temperature()
+    end
+
+    def tempmin
+      "%s°" % @x.temperatureMin.round
+    end
+                                 
+    def tempmax
+      "%s°" % @x.temperatureMax.round
+    end
+    
+
   end
 
   def today()
     Day.new(@forecast, @tlabel)
   end
+  
+  alias now today
 
   def tomorrow()
     
@@ -128,5 +170,38 @@ class MyWeatherForecast
     i += 1 until Time.at(@forecast['hourly']['data'][i]['time']).hour ==  12
     DaysAhead.new(@forecast, @tlabel, index: i)
   end
+  
+  def monday()    day :monday    end
+  def tuesday()   day :tuesday   end
+  def wednesday() day :wednesday end
+  def thursday()  day :thursday  end
+  def friday()    day :friday    end
+  def saturday()  day :saturday  end
+  def sunday()    day :sunday    end
+    
+  alias sat saturday
+  alias sun sunday
+  alias mon monday
+  alias tue tuesday
+  alias wed wednesday
+  alias thu thursday
+  alias fri friday
+
+  private
+  
+  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)    
+  end
 
-end
+end

metadata

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