s44_myweatherforecast 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b200ab26b815ac2751d6b48ccdf753f852458718
-  data.tar.gz: b028f8eb216d6b2a8ebcac5e589e0937444c00ea
+  metadata.gz: 50a3968fba44cdd7ecef7fc5d582726cca7ac4bd
+  data.tar.gz: 9e550dd64b4bf547cf5cb67281884889095406fb
 SHA512:
-  metadata.gz: 9dd5e1658982d977ddcb123b24bd4ccd62d14b2c32f6a0c9e3b22e0fa879975d140ad5487faab5d150f58c990ba63ca2c962a7fe40373086ee3bf0bcb1109f0f
-  data.tar.gz: 1e9fb67681cd1bf267904b6d0935372e244898433f07a79edc6cb8245483635565b0cc401e895fed6329bb413bcda191d9bbd5870d824c9c604870ace480ba28
+  metadata.gz: 3b0070eebe6b26cacaa142419af231f8106e9827df1e94428ebbf98938c75f7825c113293859f32a863e1cf0c8e4ced69b80943c8a3817b6333dde6fc067d743
+  data.tar.gz: 7993f440d3e1f673d1f9fdb917c89b4971463f6406ea4c662cfde74882df769b3a107b7c79505138538f7daee554c1b681269f4ab8ae39b66254ca49c7cd23da

data/lib/s44_myweatherforecast.rb

@@ -34,14 +34,49 @@ class S44_MyWeatherForecast
   # e.g. is it going to rain tomorrow? return an array of periods within the 
   # day of when it will rain or an empty array if there is no rain forecast
   
-  def query(day=:tomorrow, desc='rain')
+  def query(day=:tomorrow, desc='rain', time: false, times: false)
+
+    r2 = %i(morning afternoon evening early_hours night).map do |x| 
+      
+      r = if times then
+        query_period(day.to_sym, x, desc, single_result: false)
+      else
+        query_period(day.to_sym, x, desc)
+      end
     
-    %i(morning afternoon evening early_hours night).select do |x| 
-      @w.method(day.to_sym).call.method(x).call.detect do |x|
-        x.to_s =~ /#{desc}/i
+      next unless r
+      
+      if time then
+        
+        [x, [r.time, r.summary]]
+        
+      elsif times
+        
+        next if r.empty?
+        [x, r.map {|y| [y.time, y.summary]}]
+        
+      else
+        x
       end
     end
     
+    r2.compact
+    
+  end
+  
+  def query_period(day=:tomorrow, period=:afternoon, desc='rain', single_result: true)
+
+    desc = 'drizzle|rain' if desc =~ /rain/i
+    obj_period = @w.method(day.to_sym).call.method(period.to_sym).call
+
+    return if obj_period.nil?
+    
+    if single_result then
+      obj_period.detect {|x| x.to_s =~ /#{desc}/i }
+    else
+      obj_period.select {|x| x.to_s =~ /#{desc}/i }
+    end
+    
   end
 
   alias this_evening evening

data.tar.gz.sig

@@ -1 +1 @@
-}S�D��c��]�F �,�+|3IϨ�2~ikH��D��S6��-�\s�{
��mߔ�Ў��
�?
�V�2+��12?C�����m�InV,�].��+."�C��6��"�T�6)ʉr�ٟ�Έ�e2Ř�'|�xI�p�Z}З��pGܣ�!�PO�q')

+��Me�`�|���&�>J/h�i�]̑�2�y�E*NJ���3�_^o��j���L�
=d+p���f�1dnB�r��*�m�vN��djb�*���7-�7������J��W߱�tW��J��/��~�/(�)��j�:aa��
��h#����

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s44_myweatherforecast
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   wNU0aSGt6u5Oh3cJFs6Zfm4W33vT5usVkr6pvh0cTHy+lAA7bmI4yItqT3Pr3TOD
   YImZerPvCoY8xQ==
   -----END CERTIFICATE-----
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu