flammarion 0.1.7pre → 0.1.7pre2

data/Readme.md

@@ -170,3 +170,5 @@ They are:
  * [jquery transit](http://ricostacruz.com/jquery.transit/)
  * [leaflet](http://leafletjs.com/)
  * [font awesome](https://fortawesome.github.io/Font-Awesome/)
+ * [emojione](http://emojione.com/)
+ * [Plotly](htps://plot.ly/)

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.7pre"
+    VERSION = "0.1.7pre2"
   end

data/lib/flammarion/writeable.rb

@@ -50,12 +50,13 @@ module Flammarion
       end
 
       def plot(data, options = {})
-        unless data.respond_to?(:keys)
-          data = {y:data, x:(1..data.size).to_a}
-        else
+        if data.respond_to?(:keys)
           options = options.merge(data)
+          data = [data]
+        elsif not data.first.respond_to?(:keys)
+          data = [{y:data, x:(1..data.size).to_a}.merge(options)]
         end
-        @engraving.send_json({action:'plot', id:@id, target:@target, data:[{type:'scatter'}.merge(data)]}.merge(options))
+        @engraving.send_json({action:'plot', id:@id, target:@target, data:data}.merge(options))
       end
     end
 
@@ -124,24 +125,11 @@ module Flammarion
     end
 
     # Creates a new plot to display single axis data
-    # @param [Array<Number>] values A list of numbers to plot
     # @macro add_options
-    # @option options [Integer] :number_of_ticks The number of tick marks to
-    #  display across the bottom
-    # @option options [Integer] :tick_precision The number of digits after the
-    #  decimal point to display next to the tick marks
-    # @option options [Float] :xstart (0.0) The starting value for the x-axis
-    # @option options [Float, String] :ystart ('min') The starting value for the
-    #  y-axis. Can be 'min' to start at the minimum value.
-    # @option options [Boolean] :draw_zero (true) draw a line through y = 0
-    # @option options [Boolean] :draw_mark (false) place a + at each point on
-    #  the line.
-    # @option options [Boolean] :draw_line (true) draw a line through all the
-    #  points.
-    # @option options [Boolean] :fill (false) fill in the area between the curve
-    #  and zero
-    # @note You can press 'a' while hovering the plot to reset the zoom.
     # @return [Plot] A Plot object for manipulation after creation.
+    # @overload plot(array, options)
+    #   @param [Array<Number>] values A list of numbers to plot
+    # @overload plot(dataset, options)
     def plot(data, options = {})
       id = @engraving.make_id
       p = Plot.new(id, @pane_name, @engraving)

data/lib/html/build/javascripts/actions.js

@@ -197,7 +197,7 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = '/images/emoji/';
+      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

data/lib/html/build/javascripts/all.js

@@ -6863,7 +6863,7 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
           }
         });
       }
-      emojione.imagePathPNG = '/images/emoji/';
+      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }
@@ -7402,6 +7402,9 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
         return Plotly.newPlot(plotDiv[0], data.data, $.extend({
           width: plotDiv.width()
         }, window.default_plot_options, data));
+      } else {
+        plotDiv[0].data = data.data;
+        return Plotly.redraw(plotDiv[0]);
       }
     }
   });

data/lib/html/build/javascripts/input.js

@@ -197,7 +197,7 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = '/images/emoji/';
+      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

data/lib/html/build/javascripts/map.js

@@ -197,7 +197,7 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = '/images/emoji/';
+      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

data/lib/html/build/javascripts/plot.js

@@ -45,6 +45,9 @@
         return Plotly.newPlot(plotDiv[0], data.data, $.extend({
           width: plotDiv.width()
         }, window.default_plot_options, data));
+      } else {
+        plotDiv[0].data = data.data;
+        return Plotly.redraw(plotDiv[0]);
       }
     }
   });

data/lib/html/build/javascripts/websocket.js

@@ -197,7 +197,7 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           }
         });
       }
-      emojione.imagePathPNG = '/images/emoji/';
+      emojione.imagePathPNG = 'images/emoji/';
       if (options.escape_icons) {
         text = emojione.toImage(text);
       }

data/lib/html/build/stylesheets/all.css

@@ -3459,7 +3459,7 @@ hr {
 }
 #plot-style {
   color: #eee;
-  background-color: #323539;
+  background-color: #1d1f21;
 }
 #plot-style .tickmarks {
   color: #a7a7a7;

data/lib/html/build/stylesheets/plot.css

@@ -22,7 +22,7 @@
 }
 #plot-style {
   color: #eee;
-  background-color: #323539;
+  background-color: #1d1f21;
 }
 #plot-style .tickmarks {
   color: #a7a7a7;

data/lib/html/source/javascripts/plot.coffee

@@ -31,3 +31,6 @@ $.extend WSClient.prototype.actions,
       @__parent.add(plotDiv, target, data)
       console.log(default_plot_options)
       Plotly.newPlot(plotDiv[0], data.data, $.extend(width: plotDiv.width(), window.default_plot_options, data))
+    else
+      plotDiv[0].data = data.data
+      Plotly.redraw(plotDiv[0])

data/lib/html/source/javascripts/websocket.coffee

@@ -80,7 +80,7 @@ class WSClient
     if options.escape_icons
       text = text.replace /:[\w-]+:/g, (match) ->
         if font_awesome_list.includes(match[1..-2]) then "<i class='fa fa-#{match[1..-2]}'></i>" else match
-    emojione.imagePathPNG = '/images/emoji/'
+    emojione.imagePathPNG = 'images/emoji/'
     text = emojione.toImage(text) if options.escape_icons
     text = $("<div>#{text}</div>")
     text.find("a[href^='http']").attr('target','_blank')

data/lib/html/source/stylesheets/plot.styl

@@ -27,7 +27,7 @@
 // index.html.slim for this to take effect.
 #plot-style
   color $fg-color
-  background-color activate($bg-color, 10%)
+  background-color activate($bg-color, 0%)
   & .tickmarks
     color activate($fg-color, 30%)
   & .markers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.7pre
+  version: 0.1.7pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame