concerto_weather 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e15925cea3acb3e5c7263440c4747a5c0dd0897d
-  data.tar.gz: 7de5a306a41e68b7fa7fd81a987eb8ada775fbd1
+  metadata.gz: fbddb0b388802f7c7bb916c32cdf2daf65717cea
+  data.tar.gz: 4d49707e9781261b06ae1f0bea600d3f4655aa23
 SHA512:
-  metadata.gz: 7187967decce7e690a845f62ec0a3de6f935565ddf144f2eb52c8ec18875ecc9115858ffd945f40c5889947b774c3bc52cee46068f3269049424f34100d2e069
-  data.tar.gz: d9157f22e38cce71ac993be5dcb3bd8ab6890fd9e797a1dc0159e3f95dd01bc73dbded059c30468c18e17658aaf797ee924ef1eccfab7e50f0405434bd994bba
+  metadata.gz: c419cefafa223ad60cc782c4bf2cd6419e4568820cea428f362c8af456207cfeebfa28d94e969edc0554034424925cda47d09a90011ba0f3b6255c051a427a91
+  data.tar.gz: e73a3895525f5db27e359126a789517a723949c4dd2e1a7059529cb8c35db827a91199e16fdaae78ddfdd7446746bd64e65f4c97595e0f7851cfc77e56250e6d

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

@@ -0,0 +1,93 @@
+function weatherRowClickHandler(event) {
+  // Handle click events on city results
+  // Lat/lng saved with weather content for future API calls.
+  $("#weather_config_lat").val($(this).attr("data-lat"));
+  $("#weather_config_lng").val($(this).attr("data-lng"));
+  // Reset all selected rows
+  $(".city-info").find("tr").each(function() {
+    $(this).attr("data-selected", "0");
+    $(this).removeClass("alert-info");
+  });
+  // Set a new selected row
+  $(this).attr("data-selected", "1");
+  $(this).addClass("alert-info");
+}
+
+function reverseGeocode(place) {
+  // Reverse gecode returned coordinates from OpenWeatherMap API
+  // OpenWeatherMap API returns limited location information so this is important
+  //   if users want to distinguish similarly named places
+  var params = {
+    format: "json",
+    lat: place.coord.lat,
+    lon: place.coord.lon
+  };
+
+  $.ajax({
+    url: "http://nominatim.openstreetmap.org/reverse",
+    data: params,
+    dataType: "json",
+    success: function(data) {
+      // Add a row to our results table
+      var lat = place.coord.lat;
+      var lng = place.coord.lon;
+      var row = "<tr class='link-hl' data-selected='0' data-lat='"+lat+"' data-lng='"+lng+"'> \
+                <td>" + place.name + "</td> \
+                <td>" + (data.address.county || '') + "</td> \
+                <td>" + (data.address.state || '') + "</td> \
+                <td>" + (data.address.country_code.toUpperCase() || '') + "</td>";
+      $('#cityResults tr:last').after(row);
+      // Handle click events for search results
+      $('#cityResults tr:last').on('click', weatherRowClickHandler)
+    }
+  });
+}
+
+function buildResultsTable(data) {
+  var places = data.list;
+  var info_el = $(".city-info");
+  // Build a table to display city query results
+  // User can select a city that best matches their intended location
+  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>"
+  // 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]);
+  }
+}
+
+function searchForCityInfo() {
+  var info_el = $(".city-info");
+  var cityQuery = $("input#weather_config_city_query").val();
+
+  if (info_el.length != 0 && cityQuery.length > 0) {
+    // 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
+    $.ajax({
+      url: "/concerto_weather/city_search.js",
+      data: {"q": cityQuery},
+      dataType: "json",
+      timeout: 4000,
+      success: function(data) {
+        // Build a table of results returned from city query
+        buildResultsTable(data);
+      },
+      error: function()  {
+        $(info_el).empty().html("<p>No results found.</p>");
+      }
+    });
+  }
+}
+
+function initCityIdSearch() {
+  var query_el = $("input#weather_config_city_query")
+  query_el.on("focusout", searchForCityInfo);
+}
+
+$(document).ready(initCityIdSearch);

data/app/controllers/concerto_weather/search_controller.rb

@@ -0,0 +1,21 @@
+module ConcertoWeather
+  class SearchController < ConcertoWeather::ApplicationController
+    def find_city
+      @results = getOpenWeatherCities(params[:q])
+
+      respond_to do |format|
+        format.js { render json: @results }
+      end
+    end
+
+    private
+      def getOpenWeatherCities(query)
+        require 'net/http'
+        require 'json'
+
+        appid = ConcertoConfig["open_weather_map_api_key"]
+        url = "http://api.openweathermap.org/data/2.5/find?q=#{query}&type=like&mode=json&appid=#{appid}"
+        return Net::HTTP.get(URI(url))
+      end
+  end
+end

data/app/models/weather.rb

@@ -12,7 +12,8 @@ class Weather < DynamicContent
 
     # Build request url
     params = {
-      id: self.config['city_id'],
+      lat: self.config['lat'],
+      lon: self.config['lng'],
       units: self.config['units'],
       cnt: 1,
       mode: 'json',
@@ -51,6 +52,6 @@ class Weather < DynamicContent
   # Weather needs a location.  Also allow specification of units
   def self.form_attributes
     attributes = super()
-    attributes.concat([:config => [:city_id, :units, :location_name]])
+    attributes.concat([:config => [:lat, :lng, :units, :location_name]])
   end
 end

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

@@ -7,24 +7,26 @@
     <div class='span4'>
     <%= form.fields_for :config do |config| %>
       <div class="clearfix">
-        <%= config.label :city_id, "City ID" %>
+        <%= config.label :city_query, "City Search" %>
         <div class="input">
-          <%= config.text_field :city_id, placeholder: "1273294", value: @content.config['city_id'] %>
+          <%= config.text_field :city_query, placeholder:"Name or Zipcode", value: @content.config['city_id'] %>
+          <%= button_tag type: "button", :class => "btn", onclick: "searchForCityInfo()" do %>
+            <i class="fa fa-refresh"></i>
+          <% end %>
         </div>
       </div>
-      <div class="clearfix">
-        <a href="http://openweathermap.org/help/city_list.txt" target="_blank"> Find your City ID </a>
-      </div>
       <div class="clearfix">
         <%= config.label :units %>
         <div class="input">
           <%= config.select :units, Weather::UNITS.map {|k,v| [v, k]}, :selected => @content.config['units'] %>
         </div>
       </div>
-    </div>
+      <%= config.hidden_field :lat %>
+      <%= config.hidden_field :lng %>
     <% end %>
-    <div>
-      <div class='woeid-info span8'></div>
+    </div>
+    <div class="clearfix">
+      <div class='city-info span8'></div>
     </div>
   </div>
 </fieldset>

data/config/routes.rb

@@ -1,3 +1,7 @@
 Rails.application.routes.draw do
-  resources :weathers, :controller => :contents, :except => [:index, :show], :path => "content"
+  resources :weathers, :controller => :contents, :except => [:index, :show], :path => 'content'
+end
+
+ConcertoWeather::Engine.routes.draw do
+  get '/city_search', to: 'search#find_city'
 end

data/lib/concerto_weather/engine.rb

@@ -5,24 +5,26 @@ module ConcertoWeather
     initializer "register content type" do |app|
       app.config.content_types << Weather
     end
-    
+
     def plugin_info(plugin_info_class)
-      @plugin_info ||= plugin_info_class.new do 
+      @plugin_info ||= plugin_info_class.new do
+        add_route("concerto_weather", ConcertoWeather::Engine)
+
         add_config("open_weather_map_api_key", "",
                    value_type: "string",
                    category: "API Keys",
                    description: "OpenWeatherMap API Access Token. This token is used for obtaining weather information when adding weather content. http://openweathermap.org/appid")
-      
+
         # Add owfont (open weather) icon set to application layout for content preview / browsing
         add_header_tags do
           stylesheet_link_tag "concerto_weather/application"
         end
 
         # Add owfont (open weather) icon set to concerto-frontend layout for weather content shown on screens
-        add_view_hook "frontend/ScreensController", :concerto_frontend_plugins do 
+        add_view_hook "frontend/ScreensController", :concerto_frontend_plugins do
           "#{ stylesheet_link_tag 'concerto_weather/application' }"
         end
-        
+
       end
     end
   end

data/lib/concerto_weather/version.rb

@@ -1,3 +1,3 @@
 module ConcertoWeather
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_weather
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,9 +41,11 @@ files:
 - app/assets/fonts/concerto_weather/owfont-regular.ttf
 - app/assets/fonts/concerto_weather/owfont-regular.woff
 - app/assets/javascripts/concerto_weather/application.js
+- app/assets/javascripts/concerto_weather/weather.js
 - app/assets/stylesheets/concerto_weather/application.css
 - app/assets/stylesheets/concerto_weather/owfont-regular.css.scss
 - app/controllers/concerto_weather/application_controller.rb
+- app/controllers/concerto_weather/search_controller.rb
 - app/helpers/concerto_weather/application_helper.rb
 - app/models/weather.rb
 - app/views/contents/weather/_form_top.html.erb