ifttt-gdash 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a905ac9bf55f0dcf3f1e033d6f994592f453578f
-  data.tar.gz: 668819d176f3a2e3ac0a0971d73bc7bfa1839ad3
+  metadata.gz: d1a7c1fdee64cd7ac57e17a7239c6620c83d124f
+  data.tar.gz: f5c4996cc9a94c054ba1b92c989ca56e41e672e9
 SHA512:
-  metadata.gz: b3924408b437fcadd12d50a1900266fb002e18177285b9690162dc2bf2dd55a257f315e1a73764411fa435d7ae0625d458ba82226c0f4f67af1f277a698cd478
-  data.tar.gz: 21a0514bb3ccfa2c553cf73fa1f9dcd67af640935865b6fec76bde7e5734f856a237fa1266b1b6b1ffc0064e4170f3df1e01d89bf205bae9e547f49a3820d73d
+  metadata.gz: 343bae5e82a87903ca8e34a8c37baf7da7add1e2355f2f371864fa86445a7c3fc6529e37c58acb2db6d3a0975a437d983f423a6a6e4470da34ea32c6696d62a8
+  data.tar.gz: 809fc4c849ef3ec45cef655c202d75c3ae6df85230610ab2e92d823687b00f540fb7246199ae1c6109e14da79df3fdadb689cf924657b7fb0612bfa0ccd3f5a5

data/views/dashboard.erb

@@ -13,13 +13,13 @@
             <% i = grouped_graphs.rindex(graphs) * @graph_columns + graphs.rindex(graph) %>
             <td>
             <% if graph %>
-                <% if graph[:graphite][:description] %>
-                    <a href='<%= uri_to_details(i) %>'>
-                    <img src='<%= [@top_level[@params[:category]].graphite_render, graph[:graphite][:url].to_s.force_encoding('UTF-8')].join "?" %>' rel="<%= row == 1 ? 'popover-below' : 'popover-above' %>" title="<%= graph[:graphite][:title] %>" data-content="<%= graph[:graphite][:description] %>"></a>
-                <% else %>
-                    <a href='<%= uri_to_details(i) %>'>
-                    <img src='<%= [@top_level[@params[:category]].graphite_render, graph[:graphite][:url]].join "?" %>'></a>
-                <% end %>
+                <% img_base_url = [@top_level[@params[:category]].graphite_render, graph[:graphite][:url].to_s.force_encoding('UTF-8')].join "?" %>
+                <% graphlot_url = URI.parse(img_base_url).tap{|x| x.path = "/graphlot/"}.to_s %>
+                <a href='<%= uri_to_details(i) %>'>
+                <%# We have to doubly-escape the title and description. The first escape will allow both the values %>
+                <%# to safely fit in the attribute (which prevents injecting HTML around the img tag). The second escape
+                <%# prevents using those properties to inject HTML into the popover itself. %>
+                <img src='<%= img_base_url %>' rel="<%= row == 1 ? 'popover-below' : 'popover-above' %>" title="<%= h(h(graph[:graphite][:title])) %>" data-content="<%= h(h(graph[:graphite][:description])) %>&lt;div&gt;&lt;a href='<%= graphlot_url %>'&gt;Go to Graphlot&lt;/a&gt;&lt;/div&gt;"></a>
                 <%= graph_caption(graph) %>
             <% end %>
             </td>
@@ -33,14 +33,14 @@
     $(function () {
       $("img[rel=popover-above]")
         .popover({
-          placement: "above", delayIn: 1000
+          placement: "above", delayIn: 1000, delayOut: 1000, html: true
         })
     })
 
     $(function () {
       $("img[rel=popover-below]")
         .popover({
-          placement: "below", delayIn: 1000
+          placement: "below", delayIn: 1000, delayOut: 1000, html: true
         })
     })
 </script>

data/views/detailed_dashboard.erb

@@ -8,11 +8,12 @@
           <% graphrows.each do |graph| %>
             <td>
             <% if graph %>
-                <% if graph[:description] %>
-                    <img src='<%= [@top_level[@params[:category]].graphite_render, graph[:url]].join "?" %>' rel="<%= row == 1 ? 'popover-below' : 'popover-above' %>" title="<%= graph[:title] %>" data-content="<%= graph[:description] %>">
-                <% else %>
-                    <img src='<%= [@top_level[@params[:category]].graphite_render, graph[:url]].join "?" %>'>
-                <% end %>
+                <% img_base_url = [@top_level[@params[:category]].graphite_render, graph[:url]].join "?" %>
+                <% graphlot_url = URI.parse(img_base_url).tap{|x| x.path = "/graphlot/"}.to_s %>
+                <%# We have to doubly-escape the title and description. The first escape will allow both the values %>
+                <%# to safely fit in the attribute (which prevents injecting HTML around the img tag). The second escape
+                <%# prevents using those properties to inject HTML into the popover itself. %>
+                <img src='<%= img_base_url %>' rel="<%= row == 1 ? 'popover-below' : 'popover-above' %>" title="<%= h(h(graph[:title])) %>" data-content="<%= h(h(graph[:description])) %>&lt;div&gt;&lt;a href='<%= graphlot_url %>'&gt;Go to Graphlot&lt;/a&gt;&lt;/div&gt;">
             <% end %>
             </td>
           <% end %>
@@ -25,7 +26,7 @@
     $(function () {
       $("img[rel=popover-above]")
         .popover({
-          placement: "above", delayIn: 1000
+          placement: "above", delayIn: 1000, delayOut: 1000, html: true
         })
         .click(function(e) {
           e.preventDefault()
@@ -35,7 +36,7 @@
     $(function () {
       $("img[rel=popover-below]")
         .popover({
-          placement: "below", delayIn: 1000
+          placement: "below", delayIn: 1000, delayOut: 1000, html: true
         })
         .click(function(e) {
           e.preventDefault()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ifttt-gdash
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake