myweatherforecast 1.0.2 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ea5e686749c95022011a476df5dca9249c52be154c1bc05cb0a3617b8ac788
-  data.tar.gz: e81794bc2bf5cd63883f1ed8ec88dffe27ec5f05bbff94d215e44b096a21cc4e
+  metadata.gz: f610e30f76a028070f0260348aa5e6ebd35b10973a0df575dd932522a39f0739
+  data.tar.gz: e2b54d313adfd0fe4b8a3b7a1fb5db1629f28641667816cea14b8572e336b61c
 SHA512:
-  metadata.gz: b4a67326665bb8bee5cf7c15800c037d9ff9f2b93889d42acf9ca9ddd5e53834f4fcbc95a640b044ca1655d344327e868a67a54324bc3890790528b6e4c88e6f
-  data.tar.gz: 2888f61cc51a0739838aef54b2e170912ca49bdb781b3f86bddf32ef826337a1ce2b873287c2b86e4e72a1b5b8600224f9360e89d6f0dd090e7303de3a1a1da9
+  metadata.gz: 5d5128ab239532d9b269ba84cc6069622aea07e622f475ee772f73619643036622efd170ef66b445b7dcfaa25b5f0dfcbf9925f1f537a6517fc96af250aaa563
+  data.tar.gz: 16f79ee28d46e4d27902db34f0d6f423976a4885ba08916cd37fc012698d78623599b4ffe0e52bbda54e7d96d694d794776cd4fbc8797afddd7597ec88b09982

data/lib/myweatherforecast.rb

@@ -14,31 +14,31 @@ require 'forecast_io'
 # 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, \
                                                                symbols: true)
     lat, lon = if location[0].is_a? Array then
-    
+
       location[0]
-      
+
     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
+
+      h = JSON.parse URI.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        
+
+    end
 
     ForecastIO.api_key = api_key
 
@@ -46,55 +46,55 @@ class MyWeatherForecast
     @forecast = ForecastIO.forecast(lat, lon, params: params)
 
     autounits = @forecast['flags']['units']
-    
+
     @tlabel = if symbols then
       autounits == 'us' ? '°F' : '°C'
     else
       autounits == 'us' ? 'degrees Farenheit' : 'degrees Celcius'
     end
-    
+
     @coordinates = [lat, lon]
     @symbols = symbols
 
   end
 
   class Hourly
-    
+
     attr_reader :today
 
     def initialize(forecast, tlabel, i=0)
-      
+
       @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
-      
+
       #@speed_label = 'kph'
       @speed_label = 'mph' #if @forecast['flags']['units'][/^uk2$/]
 
-    end    
-    
+    end
+
     def at(raw_hour)
-      
+
       hour = Time.parse(raw_hour).hour
       i = 0
 
       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 ahead(advance=2)
-      
+
       current_hour = Time.at(@hourly_data[0]['time']).hour + advance
-      
-      case current_hour
+
+      name = case current_hour
       when 12..17
         :afternoon
       when 0..5
@@ -105,15 +105,18 @@ class MyWeatherForecast
         :morning
       when night_time.hour..23
         :night
-      end      
-      
+      end
+
+      method(name).call
+
     end
-    
-    def afternoon()   period(12, 17)                end         
+
+    def afternoon()   period(12, 17)                end
+    def detail()      period(0, 23)                 end
     def early_hours() period(0, 5)                  end
-      
+
     def emoji()
-      
+
       h = {
         'clear-day' => :sun,
         'clear-night' => :night_with_stars,
@@ -125,61 +128,61 @@ class MyWeatherForecast
         'cloudy' => :cloud,
         'partly-cloudy-day' => :sun_behind_cloud,
         'partly-cloudy-night' => :cloud
-      }      
-      
+      }
+
       Emoji2020.new(h[icon()]).to_s
-      
+
     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 morning()     period(6, 12)                 end
+    def night()       period(night_time.hour, 23)   end
+
     def night_time()
       Time.at(@day.sunsetTime)
-    end        
-    
+    end
+
     def humidity()
       @x.humidity
     end
-    
+
     def icon()
       @x.icon
     end
-    
+
     def noon()
       at_hour 12
     end
-    
+
     alias midday noon
 
     def to_s
       r = "%s: %d%s, %s" % [self.time.strftime("%-I%P"), @x.temperature.round, \
                                                           @tlabel, @x.summary]
-      r << ", %s" % [windspeed] if r[/windy|breezy/i]      
+      r << ", %s" % [windspeed] if r[/windy|breezy/i]
       r
     end
 
     def summary()
       @x.summary
     end
-    
+
     def sunrise()
       @day.sunrise
     end
-        
+
     def sunset()
       @day.sunset
-    end    
-    
-    alias night_time sunset    
-    
+    end
+
+    alias night_time sunset
+
     def temperature
       "%s°" % @x.temperature.round
     end
-    
+
     alias temp temperature
-    
+
     def time
       Time.at @x.time
     end
@@ -187,43 +190,43 @@ class MyWeatherForecast
     def visibility()
       @x.visibility
     end
-    
+
     def windspeed()
       "%s%s" % [@x.windSpeed.round, @speed_label]
     end
-    
+
     private
-    
+
     def at_hour(n)
 
       i = 0
 
-      return if Time.at(@hourly_data[i]['time']).hour > n 
+      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)
-      
-      current_hour = Time.at(@hourly_data[0]['time']).hour      
-      
+
+      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
-    
+
   end
-  
-                                 
+
+
   class Daily < Hourly
-                                 
+
     def initialize(forecast, tlabel, d=0)
-      
+
       @forecast = forecast
 
       @x = forecast['daily']['data'][d]
@@ -232,48 +235,51 @@ class MyWeatherForecast
       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      
-      
+
+      @i = forecast['hourly']['data'].index found
+
       return if @i.nil?
 
       @hourly_data = forecast['hourly']['data'][@i..-1]
       @day = self
-                                      
+
     end
-    
+
+    def day()
+      Date::ABBR_DAYNAMES[self.time.wday]
+    end
+
     def to_s
-      
-      label = self.time.to_date == Time.now.to_date ? 'Today' : \
-                                            Date::ABBR_DAYNAMES[self.time.wday]
-      
+
+      label = self.time.to_date == Time.now.to_date ? 'Today' : day()
       mask = @symbols ? "%s: ▽%s ▲%s, %s" : "%s: %s %s, %s"
       mask % [label, tempmin, tempmax, @x.summary]
+
     end
-    
+
     def sunrise()
       Time.at @x.sunriseTime
     end
-    
+
     def sunset()
       Time.at @x.sunsetTime
-    end    
-    
+    end
+
     def temperature()
     end
 
     def tempmin
       "%s°" % [@x.temperatureMin.round]
     end
-                                 
+
     def tempmax
       "%s°" % [@x.temperatureMax.round]
     end
-    
+
 
   end
-  
-  
+
+
   # e.g.
   # require 'myweatherforecast'
   #
@@ -289,32 +295,32 @@ class MyWeatherForecast
   end
 
   def hours()
-    
+
     len = @forecast['hourly']['data'].length
     len.times.map {|i| Hourly.new @forecast, @tlabel, i}
 
   end
-  
+
   def now()
     Hourly.new(@forecast, @tlabel)
   end
-    
+
   def today()
     Daily.new(@forecast, @tlabel)
   end
-  
-  alias currently now  
-  
+
+  alias currently now
+
   def tonight()
     Daily.new(@forecast, @tlabel).night
   end
-        
+
   alias this today
-  
-  def tomorrow()    
+
+  def tomorrow()
     Daily.new(@forecast, @tlabel, 1)
-  end 
-  
+  end
+
   def monday()    day :monday    end
   def tuesday()   day :tuesday   end
   def wednesday() day :wednesday end
@@ -322,7 +328,7 @@ class MyWeatherForecast
   def friday()    day :friday    end
   def saturday()  day :saturday  end
   def sunday()    day :sunday    end
-    
+
   alias sat saturday
   alias sun sunday
   alias mon monday
@@ -331,13 +337,30 @@ class MyWeatherForecast
   alias thu thursday
   alias fri friday
 
+  def next_3days()
+
+    days().take(4)[1..-1].map do |x|
+      "%s: %s - %s #{x.emoji} %s" % [x.time.strftime("%a"), x.tempmin,
+                                     x.tempmax, x.summary]
+    end.join("\n")
+
+  end
+
+  def next_5days()
+
+    days().take(6)[1..-1].map do |x|
+      "%s: %s %s" % [x.time.strftime("%a"), x.tempmax, x.summary]
+    end.join("\n")
+
+  end
+
   private
-  
+
   def day(name)
-    
+
     name = (name.to_s + '?').to_sym
-                                 
-    d = 0 
+
+    d = 0
     d += 1 until Time.at(@forecast['daily']['data'][d].time).method(name).call
     Time.at(@forecast['daily']['data'][d].time)
     Daily.new(@forecast, @tlabel, d)

data.tar.gz.sig

@@ -1,3 +1,2 @@
-�b\ꐯ���w�D zE�H{�0�<G��2�4�l{,�?ٯ+��(�e~:%��9E;���W�˝��k���| ��M�R8kݪ,�)}������W�n9�/sWi��)m(T��F������x�I:��߸�.��Q�n��T��[��r0�5� D�
�ȫʍZ>������
-L}���Z�X��߻���P�|��ę5~�C�\f�s֚��u[u^Ev��(1i��6Y��XO��*��!���>`R�ѐ�$�q��'R�57�%G�Xy)!�LO�������m����fGk����s8EM�-ig�@�w���Q���92(�h*���T.
-K*�l��F��m�Z��w�`=0���E�����أ��܈"���v�Ibr�ռ
+)�V&�9�^Y�uDu��
+��}7��ѕ�(5hr�`AJojP�=�%���;d1w�YB�t���D���hQ���KU'N��1�#Q:Q���\�s}N�����&��I��^?�'�lZ:�����6���1��(6��i�|,Yw�}R�P_3>�-ب��϶�n�ش��#�0x�m1�����h��WC���vS6+q�������v�Qzi�#�{@F��]���4��!? 9�UD;�!?�(7L5
g:��y2�*������S����9r^��,�A?��\�ՊW]�!H��"U�~RۥA��U������=����.�����P����f��y:���<��{���)�v�m��8Z|,Ss���rfnE~�iZ�{��ev�����ۜ

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myweatherforecast
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.6
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNDI2MDkwMDEzWhcN
-  MjEwNDI2MDkwMDEzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDy5Ev/
-  +TmmW2Zbqs3nwm1ZKztFwS4HKierISuHHK9LRVUoocJ1HAMt65t9K0FqLHcPw8Cq
-  A83Hh6pyOC38Q6xE0bACRz05jL/AKWQU+KF2o9gyph4+b/Y+S51627/nJPaaPl/i
-  /AAkCPX+XYZZx6Ts3c4bajWbBZQvduKz+Mgns0HHfZyU4OL9PhjQSpL4w+b53C7I
-  rROHOcskWOmKhqD04VLoB0k7IoKQ6iD6AJLGwcLPIEKcQ00F6kiA9lFYUt9Iw/YM
-  Ci1W6SO7b80+7nYLeKgYMF3xfZwUB7ZwrIv3oNYZqLmSnk2NlDlibYNOd8CEm51d
-  il/LCYqBjsx8hQxddQ7bqckkMHI2aWfnB8CH/l3r7vWvkKrlyWkA+yc5Hain86eu
-  qip4E40kzjT1dKNuayS8MWYqD0kGrvZd5J6mm0w1SVSCmk5HVR68WkpNT63IXS5Y
-  tqflllrFbf1onOkOw3GOrN+IKGVnBdxZEpgwnROXTnswdUJ7Q8POSiK2Qu8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUcUjjw62h
-  LOtlQ5ITbp0+TWaMl9EwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MjAzNTU2WhcN
+  MjIxMTE4MjAzNTU2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4eL0X
+  SYCTqoyqfk6AmnRvGe/0sgrAywdGq4FJb4B56LmiPEJI6UH8HNxsSCtqhvSXg35e
+  5ZcWu9OwFrZiSqJmj8JaLVLTtm094hBXKgDFCUFhlVsdUZ8G/0c+J3uDjM5ucCyX
+  gRfKBoTnGup7pGstGChVMn00RzcsgfO30p1dxQcYTxWsbqEb1hlfmVIfRhmDdq4T
+  tLjyW8ZhgblNfQIlTnRB81x3A1E7ECL4nQkiKUjmzipYOXW34st795FA5rQlyiKC
+  PgnsUa2QpUcZVS7Rx2GfSVoftupHEPNUUuCnW1q0bihUf6Y34n4Ha0bFl0Q1mlEk
+  1mSE0m3XHQqFmJYqLehMpMsOUQSRwjDPRO1ciMbNT+QaoKKaeYP6LALC1sEODrNZ
+  ux05Zw5jUgIMc046rFRR/tBqM6r+WvGbemLMNpOvQwwMkPJmpu0ROmAAFjZyCis6
+  qllnE+P9M7S0ULLFkPnoCQE62fFGpHkcoW75rYplj42MZxz6bMtw5xuf718CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUNEqVjENP
+  Ii49GrSvh1D69uhDT/AwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAUzolYndXxgA1eH/QTx1gbEK4ay7UW4/BUMZcenlM
-  Xx841MdN5yfy91NWeo/Qy0ruxCnNtCvXsVEx6P1TVLaZBxkU/i/H3TgNrOsqgRHz
-  8S428Xg3PTTYkMf27+sLMO8uXmEYeCjrbdEyUBiCtmPht776T2nepwOJNwqgb8x8
-  qSMtqEYZxY3x+4Dd9CNf2xQujQ26Q4qyZnzYIuZQb9aHMgAiww3rst8Kxc83pggI
-  It47yWd2GhjXd7fv/9MZ0Uhfov+ExsqSr9H0HDjf8KCL+Y9OzNAW7ixpQpXK0pQJ
-  i54CNZiaGNwJnBVp9USO7cA5jCKN1Iouaj/Vbie5XXhiGnOZ/cyfna/K/fX10/lh
-  JL0NiXQMvY3FTEjgq7BZxit1Q7dE07TH54CD/f5EMNm9v/f5BKVPDF+pfAUrZnKy
-  T8ZItjfCqcG6MNMdmPqplYAqpSJzVB9ucdkrz8Ia5Lf1waJw6Dd0m1zHWYSofIH8
-  HuG3HnRIMQNQE2s1PFtxmX2w
+  BgkqhkiG9w0BAQsFAAOCAYEAT0hmJ5VYOXO6p9xQlh1WGOzDa0lKn8n8a1yIjr+s
+  G/cc6Ubk492Pg3wwogbp6XEhZkbWhupyi1I+j7Tk8W5QQ//ZNgc5QVBCLuDRv9GI
+  YEM7k4laUkARx79bemoiqedrMR63E1SDqqlOIOC77Wyz8ZK264Adj+yW3CizoX15
+  d2ji2ZlfG5itpXTdATQEN2r+FaXWwdom+xxKg2/so8/ZHylNr7pVKWzvO/Pc7GaZ
+  7l+jA4xr1qSM7k+UKSw2hKtIyjzXRjUkmdusaT+EvuajIvGHuATk9VnIFK3K+DcE
+  p33f9tL1S5hvcHIuITP/R6DbYBn6cbrmsKWGQFcxaBYzjmvXeriqV+U7QAbZD7yU
+  cfNYElTbzllkLfSpLAxf6SDmp8JjVYm3lWZ/AiSZTY5GDSLy/gAfv3wI2uvxi61h
+  Xe+ZY1GQbdQEDFDEvbHvn24bxuz3fQ4VF8L39HzvwQn9EXjvOAxOoQEHJAPS+uAn
+  iVXeBn9xu1pLJZy7L6X+Op2j
   -----END CERTIFICATE-----
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forecast_io
@@ -61,44 +61,44 @@ dependencies:
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: emoji2020
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,7 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: This gem is a wrapper of the forecast_io gem.