myweatherforecast 0.5.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3790db2ccc5ae1ac3c3cb9fa56943adc43303f54
-  data.tar.gz: 9d0beffee925db0fea583c12226d1ad5ead4b606
+  metadata.gz: 7bc406aab9f5f598d784019fed895b64d1cfbc9e
+  data.tar.gz: bf9615a04c8281748d32a3d711d5d0dd2c0e495f
 SHA512:
-  metadata.gz: a9f140c0f49442db0601c703d3ab9b786f443052ca93ddf916c77f159b1960a13e33e3544356721a55c91552c5cb29e2f6688a6de83622fc256e1ea4bd45dcdc
-  data.tar.gz: 4bac4b3568cf6f6814e7f58aa7e810454528724922463770bad27f8775da68e7c356db9703a01624dd88ecc969f30550981c3b955d61db759ed40303e541d764
+  metadata.gz: e97dc2f9c869961c409161f94c454a4dfd24e1047545e94c88464ec1f99cadd9e1fcf61b033f50cb74d9076a494848ea2898e49db39e7bed2ae790234ade0f6a
+  data.tar.gz: c1198cb17e718517caa6bf6e96791cced478c1a20e4378af9456c4653efb7e00e10e82c0f1a49a35745a380f631941e7e3b04f105c558e0e13b57f4238498f77

data/lib/myweatherforecast.rb

@@ -17,11 +17,11 @@ class MyWeatherForecast
   
   attr_reader :coordinates
 
-  def initialize(*location, api_key: nil, units: :auto, timeout: 3)
+  def initialize(*location, api_key: nil, units: :auto, timeout: 3, \
+                                                               symbols: true)
+    lat, lon = if location[0].is_a? Array then
     
-    lat, lon = if location.length > 1 then
-    
-      location
+      location[0]
       
     elsif location.any?
       
@@ -47,9 +47,15 @@ class MyWeatherForecast
 
     autounits = @forecast['flags']['units']
     
-    @tlabel = autounits == 'us' ? '°F' : '°C'      
-    @coordinates = [lat, lon]
+    @tlabel = if symbols then
+      autounits == 'us' ? '°F' : '°C'
+    else
+      autounits == 'us' ? 'degrees Farenheit' : 'degrees Celcius'
+    end
     
+    @coordinates = [lat, lon]
+    @symbols = symbols
+
   end
 
   class Hourly
@@ -65,6 +71,9 @@ class MyWeatherForecast
       else
         [forecast.currently, forecast['hourly']['data']]
       end
+      
+      #@speed_label = 'kph'
+      @speed_label = 'mph' #if @forecast['flags']['units'][/^uk2$/]
 
     end    
     
@@ -106,8 +115,10 @@ class MyWeatherForecast
     alias midday noon
 
     def to_s
-      "%s: %d%s, %s" % [self.time.strftime("%-I%P"), @x.temperature.round, \
+      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
     end
 
     def summary()
@@ -139,7 +150,7 @@ class MyWeatherForecast
     end
     
     def windspeed()
-      @x.windSpeed.round
+      "%s%s" % [@x.windSpeed.round, @speed_label]
     end
     
     private
@@ -197,7 +208,8 @@ class MyWeatherForecast
       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]
+      mask = @symbols ? "%s: ▽%s ▲%s, %s" : "%s: %s %s, %s"
+      mask % [label, tempmin, tempmax, @x.summary]
     end
     
     def sunrise()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myweatherforecast
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.5
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   GwZIa3P1Ea+RT3dq6Es6+k/jkXNYth2ABedYgIgU0DgZpU/JrQ1DcvAA6VGUEwar
   ztA769NWsU/h1g==
   -----END CERTIFICATE-----
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forecast_io