concerto_weather 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71f297c5a33be038f4b200406aa29a80b9fb6d18
-  data.tar.gz: 153d8f18b91219bc5592e5d3e36e97bff4498ba6
+  metadata.gz: 4cc51a447fc74de85eb7c5a0cb6044786aca27c1
+  data.tar.gz: 2338b3c08deb9118e1583005ec31ad590aa773c6
 SHA512:
-  metadata.gz: 83d44d494a800265ec646e4af6f699ac910e42be7ade1ec1514dcd98f2be18898fe672307d2a9471e399d8ce106e48394b937c4b8a5a543b1cfbe248f71b65b7
-  data.tar.gz: 3db8207e0d7cd9cdf60f8f80809aedf66c6830ed88ed4fe2fb69689fc821d9487d7a9844c3c862f8b304540e5adf04d1ddf4eb919f453af969cab1dbb4600cff
+  metadata.gz: 0ebee68781d71c7ae64b2e0fb2f3ad6dea08720ab4c15cac999d5cfb3f34214d8dd5aa4e10f885cf71d3ab301ab379694e3b4bb15ac58b7fb1402040128a09a6
+  data.tar.gz: 6f8bff58c5e4121f09856b0d4a428787a72d58147f144020b0913c1508c95ceb6bb6b6922b2e36307d183c9539de8a009c087c5aee67838e491ddf9ed8b365a1

data/README.md

@@ -28,6 +28,8 @@ It uses ruby's variable substitution. The following variables are supported:
 * #{format_icon} - the html code to inject the weather icon (<i...> </i>) - uses OWF or WI font based on the setting
 * #{format_high} - High temperature (including units) for the day
 * #{format_low}  - Low temperature (including units) for the day
+* #{format_current} - Current temperature (including units). Updated every 5 minutes by default.
+
 
 It can be used for example as follows:
 
@@ -57,4 +59,6 @@ If no format is specified the following is used:
                 </div>
 ````
 
+Current Temperature only available if forecast type selected to be "Realtime". 
+Conversely, high/low temperatures for the day are available if forecast is "Max and Min for the day"
 

data/app/controllers/concerto_weather/search_controller.rb

@@ -12,9 +12,11 @@ module ConcertoWeather
       def getOpenWeatherCities(query)
         require 'net/http'
         require 'json'
+        require 'erb'
 
+        query_escaped=ERB::Util.url_encode(query)
         appid = ConcertoConfig["open_weather_map_api_key"]
-        url = "http://api.openweathermap.org/data/2.5/find?q=#{query}&type=like&mode=json&appid=#{appid}"
+        url = "http://api.openweathermap.org/data/2.5/find?q=#{query_escaped}&type=like&mode=json&appid=#{appid}"
         return Net::HTTP.get(URI(url))
       end
   end

data/app/models/weather.rb

@@ -1,20 +1,21 @@
 class Weather < DynamicContent
-  DISPLAY_NAME = 'Weather'
+  DISPLAY_NAME = 'Weather'.freeze
 
   UNITS = {
     'metric' => 'Celsius',
     'imperial' => 'Fahrenheit'
-  }
+  }.freeze
 
   FONTS = {
     'owf' => 'Open Weather Font',
     'wi' => 'Weather Icons'
-  }
+  }.freeze
 
   FORECAST = {
     'realtime' => 'Realtime Weather',
-    'forecast' => 'Max and Min temps forecast for the day'
-  }
+    'forecast' => 'Max and Min temps forecast for the day',
+    'nextday' => 'Max and Min temps forecast for the next day'
+  }.freeze
 
   validate :validate_config
 
@@ -22,135 +23,139 @@ class Weather < DynamicContent
     require 'json'
     require 'net/http'
 
+    # initialize replacement vars incase they are net set by the chosen forecast
+    format_city = ''
+    format_current = ''
+    format_high = ''
+    format_icon = ''
+    format_iconid = ''
+    format_low = ''
+
     forecast_type = self.config['forecast_type']
+    format_string = self.config['format_string']
     font_name = self.config['font_name']
 
