concerto_weather 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3b305c49d520a14b485d360e103d7d9d50aeae1
-  data.tar.gz: a9174426494b15866b904fbac424c2eed53cf1c6
+  metadata.gz: 71f297c5a33be038f4b200406aa29a80b9fb6d18
+  data.tar.gz: 153d8f18b91219bc5592e5d3e36e97bff4498ba6
 SHA512:
-  metadata.gz: cc5772d0ec6f33c20500d4db8e07cb667e2791db2fc84eb0ee428db97a712f585577ba49c21bd04d9b2d34e2e97225ce8d52de30ac3233fa608f6340b2c06318
-  data.tar.gz: 66a587392ffbe69540564a511e09b58b9c3a4757efb79d969fbe75f618d8db60e6e7e2458a29d14b48923d8b2cc1a02c8eb49b4d0337d14c85536378bce2e31b
+  metadata.gz: 83d44d494a800265ec646e4af6f699ac910e42be7ade1ec1514dcd98f2be18898fe672307d2a9471e399d8ce106e48394b937c4b8a5a543b1cfbe248f71b65b7
+  data.tar.gz: 3db8207e0d7cd9cdf60f8f80809aedf66c6830ed88ed4fe2fb69689fc821d9487d7a9844c3c862f8b304540e5adf04d1ddf4eb919f453af969cab1dbb4600cff

data/app/assets/javascripts/concerto_weather/weather.js

@@ -24,7 +24,7 @@ function reverseGeocode(place) {
   };
 
   $.ajax({
-    url: "http://nominatim.openstreetmap.org/reverse",
+    url: "//nominatim.openstreetmap.org/reverse",
     data: params,
     dataType: "json",
     success: function(data) {
@@ -51,13 +51,15 @@ function buildResultsTable(data) {
   table = "<table id='cityResults' class='table table-condensed'> \
            <thead><th>Name</th><th>District/County/Region</th><th>Province/State</th><th>Country</th>";
   tableBody = "<tbody></tbody></table>";
-  tableBody += "<hr/><i>Can't find your city? Try entering your zip code <b>or</b> your city along with its state (ex: Madison, WI).</i>"
+  tableBody += "<hr/><i>You must select your city from the list above.  Can't find your city? Try entering your zip code <b>or</b> your city along with its state (ex: Madison, WI).</i>"
   // Insert our empty results table
   $(info_el).empty().html(table + tableBody);
   // Find the address info for each weather search result
   // Then insert the place data into our results table
-  for (var i = 0; i < places.length; i++) {
-    reverseGeocode(places[i]);
+  if (typeof places != 'undefined') {
+    for (var i = 0; i < places.length; i++) {
+      reverseGeocode(places[i]);
+    }
   }
 }
 
@@ -66,6 +68,10 @@ function searchForCityInfo() {
   var cityQuery = $("input#weather_config_city_query").val();
 
   if (info_el.length != 0 && cityQuery.length > 0) {
+    // clear out any prior selected city
+    $("#weather_config_lat").val("");
+    $("#weather_config_lng").val("");
+
     // Add a 'searching' placeholder while city query results are loading
     $(info_el).empty().html("<i class='fa fa-spinner fa-spin'></i> searching...");
     // Query the OpenWeatherAPI to find a list of matching cities based on input
@@ -73,12 +79,12 @@ function searchForCityInfo() {
       url: "/concerto_weather/city_search.js",
       data: {"q": cityQuery},
       dataType: "json",
-      timeout: 4000,
+      timeout: 6000,
       success: function(data) {
         // Build a table of results returned from city query
         buildResultsTable(data);
       },
-      error: function()  {
+      error: function(data)  {
         $(info_el).empty().html("<p>No results found.</p>");
       }
     });

data/app/assets/stylesheets/concerto_weather/weather.scss

@@ -0,0 +1,11 @@
+#cityResults tr {
+  cursor: pointer;
+}
+
+textarea#weather_config_format_string {
+  width: 100%;
+}
+
+label[for=weather_config_format_string] + div.input {
+  padding-right: 2em;
+}

data/app/models/weather.rb

@@ -8,7 +8,7 @@ class Weather < DynamicContent
 
   FONTS = {
     'owf' => 'Open Weather Font',
-    'wi' => 'Weather Icons' 
+    'wi' => 'Weather Icons'
   }
 
   FORECAST = {
@@ -16,6 +16,8 @@ class Weather < DynamicContent
     'forecast' => 'Max and Min temps forecast for the day'
   }
 
+  validate :validate_config
+
   def build_content
     require 'json'
     require 'net/http'
@@ -41,8 +43,14 @@ class Weather < DynamicContent
        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']
@@ -56,7 +64,7 @@ class Weather < DynamicContent
 
        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]}"
-       emptyhtml = "
+       empty_html = "
                 <h1> Today in #{format_city} </h1>
                 <div style='float: left; width: 50%'>
                    #{format_icon}
@@ -85,6 +93,12 @@ class Weather < DynamicContent
        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"]
@@ -101,7 +115,7 @@ class Weather < DynamicContent
        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]}"
-       emptyhtml = "
+       empty_html = "
                 <h1> Today in #{format_city} </h1>
                 <div style='float: left; width: 50%'>
                    #{format_icon}
@@ -111,15 +125,13 @@ class Weather < DynamicContent
                   <h1> #{format_current} </h1>
                 </div>
               "
-
     end
 
-
     format_string = self.config['format_string']
 
-    if format_string.blank? 
+    if format_string.blank?
        rawhtml = empty_html
-    else 
+    else
        rawhtml = eval("\"" + format_string + "\"")
     end
 
@@ -135,4 +147,10 @@ class Weather < DynamicContent
     attributes = super()
     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
+  end
 end

data/app/views/contents/weather/_form_top.html.erb

@@ -4,6 +4,11 @@
 <fieldset>
   <legend><span>Weather</span></legend>
   <div class="row-fluid">
+    <% if ConcertoConfig["open_weather_map_api_key"].blank? %>
+    <div class='alert alert-warning'>
+      The OpenWeatherMap API Key under Settings appears to be blank.  An API key is required for this content.
+    </div>
+    <% end %>
     <div class='span4'>
     <%= form.fields_for :config do |config| %>
       <div class="clearfix">

data/lib/concerto_weather/version.rb

@@ -1,3 +1,3 @@
 module ConcertoWeather
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_weather
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,6 +51,7 @@ files:
 - app/assets/stylesheets/concerto_weather/owfont-regular.css.scss
 - app/assets/stylesheets/concerto_weather/weather-icons-wind.min.css.scss
 - app/assets/stylesheets/concerto_weather/weather-icons.min.css.scss
+- app/assets/stylesheets/concerto_weather/weather.scss
 - app/controllers/concerto_weather/application_controller.rb
 - app/controllers/concerto_weather/search_controller.rb
 - app/helpers/concerto_weather/application_helper.rb