concerto_weather 0.0.1 → 0.0.2

data/app/assets/javascripts/weather.js

@@ -0,0 +1,76 @@
+
+// attach handler to woeid so when it loses focus we can look it up
+// not dry, but no middle man
+function attachWoeidHandlers() {
+  $('input#weather_config_woeid').on('blur', getWoeidInfo);
+
+  function getWoeidInfo() {
+    // will place name, district-county, province-state, country, woeid into 'div.woeid-info'
+
+    var info = '<p>WOEID details could not be determined.</p>';
+    var woeid = $('input#weather_config_woeid').val();
+    var info_el = $('.woeid-info');
+    var woeidName = $('i.woeid-name');
+
+    // something was changed, so wipe out the pre-existing woeid name
+    if (woeidName.length != 0) {
+      $(woeidName).text('');
+    }
+
+    if (info_el.length != 0) {
+      // we found the summary box
+      $(info_el).empty().html('searching...');
+      $.ajax({
+        url: "http://query.yahooapis.com/v1/public/yql?q=" + encodeURIComponent("select woeid, placeTypeName, name, admin1, admin2, country from geo.places where (text = \"" +  woeid + "\" or woeid = \"" + woeid + "\") limit 5") + "&format=json",
+        dataType: 'jsonp',
+        timeout: 4000,
+        success: function (data) {
+
+          function htmlEncode(value){
+            //create a in-memory div, set it's inner text(which jQuery automatically encodes)
+            //then grab the encoded contents back out.  The div never exists on the page.
+            return $('<div/>').text(value).html();
+          }
+
+          if (data.query && data.query.count > 0 && typeof(data.query.results.place) != "undefined") {
+            j = data.query.results.place;
+            if (!(j instanceof Array)) {
+              j = [ data.query.results.place ];
+            }
+
+            // we got something, should use jq datatables with js array load
+            // places = []
+            // j.forEach(function(item) {
+            //   places.push([item.name, item.placeTypeName.content, (item.admin1 ? item.admin1.content : ''), 
+            //     (item.admin2 ? item.admin2.content : ''), item.country.content, item.woeid]);
+            // });
+
+            // icky html table construction (with classes for bootstrap)
+            places = "<table class=\"table table-striped table-condensed table-bordered\">";
+            places += "<thead><tr><th>Name</th><th>Type</th><th>District/County/Region</th><th>Province/State</th><th>Country</th><th>WOEID</th></th></thead>";
+            places += "<tbody>";
+            tbody = "";
+            j.forEach(function(item) {
+              // todo: need htmlencoding
+              tbody += "<tr><td>" + htmlEncode(item.name) + "</td><td>" + 
+                htmlEncode(item.placeTypeName.content) + "</td><td>" + 
+                htmlEncode((item.admin1 ? item.admin1.content : '')) + "</td><td>" + 
+                htmlEncode((item.admin2 ? item.admin2.content : '')) + "</td><td>" + 
+                htmlEncode((item.country ? item.country.content : '')) + "</td><td>" + 
+                item.woeid + "</td></tr>";
+            });
+            places += tbody + "</tbody></table>";
+            info = places;
+          } 
+          $(info_el).empty().html(info);
+        },
+        error: function (xoptions, textStatus)  {
+          $(info_el).empty().html(info);
+        }
+      });
+    }
+  }
+}
+
+$(document).ready(attachWoeidHandlers);
+$(document).on('page:change', attachWoeidHandlers);

data/app/models/weather.rb

@@ -1,11 +1,18 @@
 class Weather < DynamicContent
   DISPLAY_NAME = 'Weather'
 
+  UNITS = {
+    'c' => 'Celsius',
+    'f' => 'Fahrenheit'
+  }
+
+  validate :woeid_must_exist
+
   def build_content
     require 'rss'
     require 'net/http'
 
-    url = "http://weather.yahooapis.com/forecastrss?p=#{self.config['zip_code']}"
+    url = "http://weather.yahooapis.com/forecastrss?w=#{self.config['woeid']}&u=#{self.config['units']}"
 
     feed = Net::HTTP.get_response(URI.parse(url)).body
 
@@ -21,9 +28,44 @@ class Weather < DynamicContent
     return [htmltext]
   end
 
-  # Weather needs a location.
+  # Weather needs a location.  Also allow specification of units
   def self.form_attributes
     attributes = super()
-    attributes.concat([:config => [:zip_code]])
+    attributes.concat([:config => [:woeid, :units]])
+  end
+
+  def woeid_must_exist
+    if !self.config.nil?  # had to add thius because rake dynamic_content:refresh was blowing up on nil object
+      if self.config['woeid'].empty?
+        errors.add(:woeid, 'must be specified')
+      else
+        data = []
+        #begin
+        woeid = URI.escape(self.config['woeid'])
+        url = URI.escape("http://query.yahooapis.com/v1/public/yql?q=select * from geo.places where woeid = #{woeid} limit 1&format=json")
+        uri = URI.parse(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        request = Net::HTTP::Get.new(uri.request_uri)
+        response = http.request(request)
+        if response.code == '200'  #ok
+          json = response.body
+          data = ActiveSupport::JSON.decode(json)
+        end
+        #rescue
+        #  Rails.logger.debug("Yahoo not reachable @ #{url}.")
+        #  return
+        #end
+        if data.empty? || data['query']['count'] == 0
+          errors.add(:woeid, 'not valid')
+        else
+          results = data['query']['results']['place']
+          info = results['name']
+          info = info + ', ' + results['admin1']['content'] if !results['admin1']['content'].empty? if !results['admin1'].nil?
+          info = info + ', ' + results['admin2']['content'] if !results['admin2']['content'].empty? if !results['admin2'].nil?
+          info = info + ', ' + results['country']['content'] if !results['country']['content'].empty? if !results['country'].nil?
+          self.config['name'] = info
+        end
+      end
+    end
   end
 end

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

@@ -1,11 +1,28 @@
+<%= javascript_include_tag "weather" %>
+
 <fieldset>
   <legend><span>Weather</span></legend>
-  <%= form.fields_for :config do |config| %>
-    <div class="clearfix">
-      <%= config.label :zip_code %>
-      <div class="input">
-        <%= config.text_field 'zip_code', :placeholder => '12180', :size => 10 %>
+  <div class="row-fluid">
+    <div class='span4'>
+    <%= form.fields_for :config do |config| %>
+      <div class="clearfix">
+        <%= config.label :woeid, "Where On Earth ID (WOEID)" %>
+        <div class="input">
+          <%= config.text_field :woeid, :placeholder => '12180', :class => "input-small", :value => @content.config['woeid'] %>
+          <br/>
+          <i class="woeid-name"><%= @content.config['name'] %></i>
+        </div>
       </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>
+    <% end %>
+    <div>
+      <div class='woeid-info span8'></div>
     </div>
-  <% end %>
+  </div>
 </fieldset>

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

@@ -1,6 +1,8 @@
 <dl>
-  <dt>Zip Code</dt>
-  <dd><%= content.config['zip_code'] %></dd>
+  <dt>WOEID</dt>
+  <dd><%= content.config['woeid'] %> - <%= content.config['name'] %></dd>
+  <dt>Units</dt>
+  <dd><%= Weather::UNITS[content.config['units']] %></dd>
   <dt>Last Successful Update</dt>
   <dd><%= content.config.include?('last_ok_refresh') ? Time.at(content.config['last_ok_refresh']).strftime('%c') : 'Never' %></dd>
   <dt>Last Attempted Update</dt>

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

@@ -1 +1 @@
-<h1>Weather for <%= content.config['zip_code'] %></h1>
+<h1>Weather for <%= content.config['woeid'] %> - <%= content.config['name'] %></h1>

data/lib/concerto_weather/version.rb

@@ -1,3 +1,3 @@
 module ConcertoWeather
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concerto_weather
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 -07:00
+date: 2013-05-30 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70183968575400 !ruby/object:Gem::Requirement
+  requirement: &70160991282920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *70183968575400
+  version_requirements: *70160991282920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70183968574960 !ruby/object:Gem::Requirement
+  requirement: &70160991282400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183968574960
+  version_requirements: *70160991282400
 description: Show the current weather and a short forecast in the sidebar of Concerto
   2.
 email:
@@ -42,6 +42,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/javascripts/weather.js
 - app/assets/stylesheets/concerto_weather/application.css
 - app/controllers/concerto_weather/application_controller.rb
 - app/helpers/concerto_weather/application_helper.rb