-    if forecast_type == 'forecast'
-       # Full day forecast
-       # Build request url
-       params = {
-          lat: self.config['lat'],
-          lon: self.config['lng'],
-          units: self.config['units'],
-          cnt: 1,
-          mode: 'json',
-          appid: ConcertoConfig['open_weather_map_api_key']
-       }
-
-       url = "http://api.openweathermap.org/data/2.5/forecast/daily?#{params.to_query}"
-
-       # Make request to OpenWeatherMapAPI
-       response = Net::HTTP.get_response(URI.parse(url)).body
-       data = JSON.parse(response)
-
-       # if there was an error, then return nil
-       if data['cod'].present? && !data['cod'].to_s.starts_with?('2')
-         Rails.logger.error("response (#{url}) =  #{response}")
-         return nil
-       end
-
-       # Build HTML using API data
-
-       self.config["location_name"] = data["city"]["name"]
-
-       format_city = data['city']['name']
-       format_iconid = "#{data['list'][0]['weather'][0]['id']}"
-
-       if font_name=='wi'
-          format_icon = "<i style=\'font-size:calc(min(80vh,80vw));' class=\'wi wi-owm-#{format_iconid}\'></i>"
-       else
-          format_icon = "<i class=\'owf owf-#{format_iconid} owf-5x\'></i>"
-       end
-
-       format_high = "#{data['list'][0]['temp']['max'].round(0)} &deg;#{UNITS[params[:units]][0]}"
-       format_low = "#{data['list'][0]['temp']['min'].round(0)} &deg;#{UNITS[params[:units]][0]}"
-       empty_html = "
-                <h1> Today in #{format_city} </h1>
-                <div style='float: left; width: 50%'>
-                   #{format_icon}
-                </div>
-                <div style='float: left; width: 50%'>
-                  <p> High </p>
-                  <h1> #{format_high} </h1>
-                  <p> Low </p>
-                  <h1> #{format_low}</h1>
-                </div>
-              "
+    # set command api parameters
+    params = {
+      lat: self.config['lat'],
+      lon: self.config['lng'],
+      units: self.config['units'],
+      mode: 'json',
+      appid: ConcertoConfig['open_weather_map_api_key']
+    }
+
+    if forecast_type == 'forecast' || forecast_type == 'nextday'
+      if forecast_type == 'forecast'
+        title = "Today's"
+        params[:cnt] = 1
+      else
+        title = "Tomorrow's"
+        params[:cnt] = 2
+      end
+
+      url = "http://api.openweathermap.org/data/2.5/forecast/daily?#{params.to_query}"
+      response = Net::HTTP.get_response(URI.parse(url)).body
+      data = JSON.parse(response)
+
+      # if there was an error, then return nil
+      if data['cod'].present? && !data['cod'].to_s.starts_with?('2')
+        Rails.logger.error("response (#{url}) =  #{response}")
+        return nil
+      end
+
+      # Build HTML using API data
+      self.config["location_name"] = data["city"]["name"]
+      format_city = data['city']['name']
+      format_iconid = "#{data['list'].last['weather'][0]['id']}"
+      if font_name == 'wi'
+        format_icon = "<i style=\'font-size:calc(min(80vh,80vw));' class=\'wi wi-owm-#{format_iconid}\'></i>"
+      else
+        format_icon = "<i class=\'owf owf-#{format_iconid} owf-5x\'></i>"
+      end
+      format_high = "#{data['list'].last['temp']['max'].round(0)} &deg;#{UNITS[params[:units]][0]}"
+      format_low = "#{data['list'].last['temp']['min'].round(0)} &deg;#{UNITS[params[:units]][0]}"
+
+      # the Redcarpet gem will assume leading spaces indicate an indented code block
+      default_html = "
+<h1> #{forecast_type == 'forecast' ? 'Today' : 'Tomorrow'} in #{format_city} </h1>
+<div style='float: left; width: 50%'>
+  #{format_icon}
+</div>
+<div style='float: left; width: 50%'>
+  <p> High </p>
+  <h1> #{format_high} </h1>
+  <p> Low </p>
+  <h1> #{format_low}</h1>
+</div>
+"
     else
-       # We're using realtime weather forecast
-       # Build request url
-       params = {
-          lat: self.config['lat'],
-          lon: self.config['lng'],
-          units: self.config['units'],
-          mode: 'json',
-          appid: ConcertoConfig['open_weather_map_api_key']
-       }
-
-       url = "http://api.openweathermap.org/data/2.5/weather?#{params.to_query}"
-
-       # Make request to OpenWeatherMapAPI
-       response = Net::HTTP.get_response(URI.parse(url)).body
-       data = JSON.parse(response)
-
-       # if there was an error, then return nil
-       if data['cod'].present? && !data['cod'].to_s.starts_with?('2')
-         Rails.logger.error("response (#{url}) =  #{response}")
-         return nil
-       end
-
-       # Build HTML using API data
-
-       self.config["location_name"] = data["name"]
-
-       format_city = data['name']
-       format_iconid = "#{data['weather'][0]['id']}"
-
-       if font_name=='wi'
-          format_icon = "<i style=\'font-size:calc(min(80vh,80vw));' class=\'wi wi-owm-#{format_iconid}\'></i>"
-       else
-          format_icon = "<i class=\'owf owf-#{format_iconid} owf-5x\'></i>"
-       end
-
-       format_high = "#{data['main']['temp_max'].round(0)} &deg;#{UNITS[params[:units]][0]}"
-       format_low = "#{data['main']['temp_min'].round(0)} &deg;#{UNITS[params[:units]][0]}"
-       format_current = "#{data['main']['temp'].round(0)} &deg;#{UNITS[params[:units]][0]}"
-       empty_html = "
-                <h1> Today in #{format_city} </h1>
-                <div style='float: left; width: 50%'>
-                   #{format_icon}
-                </div>
-                <div style='float: left; width: 50%'>
-                  <p> Current </p>
-                  <h1> #{format_current} </h1>
-                </div>
-              "
+      # We're using realtime weather forecast
+
+      title = 'Current'
+      url = "http://api.openweathermap.org/data/2.5/weather?#{params.to_query}"
+      response = Net::HTTP.get_response(URI.parse(url)).body
+      data = JSON.parse(response)
+
+      # if there was an error, then return nil
+      if data['cod'].present? && !data['cod'].to_s.starts_with?('2')
+        Rails.logger.error("response (#{url}) =  #{response}")
+        return nil
+      end
+
+      # Build HTML using API data
+      self.config["location_name"] = data["name"]
+
+      format_city = data['name']
+      format_iconid = "#{data['weather'][0]['id']}"
+      if font_name == 'wi'
+        format_icon = "<i style=\'font-size:calc(min(80vh,80vw));' class=\'wi wi-owm-#{format_iconid}\'></i>"
+      else
+        format_icon = "<i class=\'owf owf-#{format_iconid} owf-5x\'></i>"
+      end
+      format_high = "#{data['main']['temp_max'].round(0)} &deg;#{UNITS[params[:units]][0]}"
+      format_low = "#{data['main']['temp_min'].round(0)} &deg;#{UNITS[params[:units]][0]}"
+      format_current = "#{data['main']['temp'].round(0)} &deg;#{UNITS[params[:units]][0]}"
+
+      # the Redcarpet gem will assume leading spaces indicate an indented code block
+      default_html = "
+<h1> Today in #{format_city} </h1>
+<div style='float: left; width: 50%'>
+  #{format_icon}
+</div>
+<div style='float: left; width: 50%'>
+  <p> Current </p>
+  <h1> #{format_current} </h1>
+</div>
+"
     end
 
-    format_string = self.config['format_string']
-
     if format_string.blank?
-       rawhtml = empty_html
+      result_html = default_html
     else
-       rawhtml = eval("\"" + format_string + "\"")
+      result_html = format_string
+      result_html.sub! '#{format_city}', format_city
+      result_html.sub! '#{format_iconid}', format_iconid
+      result_html.sub! '#{format_icon}', format_icon
+      result_html.sub! '#{format_high}', format_high
+      result_html.sub! '#{format_low}', format_low
+      result_html.sub! '#{format_current}', format_current
     end
 
     # Create HtmlText content
-    htmltext = HtmlText.new()
-    htmltext.name = "Today's weather in #{format_city}"
-    htmltext.data = rawhtml
-    return [htmltext]
+    htmltext = HtmlText.new
+    htmltext.name = "#{title} weather in #{format_city}"
+    htmltext.data = result_html
+
+    [htmltext]
   end
 
   # Weather needs a location.  Also allow specification of units
   def self.form_attributes
     attributes = super()
-    attributes.concat([:config => [:lat, :lng, :units, :font_name, :location_name, :format_string, :forecast_type]])
+    attributes.concat([config: [:lat, :lng, :units, :font_name, :location_name, :format_string, :forecast_type]])
   end
 
   def validate_config
-    if self.config['lat'].blank? || self.config['lng'].blank?
-      errors.add(:base, 'A city must be selected')
-    end
+    errors.add(:base, 'A city must be selected') if self.config['lat'].blank? || self.config['lng'].blank?
   end
 end

data/lib/concerto_weather/version.rb

@@ -1,3 +1,3 @@
 module ConcertoWeather
-  VERSION = "0.5"
+  VERSION = '0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_weather
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails